Merge branch 'master' into master

Author: berardo

CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="0.8.0"></a>
+# [0.8.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.7.3...0.8.0) (2017-09-08)
+
+### Features
+
+* add support for web workers to default template ([#269](https://github.com/NativeScript/nativescript-dev-webpack/issues/269)) ([494ccbb](https://github.com/NativeScript/nativescript-dev-webpack/commit/494ccbb))
+
+
 <a name="0.7.3"></a>
 ## [0.7.3](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.7.2...0.7.3) (2017-07-12)
 

bin/generate-android-snapshot

@@ -6,9 +6,9 @@ const { existsSync } = require("fs");
 
 const semver = require("semver");
 
-const { getPackageJson } = require("../projectHelpers");
+const { getPackageJson, getProjectDir } = require("../projectHelpers");
 
-const PROJECT_DIR = pathResolve(__dirname, "../../../");
+const PROJECT_DIR = getProjectDir({ nestingLvl: 2 });
 const packageJson = getPackageJson(PROJECT_DIR);
 
 if (!process.env.npm_config_argv) {
@@ -152,7 +152,9 @@ function webpack(platform, env) {
         console.log(`Running webpack for ${platform}...`);
 
         const args = [
-            `webpack`,
+            `node`,
+            `--preserve-symlinks`,
+            `./node_modules/.bin/webpack`,
             `--config=webpack.config.js`,
             `--progress`,
             `--env.${platform}`,

bin/install-ns-webpack

@@ -3,7 +3,9 @@
 const path = require("path");
 const fs = require("fs");
 
-const PROJECT_DIR = path.resolve(__dirname, "../../../");
+const { getProjectDir } = require("../projectHelpers");
+
+const PROJECT_DIR = getProjectDir({ nestingLvl: 2 });
 const APP_ID = require(path.resolve(PROJECT_DIR, "./package.json")).nativescript.id;
 const APP_NAME = APP_ID.substring(APP_ID.lastIndexOf(".") + 1);
 const PROJECT_PATHS = {

bin/ns-bundle

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 const { resolve } = require("path");
 
-const { getPackageJson, writePackageJson } = require("../projectHelpers");
+const { getPackageJson, getProjectDir, writePackageJson } = require("../projectHelpers");
 const { forceUpdateProjectDeps } = require("../dependencyManager");
 const { editExistingProjectFiles } = require("../projectFilesManager");
 
-const PROJECT_DIR = resolve(__dirname, "../../../");
+const PROJECT_DIR = getProjectDir({ nestingLvl: 2 });
+const packageJson = getPackageJson(PROJECT_DIR);
 
 console.info("Updating dev dependencies...");
-const packageJson = getPackageJson(PROJECT_DIR);
+
 const { deps } = forceUpdateProjectDeps(packageJson);
 packageJson.devDependencies = deps;
 writePackageJson(packageJson, PROJECT_DIR);

bin/ns-verify-bundle

@@ -64,6 +64,7 @@ function getRequiredDeps(packageJson) {
         "copy-webpack-plugin": "~4.0.1",
         "raw-loader": "~0.5.1",
         "nativescript-css-loader": "~0.26.0",
+        "nativescript-worker-loader": "~0.8.1",
         "resolve-url-loader": "~2.1.0",
         "extract-text-webpack-plugin": "~3.0.0",
     };

bin/remove-ns-webpack

@@ -1,9 +1,9 @@
 const path = require("path");
 const { existsSync } = require("fs");
 
-const { getPackageJson, isAngular } = require("./projectHelpers");
+const { getPackageJson, getProjectDir, isAngular } = require("./projectHelpers");
 
-const PROJECT_DIR = path.dirname(path.dirname(__dirname));
+const PROJECT_DIR = getProjectDir({ nestingLvl: 2 });
 const APP_DIR = path.join(PROJECT_DIR, "app");
 
 Object.assign(exports, require('./plugins'));

bin/update-ns-webpack

@@ -6,7 +6,7 @@ const projectFilesManager = require("./projectFilesManager");
 const npmScriptsManager = require("./npmScriptsManager");
 const dependencyManager = require("./dependencyManager");
 
-const PROJECT_DIR = path.dirname(path.dirname(__dirname));
+const PROJECT_DIR = helpers.getProjectDir({ nestingLvl: 2 });
 const APP_DIR = path.resolve(PROJECT_DIR, "app");
 
 function install() {

dependencyManager.js

@@ -11,9 +11,7 @@ const DEPRECATED_SCRIPT_TEMPLATES = Object.freeze([
     "prewebpack-[PLATFORM]",
     "webpack-[PLATFORM]",
     "prestart-[PLATFORM]-bundle",
-    "start-[PLATFORM]-bundle",
     "prebuild-[PLATFORM]-bundle",
-    "build-[PLATFORM]-bundle",
 ]);
 
 const PLATFORMS = Object.freeze(["android", "ios"]);

index.js

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

installer.js

@@ -44,6 +44,15 @@ module.exports = env => {
             alias: {
                 '~': resolve("./app")
             },
+
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked packages during development.
+            symlinks: false
+        },
+        resolveLoader: {
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked loader packages during development.
+            symlinks: false
         },
         node: {
             // Disable node shims that conflict with NativeScript

npmScriptsManager.js

@@ -6,4 +6,5 @@ const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
 `;

package.json

@@ -26,6 +26,9 @@ module.exports = `
             "./vendor",
             "./bundle",
         ]),
+        
+        // Support for web workers since v3.2
+        new NativeScriptWorkerPlugin(),
 
         // Generate report files for bundles content
         new BundleAnalyzerPlugin({

prepublish/common/exports.js

@@ -30,11 +30,36 @@ const writePackageJson = (content, projectDir) => {
     fs.writeFileSync(packageJsonPath, JSON.stringify(content, null, 2))
 }
 
+const getProjectDir = ({ nestingLvl } = { nestingLvl: 0 }) => {
+    // INIT_CWD is available since npm 5.4
+    const initCwd = process.env.INIT_CWD;
+    const shouldUseInitCwd = (() => {
+        if (!initCwd) {
+            return false;
+        }
+
+        const installedPackage = path.resolve(initCwd, "node_modules", "nativescript-dev-webpack");
+        if (!fs.existsSync(installedPackage)) {
+            return false;
+        }
+
+        const stat = fs.lstatSync(installedPackage);
+        return stat.isSymbolicLink();
+    })();
+
+    return shouldUseInitCwd ?
+        initCwd :
+        Array
+            .from(Array(nestingLvl))
+            .reduce(dir => path.dirname(dir), __dirname);
+};
+
 const getPackageJsonPath = projectDir => path.resolve(projectDir, "package.json");
 
 module.exports = {
     isTypeScript,
     isAngular,
-    getPackageJson,
     writePackageJson,
+    getPackageJson,
+    getProjectDir,
 };

prepublish/common/imports.js

@@ -7,6 +7,7 @@ const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
 
 const { AotPlugin } = require("@ngtools/webpack");
 
@@ -59,6 +60,15 @@ module.exports = env => {
             alias: {
                 '~': resolve("./app")
             },
+
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked packages during development.
+            symlinks: false
+        },
+        resolveLoader: {
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked loader packages during development.
+            symlinks: false
         },
         node: {
             // Disable node shims that conflict with NativeScript
@@ -184,6 +194,9 @@ function getPlugins(platform, env) {
             "./vendor",
             "./bundle",
         ]),
+        
+        // Support for web workers since v3.2
+        new NativeScriptWorkerPlugin(),
 
         // Generate report files for bundles content
         new BundleAnalyzerPlugin({

prepublish/common/plugins.js

@@ -7,6 +7,7 @@ const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
 
 
 let mainSheet = '';
@@ -56,6 +57,15 @@ module.exports = env => {
             alias: {
                 '~': resolve("./app")
             },
+
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked packages during development.
+            symlinks: false
+        },
+        resolveLoader: {
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked loader packages during development.
+            symlinks: false
         },
         node: {
             // Disable node shims that conflict with NativeScript
@@ -168,6 +178,9 @@ function getPlugins(platform, env) {
             "./vendor",
             "./bundle",
         ]),
+        
+        // Support for web workers since v3.2
+        new NativeScriptWorkerPlugin(),
 
         // Generate report files for bundles content
         new BundleAnalyzerPlugin({

projectHelpers.js

@@ -7,6 +7,7 @@ const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
 
 
 let mainSheet = '';
@@ -56,6 +57,15 @@ module.exports = env => {
             alias: {
                 '~': resolve("./app")
             },
+
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked packages during development.
+            symlinks: false
+        },
+        resolveLoader: {
+            // This will not follow symlinks to their original location,
+            // and will enable us to work with symlinked loader packages during development.
+            symlinks: false
         },
         node: {
             // Disable node shims that conflict with NativeScript
@@ -177,6 +187,9 @@ function getPlugins(platform, env) {
             "./vendor",
             "./bundle",
         ]),
+        
+        // Support for web workers since v3.2
+        new NativeScriptWorkerPlugin(),
 
         // Generate report files for bundles content
         new BundleAnalyzerPlugin({