Skip to content

Commit b45916c

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge pull request #1831 from NativeScript/amiorkov/angular8-rc
feat: migrate to Angular 8
2 parents 418aff2 + 7894b19 commit b45916c

File tree

23 files changed

+165
-158
lines changed

23 files changed

+165
-158
lines changed

‎e2e/animation-examples/app/animation-builder.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import { Component, ViewChild } from '@angular/core';
77
`
88
})
99
export class AnimationBuilderComponent {
10-
@ViewChild('button')
11-
private button;
10+
@ViewChild('button', { static: false }) button;
1211

1312
constructor(private _builder: AnimationBuilder) {}
1413

‎e2e/animation-examples/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.2.0",
17-
"@angular/common": "~7.2.0",
18-
"@angular/compiler": "~7.2.0",
19-
"@angular/core": "~7.2.0",
20-
"@angular/forms": "~7.2.0",
21-
"@angular/http": "~7.2.0",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
25-
"nativescript-angular": "^7.2.4-next-2019-05-06-201428-01",
16+
"@angular/animations": "8.0.0",
17+
"@angular/common": "8.0.0",
18+
"@angular/compiler": "8.0.0",
19+
"@angular/core": "8.0.0",
20+
"@angular/forms": "8.0.0",
21+
"@angular/http": "8.0.0-beta.10",
22+
"@angular/platform-browser": "8.0.0",
23+
"@angular/platform-browser-dynamic": "8.0.0",
24+
"@angular/router": "8.0.0",
25+
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.2",
2727
"reflect-metadata": "~0.1.8",
2828
"rxjs": "^6.3.3",
2929
"tns-core-modules": "^5.4.0-next-2019-05-01-141636-02",
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~7.2.0",
34-
"@ngtools/webpack": "~7.2.0",
33+
"@angular/compiler-cli": "8.0.0",
34+
"@ngtools/webpack": "8.0.0",
3535
"@types/chai": "~4.1.7",
3636
"@types/mocha": "~5.2.5",
3737
"@types/node": "~10.12.18",
@@ -45,7 +45,7 @@
4545
"nativescript-dev-appium": "next",
4646
"nativescript-dev-typescript": "^0.9.1-next-2019-03-12-162713-03",
4747
"nativescript-dev-webpack": "^0.22.0-next-2019-04-17-111030-01",
48-
"typescript": "~3.1.1"
48+
"typescript": "~3.4.5"
4949
},
5050
"scripts": {
5151
"u": "update-ns-webpack",

‎e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ModalViewComponent } from "~/modal-shared/modal-view.component";
2323

2424
export class BasicsNavigationComponent {
2525

26-
@ViewChild("popoverButtonComp") popoverButtonComp: ElementRef;
26+
@ViewChild("popoverButtonComp", { static: false }) popoverButtonComp: ElementRef;
2727
@Input() col: number;
2828
constructor(
2929
private modal: ModalDialogService,

‎e2e/modal-navigation-ng/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.2.0",
17-
"@angular/common": "~7.2.0",
18-
"@angular/compiler": "~7.2.0",
19-
"@angular/core": "~7.2.0",
20-
"@angular/forms": "~7.2.0",
21-
"@angular/http": "~7.2.0",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
16+
"@angular/animations": "8.0.0",
17+
"@angular/common": "8.0.0",
18+
"@angular/compiler": "8.0.0",
19+
"@angular/core": "8.0.0",
20+
"@angular/forms": "8.0.0",
21+
"@angular/http": "8.0.0-beta.10",
22+
"@angular/platform-browser": "8.0.0",
23+
"@angular/platform-browser-dynamic": "8.0.0",
24+
"@angular/router": "8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -30,8 +30,8 @@
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~7.2.0",
34-
"@ngtools/webpack": "~7.2.0",
33+
"@angular/compiler-cli": "8.0.0",
34+
"@ngtools/webpack": "8.0.0",
3535
"@types/chai": "~4.1.7",
3636
"@types/mocha": "~5.2.5",
3737
"@types/node": "~10.12.18",
@@ -45,7 +45,7 @@
4545
"nativescript-dev-typescript": "next",
4646
"nativescript-dev-webpack": "next",
4747
"tns-platform-declarations": "next",
48-
"typescript": "~3.1.1"
48+
"typescript": "~3.4.5"
4949
},
5050
"scripts": {
5151
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

‎e2e/nested-router-tab-view/app/app.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra
1212
export class AppComponent {
1313
private isInitialNavigation = true;
1414

15-
@ViewChild(TabViewDirective) tabView: TabViewDirective;
15+
@ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective;
1616

1717
constructor(router: Router, location: NSLocationStrategy) {
1818
router.events.subscribe(e => {

‎e2e/nested-router-tab-view/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.2.0",
17-
"@angular/common": "~7.2.0",
18-
"@angular/compiler": "~7.2.0",
19-
"@angular/core": "~7.2.0",
20-
"@angular/forms": "~7.2.0",
21-
"@angular/http": "~7.2.0",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
16+
"@angular/animations": "8.0.0",
17+
"@angular/common": "8.0.0",
18+
"@angular/compiler": "8.0.0",
19+
"@angular/core": "8.0.0",
20+
"@angular/forms": "8.0.0",
21+
"@angular/http": "8.0.0-beta.10",
22+
"@angular/platform-browser": "8.0.0",
23+
"@angular/platform-browser-dynamic": "8.0.0",
24+
"@angular/router": "8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -30,8 +30,8 @@
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~7.2.0",
34-
"@ngtools/webpack": "~7.2.0",
33+
"@angular/compiler-cli": "8.0.0",
34+
"@ngtools/webpack": "8.0.0",
3535
"@types/chai": "~4.1.7",
3636
"@types/mocha": "~5.2.5",
3737
"@types/node": "~10.12.18",
@@ -44,7 +44,7 @@
4444
"nativescript-dev-appium": "next",
4545
"nativescript-dev-typescript": "next",
4646
"nativescript-dev-webpack": "next",
47-
"typescript": "~3.1.1"
47+
"typescript": "3.4.5"
4848
},
4949
"scripts": {
5050
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

‎e2e/renderer/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"id": "org.nativescript.renderer"
88
},
99
"dependencies": {
10-
"@angular/common": "~7.2.0",
11-
"@angular/compiler": "~7.2.0",
12-
"@angular/core": "~7.2.0",
13-
"@angular/forms": "~7.2.0",
14-
"@angular/http": "~7.2.0",
15-
"@angular/platform-browser": "~7.2.0",
16-
"@angular/platform-browser-dynamic": "~7.2.0",
17-
"@angular/router": "~7.2.0",
10+
"@angular/common": "8.0.0",
11+
"@angular/compiler": "8.0.0",
12+
"@angular/core": "8.0.0",
13+
"@angular/forms": "8.0.0",
14+
"@angular/http": "8.0.0-beta.10",
15+
"@angular/platform-browser": "8.0.0",
16+
"@angular/platform-browser-dynamic": "8.0.0",
17+
"@angular/router": "8.0.0",
1818
"nativescript-angular": "file:../../nativescript-angular",
1919
"nativescript-intl": "^3.0.0",
2020
"reflect-metadata": "~0.1.8",
@@ -23,8 +23,8 @@
2323
"zone.js": "^0.8.4"
2424
},
2525
"devDependencies": {
26-
"@angular/compiler-cli": "~7.2.0",
27-
"@ngtools/webpack": "~7.2.0",
26+
"@angular/compiler-cli": "8.0.0",
27+
"@ngtools/webpack": "8.0.0",
2828
"@types/chai": "~4.1.7",
2929
"@types/mocha": "~5.2.5",
3030
"@types/node": "~10.12.18",
@@ -40,7 +40,7 @@
4040
"nativescript-dev-typescript": "next",
4141
"nativescript-dev-webpack": "next",
4242
"tslib": "^1.7.1",
43-
"typescript": "~3.1.1"
43+
"typescript": "~3.4.5"
4444
},
4545
"scripts": {
4646
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

‎e2e/routable-animations/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"id": "org.nativescript.nsroanimations"
88
},
99
"dependencies": {
10-
"@angular/animations": "~6.0.6",
11-
"@angular/common": "~6.0.6",
12-
"@angular/compiler": "~6.0.6",
13-
"@angular/core": "~6.0.6",
14-
"@angular/forms": "~6.0.6",
15-
"@angular/http": "~6.0.6",
16-
"@angular/platform-browser": "~6.0.6",
17-
"@angular/platform-browser-dynamic": "~6.0.6",
18-
"@angular/router": "~6.0.6",
10+
"@angular/animations": "8.0.0",
11+
"@angular/common": "8.0.0",
12+
"@angular/compiler": "8.0.0",
13+
"@angular/core": "8.0.0",
14+
"@angular/forms": "8.0.0",
15+
"@angular/http": "8.0.0-beta.10",
16+
"@angular/platform-browser": "8.0.0",
17+
"@angular/platform-browser-dynamic": "8.0.0",
18+
"@angular/router": "8.0.0",
1919
"nativescript-angular": "next",
2020
"nativescript-theme-core": "~1.0.2",
2121
"reflect-metadata": "~0.1.8",
@@ -24,8 +24,8 @@
2424
"zone.js": "^0.8.26"
2525
},
2626
"devDependencies": {
27-
"@ngtools/webpack": "6.1.0-rc.0",
28-
"@angular/compiler-cli": "~6.1.0-beta.3",
27+
"@ngtools/webpack": "8.0.0",
28+
"@angular/compiler-cli": "8.0.0",
2929
"@types/chai": "~4.1.3",
3030
"@types/mocha": "~5.2.1",
3131
"@types/node": "^7.0.5",
@@ -38,7 +38,7 @@
3838
"nativescript-dev-appium": "^4.0.0",
3939
"nativescript-dev-typescript": "~0.7.1",
4040
"nativescript-dev-webpack": "next",
41-
"typescript": "~2.7.2"
41+
"typescript": "~3.4.5"
4242
},
4343
"scripts": {
4444
"ns-bundle": "ns-bundle",

‎e2e/router-tab-view/app/app.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra
1212
export class AppComponent {
1313
private isInitialNavigation = true;
1414

15-
@ViewChild(TabViewDirective) tabView: TabViewDirective;
15+
@ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective;
1616

1717
constructor(router: Router, location: NSLocationStrategy) {
1818
router.events.subscribe(e => {

‎e2e/router-tab-view/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~7.2.0",
17-
"@angular/common": "~7.2.0",
18-
"@angular/compiler": "~7.2.0",
19-
"@angular/core": "~7.2.0",
20-
"@angular/forms": "~7.2.0",
21-
"@angular/http": "~7.2.0",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
16+
"@angular/animations": "8.0.0",
17+
"@angular/common": "8.0.0",
18+
"@angular/compiler": "8.0.0",
19+
"@angular/core": "8.0.0",
20+
"@angular/forms": "8.0.0-beta.10",
21+
"@angular/http": "8.0.0",
22+
"@angular/platform-browser": "8.0.0",
23+
"@angular/platform-browser-dynamic": "8.0.0",
24+
"@angular/router": "8.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -41,7 +41,7 @@
4141
"mochawesome": "~3.1.2",
4242
"nativescript-dev-appium": "next",
4343
"nativescript-dev-typescript": "next",
44-
"typescript": "~3.1.1"
44+
"typescript": "~3.4.5"
4545
},
4646
"scripts": {
4747
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

0 commit comments

Comments
 (0)