From cbb51ab24a856d6b388b640b56ca3c54b57e31e6 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Tue, 15 Jan 2019 10:14:49 +0200 Subject: [PATCH 1/3] chore: bump to angular 7.2.0 --- e2e/modal-navigation-ng/package.json | 22 +++++++------- e2e/nested-router-tab-view/package.json | 22 +++++++------- e2e/renderer/package.json | 20 ++++++------- e2e/router-tab-view/package.json | 18 ++++++------ e2e/router/package.json | 22 +++++++------- e2e/single-page/package.json | 22 +++++++------- nativescript-angular/package.json | 38 ++++++++++++------------- ng-sample/package.json | 18 ++++++------ tests/package.json | 18 ++++++------ 9 files changed, 100 insertions(+), 100 deletions(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 7ae334754..bf92f4395 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "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.1.0", - "@ngtools/webpack": "~7.1.0", + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.2.0", "@types/chai": "^4.0.2", "@types/mocha": "^5.2.5", "@types/node": "^10.12.12", diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 502e5c8a2..109b89bdc 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@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": "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.1.0", - "@ngtools/webpack": "~7.1.0", + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.2.0", "@types/chai": "^4.0.2", "@types/mocha": "^5.2.5", "@types/node": "^10.12.12", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index caa9fed90..d2e82b4ff 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,14 +7,14 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.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": "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.1.0", - "@ngtools/webpack": "~7.1.0", + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.2.0", "@types/chai": "~4.1.3", "@types/mocha": "~5.2.1", "@types/node": "10.11.4", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 8834e81d8..187cc9752 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "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 5d6bc7949..d550d9c1b 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -7,15 +7,15 @@ "id": "org.nativescript.router" }, "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -24,8 +24,8 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@ngtools/webpack": "~7.1.0", - "@angular/compiler-cli": "~7.1.0", + "@ngtools/webpack": "~7.2.0", + "@angular/compiler-cli": "~7.2.0", "@types/chai": "^4.0.2", "@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 2cc4d2626..c324e1e25 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "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.1.0", - "@ngtools/webpack": "~7.1.0", + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.2.0", "@types/chai": "^4.0.2", "@types/mocha": "^5.2.5", "@types/node": "^10.12.12", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 8477b29ce..43e06ed63 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -44,30 +44,30 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/router": "~7.1.0", + "@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", "rxjs": "^6.3.3", - "tns-core-modules": "^5.0.0 || >5.0.0- || >5.1.0-", + "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.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/compiler-cli": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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", "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 4e5f315f6..de8926960 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.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "file:../nativescript-angular", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/tests/package.json b/tests/package.json index 5d405779a..1447a413b 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/http": "~7.1.0", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", + "@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": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.3.3", From 47a29c9ace9e524d732cf4e14232919a2976f85e Mon Sep 17 00:00:00 2001 From: vakrilov Date: Tue, 15 Jan 2019 10:15:16 +0200 Subject: [PATCH 2/3] chore: remove deprecated example --- .../app/examples/router/clear-history-test.ts | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/ng-sample/app/examples/router/clear-history-test.ts b/ng-sample/app/examples/router/clear-history-test.ts index 727f982d5..8c25960c5 100644 --- a/ng-sample/app/examples/router/clear-history-test.ts +++ b/ng-sample/app/examples/router/clear-history-test.ts @@ -6,21 +6,11 @@ import { BehaviorSubject } from "rxjs"; @Injectable() class LocationLogService { - public locationStack$ = new BehaviorSubject>([]); public routerEvents$ = new BehaviorSubject>([]); - public showStack: boolean = true; constructor(router: Router, private strategy: NSLocationStrategy) { router.events.subscribe((e) => { this.routerEvents$.next([...this.routerEvents$.getValue(), e.toString()]); - - let states = this.strategy._getStates() - .map((v, i) => { - return (i + "." + (v.isPageNavigation ? "[PAGE]" : "") + " \"" + v.url + "\""); - }) - .reverse(); - - this.locationStack$.next(states); }); } } @@ -29,15 +19,9 @@ class LocationLogService { selector: "location-log", styleUrls: ["examples/router/styles.css"], template: ` - - - - + From 9fb9fb3f4228a6a23a69a5b9889697952ec4cbd2 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Thu, 17 Jan 2019 16:23:41 +0200 Subject: [PATCH 3/3] chore: set version to 7.2.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 05d33ccd3..ea4257c6d 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "7.1.1", + "version": "7.2.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",