fix(router): await viewModel configureRouter

aurelia · May 3, 2019 · aed5f53 · aed5f53
1 parent ca31bf6
commit aed5f53
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/app-router.ts b/src/app-router.ts
@@ -8,6 +8,7 @@ import { EventAggregator } from 'aurelia-event-aggregator';
 import { NavigationInstruction } from './navigation-instruction';
 import { ViewPort, ConfiguresRouter, PipelineResult } from './interfaces';
 import { RouterEvent } from './router-event';
+import { RouterConfiguration } from './router-configuration';
 
 /**@internal */
 declare module 'aurelia-dependency-injection' {
@@ -96,10 +97,13 @@ export class AppRouter extends Router {
           const resolveConfiguredPromise = this._resolveConfiguredPromise;
           this._resolveConfiguredPromise = () => {/**/};
           return this
-            .configure(config => {
-              viewModel.configureRouter(config, this);
-              return config;
-            })
+            .configure(config =>
+              Promise
+                .resolve(viewModel.configureRouter(config, this))
+                // an issue with configure interface. Should be fixed there
+                // todo: fix this via configure interface in router
+                .then(() => config) as any
+            )
             .then(() => {
               this.activate();
               resolveConfiguredPromise();