Merge pull request #20574 from davidtaylorhq/follow-redirects

Author: kategengler

package.json

@@ -83,7 +83,7 @@
     "ember-router-generator": "^2.0.0",
     "inflection": "^2.0.1",
     "route-recognizer": "^0.3.4",
-    "router_js": "^8.0.5",
+    "router_js": "^8.0.6",
     "semver": "^7.5.2",
     "silent-error": "^1.1.1",
     "simple-html-tokenizer": "^0.5.11"

packages/@ember/-internals/package.json

@@ -69,7 +69,7 @@
     "ember-template-compiler": "workspace:*",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5",
+    "router_js": "^8.0.6",
     "rsvp": "^4.8.5"
   },
   "devDependencies": {

packages/@ember/application/instance.ts

@@ -263,11 +263,6 @@ class ApplicationInstance extends EngineInstance {
     let handleTransitionReject = (error: any): unknown => {
       if (error.error && error.error instanceof Error) {
         throw error.error;
-      } else if (error.name === 'TransitionAborted' && router._routerMicrolib.activeTransition) {
-        return router._routerMicrolib.activeTransition.then(
-          handleTransitionResolve,
-          handleTransitionReject
-        );
       } else if (error.name === 'TransitionAborted') {
         throw new Error(error.message);
       } else {
@@ -284,6 +279,7 @@ class ApplicationInstance extends EngineInstance {
     // getURL returns the set url with the rootURL stripped off
     return router
       .handleURL(location.getURL())
+      .followRedirects()
       .then(handleTransitionResolve, handleTransitionReject);
   }
 

packages/@ember/application/package.json

@@ -30,6 +30,6 @@
     "ember-template-compiler": "workspace:*",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5"
+    "router_js": "^8.0.6"
   }
 }

packages/@ember/engine/package.json

@@ -27,6 +27,6 @@
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5"
+    "router_js": "^8.0.6"
   }
 }

packages/@ember/routing/package.json

@@ -37,6 +37,6 @@
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5"
+    "router_js": "^8.0.6"
   }
 }

packages/ember-testing/package.json

@@ -27,6 +27,6 @@
     "backburner.js": "^2.7.0",
     "ember": "workspace:*",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5"
+    "router_js": "^8.0.6"
   }
 }

packages/ember/package.json

@@ -46,7 +46,7 @@
     "ember-testing": "workspace:*",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
-    "router_js": "^8.0.5",
+    "router_js": "^8.0.6",
     "rsvp": "^4.8.5"
   }
 }

packages/ember/tests/routing/decoupled_basic_test.js

@@ -698,7 +698,11 @@ moduleFor(
         // if we transition in this test we will receive failures
         // if the tests are run from a static file
         _doURLTransition() {
-          return RSVP.resolve('');
+          return {
+            followRedirects() {
+              return RSVP.resolve('');
+            },
+          };
         },
       });
 

packages/internal-test-helpers/package.json

@@ -39,7 +39,7 @@
     "dag-map": "^2.0.2",
     "ember": "workspace:*",
     "ember-template-compiler": "workspace:*",
-    "router_js": "^8.0.5",
+    "router_js": "^8.0.6",
     "rsvp": "^4.8.5",
     "simple-html-tokenizer": "^0.5.11"
   }