Merge branch 'master' into svetoslavtsenov/update-release-schema

Author: SvetoslavTsenov

CHANGELOG.md

@@ -32,7 +32,7 @@
 
 
 <a name="0.20.0"></a>
-# [0.20.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.18.3...0.20.0) (2019-02-08)
+# [0.20.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.19.2...0.20.0) (2019-02-08)
 
 
 ### Bug Fixes

bundle-config-loader.js

@@ -1,6 +1,14 @@
+const unitTestingConfigLoader = require("./unit-testing-config-loader");
+
 module.exports = function (source) {
     this.cacheable();
-    const { angular = false, loadCss = true, registerModules = /(root|page)\.(xml|css|js|ts|scss)$/ } = this.query;
+    const { angular = false, loadCss = true, unitTesting, projectRoot, appFullPath, registerModules = /(root|page)\.(xml|css|js|ts|scss)$/ } = this.query;
+
+    if (unitTesting) {
+        source = unitTestingConfigLoader({ appFullPath, projectRoot, angular, rootPagesRegExp: registerModules });
+        this.callback(null, source);
+        return;
+    }
 
     const hmr = `
         if (module.hot) {

index.js

@@ -53,6 +53,12 @@ exports.getAppPath = (platform, projectDir) => {
     }
 };
 
+exports.getEntryPathRegExp = (appFullPath, entryModule) => {
+    const entryModuleFullPath = path.join(appFullPath, entryModule);
+    // Windows paths contain `\`, so we need to convert each of the `\` to `\\`, so it will be correct inside RegExp
+    const escapedPath = entryModuleFullPath.replace(/\\/g, "\\\\");
+    return new RegExp(escapedPath);
+}
 /**
  * Converts an array of strings externals to an array of regular expressions.
  * Input is an array of string, which we need to convert to regular expressions, so all imports for this module will be treated as externals.

index.spec.ts

@@ -1,4 +1,5 @@
-import { getConvertedExternals } from './index';
+import { getConvertedExternals, getEntryPathRegExp } from './index';
+const path = require("path");
 
 describe('index', () => {
     describe('getConvertedExternals', () => {
@@ -51,4 +52,27 @@ describe('index', () => {
             });
         });
     });
+
+    describe('getEntryPathRegExp', () => {
+        const originalPathJoin = path.join;
+        const entryModule = "index.js";
+
+        afterEach(() => {
+            path.join = originalPathJoin;
+        });
+
+        it('returns RegExp that matches Windows', () => {
+            const appPath = "D:\\Work\\app1\\app";
+            path.join = path.win32.join;
+            const regExp = getEntryPathRegExp(appPath, entryModule);
+            expect(!!regExp.exec(`${appPath}\\${entryModule}`)).toBe(true);
+        });
+
+        it('returns RegExp that works with POSIX paths', () => {
+            const appPath = "/usr/local/lib/app1/app";
+            path.join = path.posix.join;
+            const regExp = getEntryPathRegExp(appPath, entryModule);
+            expect(!!regExp.exec(`${appPath}/${entryModule}`)).toBe(true);
+        });
+    });
 });

lib/compiler.js

@@ -174,8 +174,9 @@ function logSnapshotWarningMessage($logger) {
 function stopWebpackForPlatform($logger, platform) {
     $logger.trace(`Stopping webpack watch for platform ${platform}.`);
     const webpackProcess = webpackProcesses[platform];
-    webpackProcess.kill("SIGINT");
-
-    delete webpackProcesses[platform];
+    if (webpackProcess) {
+        webpackProcess.kill("SIGINT");
+        delete webpackProcesses[platform];
+    }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",

plugins/WatchStateLoggerPlugin.ts

@@ -1,6 +1,4 @@
 import { join } from "path";
-import { writeFileSync, readFileSync } from "fs";
-const utils = require("../lib/utils");
 
 export enum messages {
     compilationComplete = "Webpack compilation complete.",
@@ -37,10 +35,6 @@ export class WatchStateLoggerPlugin {
                 .keys(compilation.assets)
                 .filter(assetKey => compilation.assets[assetKey].emitted);
 
-            if (compilation.errors.length > 0) {
-                WatchStateLoggerPlugin.rewriteHotUpdateChunk(compiler, compilation, emittedFiles);
-            }
-
             // provide fake paths to the {N} CLI - relative to the 'app' folder
             // in order to trigger the livesync process
             const emittedFilesFakePaths = emittedFiles
@@ -51,62 +45,4 @@ export class WatchStateLoggerPlugin {
             process.send && process.send({ emittedFiles: emittedFilesFakePaths }, error => null);
         });
     }
-
-    /**
-     * Rewrite an errored chunk to make the hot module replace successful.
-     * @param compiler the webpack compiler
-     * @param emittedFiles the emitted files from the current compilation
-     */
-    private static rewriteHotUpdateChunk(compiler, compilation, emittedFiles: string[]) {
-        const chunk = this.findHotUpdateChunk(emittedFiles);
-        if (!chunk) {
-            return;
-        }
-
-        const { name } = utils.parseHotUpdateChunkName(chunk);
-        if (!name) {
-            return;
-        }
-
-        const absolutePath = join(compiler.outputPath, chunk);
-
-        const newContent = this.getWebpackHotUpdateReplacementContent(compilation.errors, absolutePath, name);
-        writeFileSync(absolutePath, newContent);
-    }
-
-    private static findHotUpdateChunk(emittedFiles: string[]) {
-        return emittedFiles.find(file => file.endsWith("hot-update.js"));
-    }
-
-    /**
-     * Gets only the modules object after 'webpackHotUpdate("bundle",' in the chunk
-     */
-    private static getModulesObjectFromChunk(chunkPath) {
-        let content = readFileSync(chunkPath, "utf8")
-        const startIndex = content.indexOf(",") + 1;
-        let endIndex = content.length - 1;
-        if(content.endsWith(';')) {
-            endIndex--;
-        }
-        return content.substring(startIndex, endIndex);
-    }
-
-    /**
-     * Gets the webpackHotUpdate call with updated modules not to include the ones with errors
-     */
-    private static getWebpackHotUpdateReplacementContent(compilationErrors, filePath, moduleName) {
-        const errorModuleIds = compilationErrors.filter(x => x.module).map(x => x.module.id);
-        if (!errorModuleIds || errorModuleIds.length == 0) {
-            // could not determine error modiles so discard everything
-            return `webpackHotUpdate('${moduleName}', {});`;
-        }
-        const updatedModules = this.getModulesObjectFromChunk(filePath);
-
-        // we need to filter the modules with a function in the file as it is a relaxed JSON not valid to be parsed and manipulated
-        return `const filter = function(updatedModules, modules) {
-            modules.forEach(moduleId => delete updatedModules[moduleId]);
-            return updatedModules;
-        }
-        webpackHotUpdate('${moduleName}', filter(${updatedModules}, ${JSON.stringify(errorModuleIds)}));`;
-    }
 }

templates/webpack.angular.js

@@ -47,6 +47,7 @@ module.exports = env => {
         report, // --env.report
         sourceMap, // --env.sourceMap
         hmr, // --env.hmr,
+        unitTesting, // --env.unitTesting
     } = env;
 
     const externals = nsWebpack.getConvertedExternals(env.externals);
@@ -55,6 +56,11 @@ module.exports = env => {
     const tsConfigName = "tsconfig.tns.json";
     const entryModule = `${nsWebpack.getEntryModule(appFullPath)}.ts`;
     const entryPath = `.${sep}${entryModule}`;
+    const entries = { bundle: entryPath };
+    if (platform === "ios") {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    };
+
     const ngCompilerTransformers = [];
     const additionalLazyModuleResources = [];
     if (aot) {
@@ -101,9 +107,7 @@ module.exports = env => {
             ]
         },
         target: nativescriptTarget,
-        entry: {
-            bundle: entryPath,
-        },
+        entry: entries,
         output: {
             pathinfo: false,
             path: dist,
@@ -139,6 +143,7 @@ module.exports = env => {
         },
         devtool: sourceMap ? "inline-source-map" : "none",
         optimization: {
+            runtimeChunk: "single",
             splitChunks: {
                 cacheGroups: {
                     vendor: {
@@ -175,7 +180,7 @@ module.exports = env => {
         module: {
             rules: [
                 {
-                    test: new RegExp(entryPath),
+                    test: nsWebpack.getEntryPathRegExp(appFullPath, entryPath),
                     use: [
                         // Require all Android app components
                         platform === "android" && {
@@ -188,6 +193,9 @@ module.exports = env => {
                             options: {
                                 angular: true,
                                 loadCss: !snapshot, // load the application css if in debug mode
+                                unitTesting,
+                                appFullPath,
+                                projectRoot,
                             }
                         },
                     ].filter(loader => !!loader)
@@ -241,25 +249,23 @@ module.exports = env => {
             }),
             // Remove all files from the out dir.
             new CleanWebpackPlugin([`${dist}/**/*`]),
-            // Copy native app resources to out dir.
-            new CopyWebpackPlugin([
-                {
-                    from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
-                    to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
-                    context: projectRoot
-                },
-            ]),
             // Copy assets to out dir. Add your own globs as needed.
             new CopyWebpackPlugin([
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },
             ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
             // Generate a bundle starter script and activate it in package.json
-            new nsWebpack.GenerateBundleStarterPlugin([
-                "./vendor",
-                "./bundle",
-            ]),
+            new nsWebpack.GenerateBundleStarterPlugin(
+                // Don't include `runtime.js` when creating a snapshot. The plugin
+                // configures the WebPack runtime to be generated inside the snapshot
+                // module and no `runtime.js` module exist.
+                (snapshot ? [] : ["./runtime"])
+                .concat([
+                    "./vendor",
+                    "./bundle",
+              ])
+            ),
             // For instructions on how to set up workers with webpack
             // check out https://github.com/nativescript/worker-loader
             new NativeScriptWorkerPlugin(),
@@ -269,6 +275,18 @@ module.exports = env => {
         ],
     };
 
+    // Copy the native app resources to the out dir
+    // only if doing a full build (tns run/build) and not previewing (tns preview)
+    if (!externals || externals.length === 0) {
+        config.plugins.push(new CopyWebpackPlugin([
+            {
+                from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
+                to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
+                context: projectRoot
+            },
+        ]));
+    }
+
 
     if (report) {
         // Generate report files for bundles content

templates/webpack.config.spec.ts

@@ -21,6 +21,7 @@ const nativeScriptDevWebpack = {
     getAppPath: () => 'app',
     getEntryModule: () => 'EntryModule',
     getResolver: () => null,
+    getEntryPathRegExp: () => null,
     getConvertedExternals: nsWebpackIndex.getConvertedExternals
 };
 
@@ -83,7 +84,8 @@ describe('webpack.config.js', () => {
                     });
 
                     it('returns empty array when externals are not passed', () => {
-                        const config = webpackConfig(getInput({ platform }));
+                        const input = getInput({ platform });
+                        const config = webpackConfig(input);
                         expect(config.externals).toEqual([]);
                     });