@remix-run/router 1.0.5-pre.0 → 1.0.5-pre.1

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.5-pre.0
+ * @remix-run/router v1.0.5-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2145,21 +2145,27 @@ function createRouter(init) {
 
 
   async function startRedirectNavigation(state, redirect, replace) {
+    var _window;
+
     if (redirect.revalidate) {
       isRevalidationRequired = true;
     }
 
     let redirectLocation = createLocation(state.location, redirect.location);
-    invariant(redirectLocation, "Expected a location on the redirect navigation");
+    invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an external redirect that goes to a new origin
 
-    if (redirect.external && typeof window !== "undefined" && typeof window.location !== "undefined") {
-      if (replace) {
-        window.location.replace(redirect.location);
-      } else {
-        window.location.assign(redirect.location);
-      }
+    if (typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
+      let newOrigin = createClientSideURL(redirect.location).origin;
 
-      return;
+      if (window.location.origin !== newOrigin) {
+        if (replace) {
+          window.location.replace(redirect.location);
+        } else {
+          window.location.assign(redirect.location);
+        }
+
+        return;
+      }
     } // There's no need to abort on redirects, since we don't detect the
     // redirect until the action/loaders have settled
 
@@ -2490,7 +2496,7 @@ function unstable_createStaticHandler(routes, opts) {
 
     let result = await queryImpl(request, location, matches);
 
-    if (result instanceof Response) {
+    if (isResponse(result)) {
       return result;
     } // When returning StaticHandlerContext, we patch back in the location here
     // since we need it for React Context.  But this helps keep our submit and
@@ -2556,7 +2562,7 @@ function unstable_createStaticHandler(routes, opts) {
 
     let result = await queryImpl(request, location, matches, match);
 
-    if (result instanceof Response) {
+    if (isResponse(result)) {
       return result;
     }
 
@@ -2585,7 +2591,7 @@ function unstable_createStaticHandler(routes, opts) {
       }
 
       let result = await loadRouteData(request, matches, routeMatch);
-      return result instanceof Response ? result : _extends({}, result, {
+      return isResponse(result) ? result : _extends({}, result, {
         actionData: null,
         actionHeaders: {}
       });
@@ -2983,22 +2989,18 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
     request.signal.removeEventListener("abort", onReject);
   }
 
-  if (result instanceof Response) {
+  if (isResponse(result)) {
     let status = result.status; // Process redirects
 
     if (redirectStatusCodes.has(status)) {
       let location = result.headers.get("Location");
-      invariant(location, "Redirects returned/thrown from loaders/actions must have a Location header"); // Check if this an external redirect that goes to a new origin
-
-      let currentUrl = new URL(request.url);
-      let currentOrigin = currentUrl.origin;
-      let newOrigin = new URL(location, currentOrigin).origin;
-      let external = newOrigin !== currentOrigin; // Support relative routing in internal redirects
+      invariant(location, "Redirects returned/thrown from loaders/actions must have a Location header");
+      let isAbsolute = /^[a-z+]+:\/\//i.test(location) || location.startsWith("//"); // Support relative routing in internal redirects
 
-      if (!external) {
+      if (!isAbsolute) {
         let activeMatches = matches.slice(0, matches.indexOf(match) + 1);
         let routePathnames = getPathContributingMatches(activeMatches).map(match => match.pathnameBase);
-        let resolvedLocation = resolveTo(location, routePathnames, currentUrl.pathname);
+        let resolvedLocation = resolveTo(location, routePathnames, new URL(request.url).pathname);
         invariant(createPath(resolvedLocation), "Unable to resolve redirect location: " + location); // Prepend the basename to the redirect location if we have one
 
         if (basename) {
@@ -3022,8 +3024,7 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
         type: ResultType.redirect,
         status,
         location,
-        revalidate: result.headers.get("X-Remix-Revalidate") !== null,
-        external
+        revalidate: result.headers.get("X-Remix-Revalidate") !== null
       };
     } // For SSR single-route requests, we want to hand Responses back directly
     // without unwrapping.  We do this with the QueryRouteResponse wrapper
@@ -3341,8 +3342,12 @@ function isRedirectResult(result) {
   return (result && result.type) === ResultType.redirect;
 }
 
+function isResponse(value) {
+  return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
+}
+
 function isRedirectResponse(result) {
-  if (!(result instanceof Response)) {
+  if (!isResponse(result)) {
     return false;
   }
 
@@ -3352,7 +3357,7 @@ function isRedirectResponse(result) {
 }
 
 function isQueryRouteResponse(obj) {
-  return obj && obj.response instanceof Response && (obj.type === ResultType.data || ResultType.error);
+  return obj && isResponse(obj.response) && (obj.type === ResultType.data || ResultType.error);
 }
 
 function isValidMethod(method) {