Merge branch 'develop'

README.md

@@ -47,24 +47,20 @@ To build the code, follow these steps.
 
 To run the unit tests, first ensure that you have followed the steps above in order to install all dependencies and successfully build the library. Once you have done that, proceed with these additional steps:
 
-1. Ensure that the [Karma](http://karma-runner.github.io/) CLI is installed. If you need to install it, use the following command:
+1. Run the test script:
 
-  ```shell
-  npm install -g karma-cli
   ```
-2. Ensure that [jspm](http://jspm.io/) is installed. If you need to install it, use the following commnand:
-
-  ```shell
-  npm install -g jspm
+  npm run test
   ```
-3. Install the client-side dependencies with jspm:
 
-  ```shell
-  jspm install
+2. With watch options to rerun the test (headless):
+
+  ```
+  npm run test:watch
   ```
 
-4. You can now run the tests with this command:
+3. With watch options to rerun the test (with browser):
 
-  ```shell
-  karma start
+  ```
+  npm run test:debugger
   ```

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",

doc/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.7.1](https://github.com/aurelia/router/compare/1.7.0...1.7.1) (2019-05-03)
+
+
+### Bug Fixes
+
+* **router:** await viewModel configureRouter ([aed5f53](https://github.com/aurelia/router/commit/aed5f53))
+
+
+
 ## [1.6.4](https://github.com/aurelia/router/compare/1.6.3...1.6.4) (2019-04-17)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",
@@ -20,7 +20,8 @@
     "url": "http://github.com/aurelia/router"
   },
   "files": [
-    "dist"
+    "dist",
+    "typings.json"
   ],
   "scripts": {
     "start": "npm run dev -- --format es2015",

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();