Merge branch 'master' into dependencies

mudlabs · web-flow · commit 790e3867f356 · 2019-06-16T16:44:29.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+<a name="0.24.1"></a>
+## [0.24.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.24.0...0.24.1) (2019-06-06)
+
+
+### Bug Fixes
+
+* move the type check to a child process in order to make it faster in bigger apps and unify the hmr and no-hmr experience. ([#926](https://github.com/NativeScript/nativescript-dev-webpack/issues/926)) ([1398179](https://github.com/NativeScript/nativescript-dev-webpack/commit/1398179))
+* stop generating .d.ts on TS compilation ([#919](https://github.com/NativeScript/nativescript-dev-webpack/issues/919)) ([ccbf8de](https://github.com/NativeScript/nativescript-dev-webpack/commit/ccbf8de))
+
+
+
+<a name="0.24.0"></a>
+# [0.24.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.22.0...0.24.0) (2019-05-30)
+
+
+### Bug Fixes
+
+* import the workaroundResolve funciton based on the Angular version (it was moved from compiler_host to utils in Angular 8) ([#904](https://github.com/NativeScript/nativescript-dev-webpack/pull/904)) ([56224a8](https://github.com/NativeScript/nativescript-dev-webpack/commit/56224a898b46fc8542f8b5928c52e9e4cb6022e2))
+
+
+### Features
+
+* update deps to Angular 8.0.0 deps ([#904](https://github.com/NativeScript/nativescript-dev-webpack/pull/904)) ([d6afb74](https://github.com/NativeScript/nativescript-dev-webpack/commit/d6afb7436585d41c4188a2373d376f2b51bc541e))
+
+
+
 <a name="0.22.0"></a>
 # [0.22.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.21.0...0.22.0) (2019-05-15)
 
diff --git a/demo/AngularApp/app/activity.android.ts b/demo/AngularApp/app/activity.android.ts
@@ -1,15 +1,15 @@
-import {setActivityCallbacks, AndroidActivityCallbacks} from "tns-core-modules/ui/frame";
+import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";
 
 @JavaProxy("org.myApp.MainActivity")
-class Activity extends android.support.v7.app.AppCompatActivity {
+class Activity extends androidx.appcompat.app.AppCompatActivity {
     public isNativeScriptActivity: boolean;
     private _callbacks: AndroidActivityCallbacks;
 
     protected onCreate(savedInstanceState: any): void { // android.os.Bundle
         // Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
         // The JS constructor might not be called because the activity is created from Android.
         this.isNativeScriptActivity = true;
-        
+
         if (!this._callbacks) {
             setActivityCallbacks(this);
         }
diff --git a/demo/AngularApp/app/application.d.ts b/demo/AngularApp/app/application.d.ts
@@ -1 +1,2 @@
 declare const android: any;
+declare const androidx: any;
diff --git a/demo/AngularApp/webpack.config.js b/demo/AngularApp/webpack.config.js
@@ -62,7 +62,7 @@ module.exports = env => {
     const entryPath = `.${sep}${entryModule}`;
     const entries = { bundle: entryPath, application: "./application.android" };
     if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     const ngCompilerTransformers = [];
diff --git a/demo/JavaScriptApp/app/activity.android.js b/demo/JavaScriptApp/app/activity.android.js
@@ -1,7 +1,7 @@
 const frame = require("ui/frame");
 
-const superProto = android.support.v7.app.AppCompatActivity.prototype;
-android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
+const superProto = androidx.appcompat.app.AppCompatActivity.prototype;
+androidx.appcompat.app.AppCompatActivity.extend("org.myApp.MainActivity", {
     onCreate: function(savedInstanceState) {
         // Set isNativeScriptActivity in onCreate.
         // The JS constructor might not be called because the activity is created from Android.
diff --git a/demo/JavaScriptApp/webpack.config.js b/demo/JavaScriptApp/webpack.config.js
@@ -56,7 +56,7 @@ module.exports = env => {
     const entryPath = `.${sep}${entryModule}.js`;
     const entries = { bundle: entryPath, application: "./application.android" };
     if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
diff --git a/demo/TypeScriptApp/app/activity.android.ts b/demo/TypeScriptApp/app/activity.android.ts
@@ -1,7 +1,7 @@
 import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
 
 @JavaProxy("org.myApp.MainActivity")
-class Activity extends android.support.v7.app.AppCompatActivity {
+class Activity extends androidx.appcompat.app.AppCompatActivity {
     public isNativeScriptActivity: boolean;
     private _callbacks: AndroidActivityCallbacks;
     protected onCreate(savedInstanceState: any): void { // android.os.Bundle
diff --git a/demo/TypeScriptApp/app/application.d.ts b/demo/TypeScriptApp/app/application.d.ts
@@ -1 +1,2 @@
 declare const android: any;
+declare const androidx: any;
diff --git a/demo/TypeScriptApp/nsconfig.json b/demo/TypeScriptApp/nsconfig.json
@@ -0,0 +1,3 @@
+{
+	"useLegacyWorkflow": false
+}
diff --git a/demo/TypeScriptApp/webpack.config.js b/demo/TypeScriptApp/webpack.config.js
@@ -60,7 +60,7 @@ module.exports = env => {
     const tsConfigPath = resolve(projectRoot, "tsconfig.tns.json");
 
     if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
diff --git a/plugins/GenerateNativeScriptEntryPointsPlugin.js b/plugins/GenerateNativeScriptEntryPointsPlugin.js
@@ -1,7 +1,7 @@
 const { RawSource } = require("webpack-sources");
 const { getPackageJson } = require("../projectHelpers");
 const { SNAPSHOT_ENTRY_NAME } = require("./NativeScriptSnapshotPlugin");
-
+const path = require("path");
 
 exports.GenerateNativeScriptEntryPointsPlugin = (function () {
     const GenerationFailedError = "Unable to generate entry files.";
@@ -49,38 +49,42 @@ exports.GenerateNativeScriptEntryPointsPlugin = (function () {
             return;
         }
 
-        const requireDeps =
-            entryPoint.chunks.map(chunk => {
-                let requireChunkFiles = "";
-                if (chunk.name === entryPointName) {
-                    entryChunk = chunk;
-                } else {
-                    chunk.files.forEach(fileName => {
-                        if (!this.isHMRFile(fileName)) {
-                            requireChunkFiles += `require("./${fileName}");`;
-                        }
-                    });
-                }
-
-                return requireChunkFiles;
-            }).join("");
+        const requiredFiles = [];
+        entryPoint.chunks.forEach(chunk => {
+            if (chunk.name === entryPointName) {
+                entryChunk = chunk;
+            } else {
+                chunk.files.forEach(fileName => {
+                    if (!this.isHMRFile(fileName)) {
+                        requiredFiles.push(fileName);
+                    }
+                });
+            }
+        });
 
         if (!entryChunk) {
             throw new Error(`${GenerationFailedError} Entry chunk not found for entry "${entryPointName}".`);
         }
 
-        entryChunk.files.forEach(fileName => {
-            if (!compilation.assets[fileName]) {
-                throw new Error(`${GenerationFailedError} File "${fileName}" not found for entry "${entryPointName}".`);
+        entryChunk.files.forEach(filePath => {
+            if (!compilation.assets[filePath]) {
+                throw new Error(`${GenerationFailedError} File "${filePath}" not found for entry "${entryPointName}".`);
             }
 
-            if (!this.isHMRFile(fileName)) {
-                const currentEntryFileContent = compilation.assets[fileName].source();
-                compilation.assets[fileName] = new RawSource(`${requireDeps}${currentEntryFileContent}`);
+            if (!this.isHMRFile(filePath)) {
+                const currFileDirRelativePath = path.dirname(filePath);
+                const pathToRootFromCurrFile = path.relative(currFileDirRelativePath, ".");
+
+                const requireDeps = requiredFiles.map(depPath => {
+                    const depRelativePath = path.join(pathToRootFromCurrFile, depPath);
+
+                    return `require("./${depRelativePath}");`;
+                }).join("");
+                const currentEntryFileContent = compilation.assets[filePath].source();
+                compilation.assets[filePath] = new RawSource(`${requireDeps}${currentEntryFileContent}`);
             }
         });
     }
-
     GenerateNativeScriptEntryPointsPlugin.prototype.addAsset = function (compilation, name, content) {
         if (this.files[name] !== content) {
             this.files[name] = content;
diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
@@ -60,8 +60,9 @@ module.exports = env => {
     const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
     const entryPath = `.${sep}${entryModule}`;
     const entries = { bundle: entryPath };
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     const ngCompilerTransformers = [];
diff --git a/templates/webpack.config.spec.ts b/templates/webpack.config.spec.ts
@@ -115,6 +115,20 @@ describe('webpack.config.js', () => {
                     expect(isCalled).toBe(true, 'Webpack.config.js must use the getConvertedExternals method');
                 });
 
+                if (platform === "ios") {
+                    it('has inspector_modules entry when tns-core-modules are not externals', () => {
+                        const input = getInput({ platform, externals: ['nativescript-vue'] });
+                        const config = webpackConfig(input);
+                        expect(config.entry["tns_modules/tns-core-modules/inspector_modules"]).toEqual("inspector_modules");
+                    });
+
+                    it('does not have inspector_modules entry when tns-core-modules are externals', () => {
+                        const input = getInput({ platform, externals: ['tns-core-modules'] });
+                        const config = webpackConfig(input);
+                        expect(config.entry["tns_modules/tns-core-modules/inspector_modules"]).toBeUndefined();
+                    });
+                }
+
                 [
                     {
                         input: ['nativescript-vue'],
@@ -343,4 +357,4 @@ describe('webpack.config.js', () => {
             });
         });
     });
-});
+});
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js
@@ -54,8 +54,9 @@ module.exports = env => {
     const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
     const entryPath = `.${sep}${entryModule}.js`;
     const entries = { bundle: entryPath };
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js
@@ -58,8 +58,9 @@ module.exports = env => {
 
     const tsConfigPath = resolve(projectRoot, "tsconfig.tns.json");
 
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
@@ -211,10 +212,13 @@ module.exports = env => {
                         loader: "ts-loader",
                         options: {
                             configFile: tsConfigPath,
-                            transpileOnly: !!hmr,
+                            // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#faster-builds
+                            // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#hot-module-replacement
+                            transpileOnly: true,
                             allowTsInNodeModules: true,
                             compilerOptions: {
-                                sourceMap: isAnySourceMapEnabled
+                                sourceMap: isAnySourceMapEnabled,
+                                declaration: false
                             }
                         },
                     }
@@ -245,6 +249,14 @@ module.exports = env => {
             }),
             // Does IPC communication with the {N} CLI to notify events when running in watch mode.
             new nsWebpack.WatchStateLoggerPlugin(),
+            // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#faster-builds
+            // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#hot-module-replacement
+            new ForkTsCheckerWebpackPlugin({
+                tsconfig: tsConfigPath,
+                async: false,
+                useTypescriptIncrementalApi: true,
+                memoryLimit: 4096
+            })
         ],
     };
 
@@ -284,12 +296,6 @@ module.exports = env => {
 
     if (hmr) {
         config.plugins.push(new webpack.HotModuleReplacementPlugin());
-
-        // With HMR ts-loader should run in `transpileOnly` mode,
-        // so assure type-checking with fork-ts-checker-webpack-plugin
-        config.plugins.push(new ForkTsCheckerWebpackPlugin({
-            tsconfig: tsConfigPath
-        }));
     }
 
 
diff --git a/templates/webpack.vue.js b/templates/webpack.vue.js
@@ -61,8 +61,9 @@ module.exports = env => {
     const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
     const entryPath = `.${sep}${entryModule}`;
     const entries = { bundle: entryPath };
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
     console.log(`Bundling application for entryPath ${entryPath}...`);
 
@@ -209,6 +210,9 @@ module.exports = env => {
                 options: {
                     appendTsSuffixTo: [/\.vue$/],
                     allowTsInNodeModules: true,
+                    compilerOptions: {
+                        declaration: false
+                    }
                 },
             },
             {

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`declare const android: any;`
	`2`	`+declare const androidx: any;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "useLegacyWorkflow": false`
	`3`	`+}`