From f2fbb321dac5ac5ebb833d4dc096ebeeda2c0958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Thu, 29 Oct 2020 18:05:55 +0100 Subject: [PATCH 1/2] fix: qp-only transition during initial transition Seems to fix https://github.com/emberjs/ember.js/issues/18577. --- lib/router/router.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/router/router.ts b/lib/router/router.ts index 5de1b895..087f6d07 100644 --- a/lib/router/router.ts +++ b/lib/router/router.ts @@ -120,7 +120,7 @@ export default abstract class Router { // perform a URL update at the end. This gives // the user the ability to set the url update // method (default is replaceState). - let newTransition = new InternalTransition(this, undefined, undefined); + let newTransition = new InternalTransition(this, undefined, newState); newTransition.queryParamsOnly = true; oldState.queryParams = this.finalizeQueryParamChange( From 6b753c72461cba68bda1ddc3fceb3ce3e0be7e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Fri, 30 Oct 2020 19:52:09 +0100 Subject: [PATCH 2/2] Update lib/router/router.ts --- lib/router/router.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/router/router.ts b/lib/router/router.ts index 087f6d07..ae0e079b 100644 --- a/lib/router/router.ts +++ b/lib/router/router.ts @@ -122,6 +122,7 @@ export default abstract class Router { // method (default is replaceState). let newTransition = new InternalTransition(this, undefined, newState); newTransition.queryParamsOnly = true; + this.setupContexts(newState, newTransition); oldState.queryParams = this.finalizeQueryParamChange( newState.routeInfos,