Merge pull request #1017 from NativeScript/hristova/update-to-angular-8.2

elena-p · web-flow · commit 87f5ca75a264 · 2019-08-12T10:13:42.000+03:00
feat: update to angular 8.2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -76,7 +76,7 @@ NOTE: There are three test apps in the repository, located in the `/demo` direct
 
 4. Build the app for Android or iOS.
     ``` bash
-    tns run android/ios --bundle
+    tns run android/ios
     ```
 
 5. Install [appium](http://appium.io/) globally.
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ For more details, see the [NativeScript docs for building with webpack](http://d
 ```sh
 $ npm install --save-dev nativescript-dev-webpack
 
-$ tns run android --bundle
+$ tns run android
 or
-$ tns run ios --bundle
+$ tns run ios
 ```
 
 ## Contribute
diff --git a/bin/ns-bundle b/bin/ns-bundle
@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-console.error("Using npm run scripts is no longer supported. Use CLI commands and pass the --bundle flag instead.\nExample:\ntns build android --bundle")
+console.error("Using npm run scripts is no longer supported. Use CLI commands instead.\nExample:\ntns build android")
 process.exit(1);
diff --git a/demo/AngularApp/package.json b/demo/AngularApp/package.json
@@ -13,24 +13,24 @@
     }
   },
   "dependencies": {
-    "@angular/common": "8.0.0",
-    "@angular/compiler": "8.0.0",
-    "@angular/core": "8.0.0",
-    "@angular/forms": "8.0.0",
+    "@angular/common": "8.2.0",
+    "@angular/compiler": "8.2.0",
+    "@angular/core": "8.2.0",
+    "@angular/forms": "8.2.0",
     "@angular/http": "8.0.0-beta.10",
-    "@angular/platform-browser": "8.0.0",
-    "@angular/platform-browser-dynamic": "8.0.0",
-    "@angular/router": "8.0.0",
+    "@angular/platform-browser": "8.2.0",
+    "@angular/platform-browser-dynamic": "8.2.0",
+    "@angular/router": "8.2.0",
     "nativescript-angular": "next",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.3.3",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "8.0.0",
-    "@ngtools/webpack": "8.0.0",
+    "@angular/compiler-cli": "8.2.0",
+    "@ngtools/webpack": "8.2.0",
     "@types/chai": "~4.1.7",
     "@types/mocha": "~5.2.5",
     "@types/node": "~10.12.18",
@@ -44,7 +44,7 @@
     "nativescript-dev-appium": "next",
     "nativescript-dev-webpack": "next",
     "node-sass": "^4.12.0",
-    "typescript": "~3.4.5"
+    "typescript": "~3.5.3"
   },
   "scripts": {
     "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
diff --git a/demo/AngularApp/webpack.config.js b/demo/AngularApp/webpack.config.js
@@ -36,8 +36,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "src",
         appResourcesPath = "App_Resources",
 
@@ -318,4 +317,4 @@ module.exports = env => {
     }
 
     return config;
-};
+};
diff --git a/demo/JavaScriptApp/webpack.config.js b/demo/JavaScriptApp/webpack.config.js
@@ -31,8 +31,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "app",
         appResourcesPath = "app/App_Resources",
 
@@ -257,4 +256,4 @@ module.exports = env => {
 
 
     return config;
-};
+};
diff --git a/demo/TypeScriptApp/webpack.config.js b/demo/TypeScriptApp/webpack.config.js
@@ -32,8 +32,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "app",
         appResourcesPath = "app/App_Resources",
 
@@ -288,4 +287,4 @@ module.exports = env => {
 
 
     return config;
-};
+};
diff --git a/dependencyManager.js b/dependencyManager.js
@@ -73,11 +73,11 @@ function getRequiredDeps(packageJson) {
     }
 
     const deps = {
-        "@angular/compiler-cli": "8.0.0",
+        "@angular/compiler-cli": "8.2.0",
     };
 
     if (!dependsOn(packageJson, "@angular-devkit/build-angular")) {
-        deps["@ngtools/webpack"] = "8.0.0";
+        deps["@ngtools/webpack"] = "8.2.0";
     }
 
     return deps;
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "generate-android-snapshot": "./bin/generate-android-snapshot"
   },
   "dependencies": {
-    "@angular-devkit/core": "8.0.0",
+    "@angular-devkit/core": "8.2.0",
     "clean-webpack-plugin": "~1.0.0",
     "copy-webpack-plugin": "~4.6.0",
     "css-loader": "~2.1.1",
@@ -75,9 +75,9 @@
     "webpack-sources": "~1.3.0"
   },
   "devDependencies": {
-    "@angular/compiler": "8.0.0",
-    "@angular/compiler-cli": "8.0.0",
-    "@ngtools/webpack": "8.0.0",
+    "@angular/compiler": "8.2.0",
+    "@angular/compiler-cli": "8.2.0",
+    "@ngtools/webpack": "8.2.0",
     "@types/jasmine": "^3.3.7",
     "@types/loader-utils": "^1.1.3",
     "@types/node": "^10.12.12",
@@ -89,6 +89,6 @@
     "jasmine-spec-reporter": "^4.2.1",
     "proxyquire": "2.1.0",
     "tns-core-modules": "next",
-    "typescript": "~3.4.0"
+    "typescript": "~3.5.3"
   }
 }
diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
@@ -35,8 +35,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "src",
         appResourcesPath = "App_Resources",
 
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js
@@ -30,8 +30,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "app",
         appResourcesPath = "app/App_Resources",
 
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js
@@ -31,8 +31,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "app",
         appResourcesPath = "app/App_Resources",
 
diff --git a/templates/webpack.vue.js b/templates/webpack.vue.js
@@ -34,8 +34,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "app",
         appResourcesPath = "app/App_Resources",
 

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ function getRequiredDeps(packageJson) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`const deps = {`
`76`		`- "@angular/compiler-cli": "8.0.0",`
	`76`	`+ "@angular/compiler-cli": "8.2.0",`
`77`	`77`	`};`
`78`	`78`
`79`	`79`	`if (!dependsOn(packageJson, "@angular-devkit/build-angular")) {`
`80`		`- deps["@ngtools/webpack"] = "8.0.0";`
	`80`	`+ deps["@ngtools/webpack"] = "8.2.0";`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return deps;`