@remix-run/router 0.0.0-experimental-cf9637ce → 0.0.0-experimental-e7e9ce6e

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-cf9637ce
+ * @remix-run/router v0.0.0-experimental-e7e9ce6e
  *
  * 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.
@@ -4098,6 +4100,7 @@
   exports.UNSAFE_DeferredData = DeferredData;
   exports.UNSAFE_convertRoutesToDataRoutes = convertRoutesToDataRoutes;
   exports.UNSAFE_getPathContributingMatches = getPathContributingMatches;
+  exports.UNSAFE_invariant = invariant;
   exports.createBrowserHistory = createBrowserHistory;
   exports.createHashHistory = createHashHistory;
   exports.createMemoryHistory = createMemoryHistory;
@@ -4108,7 +4111,6 @@
   exports.generatePath = generatePath;
   exports.getStaticContextFromError = getStaticContextFromError;
   exports.getToPathname = getToPathname;
-  exports.invariant = invariant;
   exports.isRouteErrorResponse = isRouteErrorResponse;
   exports.joinPaths = joinPaths;
   exports.json = json;