CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="0.7.2"></a>
+## [0.7.2](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.6.3...0.7.2) (2017-07-05)
+
+
+### Bug Fixes
+
+* **mangle-excludes:** add Compat Query and Close listener classes ([#190](https://github.com/NativeScript/nativescript-dev-webpack/issues/190)) ([5791cfc](https://github.com/NativeScript/nativescript-dev-webpack/commit/5791cfc))
+* **ns-bundle:** escape command and args when spawning child process ([c3e7376](https://github.com/NativeScript/nativescript-dev-webpack/commit/c3e7376)), closes [#209](https://github.com/NativeScript/nativescript-dev-webpack/issues/209)
+* run gradlew clean only for tns <=3.0.1 ([efea463](https://github.com/NativeScript/nativescript-dev-webpack/commit/efea463))
+
+
+### Features
+
+* add BundleAnalyzerPlugin to webpack config ([ac32b14](https://github.com/NativeScript/nativescript-dev-webpack/commit/ac32b14))
+* add support for passing params via --env to webpack ([#204](https://github.com/NativeScript/nativescript-dev-webpack/issues/204)) ([4921321](https://github.com/NativeScript/nativescript-dev-webpack/commit/4921321))
+* alias tilde to point to the app root ([#201](https://github.com/NativeScript/nativescript-dev-webpack/issues/201)) ([3fb865d](https://github.com/NativeScript/nativescript-dev-webpack/commit/3fb865d))
+
+
+
 <a name="0.7.1"></a>
 ## [0.7.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.6.3...0.7.1) (2017-06-22)
 

README.md

@@ -21,7 +21,7 @@ $ npm run start-ios-bundle
 
 # Documentation
 
-For details, see the [NativeScript docs](http://docs.nativescript.org/angular/tooling/bundling-with-webpack.html).
+For details, see the [NativeScript docs](http://docs.nativescript.org/angular/best-practices/bundling-with-webpack.html).
 
 # Note about dependencies.
 

bin/ns-bundle

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const { spawn } = require("child_process");
-const { resolve: pathResolve } = require("path");
+const { resolve: pathResolve, join } = require("path");
 const { existsSync } = require("fs");
 const { getPackageJson } = require("../projectHelpers");
 const { isVersionGte } = require("../utils");
@@ -13,13 +13,16 @@ if (!process.env.npm_config_argv) {
     throwError({message: "No flags provided."});
 }
 
-const escape = arg => `"${arg}"`;
+const escapeWithQuotes = arg => `"${arg}"`;
 const isTnsCommand = flag => flag.endsWith("-app");
+const isEnvCommand = flag => flag.indexOf("env.") > -1;
 const shouldUglify = () => process.env.npm_config_uglify;
-const shouldSnapshot = (platform) => platform == "android" && require("os").type() != "Windows_NT" && process.env.npm_config_snapshot;
+const shouldSnapshot = platform => platform == "android" &&
+    require("os").type() != "Windows_NT" &&
+    process.env.npm_config_snapshot;
 
 const npmArgs = JSON.parse(process.env.npm_config_argv).original;
-const tnsArgs = getTnsArgs(npmArgs).map(escape);
+const tnsArgs = getTnsArgs(npmArgs).map(escapeWithQuotes);
 const flags = npmArgs.filter(a => a.startsWith("--")).map(a => a.substring(2));
 const options = getOptions(flags);
 
@@ -34,7 +37,7 @@ function getTnsArgs(args) {
         "--nobundle",
     ];
 
-    return args.filter(a => !other.includes(a) && !isTnsCommand(a));
+    return args.filter(a => !other.includes(a) && !isTnsCommand(a) && !isEnvCommand(a));
 }
 
 execute(options);
@@ -50,8 +53,8 @@ function execute(options) {
             ...commands,
             () => cleanApp(platform),
             () => cleanSnapshotArtefacts(),
-            () => cleanBuildArtifacts(platform),
-            () => webpack(platform),
+            () => cleanBuildArtefacts(platform),
+            () => webpack(platform, options.env),
         ];
     }
 
@@ -67,16 +70,16 @@ function execute(options) {
     return commands.reduce((current, next) => current.then(next), Promise.resolve());
 }
 
-function cleanBuildArtifacts(platform) {
+function cleanBuildArtefacts(platform) {
     return new Promise((resolve, reject) => {
         if (platform !== "android") {
             return resolve();
         }
 
         getTnsVersion().then(version => {
-            // the android build artifacts should be cleaned manually
+            // the android build artefacts should be cleaned manually
             // for nativescript-cli v3.0.1 and below or if using uglify
-            if (isVersionGte(version, "3.0.1") || shouldUglify()) {
+            if (!isVersionGte(version, "3.0.1") || shouldUglify()) {
                 gradlewClean().then(resolve).catch(throwError);
             } else {
                 return resolve();
@@ -95,7 +98,7 @@ function installSnapshotArtefacts() {
 
 function gradlewClean() {
     return new Promise((resolve, reject) => {
-        const platformsPath = pathResolve(PROJECT_DIR, "platforms", "android")
+        const platformsPath = join(PROJECT_DIR, "platforms", "android")
         const gradlew = pathResolve(platformsPath, "gradlew");
         if (!existsSync(gradlew)) {
             return resolve();
@@ -133,13 +136,14 @@ function versionToNumber(version) {
 // Clear platform/**/app folder contents
 function cleanApp(platform) {
     return new Promise((resolve, reject) => {
+
         spawnChildProcess("tns", "clean-app", platform)
             .then(resolve)
             .catch(throwError)
     });
 }
 
-function webpack(platform) {
+function webpack(platform, env) {
     return new Promise(function (resolve, reject) {
         console.log(`Running webpack for ${platform}...`);
 
@@ -148,9 +152,10 @@ function webpack(platform) {
             `--config=webpack.config.js`,
             `--progress`,
             `--env.${platform}`,
+            ...env.map(item => `--${item}`),
             shouldUglify() && `--env.uglify`,
             shouldSnapshot(platform) && `--env.snapshot`
-        ];
+        ].filter(a => !!a);
 
         spawnChildProcess(...args)
             .then(resolve)
@@ -169,14 +174,15 @@ function runTns(command, platform) {
 }
 
 function getOptions(flags) {
-    let options = {};
-    options.platform = getPlatform(flags);
-    options.command = getCommand(flags);
-    options.bundle = !flags.includes("nobundle");
-
-    return options;
+    return {
+        platform: getPlatform(flags),
+        command: getCommand(flags),
+        env: flags.filter(isEnvCommand),
+        bundle: !flags.includes("nobundle"),
+    };
 }
 
+
 function getPlatform(flags) {
     if (flags.includes("android") && flags.includes("ios")) {
         throwError({message: "You cannot use both --android and --ios flags!"});
@@ -187,7 +193,9 @@ function getPlatform(flags) {
     } else if (flags.includes("ios")) {
         return "ios";
     } else {
-        throwError({message: "You must provide a target platform! Use either --android, or --ios flag."});
+        throwError({message:
+            "You must provide a target platform! " +
+            "Use either --android, or --ios flag."});
     }
 }
 
@@ -202,7 +210,10 @@ function getCommand(flags) {
 
 function spawnChildProcess(command, ...args) {
     return new Promise((resolve, reject) => {
-        const childProcess = spawn(command, args, {
+        const escapedArgs = args.map(escapeWithQuotes)
+        const escapedCommand = escapeWithQuotes(command)
+
+        const childProcess = spawn(escapedCommand, escapedArgs, {
             stdio: "inherit",
             pwd: PROJECT_DIR,
             shell: true,

package.json

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

prepublish/common/exports.js

@@ -39,7 +39,11 @@ module.exports = env => {
             modules: [
                 "node_modules/tns-core-modules",
                 "node_modules",
-            ]
+            ],
+
+            alias: {
+                '~': resolve("./app")
+            },
         },
         node: {
             // Disable node shims that conflict with NativeScript

templates/webpack.angular.js

@@ -49,7 +49,11 @@ module.exports = env => {
             modules: [
                 "node_modules/tns-core-modules",
                 "node_modules",
-            ]
+            ],
+
+            alias: {
+                '~': resolve("./app")
+            },
         },
         node: {
             // Disable node shims that conflict with NativeScript

templates/webpack.javascript.js

@@ -48,7 +48,11 @@ module.exports = env => {
             modules: [
                 "node_modules/tns-core-modules",
                 "node_modules",
-            ]
+            ],
+
+            alias: {
+                '~': resolve("./app")
+            },
         },
         node: {
             // Disable node shims that conflict with NativeScript

templates/webpack.typescript.js

@@ -48,7 +48,11 @@ module.exports = env => {
             modules: [
                 "node_modules/tns-core-modules",
                 "node_modules",
-            ]
+            ],
+
+            alias: {
+                '~': resolve("./app")
+            },
         },
         node: {
             // Disable node shims that conflict with NativeScript