From e18ec6080c59f643abfd83e79deb9f2111049d02 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 21 Nov 2019 13:59:58 +0200 Subject: [PATCH 1/6] chore: bump versions --- nativescript-angular-package/package.json | 2 +- nativescript-angular/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json index c0d951a42..5cf0f21a4 100644 --- a/nativescript-angular-package/package.json +++ b/nativescript-angular-package/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "8.30.0", + "version": "8.20.4", "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", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 4e0527624..47b89df37 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/angular", - "version": "8.30.0", + "version": "8.20.4", "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 6984c267760bd9ddff5389cd518e2d47e110311d Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Fri, 13 Dec 2019 13:16:42 +0200 Subject: [PATCH 2/6] fix: wrong import path in compat package https://github.com/NativeScript/nativescript-angular/issues/2059 --- nativescript-angular-package/zone-js/testing.jasmine.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nativescript-angular-package/zone-js/testing.jasmine.ts b/nativescript-angular-package/zone-js/testing.jasmine.ts index 0d852527d..06c6899df 100644 --- a/nativescript-angular-package/zone-js/testing.jasmine.ts +++ b/nativescript-angular-package/zone-js/testing.jasmine.ts @@ -1,3 +1,3 @@ // Bootstrap helper module for jasmine spec tests import "@nativescript/angular/platform"; -import "@nativescript/angular/dist/zone-nativescript.jasmine.js"; +import "@nativescript/angular/zone-js/dist/zone-nativescript.jasmine.js"; From 4b730826f8ea8410264442aae6ce77336914b9b7 Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Wed, 18 Dec 2019 12:07:01 +0200 Subject: [PATCH 3/6] Update page-router-outlet.ts --- nativescript-angular/router/page-router-outlet.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts index 34ba4446f..2e7ac3cbf 100644 --- a/nativescript-angular/router/page-router-outlet.ts +++ b/nativescript-angular/router/page-router-outlet.ts @@ -348,13 +348,13 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire this.changeDetector.markForCheck(); this.activated = loaderRef.instance.loadWithFactory(factory); - this.loadComponentInPage(page, this.activated); + this.loadComponentInPage(page, this.activated, { activatedRoute }); this.activated[loaderRefSymbol] = loaderRef; } @profile - private loadComponentInPage(page: Page, componentRef: ComponentRef): void { + private loadComponentInPage(page: Page, componentRef: ComponentRef, navigationContext): void { // Component loaded. Find its root native view. const componentView = componentRef.location.nativeElement; // Remove it from original native parent. @@ -393,6 +393,7 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire create() { return page; }, + context: navigationContext, clearHistory: navOptions.clearHistory, animated: navOptions.animated, transition: navOptions.transition From 3547534e6528a9439dcb8ebf6dcf67900f34d071 Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Tue, 7 Jan 2020 17:28:08 +0200 Subject: [PATCH 4/6] release: cut the 8.20.4 release --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 554fc48b4..51c07e20d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [8.20.4](https://github.com/NativeScript/nativescript-angular/compare/8.20.3...8.20.4) (2020-01-07) + + +### Bug Fixes + +* add context to frame navigation ([#2100](https://github.com/NativeScript/nativescript-angular/pull/2100)) +* wrong import path in compat package ([#2097](https://github.com/NativeScript/nativescript-angular/pull/2097)) + + + ## [8.20.3](https://github.com/NativeScript/nativescript-angular/compare/8.20.2...8.20.3) (2019-11-13) From a47909911600331d5c91f5c8939032070818d432 Mon Sep 17 00:00:00 2001 From: Alexander Vakrilov Date: Fri, 17 Jan 2020 14:36:53 +0200 Subject: [PATCH 5/6] fix(hmr): After HMR app is blank when re-launched (#2108) --- nativescript-angular/platform-common.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts index cd9d02dd4..40dc0cec5 100644 --- a/nativescript-angular/platform-common.ts +++ b/nativescript-angular/platform-common.ts @@ -191,19 +191,8 @@ export class NativeScriptPlatformRef extends PlatformRef { @profile private bootstrapNativeScriptApp() { const autoCreateFrame = !!this.appOptions.createFrameOnBootstrap; - let tempAppHostView: AppHostView; let rootContent: View; - if (autoCreateFrame) { - const { page, frame } = this.createFrameAndPage(false); - setRootPage(page); - rootContent = frame; - } else { - // Create a temp page for root of the renderer - tempAppHostView = new AppHostView(); - setRootPage(tempAppHostView); - } - if (isLogEnabled()) { bootstrapLog("NativeScriptPlatform bootstrap started."); } @@ -214,6 +203,17 @@ export class NativeScriptPlatformRef extends PlatformRef { bootstrapLog("Application launch event fired"); } + let tempAppHostView: AppHostView; + if (autoCreateFrame) { + const { page, frame } = this.createFrameAndPage(false); + setRootPage(page); + rootContent = frame; + } else { + // Create a temp page for root of the renderer + tempAppHostView = new AppHostView(); + setRootPage(tempAppHostView); + } + let bootstrapPromiseCompleted = false; this._bootstrapper().then( moduleRef => { From ea6d2fc4446142f32be051feccdd99598d1e6fda Mon Sep 17 00:00:00 2001 From: vakrilov Date: Fri, 31 Jan 2020 15:06:14 +0200 Subject: [PATCH 6/6] chore: version bump --- nativescript-angular-package/package.json | 2 +- nativescript-angular/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json index 5cf0f21a4..9c0ce6a1d 100644 --- a/nativescript-angular-package/package.json +++ b/nativescript-angular-package/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "8.20.4", + "version": "8.21.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", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 47b89df37..5d42c9747 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/angular", - "version": "8.20.4", + "version": "8.21.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",