diff --git a/apps/playground/tsconfig.json b/apps/playground/tsconfig.json index 527674cc7..9e31b2bdb 100644 --- a/apps/playground/tsconfig.json +++ b/apps/playground/tsconfig.json @@ -1,18 +1,8 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "target": "ES2017", - "module": "esnext", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "noEmitHelpers": true, - "noEmitOnError": true, - "skipLibCheck": true, - "lib": ["es2018", "dom"], - "baseUrl": ".", "paths": { "~/*": ["src/*"] } - }, - "exclude": ["node_modules", "platforms"] + } } diff --git a/packages/core/http/http-request/index.android.ts b/packages/core/http/http-request/index.android.ts index b40d43d5b..8ebbd8f75 100644 --- a/packages/core/http/http-request/index.android.ts +++ b/packages/core/http/http-request/index.android.ts @@ -31,13 +31,6 @@ function ensureImageSource() { } } -let platform: typeof platformModule; -function ensurePlatform() { - if (!platform) { - platform = require('../../platform'); - } -} - let fs: typeof fsModule; function ensureFileSystem() { if (!fs) { @@ -205,8 +198,6 @@ function buildJavaOptions(options: httpModule.HttpRequestOptions) { javaOptions.headers = arrayList; } - ensurePlatform(); - // pass the maximum available image size to the request options in case we need a bitmap conversion javaOptions.screenWidth = Screen.mainScreen.widthPixels; javaOptions.screenHeight = Screen.mainScreen.heightPixels; diff --git a/packages/core/tsconfig.lib.json b/packages/core/tsconfig.lib.json index 213e35d9a..dff655588 100644 --- a/packages/core/tsconfig.lib.json +++ b/packages/core/tsconfig.lib.json @@ -16,7 +16,7 @@ "rootDir": "./", "types": ["node"], "plugins": [ - { "transform": "../webpack/transformers/ns-transform-native-classes.ts", "type": "raw" } + { "transform": "../../../packages/webpack/transformers/ns-transform-native-classes.ts", "type": "raw" } ] }, "exclude": ["**/*.spec.ts", "dist", "__tests__"], diff --git a/packages/webpack/templates/webpack.angular.js b/packages/webpack/templates/webpack.angular.js index 0846c7b64..96db6ac35 100644 --- a/packages/webpack/templates/webpack.angular.js +++ b/packages/webpack/templates/webpack.angular.js @@ -6,6 +6,7 @@ const nativescriptTarget = require('@nativescript/webpack/nativescript-target'); const { nsSupportHmrNg } = require('@nativescript/webpack/transformers/ns-support-hmr-ng'); +const nsTransformNativeClasses = require("@nativescript/webpack/transformers/ns-transform-native-classes").default; const { getMainModulePath } = require('@nativescript/webpack/utils/ast-utils'); diff --git a/packages/webpack/templates/webpack.config.spec.ts b/packages/webpack/templates/webpack.config.spec.ts index eeca37d2b..ea0d06885 100644 --- a/packages/webpack/templates/webpack.config.spec.ts +++ b/packages/webpack/templates/webpack.config.spec.ts @@ -51,6 +51,7 @@ const webpackConfigAngular = proxyquire('./webpack.angular', { return FakeHmrTransformerFlag; }, }, + '@nativescript/webpack/transformers/ns-transform-native-classes': emptyObject, '@nativescript/webpack/utils/ast-utils': { getMainModulePath: () => { return 'fakePath'; @@ -78,6 +79,7 @@ const webpackConfigAngular = proxyquire('./webpack.angular', { const webpackConfigTypeScript = proxyquire('./webpack.typescript', { '@nativescript/webpack': nativeScriptDevWebpack, '@nativescript/webpack/nativescript-target': emptyObject, + '@nativescript/webpack/transformers/ns-transform-native-classes': emptyObject, '@nativescript/webpack/utils/tsconfig-utils': { getNoEmitOnErrorFromTSConfig: () => { return false; @@ -98,6 +100,7 @@ const webpackConfigJavaScript = proxyquire('./webpack.javascript', { const webpackConfigVue = proxyquire('./webpack.vue', { '@nativescript/webpack': nativeScriptDevWebpack, '@nativescript/webpack/nativescript-target': emptyObject, + '@nativescript/webpack/transformers/ns-transform-native-classes': emptyObject, 'vue-loader/lib/plugin': EmptyClass, 'nativescript-vue-template-compiler': emptyObject, 'terser-webpack-plugin': TerserJsStub, diff --git a/packages/webpack/templates/webpack.typescript.js b/packages/webpack/templates/webpack.typescript.js index 47032294c..743a6585f 100644 --- a/packages/webpack/templates/webpack.typescript.js +++ b/packages/webpack/templates/webpack.typescript.js @@ -5,6 +5,7 @@ const webpack = require("webpack"); const nsWebpack = require("@nativescript/webpack"); const nativescriptTarget = require("@nativescript/webpack/nativescript-target"); const { getNoEmitOnErrorFromTSConfig } = require("@nativescript/webpack/utils/tsconfig-utils"); +const nsTransformNativeClasses = require("@nativescript/webpack/transformers/ns-transform-native-classes").default; const { CleanWebpackPlugin } = require("clean-webpack-plugin"); const CopyWebpackPlugin = require("copy-webpack-plugin"); const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); @@ -246,7 +247,10 @@ module.exports = env => { compilerOptions: { sourceMap: isAnySourceMapEnabled, declaration: false - } + }, + getCustomTransformers: (program) => ({ + before: [nsTransformNativeClasses] + }) }, } }, diff --git a/packages/webpack/templates/webpack.vue.js b/packages/webpack/templates/webpack.vue.js index 453fffd22..f18804189 100644 --- a/packages/webpack/templates/webpack.vue.js +++ b/packages/webpack/templates/webpack.vue.js @@ -11,6 +11,7 @@ const NsVueTemplateCompiler = require("nativescript-vue-template-compiler"); const nsWebpack = require("@nativescript/webpack"); const nativescriptTarget = require("@nativescript/webpack/nativescript-target"); +const nsTransformNativeClasses = require("@nativescript/webpack/transformers/ns-transform-native-classes").default; const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin"); const hashSalt = Date.now().toString(); @@ -264,7 +265,10 @@ module.exports = env => { allowTsInNodeModules: true, compilerOptions: { declaration: false - } + }, + getCustomTransformers: (program) => ({ + before: [nsTransformNativeClasses] + }) }, }, {