@remix-run/router 1.3.3-pre.0 → 1.3.3

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.3-pre.0
+ * @remix-run/router v1.3.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2559,9 +2559,10 @@
       invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an absolute external redirect that goes to a new origin
 
       if (ABSOLUTE_URL_REGEX.test(redirect.location) && isBrowser && typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
-        let newOrigin = init.history.createURL(redirect.location).origin;
+        let url = init.history.createURL(redirect.location);
+        let isDifferentBasename = stripBasename(url.pathname, init.basename || "/") == null;
 
-        if (window.location.origin !== newOrigin) {
+        if (window.location.origin !== url.origin || isDifferentBasename) {
           if (replace) {
             window.location.replace(redirect.location);
           } else {
@@ -3596,13 +3597,14 @@
 
           location = createPath(resolvedLocation);
         } else if (!isStaticRequest) {
-          // Strip off the protocol+origin for same-origin absolute redirects.
-          // If this is a static reques, we can let it go back to the browser
-          // as-is
+          // Strip off the protocol+origin for same-origin + same-basename absolute
+          // redirects. If this is a static request, we can let it go back to the
+          // browser as-is
           let currentUrl = new URL(request.url);
           let url = location.startsWith("//") ? new URL(currentUrl.protocol + location) : new URL(location);
+          let isSameBasename = stripBasename(url.pathname, basename) != null;
 
-          if (url.origin === currentUrl.origin) {
+          if (url.origin === currentUrl.origin && isSameBasename) {
             location = url.pathname + url.search + url.hash;
           }
         } // Don't process redirects in the router during static requests requests.