Merge branch 'master' into trifonov/android-settings-file

Author: vtrifonov

CHANGELOG.md

@@ -1,3 +1,65 @@
+<a name="0.11.0"></a>
+# [0.11.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.10.2...0.11.0) (2018-04-25)
+
+
+### Bug Fixes
+
+* allow using the plugin via symlink ([#501](https://github.com/NativeScript/nativescript-dev-webpack/issues/501)) ([a7acb4d](https://github.com/NativeScript/nativescript-dev-webpack/commit/a7acb4d))
+* bundling of Angular apps using linked TS plugins ([#505](https://github.com/NativeScript/nativescript-dev-webpack/issues/505)) ([41779ad](https://github.com/NativeScript/nativescript-dev-webpack/commit/41779ad))
+
+
+### Features
+
+* configure v8Version for snapshot tools ([#503](https://github.com/NativeScript/nativescript-dev-webpack/issues/503)) ([cf0d76b](https://github.com/NativeScript/nativescript-dev-webpack/commit/cf0d76b))
+
+### BREAKING CHANGES
+
+> The command below will overwrite the existing project's webpack configuration files with the most recent ones, so you don't have to manually apply the required changes:
+> ```
+> ./node_modules/.bin/update-ns-webpack --configs
+> ```
+
+* The NativeScriptAngularCompilerPlugin is loaded in a different way now. The existing projects using the plugin should add the following line to their `webpack.config.js` file:
+``` js
+// webpack.config.js
+
+module.exports = env => {
+    const platform = env && (env.android && "android" || env.ios && "ios");
+    if (!platform) {
+        throw new Error("You need to provide a target platform!");
+    }
+
+    const platforms = ["ios", "android"];
+    const projectRoot = __dirname;
+    nsWebpack.loadAdditionalPlugins({ projectDir: projectRoot }); // <----- Add this line
+
+    // ...
+``` 
+
+* The `getAppPath` method expects two arguments now - `platform` and `projectRoot`. The usage inside the project's `webpack.config.js` should be changed in the following way:
+
+Before:
+``` js
+// webpack.config.js
+
+// Default destination inside platforms/<platform>/...
+const dist = resolve(projectRoot, nsWebpack.getAppPath(platform));
+
+// ...
+```
+
+After:
+``` js
+// webpack.config.js
+
+// Default destination inside platforms/<platform>/...
+const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
+
+// ...
+```
+
+
+
 <a name="0.10.2"></a>
 ## [0.10.2](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.10.1...0.10.2) (2018-04-18)
 

CONTRIBUTING.md

@@ -153,33 +153,28 @@ Thank you for your contribution!
 npm install
 ```
 
-2. Remove the `package-lock.json` file if it was generated.
-```bash
-rm package-lock.json
-```
-
-3. Add the following to your `.npmrc`.
+2. Add the following to your `.npmrc`.
 ```
 tag-version-prefix=""
 message="release: cut the %s release"
 ```
 
-4. Create new branch for the release:
+3. Create new branch for the release:
 ```
 git checkout -b username/release-version
 ```
 
-5. Run `npm version` to bump the version in the `package.json`, tag the release and update the CHANGELOG.md:
+4. Run `npm version` to bump the version in the `package.json`, tag the release and update the CHANGELOG.md:
 ```
 npm version [patch|minor|major]
 ```
 
-6. Push all changes to your branch and create a PR.
+5. Push all changes to your branch and create a PR.
 ```bash
 git push --set-upstream origin username/release-version --tags
 ```
 
-7. Publish the package to npm after the PR is merged.
+6. Publish the package to npm after the PR is merged.
 ```bash
 npm publish
 ```

android-app-components-loader.js

@@ -0,0 +1,14 @@
+module.exports = function(source) {
+    this.cacheable();
+    const { modules } = this.query;
+    const imports = modules.map(m => `require("${m}");`).join("\n");
+    const augmentedSource = `
+        if (!global["__snapshot"]) {
+            ${imports}
+        }
+
+        ${source}
+    `;
+
+    this.callback(null, augmentedSource);
+};

demo/.gitignore

@@ -14,11 +14,6 @@ test-results.xml
 tsconfig.aot.json
 
 vendor.js
-vendor-platform.android.js
-vendor-platform.ios.js
-
 vendor.ts
-vendor-platform.android.ts
-vendor-platform.ios.ts
 
 webpack.config.js

demo/AngularApp/package.json

@@ -13,24 +13,25 @@
     }
   },
   "dependencies": {
-    "@angular/common": "~5.2.0",
-    "@angular/compiler": "~5.2.0",
-    "@angular/core": "~5.2.0",
-    "@angular/forms": "~5.2.0",
-    "@angular/http": "~5.2.0",
-    "@angular/platform-browser": "~5.2.0",
-    "@angular/platform-browser-dynamic": "~5.2.0",
-    "@angular/router": "~5.2.0",
-    "nativescript-angular": "next",
+    "@angular/common": "~6.0.0-rc.0",
+    "@angular/compiler": "~6.0.0-rc.0",
+    "@angular/core": "~6.0.0-rc.0",
+    "@angular/forms": "~6.0.0-rc.0",
+    "@angular/http": "~6.0.0-rc.0",
+    "@angular/platform-browser": "~6.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "~6.0.0-rc.0",
+    "@angular/router": "~6.0.0-rc.0",
+    "nativescript-angular": "rc",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "^5.5.0",
+    "rxjs": "~6.0.0-beta.1",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~5.2.0",
-    "@ngtools/webpack": "~1.9.4",
+    "@angular-devkit/core": "~0.5.5",
+    "@angular/compiler-cli": "~6.0.0-rc.0",
+    "@ngtools/webpack": "~6.0.0-rc.3",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -39,7 +40,8 @@
     "babylon": "6.18.0",
     "chai": "~4.1.1",
     "chai-as-promised": "~7.1.1",
-    "copy-webpack-plugin": "~4.3.0",
+    "clean-webpack-plugin": "~0.1.19",
+    "copy-webpack-plugin": "~4.5.1",
     "css-loader": "~0.28.7",
     "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
@@ -51,14 +53,15 @@
     "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "file:../..",
     "nativescript-worker-loader": "~0.8.1",
-    "node-sass": "^4.7.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.2.1",
-    "sass-loader": "^6.0.6",
-    "typescript": "~2.6.2",
-    "webpack": "~3.10.0",
+    "resolve-url-loader": "~2.3.0",
+    "sass-loader": "~6.0.6",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "~1.2.4",
+    "webpack": "~4.5.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "^1.1.0"
+    "webpack-cli": "~2.0.14",
+    "webpack-sources": "~1.1.0"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",

demo/JavaScriptApp/package.json

@@ -17,12 +17,16 @@
     "tns-core-modules": "next"
   },
   "devDependencies": {
+    "@types/chai": "^4.0.2",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.5",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
-    "copy-webpack-plugin": "~4.0.1",
+    "clean-webpack-plugin": "~0.1.19",
+    "copy-webpack-plugin": "~4.5.1",
     "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.0",
+    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "mocha": "~3.5.0",
     "mocha-junit-reporter": "^1.13.0",
@@ -33,11 +37,13 @@
     "nativescript-worker-loader": "~0.8.1",
     "node-sass": "^4.7.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.1.0",
-    "sass-loader": "^6.0.6",
-    "webpack": "~3.10.0",
+    "resolve-url-loader": "~2.3.0",
+    "sass-loader": "~6.0.6",
+    "uglifyjs-webpack-plugin": "~1.2.4",
+    "webpack": "~4.5.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "^1.1.0"
+    "webpack-cli": "~2.0.14",
+    "webpack-sources": "~1.1.0"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",

demo/TypeScriptApp/package.json

@@ -17,16 +17,17 @@
     "tns-core-modules": "next"
   },
   "devDependencies": {
-    "awesome-typescript-loader": "~3.1.3",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
+    "awesome-typescript-loader": "~5.0.0-1",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
-    "copy-webpack-plugin": "~4.0.1",
+    "clean-webpack-plugin": "~0.1.19",
+    "copy-webpack-plugin": "~4.5.1",
     "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.0",
+    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "mocha": "~3.5.0",
     "mocha-junit-reporter": "^1.13.0",
@@ -36,14 +37,15 @@
     "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "file:../..",
     "nativescript-worker-loader": "~0.8.1",
-    "node-sass": "^4.7.2",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.1.0",
-    "sass-loader": "^6.0.6",
-    "typescript": "~2.6.2",
-    "webpack": "~3.10.0",
+    "resolve-url-loader": "~2.3.0",
+    "sass-loader": "~6.0.6",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "~1.2.4",
+    "webpack": "~4.5.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "^1.1.0"
+    "webpack-cli": "~2.0.14",
+    "webpack-sources": "~1.1.0"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",

dependencyManager.js

@@ -58,26 +58,28 @@ function addDependency(deps, name, version, force) {
 
 function getRequiredDeps(packageJson) {
     const deps = {
-        "webpack": "~3.10.0",
+        "webpack": "~4.5.0",
+        "webpack-cli": "~2.0.14",
         "webpack-bundle-analyzer": "^2.9.1",
         "webpack-sources": "~1.1.0",
         "clean-webpack-plugin": "~0.1.19",
-        "copy-webpack-plugin": "~4.3.0",
+        "copy-webpack-plugin": "~4.5.1",
         "raw-loader": "~0.5.1",
         "css-loader": "~0.28.7",
         "nativescript-worker-loader": "~0.8.1",
-        "resolve-url-loader": "~2.2.1",
+        "resolve-url-loader": "~2.3.0",
         "extract-text-webpack-plugin": "~3.0.2",
-        "uglifyjs-webpack-plugin": "~1.1.6",
+        "uglifyjs-webpack-plugin": "~1.2.4",
     };
 
     if (isAngular({packageJson})) {
         Object.assign(deps, {
             "@angular/compiler-cli": packageJson.dependencies["@angular/core"],
-            "@ngtools/webpack": "~1.9.4",
+            "@ngtools/webpack": "~6.0.0-rc.3",
+            "@angular-devkit/core": "~0.5.5",
         });
     } else if (isTypeScript({packageJson})) {
-        Object.assign(deps, { "awesome-typescript-loader": "~3.1.3" });
+        Object.assign(deps, { "awesome-typescript-loader": "~5.0.0" });
     }
 
     if (isSass({packageJson})) {

lib/utils.js

@@ -19,7 +19,7 @@ function buildEnvData($projectData, platform, env) {
     const appResourcesPath = getAppResourcesPathFromProjectData($projectData);
     Object.assign(envData,
         appPath && { appPath },
-        appResourcesPath && { appResourcesPath }
+        appResourcesPath && { appResourcesPath },
     );
 
     return envData;