avoid RouterService's own router access triggers setup

emberjs · Sep 20, 2020 · c6226d0 · c6226d0
1 parent 77b333b
commit c6226d0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -10,7 +10,7 @@ import { Transition } from 'router_js';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
-const ROUTER = symbol('ROUTER');
+const ROUTER = symbol('ROUTER') as string;
 
 let freezeRouteInfo: Function;
 if (DEBUG) {
@@ -79,14 +79,16 @@ export default class RouterService extends Service {
   init() {
     super.init(...arguments);
 
-    this._router.on('routeWillChange', (transition: Transition) => {
+    const router = getOwner(this).lookup('router:main') as EmberRouter;
+
+    router.on('routeWillChange', (transition: Transition) => {
       if (DEBUG) {
         freezeRouteInfo(transition);
       }
       this.trigger('routeWillChange', transition);
     });
 
-    this._router.on('routeDidChange', (transition: Transition) => {
+    router.on('routeDidChange', (transition: Transition) => {
       if (DEBUG) {
         freezeRouteInfo(transition);
       }