Apply PR aurelia#643

rmja · Feb 7, 2022 · 0e952c7 · 0e952c7
1 parent d26cccc
commit 0e952c7
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4 deletions.
diff --git a/dist/amd/aurelia-router.js b/dist/amd/aurelia-router.js
diff --git a/dist/amd/aurelia-router.js.map b/dist/amd/aurelia-router.js.map
diff --git a/dist/commonjs/aurelia-router.js b/dist/commonjs/aurelia-router.js
diff --git a/dist/commonjs/aurelia-router.js.map b/dist/commonjs/aurelia-router.js.map
diff --git a/dist/es2015/aurelia-router.js b/dist/es2015/aurelia-router.js
diff --git a/dist/es2015/aurelia-router.js.map b/dist/es2015/aurelia-router.js.map
diff --git a/dist/native-modules/aurelia-router.js b/dist/native-modules/aurelia-router.js
diff --git a/dist/native-modules/aurelia-router.js.map b/dist/native-modules/aurelia-router.js.map
diff --git a/src/navigation-plan.ts b/src/navigation-plan.ts
@@ -82,6 +82,14 @@ export const buildRedirectPlan = (instruction: NavigationInstruction) => {
       if (queryString) {
         redirectLocation += '?' + queryString;
       }
+      let redirectQueryString = redirectInstruction.queryString;
+      if (redirectQueryString) {
+        if (queryString) {
+          redirectLocation += '&' + redirectQueryString;
+        } else {
+          redirectLocation += '?' + redirectQueryString;
+        }
+      }
 
       return Promise.resolve(new Redirect(redirectLocation));
     });