From ab4312b0a77a4e69ef81aa062237c6e811bc0630 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Fri, 17 May 2019 10:17:34 +0300 Subject: [PATCH 01/11] chore: update app's to latest 8 rc version of Angular chore: migrate to latest 8 rc version of Angular --- e2e/modal-navigation-ng/package.json | 24 ++++++------ e2e/nested-router-tab-view/package.json | 26 ++++++------- e2e/renderer/package.json | 22 +++++------ e2e/router/package.json | 24 ++++++------ nativescript-angular/package.json | 38 +++++++++---------- .../router/ns-platform-location.ts | 9 +++++ ng-sample/package.json | 20 +++++----- 7 files changed, 86 insertions(+), 77 deletions(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 31c2d0eeb..1b0fd836a 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -45,7 +45,7 @@ "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tns-platform-declarations": "next", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index ff096ee2f..9871762e1 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -6,22 +6,22 @@ "nativescript": { "id": "org.nativescript.nestedroutertabview", "tns-ios": { - "version": "next" + "version": "6.0.0-2019-05-16-165318-01" }, "tns-android": { "version": "next" } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@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-typescript": "next", "nativescript-dev-webpack": "next", - "typescript": "~3.1.1" + "typescript": "3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index e32d7588e..08d6a358c 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,14 +7,14 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -23,8 +23,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -40,7 +40,7 @@ "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/router/package.json b/e2e/router/package.json index 1e7340917..d7a391360 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -10,15 +10,15 @@ } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -27,8 +27,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "^10.12.12", @@ -44,7 +44,7 @@ "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 062189aaa..de888d629 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -45,35 +45,35 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "rxjs": "^6.3.3", "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0-", "typescript": "~3.1.1", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/compiler-cli": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "codelyzer": "^4.5.0", "rxjs": "~6.3.3", "tns-core-modules": "next", "tslint": "^5.5.0", - "typescript": "~3.1.1", + "typescript": "~3.4.5", "zone.js": "^0.8.4", "nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master", "typedoc": "^0.13.0" diff --git a/nativescript-angular/router/ns-platform-location.ts b/nativescript-angular/router/ns-platform-location.ts index ebd86f067..b1828e4e6 100644 --- a/nativescript-angular/router/ns-platform-location.ts +++ b/nativescript-angular/router/ns-platform-location.ts @@ -13,6 +13,15 @@ export class NativescriptPlatformLocation extends PlatformLocation { } } + getState(): any { + return undefined; + } + + readonly hostname: string; + readonly href: string; + readonly port: string; + readonly protocol: string; + getBaseHrefFromDOM(): string { return "/"; } diff --git a/ng-sample/package.json b/ng-sample/package.json index de8926960..2d3844a47 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -32,15 +32,15 @@ }, "homepage": "https://github.com/NativeScript/template-hello-world", "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../nativescript-angular", "rxjs": "~6.3.3", "tns-core-modules": "next", @@ -56,7 +56,7 @@ "nativescript-dev-typescript": "next", "shelljs": "^0.7.0", "tslint": "^4.5.1", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "tslint": "tslint --project tsconfig.json --config tslint.json", From f4449e22e0db896ffadea9ddbc4e52b6b2c7161c Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Mon, 20 May 2019 14:06:35 +0300 Subject: [PATCH 02/11] chore: update app's to latest 8 rc version of Angular --- e2e/animation-examples/package.json | 22 +++++++++++----------- e2e/routable-animations/package.json | 22 +++++++++++----------- e2e/router-tab-view/package.json | 18 +++++++++--------- e2e/single-page/package.json | 22 +++++++++++----------- e2e/tests-app-ng/package.json | 14 +++++++------- tests/package.json | 18 +++++++++--------- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 8ed8f99be..a9c7c640f 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "^7.2.4-next-2019-05-06-201428-01", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index 53cbd60bb..b602fddbc 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -7,15 +7,15 @@ "id": "org.nativescript.nsroanimations" }, "dependencies": { - "@angular/animations": "~6.0.6", - "@angular/common": "~6.0.6", - "@angular/compiler": "~6.0.6", - "@angular/core": "~6.0.6", - "@angular/forms": "~6.0.6", - "@angular/http": "~6.0.6", - "@angular/platform-browser": "~6.0.6", - "@angular/platform-browser-dynamic": "~6.0.6", - "@angular/router": "~6.0.6", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "next", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", @@ -24,8 +24,8 @@ "zone.js": "^0.8.26" }, "devDependencies": { - "@ngtools/webpack": "6.1.0-rc.0", - "@angular/compiler-cli": "~6.1.0-beta.3", + "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.4", "@types/chai": "~4.1.3", "@types/mocha": "~5.2.1", "@types/node": "^7.0.5", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 0672cbcfc..09a5ef1df 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-beta.10", + "@angular/http": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 812376667..6dc411ef8 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "8.0.0-rc.4", + "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index d260b5a4a..74ebf9b35 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -13,13 +13,13 @@ } }, "dependencies": { - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "next", "nativescript-intl": "~3.0.0", "nativescript-theme-core": "^1.0.4", diff --git a/tests/package.json b/tests/package.json index 6f02fcab8..b52d9f3d6 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", + "@angular/animations": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.4", + "@angular/compiler": "8.0.0-rc.4", + "@angular/core": "8.0.0-rc.4", + "@angular/forms": "8.0.0-rc.4", + "@angular/http": "8.0.0-beta.10", + "@angular/platform-browser": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.4", + "@angular/router": "8.0.0-rc.4", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.3.3", From ab132247ca192de5195963947a57980fbad5bdfe Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Tue, 21 May 2019 16:24:55 +0300 Subject: [PATCH 03/11] chore: update typescript dep in applications --- e2e/animation-examples/package.json | 2 +- e2e/routable-animations/package.json | 2 +- e2e/router-tab-view/package.json | 2 +- e2e/single-page/package.json | 2 +- nativescript-angular/package.json | 2 +- tests/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index a9c7c640f..4c8097378 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -45,7 +45,7 @@ "nativescript-dev-appium": "next", "nativescript-dev-typescript": "^0.9.1-next-2019-03-12-162713-03", "nativescript-dev-webpack": "^0.22.0-next-2019-04-17-111030-01", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "u": "update-ns-webpack", diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index b602fddbc..5cbcab8a6 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -38,7 +38,7 @@ "nativescript-dev-appium": "^4.0.0", "nativescript-dev-typescript": "~0.7.1", "nativescript-dev-webpack": "next", - "typescript": "~2.7.2" + "typescript": "~3.4.5" }, "scripts": { "ns-bundle": "ns-bundle", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 09a5ef1df..f704b844c 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -41,7 +41,7 @@ "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", "nativescript-dev-typescript": "next", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 6dc411ef8..a09d60232 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -47,7 +47,7 @@ "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index de888d629..809f31be6 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -55,7 +55,7 @@ "@angular/router": "8.0.0-rc.4", "rxjs": "^6.3.3", "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0-", - "typescript": "~3.1.1", + "typescript": "~3.4.5", "zone.js": "^0.8.4" }, "devDependencies": { diff --git a/tests/package.json b/tests/package.json index b52d9f3d6..672ee5772 100644 --- a/tests/package.json +++ b/tests/package.json @@ -60,7 +60,7 @@ "nativescript-dev-typescript": "next", "sinon": "^7.3.2", "tslint": "^4.5.1", - "typescript": "~3.1.1" + "typescript": "~3.4.5" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json", From 28d262d74e04540c8b3a11c9ebd0acd255d07c23 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Mon, 27 May 2019 10:29:22 +0300 Subject: [PATCH 04/11] chore: update to Angular 8 rc5 chore: update demo apps to Angular 8 rc5 --- e2e/animation-examples/package.json | 18 +++++++------- e2e/modal-navigation-ng/package.json | 20 ++++++++-------- e2e/nested-router-tab-view/package.json | 18 +++++++------- e2e/renderer/package.json | 16 ++++++------- e2e/routable-animations/package.json | 18 +++++++------- e2e/router-tab-view/package.json | 16 ++++++------- e2e/router/package.json | 18 +++++++------- e2e/single-page/package.json | 18 +++++++------- e2e/tests-app-ng/package.json | 14 +++++------ nativescript-angular/package.json | 32 ++++++++++++------------- ng-sample/package.json | 16 ++++++------- tests/package.json | 16 ++++++------- 12 files changed, 110 insertions(+), 110 deletions(-) diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 4c8097378..6af83d88c 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "^7.2.4-next-2019-05-06-201428-01", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 1b0fd836a..19b199b60 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -9,19 +9,19 @@ "version": "next" }, "tns-ios": { - "version": "next" + "version": "6.0.0-2019-05-22-142408-01" } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 9871762e1..3e71c1f8f 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 08d6a358c..635e16594 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,14 +7,14 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -23,7 +23,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index 5cbcab8a6..4203052fe 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -7,15 +7,15 @@ "id": "org.nativescript.nsroanimations" }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "next", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", @@ -25,7 +25,7 @@ }, "devDependencies": { "@ngtools/webpack": "8.0.0-rc.4", - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@types/chai": "~4.1.3", "@types/mocha": "~5.2.1", "@types/node": "^7.0.5", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index f704b844c..e9042506c 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", "@angular/forms": "8.0.0-beta.10", - "@angular/http": "8.0.0-rc.4", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/http": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", diff --git a/e2e/router/package.json b/e2e/router/package.json index d7a391360..b2ec86c3c 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -10,15 +10,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -27,7 +27,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index a09d60232..9d242e109 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0-rc.5", "@ngtools/webpack": "8.0.0-rc.4", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index 74ebf9b35..7b11611c3 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -13,13 +13,13 @@ } }, "dependencies": { - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "next", "nativescript-intl": "~3.0.0", "nativescript-theme-core": "^1.0.4", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 809f31be6..01650bc4b 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -45,30 +45,30 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "rxjs": "^6.3.3", "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0-", "typescript": "~3.4.5", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/compiler-cli": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/compiler-cli": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "codelyzer": "^4.5.0", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/ng-sample/package.json b/ng-sample/package.json index 2d3844a47..797569e44 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -32,15 +32,15 @@ }, "homepage": "https://github.com/NativeScript/template-hello-world", "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "file:../nativescript-angular", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/tests/package.json b/tests/package.json index 672ee5772..2675ea353 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "8.0.0-rc.4", - "@angular/common": "8.0.0-rc.4", - "@angular/compiler": "8.0.0-rc.4", - "@angular/core": "8.0.0-rc.4", - "@angular/forms": "8.0.0-rc.4", + "@angular/animations": "8.0.0-rc.5", + "@angular/common": "8.0.0-rc.5", + "@angular/compiler": "8.0.0-rc.5", + "@angular/core": "8.0.0-rc.5", + "@angular/forms": "8.0.0-rc.5", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.4", - "@angular/platform-browser-dynamic": "8.0.0-rc.4", - "@angular/router": "8.0.0-rc.4", + "@angular/platform-browser": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0-rc.5", + "@angular/router": "8.0.0-rc.5", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.3.3", From 148b31d7169f95eaa7a3401470b694eee5b5640c Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Mon, 27 May 2019 13:08:47 +0300 Subject: [PATCH 05/11] chore: update deprecated angular API in demo apps --- e2e/animation-examples/app/animation-builder.component.ts | 3 +-- .../app/navigation/basic.navigation.component.ts | 2 +- e2e/nested-router-tab-view/app/app.component.ts | 2 +- e2e/router-tab-view/app/app.component.ts | 2 +- tests/app/tests/detached-loader-tests.ts | 2 +- tests/app/tests/list-view-tests.ts | 2 +- tests/app/tests/renderer-tests.ts | 8 ++++---- tests/app/tests/router-module-tests.ts | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/e2e/animation-examples/app/animation-builder.component.ts b/e2e/animation-examples/app/animation-builder.component.ts index d56bec432..0ea5a1bee 100644 --- a/e2e/animation-examples/app/animation-builder.component.ts +++ b/e2e/animation-examples/app/animation-builder.component.ts @@ -7,8 +7,7 @@ import { Component, ViewChild } from '@angular/core'; ` }) export class AnimationBuilderComponent { - @ViewChild('button') - private button; + @ViewChild('button', { static: false }) button; constructor(private _builder: AnimationBuilder) {} diff --git a/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts b/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts index 49f7a2567..ba273811b 100644 --- a/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts +++ b/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts @@ -23,7 +23,7 @@ import { ModalViewComponent } from "~/modal-shared/modal-view.component"; export class BasicsNavigationComponent { - @ViewChild("popoverButtonComp") popoverButtonComp: ElementRef; + @ViewChild("popoverButtonComp", { read: ElementRef, static: false }) popoverButtonComp: ElementRef; @Input() col: number; constructor( private modal: ModalDialogService, diff --git a/e2e/nested-router-tab-view/app/app.component.ts b/e2e/nested-router-tab-view/app/app.component.ts index d3e62efe5..62dd1b475 100644 --- a/e2e/nested-router-tab-view/app/app.component.ts +++ b/e2e/nested-router-tab-view/app/app.component.ts @@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra export class AppComponent { private isInitialNavigation = true; - @ViewChild(TabViewDirective) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { read: TabViewDirective, static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/e2e/router-tab-view/app/app.component.ts b/e2e/router-tab-view/app/app.component.ts index d3e62efe5..62dd1b475 100644 --- a/e2e/router-tab-view/app/app.component.ts +++ b/e2e/router-tab-view/app/app.component.ts @@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra export class AppComponent { private isInitialNavigation = true; - @ViewChild(TabViewDirective) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { read: TabViewDirective, static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/tests/app/tests/detached-loader-tests.ts b/tests/app/tests/detached-loader-tests.ts index e5dbe4ba7..9381fdd50 100644 --- a/tests/app/tests/detached-loader-tests.ts +++ b/tests/app/tests/detached-loader-tests.ts @@ -10,7 +10,7 @@ class TestComponent { } class LoaderComponentBase { - @ViewChild(DetachedLoader) public loader: DetachedLoader; + @ViewChild(DetachedLoader, { read: DetachedLoader, static: false }) public loader: DetachedLoader; } @Component({ diff --git a/tests/app/tests/list-view-tests.ts b/tests/app/tests/list-view-tests.ts index 43de0f846..dc1c2c46d 100644 --- a/tests/app/tests/list-view-tests.ts +++ b/tests/app/tests/list-view-tests.ts @@ -93,7 +93,7 @@ export class TestDefaultItemTemplateComponent { this.myItems.push(new DataItem(i, "Name " + i)); } } - @ViewChild("listView") listViewElement: ListViewComponent; + @ViewChild("listView", { read: ListViewComponent, static: false }) listViewElement: ListViewComponent; onScrollListViewTo() { this.listViewElement.nativeElement.scrollToIndex(100); } diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts index 9cc746d3e..dc5ef65bb 100644 --- a/tests/app/tests/renderer-tests.ts +++ b/tests/app/tests/renderer-tests.ts @@ -222,10 +222,10 @@ registerElement("ButtonCounter", () => ButtonCounter); }`] }) export class NgControlSettersCount { - @ViewChild("btn1") btn1: ElementRef; - @ViewChild("btn2") btn2: ElementRef; - @ViewChild("btn3") btn3: ElementRef; - @ViewChild("btn3") btn4: ElementRef; + @ViewChild("btn1", { read: ElementRef, static: false }) btn1: ElementRef; + @ViewChild("btn2", { read: ElementRef, static: false }) btn2: ElementRef; + @ViewChild("btn3", { read: ElementRef, static: false }) btn3: ElementRef; + @ViewChild("btn3", { read: ElementRef, static: false }) btn4: ElementRef; get buttons(): ElementRef[] { return [this.btn1, this.btn2, this.btn3, this.btn4]; } diff --git a/tests/app/tests/router-module-tests.ts b/tests/app/tests/router-module-tests.ts index 7bce3f7ef..5b999b02e 100644 --- a/tests/app/tests/router-module-tests.ts +++ b/tests/app/tests/router-module-tests.ts @@ -13,7 +13,7 @@ import { NSRouteReuseStrategy } from "nativescript-angular/router/ns-route-reuse template: `` }) class RouterTestComponent { - @ViewChild(NSRouterLink) + @ViewChild(NSRouterLink, { read: NSRouterLink, static: false }) nsRouterLink: NSRouterLink; } From e4732064718c1f49e63c3b473aeb37e9d35e0932 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Mon, 27 May 2019 13:34:05 +0300 Subject: [PATCH 06/11] chore: update to new Angular 8 API --- nativescript-angular/directives/templated-items-comp.ts | 4 ++-- nativescript-angular/router/ns-empty-outlet.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nativescript-angular/directives/templated-items-comp.ts b/nativescript-angular/directives/templated-items-comp.ts index a70746796..69aaabfed 100644 --- a/nativescript-angular/directives/templated-items-comp.ts +++ b/nativescript-angular/directives/templated-items-comp.ts @@ -56,11 +56,11 @@ export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, Aft protected _differ: IterableDiffer; protected _templateMap: Map; - @ViewChild("loader", { read: ViewContainerRef }) loader: ViewContainerRef; + @ViewChild("loader", { read: ViewContainerRef, static: false }) loader: ViewContainerRef; @Output() public setupItemView = new EventEmitter(); - @ContentChild(TemplateRef) itemTemplateQuery: TemplateRef; + @ContentChild(TemplateRef, { read: TemplateRef, static: false }) itemTemplateQuery: TemplateRef; itemTemplate: TemplateRef; diff --git a/nativescript-angular/router/ns-empty-outlet.component.ts b/nativescript-angular/router/ns-empty-outlet.component.ts index 4de7f9e69..872210170 100644 --- a/nativescript-angular/router/ns-empty-outlet.component.ts +++ b/nativescript-angular/router/ns-empty-outlet.component.ts @@ -7,7 +7,7 @@ import { PageRouterOutlet } from "./page-router-outlet"; template: "" }) export class NSEmptyOutletComponent { - @ViewChild(PageRouterOutlet) pageRouterOutlet: PageRouterOutlet; + @ViewChild(PageRouterOutlet, { read: PageRouterOutlet, static: false }) pageRouterOutlet: PageRouterOutlet; constructor(private page: Page) { if (this.page) { this.page.actionBarHidden = true; From b16046da61e41ca37cea1311030c1c7fadf04f31 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Wed, 29 May 2019 09:44:24 +0300 Subject: [PATCH 07/11] feat: upgrade to Angular 8 --- e2e/animation-examples/package.json | 22 ++++++++--------- e2e/modal-navigation-ng/package.json | 20 ++++++++-------- e2e/nested-router-tab-view/package.json | 20 ++++++++-------- e2e/renderer/package.json | 18 +++++++------- e2e/routable-animations/package.json | 20 ++++++++-------- e2e/router-tab-view/package.json | 16 ++++++------- e2e/router/package.json | 20 ++++++++-------- e2e/single-page/package.json | 20 ++++++++-------- e2e/tests-app-ng/package.json | 14 +++++------ nativescript-angular/package.json | 32 ++++++++++++------------- ng-sample/package.json | 16 ++++++------- tests/package.json | 16 ++++++------- 12 files changed, 117 insertions(+), 117 deletions(-) diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 6af83d88c..f995a696e 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -13,16 +13,16 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", - "nativescript-angular": "^7.2.4-next-2019-05-06-201428-01", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", + "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", "rxjs": "^6.3.3", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 19b199b60..05685d78a 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 3e71c1f8f..f7783b5cf 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 635e16594..4d6fd6337 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,14 +7,14 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -23,8 +23,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index 4203052fe..4e8f38c69 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -7,15 +7,15 @@ "id": "org.nativescript.nsroanimations" }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "next", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", @@ -24,8 +24,8 @@ "zone.js": "^0.8.26" }, "devDependencies": { - "@ngtools/webpack": "8.0.0-rc.4", - "@angular/compiler-cli": "8.0.0-rc.5", + "@ngtools/webpack": "8.0.0", + "@angular/compiler-cli": "8.0.0", "@types/chai": "~4.1.3", "@types/mocha": "~5.2.1", "@types/node": "^7.0.5", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index e9042506c..e0b508fae 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", "@angular/forms": "8.0.0-beta.10", - "@angular/http": "8.0.0-rc.5", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/http": "8.0.0", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", diff --git a/e2e/router/package.json b/e2e/router/package.json index b2ec86c3c..ace5d61c3 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -10,15 +10,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -27,8 +27,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "^10.12.12", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 9d242e109..06bd8aaf8 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,8 +30,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0-rc.5", - "@ngtools/webpack": "8.0.0-rc.4", + "@angular/compiler-cli": "8.0.0", + "@ngtools/webpack": "8.0.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index 7b11611c3..948dd6f00 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -13,13 +13,13 @@ } }, "dependencies": { - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "next", "nativescript-intl": "~3.0.0", "nativescript-theme-core": "^1.0.4", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 01650bc4b..c37d51285 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -45,30 +45,30 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/router": "8.0.0", "rxjs": "^6.3.3", "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0-", "typescript": "~3.4.5", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/compiler-cli": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "codelyzer": "^4.5.0", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/ng-sample/package.json b/ng-sample/package.json index 797569e44..fdb973dff 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -32,15 +32,15 @@ }, "homepage": "https://github.com/NativeScript/template-hello-world", "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "file:../nativescript-angular", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/tests/package.json b/tests/package.json index 2675ea353..97e308db3 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "8.0.0-rc.5", - "@angular/common": "8.0.0-rc.5", - "@angular/compiler": "8.0.0-rc.5", - "@angular/core": "8.0.0-rc.5", - "@angular/forms": "8.0.0-rc.5", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/core": "8.0.0", + "@angular/forms": "8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0-rc.5", - "@angular/platform-browser-dynamic": "8.0.0-rc.5", - "@angular/router": "8.0.0-rc.5", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.3.3", From 21cdb3e12949fcde6beabc807d592b6447627a59 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Wed, 29 May 2019 16:23:02 +0300 Subject: [PATCH 08/11] chore: revert demo tns-ios version --- e2e/modal-navigation-ng/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 05685d78a..6e3e6944f 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -9,7 +9,7 @@ "version": "next" }, "tns-ios": { - "version": "6.0.0-2019-05-22-142408-01" + "version": "next" } }, "dependencies": { From 89ad2fa9bc67ab177433e5f7c2d8fe1bce03adb3 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Wed, 29 May 2019 16:23:17 +0300 Subject: [PATCH 09/11] chore: bump version to 8.0.0 --- nativescript-angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index c37d51285..72fbd40ae 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "7.3.0", + "version": "8.0.0", "description": "An Angular renderer that lets you build mobile apps with NativeScript.", "homepage": "https://www.nativescript.org/", "bugs": "https://github.com/NativeScript/nativescript-angular/issues", From b9b9bbce24adac600510bb59d86780d6d64fa83e Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Wed, 29 May 2019 16:55:19 +0300 Subject: [PATCH 10/11] chore: revert demo tns-ios version --- e2e/nested-router-tab-view/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index f7783b5cf..97ee5a7c8 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -6,7 +6,7 @@ "nativescript": { "id": "org.nativescript.nestedroutertabview", "tns-ios": { - "version": "6.0.0-2019-05-16-165318-01" + "version": "next" }, "tns-android": { "version": "next" From 7894b19515d91f7753d1ea2c789d50f3af678547 Mon Sep 17 00:00:00 2001 From: VladimirAmiorkov Date: Wed, 29 May 2019 17:24:34 +0300 Subject: [PATCH 11/11] chore: remove 'read' from ViewChild calls --- .../app/navigation/basic.navigation.component.ts | 2 +- e2e/nested-router-tab-view/app/app.component.ts | 2 +- e2e/router-tab-view/app/app.component.ts | 2 +- tests/app/tests/detached-loader-tests.ts | 2 +- tests/app/tests/list-view-tests.ts | 2 +- tests/app/tests/renderer-tests.ts | 8 ++++---- tests/app/tests/router-module-tests.ts | 3 +-- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts b/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts index ba273811b..bf194fb2f 100644 --- a/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts +++ b/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts @@ -23,7 +23,7 @@ import { ModalViewComponent } from "~/modal-shared/modal-view.component"; export class BasicsNavigationComponent { - @ViewChild("popoverButtonComp", { read: ElementRef, static: false }) popoverButtonComp: ElementRef; + @ViewChild("popoverButtonComp", { static: false }) popoverButtonComp: ElementRef; @Input() col: number; constructor( private modal: ModalDialogService, diff --git a/e2e/nested-router-tab-view/app/app.component.ts b/e2e/nested-router-tab-view/app/app.component.ts index 62dd1b475..7c18980d7 100644 --- a/e2e/nested-router-tab-view/app/app.component.ts +++ b/e2e/nested-router-tab-view/app/app.component.ts @@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra export class AppComponent { private isInitialNavigation = true; - @ViewChild(TabViewDirective, { read: TabViewDirective, static: false }) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/e2e/router-tab-view/app/app.component.ts b/e2e/router-tab-view/app/app.component.ts index 62dd1b475..7c18980d7 100644 --- a/e2e/router-tab-view/app/app.component.ts +++ b/e2e/router-tab-view/app/app.component.ts @@ -12,7 +12,7 @@ import { NSLocationStrategy } from "nativescript-angular/router/ns-location-stra export class AppComponent { private isInitialNavigation = true; - @ViewChild(TabViewDirective, { read: TabViewDirective, static: false }) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/tests/app/tests/detached-loader-tests.ts b/tests/app/tests/detached-loader-tests.ts index 9381fdd50..1d54ee91e 100644 --- a/tests/app/tests/detached-loader-tests.ts +++ b/tests/app/tests/detached-loader-tests.ts @@ -10,7 +10,7 @@ class TestComponent { } class LoaderComponentBase { - @ViewChild(DetachedLoader, { read: DetachedLoader, static: false }) public loader: DetachedLoader; + @ViewChild(DetachedLoader, { static: false }) public loader: DetachedLoader; } @Component({ diff --git a/tests/app/tests/list-view-tests.ts b/tests/app/tests/list-view-tests.ts index dc1c2c46d..ee28a9c8c 100644 --- a/tests/app/tests/list-view-tests.ts +++ b/tests/app/tests/list-view-tests.ts @@ -93,7 +93,7 @@ export class TestDefaultItemTemplateComponent { this.myItems.push(new DataItem(i, "Name " + i)); } } - @ViewChild("listView", { read: ListViewComponent, static: false }) listViewElement: ListViewComponent; + @ViewChild("listView", { static: false }) listViewElement: ListViewComponent; onScrollListViewTo() { this.listViewElement.nativeElement.scrollToIndex(100); } diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts index dc5ef65bb..2a0984ed3 100644 --- a/tests/app/tests/renderer-tests.ts +++ b/tests/app/tests/renderer-tests.ts @@ -222,10 +222,10 @@ registerElement("ButtonCounter", () => ButtonCounter); }`] }) export class NgControlSettersCount { - @ViewChild("btn1", { read: ElementRef, static: false }) btn1: ElementRef; - @ViewChild("btn2", { read: ElementRef, static: false }) btn2: ElementRef; - @ViewChild("btn3", { read: ElementRef, static: false }) btn3: ElementRef; - @ViewChild("btn3", { read: ElementRef, static: false }) btn4: ElementRef; + @ViewChild("btn1", { static: false }) btn1: ElementRef; + @ViewChild("btn2", { static: false }) btn2: ElementRef; + @ViewChild("btn3", { static: false }) btn3: ElementRef; + @ViewChild("btn3", { static: false }) btn4: ElementRef; get buttons(): ElementRef[] { return [this.btn1, this.btn2, this.btn3, this.btn4]; } diff --git a/tests/app/tests/router-module-tests.ts b/tests/app/tests/router-module-tests.ts index 5b999b02e..8a8ade953 100644 --- a/tests/app/tests/router-module-tests.ts +++ b/tests/app/tests/router-module-tests.ts @@ -13,8 +13,7 @@ import { NSRouteReuseStrategy } from "nativescript-angular/router/ns-route-reuse template: `` }) class RouterTestComponent { - @ViewChild(NSRouterLink, { read: NSRouterLink, static: false }) - nsRouterLink: NSRouterLink; + @ViewChild(NSRouterLink, { static: false }) nsRouterLink: NSRouterLink; } describe("NativeScriptRouterModule.forRoot", () => {