From e3657c446db7af23d50f8514d001e5709c2b7788 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Tue, 17 Nov 2020 13:57:27 -0800 Subject: [PATCH] feat(angular): v11 (#2297) --- e2e/animation-examples/package.json | 24 ++++++------ nativescript-angular-package/package.json | 28 +++++++------- nativescript-angular/app-host-view.ts | 1 + nativescript-angular/package.json | 38 +++++++++---------- nativescript-angular/router/ns-router-link.ts | 2 - 5 files changed, 46 insertions(+), 47 deletions(-) diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 8d9aaed48..a56c99369 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -5,14 +5,14 @@ "readme": "NativeScript Application", "repository": "", "dependencies": { - "@angular/animations": "~10.1.0", - "@angular/common": "~10.1.0", - "@angular/compiler": "~10.1.0", - "@angular/core": "~10.1.0", - "@angular/forms": "~10.1.0", - "@angular/platform-browser": "~10.1.0", - "@angular/platform-browser-dynamic": "~10.1.0", - "@angular/router": "~10.1.0", + "@angular/animations": "~11.0.0", + "@angular/common": "~11.0.0", + "@angular/compiler": "~11.0.0", + "@angular/core": "~11.0.0", + "@angular/forms": "~11.0.0", + "@angular/platform-browser": "~11.0.0", + "@angular/platform-browser-dynamic": "~11.0.0", + "@angular/router": "~11.0.0", "@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.13", @@ -21,10 +21,10 @@ "zone.js": "^0.11.1" }, "devDependencies": { - "@angular/compiler-cli": "~10.1.0", - "@nativescript/ios": "7.0.0", + "@angular/compiler-cli": "~11.0.0", + "@nativescript/ios": "7.0.5", "@nativescript/webpack": "~3.0.0", - "@ngtools/webpack": "~10.1.0", + "@ngtools/webpack": "~11.0.0", "@types/chai": "~4.2.0", "@types/mocha": "~7.0.0", "@types/node": "~14.0.0", @@ -37,7 +37,7 @@ "mochawesome": "~6.1.1", "nativescript-css-loader": "~0.26.0", "node-sass": "~4.14.1", - "typescript": "~3.9.0" + "typescript": "~4.0.0" }, "scripts": { "clean": "ns clean", diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json index 0a75675e8..0d2a16f8e 100644 --- a/nativescript-angular-package/package.json +++ b/nativescript-angular-package/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "10.0.0", + "version": "11.0.0", "description": "Compatibility with old style nativescript-angular imports.", "homepage": "https://www.nativescript.org/", "bugs": "https://github.com/NativeScript/nativescript-angular/issues", @@ -35,20 +35,20 @@ ] }, "devDependencies": { - "@angular/animations": "~10.0.0", - "@angular/common": "~10.0.0", - "@angular/compiler": "~10.0.0", - "@angular/compiler-cli": "~10.0.0", - "@angular/core": "~10.0.0", - "@angular/forms": "~10.0.0", - "@angular/platform-browser": "~10.0.0", - "@angular/platform-browser-dynamic": "~10.0.0", - "@angular/router": "~10.0.0", - "@nativescript/angular": "~10.0.0", + "@angular/animations": "~11.0.0", + "@angular/common": "~11.0.0", + "@angular/compiler": "~11.0.0", + "@angular/compiler-cli": "~11.0.0", + "@angular/core": "~11.0.0", + "@angular/forms": "~11.0.0", + "@angular/platform-browser": "~11.0.0", + "@angular/platform-browser-dynamic": "~11.0.0", + "@angular/router": "~11.0.0", + "@nativescript/angular": "rc", "@nativescript/core": "rc", - "ng-packagr": "^10.0.1", - "rxjs": "~6.5.5", - "typescript": "~3.9.0" + "ng-packagr": "^11.0.0", + "rxjs": "~6.6.0", + "typescript": "~4.0.0" }, "scripts": { "setup": "npx rimraf hooks node_modules package-lock.json && npm i", diff --git a/nativescript-angular/app-host-view.ts b/nativescript-angular/app-host-view.ts index 55e91911c..3f14d684d 100644 --- a/nativescript-angular/app-host-view.ts +++ b/nativescript-angular/app-host-view.ts @@ -17,6 +17,7 @@ export class AppHostView extends ContentView { this._ngAppRoot = value; } + // @ts-ignore get content(): View { return this._content; } diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 38d0c5311..f027eaaf8 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/angular", - "version": "10.1.7", + "version": "11.0.0-rc.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", @@ -61,37 +61,37 @@ "nativescript-intl": "^4.0.0" }, "peerDependencies": { - "@angular/common": "^10.1.0", - "@angular/compiler": "^10.1.0", - "@angular/core": "^10.1.0", - "@angular/forms": "^10.1.0", - "@angular/platform-browser": "^10.1.0", - "@angular/platform-browser-dynamic": "^10.1.0", - "@angular/router": "^10.1.0" + "@angular/common": "^11.0.0", + "@angular/compiler": "^11.0.0", + "@angular/core": "^11.0.0", + "@angular/forms": "^11.0.0", + "@angular/platform-browser": "^11.0.0", + "@angular/platform-browser-dynamic": "^11.0.0", + "@angular/router": "^11.0.0" }, "devDependencies": { - "@angular/animations": "~10.1.0", - "@angular/common": "~10.1.0", - "@angular/compiler": "~10.1.0", - "@angular/compiler-cli": "~10.1.0", - "@angular/core": "~10.1.0", - "@angular/forms": "~10.1.0", - "@angular/platform-browser": "~10.1.0", - "@angular/platform-browser-dynamic": "~10.1.0", - "@angular/router": "~10.1.0", + "@angular/animations": "~11.0.0", + "@angular/common": "~11.0.0", + "@angular/compiler": "~11.0.0", + "@angular/compiler-cli": "~11.0.0", + "@angular/core": "~11.0.0", + "@angular/forms": "~11.0.0", + "@angular/platform-browser": "~11.0.0", + "@angular/platform-browser-dynamic": "~11.0.0", + "@angular/router": "~11.0.0", "@nativescript/core": "~7.0.0", "codelyzer": "^5.2.0", "conventional-changelog-cli": "^2.0.34", "husky": "^4.2.5", "lint-staged": "^10.2.11", "nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master", - "ng-packagr": "~10.1.0", + "ng-packagr": "~11.0.0", "prettier": "^2.0.5", "rxjs": "~6.6.0", "tslint": "^6.1.2", "tslint-config-prettier": "^1.18.0", "typedoc": "~0.17.0", - "typescript": "~3.9.0", + "typescript": "~4.0.0", "zone.js": "^0.11.1" }, "husky": { diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts index 23aa97bac..02ba34a39 100644 --- a/nativescript-angular/router/ns-router-link.ts +++ b/nativescript-angular/router/ns-router-link.ts @@ -68,7 +68,6 @@ export class NSRouterLink { relativeTo: this.route, queryParams: this.queryParams, fragment: this.fragment, - preserveQueryParams: attrBoolValue(this.preserveQueryParams), queryParamsHandling: this.queryParamsHandling, preserveFragment: attrBoolValue(this.preserveFragment), }); @@ -102,7 +101,6 @@ export class NSRouterLink { relativeTo: this.route, queryParams: this.queryParams, fragment: this.fragment, - preserveQueryParams: attrBoolValue(this.preserveQueryParams), queryParamsHandling: this.queryParamsHandling, preserveFragment: attrBoolValue(this.preserveFragment), });