chore(all): prepare release 1.0.0-rc.1.0.1

bower.json

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

dist/amd/aurelia-router.js

@@ -304,6 +304,7 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
         return this.fragment;
       }
 
+      path = encodeURI(path);
       return this.fragment.substr(0, this.fragment.lastIndexOf(path));
     };
 
@@ -967,6 +968,8 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
         var current = nav[i];
         if (!current.config.href) {
           current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+        } else {
+          current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
         }
       }
     };

dist/aurelia-router.d.ts

@@ -21,17 +21,17 @@ export declare interface Next {
   /**
     * Indicates the successful completion of the entire pipeline.
     */
-  complete(result: any): Promise<any>;
+  complete(result?: any): Promise<any>;
 
   /**
     * Indicates that the pipeline should cancel processing.
     */
-  cancel(result: any): Promise<any>;
+  cancel(result?: any): Promise<any>;
 
   /**
     * Indicates that pipeline processing has failed and should be stopped.
     */
-  reject(result: any): Promise<any>;
+  reject(result?: any): Promise<any>;
 
   /**
     * Indicates the successful completion of the pipeline step.
@@ -327,6 +327,11 @@ export declare class NavModel {
     * The route config.
     */
   config: RouteConfig;
+
+  /**
+    * The router associated with this navitation model.
+    */
+  router: Router;
   constructor(router: Router, relativeHref: string);
 
   /**

dist/aurelia-router.js

@@ -74,17 +74,17 @@ interface Next {
   /**
   * Indicates the successful completion of the entire pipeline.
   */
-  complete: (result: any) => Promise<any>,
+  complete: (result?: any) => Promise<any>,
 
   /**
   * Indicates that the pipeline should cancel processing.
   */
-  cancel: (result: any) => Promise<any>,
+  cancel: (result?: any) => Promise<any>,
 
   /**
   * Indicates that pipeline processing has failed and should be stopped.
   */
-  reject: (result: any) => Promise<any>
+  reject: (result?: any) => Promise<any>
 }
 
 /**
@@ -354,6 +354,7 @@ export class NavigationInstruction {
       return this.fragment;
     }
 
+    path = encodeURI(path);
     return this.fragment.substr(0, this.fragment.lastIndexOf(path));
   }
 
@@ -480,6 +481,11 @@ export class NavModel {
   */
   config: RouteConfig = null;
 
+  /**
+  * The router associated with this navitation model.
+  */
+  router: Router;
+
   constructor(router: Router, relativeHref: string) {
     this.router = router;
     this.relativeHref = relativeHref;
@@ -1302,6 +1308,8 @@ export class Router {
       let current = nav[i];
       if (!current.config.href) {
         current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+      } else {
+        current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
       }
     }
   }

dist/commonjs/aurelia-router.js

@@ -259,6 +259,7 @@ var NavigationInstruction = exports.NavigationInstruction = function () {
       return this.fragment;
     }
 
+    path = encodeURI(path);
     return this.fragment.substr(0, this.fragment.lastIndexOf(path));
   };
 
@@ -922,6 +923,8 @@ var Router = exports.Router = function () {
       var current = nav[i];
       if (!current.config.href) {
         current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+      } else {
+        current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
       }
     }
   };

dist/es2015/aurelia-router.js

@@ -211,6 +211,7 @@ export let NavigationInstruction = class NavigationInstruction {
       return this.fragment;
     }
 
+    path = encodeURI(path);
     return this.fragment.substr(0, this.fragment.lastIndexOf(path));
   }
 
@@ -815,6 +816,8 @@ export let Router = class Router {
       let current = nav[i];
       if (!current.config.href) {
         current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+      } else {
+        current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
       }
     }
   }

dist/native-modules/aurelia-router.js

@@ -238,6 +238,7 @@ export var NavigationInstruction = function () {
       return this.fragment;
     }
 
+    path = encodeURI(path);
     return this.fragment.substr(0, this.fragment.lastIndexOf(path));
   };
 
@@ -901,6 +902,8 @@ export var Router = function () {
       var current = nav[i];
       if (!current.config.href) {
         current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+      } else {
+        current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
       }
     }
   };

dist/system/aurelia-router.js

@@ -756,6 +756,7 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
             return this.fragment;
           }
 
+          path = encodeURI(path);
           return this.fragment.substr(0, this.fragment.lastIndexOf(path));
         };
 
@@ -1372,6 +1373,8 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
             var current = nav[i];
             if (!current.config.href) {
               current.href = _createRootedPath(current.relativeHref, this.baseUrl, this.history._hasPushState);
+            } else {
+              current.href = _normalizeAbsolutePath(current.config.href, this.history._hasPushState);
             }
           }
         };

doc/CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="1.0.0-rc.1.0.1"></a>
+# [1.0.0-rc.1.0.1](https://github.com/aurelia/router/compare/1.0.0-rc.1.0.0...v1.0.0-rc.1.0.1) (2016-07-12)
+
+
+### Bug Fixes
+
+* **navigation-instruction:** incorrect base url extraction ([b8036e4](https://github.com/aurelia/router/commit/b8036e4)), closes [#309](https://github.com/aurelia/router/issues/309)
+* **router:** navigation model explicit href normalization ([e80a16c](https://github.com/aurelia/router/commit/e80a16c))
+
+
+### Features
+
+* **nav-model:** add router property to dts ([fe0070c](https://github.com/aurelia/router/commit/fe0070c)), closes [#359](https://github.com/aurelia/router/issues/359)
+
+
+
 <a name="1.0.0-rc.1.0.0"></a>
 # [1.0.0-rc.1.0.0](https://github.com/aurelia/router/compare/1.0.0-beta.2.0.1...v1.0.0-rc.1.0.0) (2016-06-22)
 

package.json

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