Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 87f5ca7

Browse files
elena-pelena-p
authored
Merge pull request #1017 from NativeScript/hristova/update-to-angular-8.2
feat: update to angular 8.2
2 parents bc45eaf + 2cf708b commit 87f5ca7

13 files changed

+32
-39
lines changed

Diff for: ‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ NOTE: There are three test apps in the repository, located in the `/demo` direct
7676
7777
4. Build the app for Android or iOS.
7878
``` bash
79-
tns run android/ios --bundle
79+
tns run android/ios
8080
```
8181
8282
5. Install [appium](http://appium.io/) globally.

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ For more details, see the [NativeScript docs for building with webpack](http://d
3333
```sh
3434
$ npm install --save-dev nativescript-dev-webpack
3535

36-
$ tns run android --bundle
36+
$ tns run android
3737
or
38-
$ tns run ios --bundle
38+
$ tns run ios
3939
```
4040

4141
## Contribute

Diff for: ‎bin/ns-bundle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env node
22

3-
console.error("Using npm run scripts is no longer supported. Use CLI commands and pass the --bundle flag instead.\nExample:\ntns build android --bundle")
3+
console.error("Using npm run scripts is no longer supported. Use CLI commands instead.\nExample:\ntns build android")
44
process.exit(1);

Diff for: ‎demo/AngularApp/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/common": "8.0.0",
17-
"@angular/compiler": "8.0.0",
18-
"@angular/core": "8.0.0",
19-
"@angular/forms": "8.0.0",
16+
"@angular/common": "8.2.0",
17+
"@angular/compiler": "8.2.0",
18+
"@angular/core": "8.2.0",
19+
"@angular/forms": "8.2.0",
2020
"@angular/http": "8.0.0-beta.10",
21-
"@angular/platform-browser": "8.0.0",
22-
"@angular/platform-browser-dynamic": "8.0.0",
23-
"@angular/router": "8.0.0",
21+
"@angular/platform-browser": "8.2.0",
22+
"@angular/platform-browser-dynamic": "8.2.0",
23+
"@angular/router": "8.2.0",
2424
"nativescript-angular": "next",
2525
"nativescript-theme-core": "~1.0.2",
2626
"reflect-metadata": "~0.1.8",
2727
"rxjs": "^6.3.3",
2828
"tns-core-modules": "next",
29-
"zone.js": "^0.8.4"
29+
"zone.js": "^0.9.1"
3030
},
3131
"devDependencies": {
32-
"@angular/compiler-cli": "8.0.0",
33-
"@ngtools/webpack": "8.0.0",
32+
"@angular/compiler-cli": "8.2.0",
33+
"@ngtools/webpack": "8.2.0",
3434
"@types/chai": "~4.1.7",
3535
"@types/mocha": "~5.2.5",
3636
"@types/node": "~10.12.18",
@@ -44,7 +44,7 @@
4444
"nativescript-dev-appium": "next",
4545
"nativescript-dev-webpack": "next",
4646
"node-sass": "^4.12.0",
47-
"typescript": "~3.4.5"
47+
"typescript": "~3.5.3"
4848
},
4949
"scripts": {
5050
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",

Diff for: ‎demo/AngularApp/webpack.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ module.exports = env => {
3636

3737
const {
3838
// The 'appPath' and 'appResourcesPath' values are fetched from
39-
// the nsconfig.json configuration file
40-
// when bundling with `tns run android|ios --bundle`.
39+
// the nsconfig.json configuration file.
4140
appPath = "src",
4241
appResourcesPath = "App_Resources",
4342

@@ -318,4 +317,4 @@ module.exports = env => {
318317
}
319318

320319
return config;
321-
};
320+
};

Diff for: ‎demo/JavaScriptApp/webpack.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ module.exports = env => {
3131

3232
const {
3333
// The 'appPath' and 'appResourcesPath' values are fetched from
34-
// the nsconfig.json configuration file
35-
// when bundling with `tns run android|ios --bundle`.
34+
// the nsconfig.json configuration file.
3635
appPath = "app",
3736
appResourcesPath = "app/App_Resources",
3837

@@ -257,4 +256,4 @@ module.exports = env => {
257256

258257

259258
return config;
260-
};
259+
};

Diff for: ‎demo/TypeScriptApp/webpack.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ module.exports = env => {
3232

3333
const {
3434
// The 'appPath' and 'appResourcesPath' values are fetched from
35-
// the nsconfig.json configuration file
36-
// when bundling with `tns run android|ios --bundle`.
35+
// the nsconfig.json configuration file.
3736
appPath = "app",
3837
appResourcesPath = "app/App_Resources",
3938

@@ -288,4 +287,4 @@ module.exports = env => {
288287

289288

290289
return config;
291-
};
290+
};

Diff for: ‎dependencyManager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ function getRequiredDeps(packageJson) {
7373
}
7474

7575
const deps = {
76-
"@angular/compiler-cli": "8.0.0",
76+
"@angular/compiler-cli": "8.2.0",
7777
};
7878

7979
if (!dependsOn(packageJson, "@angular-devkit/build-angular")) {
80-
deps["@ngtools/webpack"] = "8.0.0";
80+
deps["@ngtools/webpack"] = "8.2.0";
8181
}
8282

8383
return deps;

Diff for: ‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"generate-android-snapshot": "./bin/generate-android-snapshot"
4747
},
4848
"dependencies": {
49-
"@angular-devkit/core": "8.0.0",
49+
"@angular-devkit/core": "8.2.0",
5050
"clean-webpack-plugin": "~1.0.0",
5151
"copy-webpack-plugin": "~4.6.0",
5252
"css-loader": "~2.1.1",
@@ -75,9 +75,9 @@
7575
"webpack-sources": "~1.3.0"
7676
},
7777
"devDependencies": {
78-
"@angular/compiler": "8.0.0",
79-
"@angular/compiler-cli": "8.0.0",
80-
"@ngtools/webpack": "8.0.0",
78+
"@angular/compiler": "8.2.0",
79+
"@angular/compiler-cli": "8.2.0",
80+
"@ngtools/webpack": "8.2.0",
8181
"@types/jasmine": "^3.3.7",
8282
"@types/loader-utils": "^1.1.3",
8383
"@types/node": "^10.12.12",
@@ -89,6 +89,6 @@
8989
"jasmine-spec-reporter": "^4.2.1",
9090
"proxyquire": "2.1.0",
9191
"tns-core-modules": "next",
92-
"typescript": "~3.4.0"
92+
"typescript": "~3.5.3"
9393
}
9494
}

Diff for: ‎templates/webpack.angular.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ module.exports = env => {
3535

3636
const {
3737
// The 'appPath' and 'appResourcesPath' values are fetched from
38-
// the nsconfig.json configuration file
39-
// when bundling with `tns run android|ios --bundle`.
38+
// the nsconfig.json configuration file.
4039
appPath = "src",
4140
appResourcesPath = "App_Resources",
4241

Diff for: ‎templates/webpack.javascript.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ module.exports = env => {
3030

3131
const {
3232
// The 'appPath' and 'appResourcesPath' values are fetched from
33-
// the nsconfig.json configuration file
34-
// when bundling with `tns run android|ios --bundle`.
33+
// the nsconfig.json configuration file.
3534
appPath = "app",
3635
appResourcesPath = "app/App_Resources",
3736

Diff for: ‎templates/webpack.typescript.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ module.exports = env => {
3131

3232
const {
3333
// The 'appPath' and 'appResourcesPath' values are fetched from
34-
// the nsconfig.json configuration file
35-
// when bundling with `tns run android|ios --bundle`.
34+
// the nsconfig.json configuration file.
3635
appPath = "app",
3736
appResourcesPath = "app/App_Resources",
3837

Diff for: ‎templates/webpack.vue.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ module.exports = env => {
3434

3535
const {
3636
// The 'appPath' and 'appResourcesPath' values are fetched from
37-
// the nsconfig.json configuration file
38-
// when bundling with `tns run android|ios --bundle`.
37+
// the nsconfig.json configuration file.
3938
appPath = "app",
4039
appResourcesPath = "app/App_Resources",
4140

0 commit comments

Comments
 (0)