@remix-run/router 1.3.0-pre.2 → 1.3.0-pre.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/router`
 
+## 1.3.0-pre.3
+
+### Patch Changes
+
+- Fix 404 bug with same-origin absolute redirects ([#9913](https://github.com/remix-run/react-router/pull/9913))
+- Support `OPTIONS` requests in `staticHandler.queryRoute` ([#9914](https://github.com/remix-run/react-router/pull/9914))
+
 ## 1.3.0-pre.2
 
 ### Minor Changes

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.0-pre.2
+ * @remix-run/router v1.3.0-pre.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2556,7 +2556,7 @@ function createRouter(init) {
     } : {}));
     invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an external redirect that goes to a new origin
 
-    if (typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
+    if (isBrowser && typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
       let newOrigin = init.history.createURL(redirect.location).origin;
 
       if (window.location.origin !== newOrigin) {
@@ -3036,7 +3036,7 @@ function createStaticHandler(routes, opts) {
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename); // SSR supports HEAD requests while SPA doesn't
 
-    if (!isValidMethod(method) && method !== "head") {
+    if (!isValidMethod(method) && method !== "head" && method !== "options") {
       throw getInternalRouterError(405, {
         method
       });
@@ -3552,6 +3552,16 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
         }
 
         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
+        let currentUrl = new URL(request.url);
+        let url = location.startsWith("//") ? new URL(currentUrl.protocol + location) : new URL(location);
+
+        if (url.origin === currentUrl.origin) {
+          location = url.pathname + url.search + url.hash;
+        }
       } // Don't process redirects in the router during static requests requests.
       // Instead, throw the Response and let the server handle it with an HTTP
       // redirect.  We also update the Location header in place in this flow so