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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.0-pre.2
+ * @remix-run/router v1.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2558,7 +2558,7 @@
       } : {}));
       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) {
@@ -3038,7 +3038,7 @@
       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
         });
@@ -3554,6 +3554,16 @@
           }
 
           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