chore(all): prepare release 1.0.0-beta.1

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "0.14.1",
+  "version": "1.0.0-beta.1",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",
@@ -16,12 +16,12 @@
     "url": "http://github.com/aurelia/router"
   },
   "dependencies": {
-    "aurelia-dependency-injection": "^0.12.0",
-    "aurelia-event-aggregator": "^0.10.0",
-    "aurelia-history": "^0.9.0",
-    "aurelia-logging": "^0.9.0",
-    "aurelia-path": "^0.11.0",
-    "aurelia-route-recognizer": "^0.9.0",
+    "aurelia-dependency-injection": "^1.0.0-beta.1",
+    "aurelia-event-aggregator": "^1.0.0-beta.1",
+    "aurelia-history": "^1.0.0-beta.1",
+    "aurelia-logging": "^1.0.0-beta.1",
+    "aurelia-path": "^1.0.0-beta.1",
+    "aurelia-route-recognizer": "^1.0.0-beta.1",
     "core-js": "zloirock/core-js"
   }
 }

build/tasks/doc.js

@@ -5,7 +5,7 @@ var typedocExtractor = require('gulp-typedoc-extractor');
 var runSequence = require('run-sequence');
 
 gulp.task('doc-generate', function(){
-  return gulp.src([paths.output + '*.d.ts', paths.doc + '/core-js.d.ts', './jspm_packages/github/aurelia/*/*.d.ts'])
+  return gulp.src([paths.output + '*.d.ts', paths.doc + '/core-js.d.ts', './jspm_packages/npm/*/*.d.ts'])
     .pipe(typedoc({
       target: 'es6',
       includeDeclarations: true,
@@ -30,4 +30,4 @@ gulp.task('doc', function(callback){
     'doc-extract',
     callback
   );
-});
+});

build/tasks/test.js

@@ -1,34 +1,30 @@
 var gulp = require('gulp');
-var karma = require('karma').server;
+var Karma = require('karma').Server;
 
 /**
  * Run test once and exit
  */
 gulp.task('test', function (done) {
-    karma.start({
-        configFile: __dirname + '/../../karma.conf.js',
-        singleRun: true
-    }, function(e) {
-        done();
-    });
+  new Karma({
+    configFile: __dirname + '/../../karma.conf.js',
+    singleRun: true
+  }, done).start();
 });
 
 /**
  * Watch for file changes and re-run tests on each change
  */
 gulp.task('tdd', function (done) {
-    karma.start({
-        configFile: __dirname + '/../../karma.conf.js'
-    }, function(e) {
-        done();
-    });
+  new Karma({
+    configFile: __dirname + '/../../karma.conf.js'
+  }, done).start();
 });
 
 /**
  * Run test once with code coverage and exit
  */
 gulp.task('cover', function (done) {
-  karma.start({
+  new Karma({
     configFile: __dirname + '/../../karma.conf.js',
     singleRun: true,
     reporters: ['coverage'],
@@ -40,7 +36,5 @@ gulp.task('cover', function (done) {
       type: 'html',
       dir: 'build/reports/coverage'
     }
-  }, function (e) {
-    done();
-  });
+  }, done).start();
 });

config.js

@@ -14,32 +14,15 @@ System.config({
   },
 
   map: {
-    "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.12.0",
-    "aurelia-event-aggregator": "github:aurelia/event-aggregator@0.10.0",
-    "aurelia-history": "github:aurelia/history@0.9.0",
-    "aurelia-logging": "github:aurelia/logging@0.9.0",
-    "aurelia-path": "github:aurelia/path@0.11.0",
-    "aurelia-route-recognizer": "github:aurelia/route-recognizer@0.9.0",
+    "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1",
+    "aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.0-beta.1",
+    "aurelia-history": "npm:aurelia-history@1.0.0-beta.1",
+    "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1",
+    "aurelia-path": "npm:aurelia-path@1.0.0-beta.1",
+    "aurelia-route-recognizer": "npm:aurelia-route-recognizer@1.0.0-beta.1",
     "babel": "npm:[email protected]",
     "babel-runtime": "npm:[email protected]",
     "core-js": "npm:[email protected]",
-    "github:aurelia/[email protected]": {
-      "aurelia-logging": "github:aurelia/[email protected]",
-      "aurelia-metadata": "github:aurelia/[email protected]",
-      "aurelia-pal": "github:aurelia/[email protected]",
-      "core-js": "npm:[email protected]"
-    },
-    "github:aurelia/[email protected]": {
-      "aurelia-logging": "github:aurelia/[email protected]"
-    },
-    "github:aurelia/[email protected]": {
-      "aurelia-pal": "github:aurelia/[email protected]",
-      "core-js": "npm:[email protected]"
-    },
-    "github:aurelia/[email protected]": {
-      "aurelia-path": "github:aurelia/[email protected]",
-      "core-js": "npm:[email protected]"
-    },
     "github:jspm/[email protected]": {
       "assert": "npm:[email protected]"
     },
@@ -55,6 +38,23 @@ System.config({
     "npm:[email protected]": {
       "util": "npm:[email protected]"
     },
+    "npm:[email protected]": {
+      "aurelia-logging": "npm:[email protected]",
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-pal": "npm:[email protected]",
+      "core-js": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-logging": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-pal": "npm:[email protected]",
+      "core-js": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-path": "npm:[email protected]",
+      "core-js": "npm:[email protected]"
+    },
     "npm:[email protected]": {
       "fs": "github:jspm/[email protected]",
       "path": "github:jspm/[email protected]",

dist/amd/aurelia-router.d.ts

@@ -10,6 +10,14 @@ declare module 'aurelia-router' {
   * A step to be run during processing of the pipeline.
   */
   export interface PipelineStep {
+
+    /**
+       * Execute the pipeline step. The step should invoke next(), next.complete(),
+       * next.cancel(), or next.reject() to allow the pipeline to continue.
+       *
+       * @param instruction The navigation instruction.
+       * @param next The next step in the pipeline.
+       */
     run(instruction: NavigationInstruction, next: Function): void;
   }
 
@@ -59,7 +67,13 @@ declare module 'aurelia-router' {
       * A URL fragment to redirect to when this route is matched.
       */
     redirect?: string;
-    navigationStrategy(instruction: NavigationInstruction): Promise<void> | void;
+
+    /**
+      * A function that can be used to dynamically select the module or modules to activate.
+      * The function is passed the current [[NavigationInstruction]], and should configure
+      * instruction.config with the desired moduleId, viewPorts, or redirect.
+      */
+    navigationStrategy?: (instruction: NavigationInstruction) => Promise<void> | void;
 
     /**
       * The view ports to target when activating this route. If unspecified, the target moduleId is loaded

dist/amd/aurelia-router.js

@@ -1476,13 +1476,22 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-dependency-injection',
           var viewModel = _this8._findViewModel(viewPort);
           if ('configureRouter' in viewModel) {
             if (!_this8.isConfigured) {
-              return {
-                v: _this8.configure(function (config) {
-                  return viewModel.configureRouter(config, _this8);
-                }).then(function () {
-                  _this8.activate();
-                })
-              };
+              var _ret6 = (function () {
+                var resolveConfiguredPromise = _this8._resolveConfiguredPromise;
+                _this8._resolveConfiguredPromise = function () {};
+                return {
+                  v: {
+                    v: _this8.configure(function (config) {
+                      return viewModel.configureRouter(config, _this8);
+                    }).then(function () {
+                      _this8.activate();
+                      resolveConfiguredPromise();
+                    })
+                  }
+                };
+              })();
+
+              if (typeof _ret6 === 'object') return _ret6.v;
             }
           } else {
             _this8.activate();

dist/aurelia-router.d.ts

@@ -10,6 +10,14 @@ declare module 'aurelia-router' {
   * A step to be run during processing of the pipeline.
   */
   export interface PipelineStep {
+
+    /**
+       * Execute the pipeline step. The step should invoke next(), next.complete(),
+       * next.cancel(), or next.reject() to allow the pipeline to continue.
+       *
+       * @param instruction The navigation instruction.
+       * @param next The next step in the pipeline.
+       */
     run(instruction: NavigationInstruction, next: Function): void;
   }
 
@@ -59,7 +67,13 @@ declare module 'aurelia-router' {
       * A URL fragment to redirect to when this route is matched.
       */
     redirect?: string;
-    navigationStrategy(instruction: NavigationInstruction): Promise<void> | void;
+
+    /**
+      * A function that can be used to dynamically select the module or modules to activate.
+      * The function is passed the current [[NavigationInstruction]], and should configure
+      * instruction.config with the desired moduleId, viewPorts, or redirect.
+      */
+    navigationStrategy?: (instruction: NavigationInstruction) => Promise<void> | void;
 
     /**
       * The view ports to target when activating this route. If unspecified, the target moduleId is loaded

dist/aurelia-router.js

@@ -1713,8 +1713,13 @@ export class AppRouter extends Router {
       let viewModel = this._findViewModel(viewPort);
       if ('configureRouter' in viewModel) {
         if (!this.isConfigured) {
+          let resolveConfiguredPromise = this._resolveConfiguredPromise;
+          this._resolveConfiguredPromise = () => {};
           return this.configure(config => viewModel.configureRouter(config, this))
-            .then(() => { this.activate(); });
+            .then(() => {
+              this.activate();
+              resolveConfiguredPromise();
+            });
         }
       } else {
         this.activate();

dist/commonjs/aurelia-router.d.ts

@@ -10,6 +10,14 @@ declare module 'aurelia-router' {
   * A step to be run during processing of the pipeline.
   */
   export interface PipelineStep {
+
+    /**
+       * Execute the pipeline step. The step should invoke next(), next.complete(),
+       * next.cancel(), or next.reject() to allow the pipeline to continue.
+       *
+       * @param instruction The navigation instruction.
+       * @param next The next step in the pipeline.
+       */
     run(instruction: NavigationInstruction, next: Function): void;
   }
 
@@ -59,7 +67,13 @@ declare module 'aurelia-router' {
       * A URL fragment to redirect to when this route is matched.
       */
     redirect?: string;
-    navigationStrategy(instruction: NavigationInstruction): Promise<void> | void;
+
+    /**
+      * A function that can be used to dynamically select the module or modules to activate.
+      * The function is passed the current [[NavigationInstruction]], and should configure
+      * instruction.config with the desired moduleId, viewPorts, or redirect.
+      */
+    navigationStrategy?: (instruction: NavigationInstruction) => Promise<void> | void;
 
     /**
       * The view ports to target when activating this route. If unspecified, the target moduleId is loaded

dist/commonjs/aurelia-router.js

@@ -1491,13 +1491,22 @@ var AppRouter = (function (_Router) {
         var viewModel = _this8._findViewModel(viewPort);
         if ('configureRouter' in viewModel) {
           if (!_this8.isConfigured) {
-            return {
-              v: _this8.configure(function (config) {
-                return viewModel.configureRouter(config, _this8);
-              }).then(function () {
-                _this8.activate();
-              })
-            };
+            var _ret6 = (function () {
+              var resolveConfiguredPromise = _this8._resolveConfiguredPromise;
+              _this8._resolveConfiguredPromise = function () {};
+              return {
+                v: {
+                  v: _this8.configure(function (config) {
+                    return viewModel.configureRouter(config, _this8);
+                  }).then(function () {
+                    _this8.activate();
+                    resolveConfiguredPromise();
+                  })
+                }
+              };
+            })();
+
+            if (typeof _ret6 === 'object') return _ret6.v;
           }
         } else {
           _this8.activate();

dist/es6/aurelia-router.d.ts

@@ -10,6 +10,14 @@ declare module 'aurelia-router' {
   * A step to be run during processing of the pipeline.
   */
   export interface PipelineStep {
+
+    /**
+       * Execute the pipeline step. The step should invoke next(), next.complete(),
+       * next.cancel(), or next.reject() to allow the pipeline to continue.
+       *
+       * @param instruction The navigation instruction.
+       * @param next The next step in the pipeline.
+       */
     run(instruction: NavigationInstruction, next: Function): void;
   }
 
@@ -59,7 +67,13 @@ declare module 'aurelia-router' {
       * A URL fragment to redirect to when this route is matched.
       */
     redirect?: string;
-    navigationStrategy(instruction: NavigationInstruction): Promise<void> | void;
+
+    /**
+      * A function that can be used to dynamically select the module or modules to activate.
+      * The function is passed the current [[NavigationInstruction]], and should configure
+      * instruction.config with the desired moduleId, viewPorts, or redirect.
+      */
+    navigationStrategy?: (instruction: NavigationInstruction) => Promise<void> | void;
 
     /**
       * The view ports to target when activating this route. If unspecified, the target moduleId is loaded

dist/es6/aurelia-router.js

@@ -1713,8 +1713,13 @@ export class AppRouter extends Router {
       let viewModel = this._findViewModel(viewPort);
       if ('configureRouter' in viewModel) {
         if (!this.isConfigured) {
+          let resolveConfiguredPromise = this._resolveConfiguredPromise;
+          this._resolveConfiguredPromise = () => {};
           return this.configure(config => viewModel.configureRouter(config, this))
-            .then(() => { this.activate(); });
+            .then(() => {
+              this.activate();
+              resolveConfiguredPromise();
+            });
         }
       } else {
         this.activate();

dist/system/aurelia-router.d.ts

@@ -10,6 +10,14 @@ declare module 'aurelia-router' {
   * A step to be run during processing of the pipeline.
   */
   export interface PipelineStep {
+
+    /**
+       * Execute the pipeline step. The step should invoke next(), next.complete(),
+       * next.cancel(), or next.reject() to allow the pipeline to continue.
+       *
+       * @param instruction The navigation instruction.
+       * @param next The next step in the pipeline.
+       */
     run(instruction: NavigationInstruction, next: Function): void;
   }
 
@@ -59,7 +67,13 @@ declare module 'aurelia-router' {
       * A URL fragment to redirect to when this route is matched.
       */
     redirect?: string;
-    navigationStrategy(instruction: NavigationInstruction): Promise<void> | void;
+
+    /**
+      * A function that can be used to dynamically select the module or modules to activate.
+      * The function is passed the current [[NavigationInstruction]], and should configure
+      * instruction.config with the desired moduleId, viewPorts, or redirect.
+      */
+    navigationStrategy?: (instruction: NavigationInstruction) => Promise<void> | void;
 
     /**
       * The view ports to target when activating this route. If unspecified, the target moduleId is loaded