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/animation-examples/package.json b/e2e/animation-examples/package.json index 8ed8f99be..f995a696e 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -13,16 +13,16 @@ } }, "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", - "nativescript-angular": "^7.2.4-next-2019-05-06-201428-01", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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/modal-navigation-ng/app/navigation/basic.navigation.component.ts b/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts index 49f7a2567..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") popoverButtonComp: ElementRef; + @ViewChild("popoverButtonComp", { static: false }) popoverButtonComp: ElementRef; @Input() col: number; constructor( private modal: ModalDialogService, diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 31c2d0eeb..6e3e6944f 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", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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/app/app.component.ts b/e2e/nested-router-tab-view/app/app.component.ts index d3e62efe5..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) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index ff096ee2f..97ee5a7c8 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-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", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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..4d6fd6337 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", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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/routable-animations/package.json b/e2e/routable-animations/package.json index 53cbd60bb..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": "~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", + "@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", + "@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": "6.1.0-rc.0", - "@angular/compiler-cli": "~6.1.0-beta.3", + "@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", @@ -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/app/app.component.ts b/e2e/router-tab-view/app/app.component.ts index d3e62efe5..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) tabView: TabViewDirective; + @ViewChild(TabViewDirective, { static: false }) tabView: TabViewDirective; constructor(router: Router, location: NSLocationStrategy) { router.events.subscribe(e => { diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 0672cbcfc..e0b508fae 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", + "@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", + "@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", @@ -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/router/package.json b/e2e/router/package.json index 1e7340917..ace5d61c3 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", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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/e2e/single-page/package.json b/e2e/single-page/package.json index 812376667..06bd8aaf8 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", + "@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", + "@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": "~7.2.0", - "@ngtools/webpack": "~7.2.0", + "@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", @@ -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/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index d260b5a4a..948dd6f00 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", + "@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/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/package.json b/nativescript-angular/package.json index 062189aaa..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", @@ -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", + "@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", + "@angular/router": "8.0.0", "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": { - "@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", + "@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", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/router": "8.0.0", "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-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; 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..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": "~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", + "@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", + "@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", @@ -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", diff --git a/tests/app/tests/detached-loader-tests.ts b/tests/app/tests/detached-loader-tests.ts index e5dbe4ba7..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) 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 43de0f846..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") 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 9cc746d3e..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") btn1: ElementRef; - @ViewChild("btn2") btn2: ElementRef; - @ViewChild("btn3") btn3: ElementRef; - @ViewChild("btn3") 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 7bce3f7ef..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) - nsRouterLink: NSRouterLink; + @ViewChild(NSRouterLink, { static: false }) nsRouterLink: NSRouterLink; } describe("NativeScriptRouterModule.forRoot", () => { diff --git a/tests/package.json b/tests/package.json index 6f02fcab8..97e308db3 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", + "@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", + "@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", @@ -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",