chore(all): prepare release 1.6.1

aurelia · Jun 19, 2018 · 0a66d74 · 0a66d74
1 parent 4fac9cf
commit 0a66d74
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/aurelia-router.js b/dist/amd/aurelia-router.js
@@ -730,6 +730,9 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
             viewPortPlan.childNavigationInstruction = childInstruction;
 
             return _buildNavigationPlan(childInstruction, viewPortPlan.strategy === activationStrategy.invokeLifecycle).then(function (childPlan) {
+              if (childPlan instanceof Redirect) {
+                return Promise.reject(childPlan);
+              }
               childInstruction.plan = childPlan;
             });
           });
@@ -1577,6 +1580,9 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
           viewPortPlan.childNavigationInstruction = childInstruction;
 
           return _buildNavigationPlan(childInstruction).then(function (childPlan) {
+            if (childPlan instanceof Redirect) {
+              return Promise.reject(childPlan);
+            }
             childInstruction.plan = childPlan;
             viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/dist/aurelia-router.js b/dist/aurelia-router.js
@@ -1114,6 +1114,9 @@ export function _buildNavigationPlan(instruction: NavigationInstruction, forceLi
               childInstruction,
               viewPortPlan.strategy === activationStrategy.invokeLifecycle)
               .then(childPlan => {
+                if (childPlan instanceof Redirect) {
+                  return Promise.reject(childPlan);
+                }
                 childInstruction.plan = childPlan;
               });
           });
@@ -2114,6 +2117,9 @@ function loadRoute(routeLoader: RouteLoader, navigationInstruction: NavigationIn
 
           return _buildNavigationPlan(childInstruction)
             .then((childPlan) => {
+              if (childPlan instanceof Redirect) {
+                return Promise.reject(childPlan);
+              }
               childInstruction.plan = childPlan;
               viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/dist/commonjs/aurelia-router.js b/dist/commonjs/aurelia-router.js
@@ -685,6 +685,9 @@ function _buildNavigationPlan(instruction, forceLifecycleMinimum) {
           viewPortPlan.childNavigationInstruction = childInstruction;
 
           return _buildNavigationPlan(childInstruction, viewPortPlan.strategy === activationStrategy.invokeLifecycle).then(function (childPlan) {
+            if (childPlan instanceof Redirect) {
+              return Promise.reject(childPlan);
+            }
             childInstruction.plan = childPlan;
           });
         });
@@ -1532,6 +1535,9 @@ function loadRoute(routeLoader, navigationInstruction, viewPortPlan) {
         viewPortPlan.childNavigationInstruction = childInstruction;
 
         return _buildNavigationPlan(childInstruction).then(function (childPlan) {
+          if (childPlan instanceof Redirect) {
+            return Promise.reject(childPlan);
+          }
           childInstruction.plan = childPlan;
           viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/dist/es2015/aurelia-router.js b/dist/es2015/aurelia-router.js
@@ -589,6 +589,9 @@ export function _buildNavigationPlan(instruction, forceLifecycleMinimum) {
           viewPortPlan.childNavigationInstruction = childInstruction;
 
           return _buildNavigationPlan(childInstruction, viewPortPlan.strategy === activationStrategy.invokeLifecycle).then(childPlan => {
+            if (childPlan instanceof Redirect) {
+              return Promise.reject(childPlan);
+            }
             childInstruction.plan = childPlan;
           });
         });
@@ -1349,6 +1352,9 @@ function loadRoute(routeLoader, navigationInstruction, viewPortPlan) {
         viewPortPlan.childNavigationInstruction = childInstruction;
 
         return _buildNavigationPlan(childInstruction).then(childPlan => {
+          if (childPlan instanceof Redirect) {
+            return Promise.reject(childPlan);
+          }
           childInstruction.plan = childPlan;
           viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/dist/native-modules/aurelia-router.js b/dist/native-modules/aurelia-router.js
@@ -663,6 +663,9 @@ export function _buildNavigationPlan(instruction, forceLifecycleMinimum) {
           viewPortPlan.childNavigationInstruction = childInstruction;
 
           return _buildNavigationPlan(childInstruction, viewPortPlan.strategy === activationStrategy.invokeLifecycle).then(function (childPlan) {
+            if (childPlan instanceof Redirect) {
+              return Promise.reject(childPlan);
+            }
             childInstruction.plan = childPlan;
           });
         });
@@ -1510,6 +1513,9 @@ function loadRoute(routeLoader, navigationInstruction, viewPortPlan) {
         viewPortPlan.childNavigationInstruction = childInstruction;
 
         return _buildNavigationPlan(childInstruction).then(function (childPlan) {
+          if (childPlan instanceof Redirect) {
+            return Promise.reject(childPlan);
+          }
           childInstruction.plan = childPlan;
           viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/dist/system/aurelia-router.js b/dist/system/aurelia-router.js
@@ -177,6 +177,9 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
             viewPortPlan.childNavigationInstruction = childInstruction;
 
             return _buildNavigationPlan(childInstruction, viewPortPlan.strategy === activationStrategy.invokeLifecycle).then(function (childPlan) {
+              if (childPlan instanceof Redirect) {
+                return Promise.reject(childPlan);
+              }
               childInstruction.plan = childPlan;
             });
           });
@@ -532,6 +535,9 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
           viewPortPlan.childNavigationInstruction = childInstruction;
 
           return _buildNavigationPlan(childInstruction).then(function (childPlan) {
+            if (childPlan instanceof Redirect) {
+              return Promise.reject(childPlan);
+            }
             childInstruction.plan = childPlan;
             viewPortInstruction.childNavigationInstruction = childInstruction;
 

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.6.1"></a>
+## [1.6.1](https://github.com/aurelia/router/compare/1.6.0...1.6.1) (2018-06-19)
+
+### Bug Fixes
+
+* **navigation-plan:** fix regression related to substate redirects
+
 <a name="1.6.0"></a>
 # [1.6.0](https://github.com/aurelia/router/compare/1.5.0...1.6.0) (2018-06-19)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",