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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.5-pre.0
+ * @remix-run/router v1.0.5-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2195,21 +2195,27 @@
 
 
     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
 
@@ -2488,7 +2494,10 @@
      * return it directly.
      */
 
-    async function query(request) {
+    async function query(request, _temp) {
+      let {
+        requestContext
+      } = _temp === void 0 ? {} : _temp;
       let url = new URL(request.url);
       let method = request.method.toLowerCase();
       let location = createLocation("", createPath(url), null, "default");
@@ -2538,9 +2547,9 @@
         };
       }
 
-      let result = await queryImpl(request, location, matches);
+      let result = await queryImpl(request, location, matches, requestContext);
 
-      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
@@ -2574,7 +2583,11 @@
      */
 
 
-    async function queryRoute(request, routeId) {
+    async function queryRoute(request, _temp2) {
+      let {
+        routeId,
+        requestContext
+      } = _temp2 === void 0 ? {} : _temp2;
       let url = new URL(request.url);
       let method = request.method.toLowerCase();
       let location = createLocation("", createPath(url), null, "default");
@@ -2604,9 +2617,9 @@
         });
       }
 
-      let result = await queryImpl(request, location, matches, match);
+      let result = await queryImpl(request, location, matches, requestContext, match);
 
-      if (result instanceof Response) {
+      if (isResponse(result)) {
         return result;
       }
 
@@ -2625,17 +2638,17 @@
       return Object.values(routeData || {})[0];
     }
 
-    async function queryImpl(request, location, matches, routeMatch) {
+    async function queryImpl(request, location, matches, requestContext, routeMatch) {
       invariant(request.signal, "query()/queryRoute() requests must contain an AbortController signal");
 
       try {
         if (isSubmissionMethod(request.method.toLowerCase())) {
-          let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), routeMatch != null);
+          let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, routeMatch != null);
           return result;
         }
 
-        let result = await loadRouteData(request, matches, routeMatch);
-        return result instanceof Response ? result : _extends({}, result, {
+        let result = await loadRouteData(request, matches, requestContext, routeMatch);
+        return isResponse(result) ? result : _extends({}, result, {
           actionData: null,
           actionHeaders: {}
         });
@@ -2661,7 +2674,7 @@
       }
     }
 
-    async function submit(request, matches, actionMatch, isRouteRequest) {
+    async function submit(request, matches, actionMatch, requestContext, isRouteRequest) {
       let result;
 
       if (!actionMatch.route.action) {
@@ -2680,7 +2693,7 @@
           error
         };
       } else {
-        result = await callLoaderOrAction("action", request, actionMatch, matches, basename, true, isRouteRequest);
+        result = await callLoaderOrAction("action", request, actionMatch, matches, basename, true, isRouteRequest, requestContext);
 
         if (request.signal.aborted) {
           let method = isRouteRequest ? "queryRoute" : "query";
@@ -2731,7 +2744,7 @@
         // Store off the pending error - we use it to determine which loaders
         // to call and will commit it when we complete the navigation
         let boundaryMatch = findNearestBoundary(matches, actionMatch.route.id);
-        let context = await loadRouteData(request, matches, undefined, {
+        let context = await loadRouteData(request, matches, requestContext, undefined, {
           [boundaryMatch.route.id]: result.error
         }); // action status codes take precedence over loader status codes
 
@@ -2748,7 +2761,7 @@
       let loaderRequest = new Request(request.url, {
         signal: request.signal
       });
-      let context = await loadRouteData(loaderRequest, matches);
+      let context = await loadRouteData(loaderRequest, matches, requestContext);
       return _extends({}, context, result.statusCode ? {
         statusCode: result.statusCode
       } : {}, {
@@ -2761,7 +2774,7 @@
       });
     }
 
-    async function loadRouteData(request, matches, routeMatch, pendingActionError) {
+    async function loadRouteData(request, matches, requestContext, routeMatch, pendingActionError) {
       let isRouteRequest = routeMatch != null; // Short circuit if we have no loaders to run (queryRoute())
 
       if (isRouteRequest && !(routeMatch != null && routeMatch.route.loader)) {
@@ -2785,7 +2798,7 @@
         };
       }
 
-      let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, basename, true, isRouteRequest))]);
+      let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, basename, true, isRouteRequest, requestContext))]);
 
       if (request.signal.aborted) {
         let method = isRouteRequest ? "queryRoute" : "query";
@@ -2995,7 +3008,7 @@
     return defaultShouldRevalidate;
   }
 
-  async function callLoaderOrAction(type, request, match, matches, basename, isStaticRequest, isRouteRequest) {
+  async function callLoaderOrAction(type, request, match, matches, basename, isStaticRequest, isRouteRequest, requestContext) {
     if (basename === void 0) {
       basename = "/";
     }
@@ -3023,7 +3036,8 @@
       invariant(handler, "Could not find the " + type + " to run on the \"" + match.route.id + "\" route");
       result = await Promise.race([handler({
         request,
-        params: match.params
+        params: match.params,
+        context: requestContext
       }), abortPromise]);
       invariant(result !== undefined, "You defined " + (type === "action" ? "an action" : "a loader") + " for route " + ("\"" + match.route.id + "\" but didn't return anything from your `" + type + "` ") + "function. Please return a value or `null`.");
     } catch (e) {
@@ -3033,22 +3047,18 @@
       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
+        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
 
-        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
-
-        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) {
@@ -3072,8 +3082,7 @@
           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
@@ -3320,13 +3329,12 @@
     };
   }
 
-  function getInternalRouterError(status, _temp) {
+  function getInternalRouterError(status, _temp3) {
     let {
       pathname,
       routeId,
-      method,
-      message
-    } = _temp === void 0 ? {} : _temp;
+      method
+    } = _temp3 === void 0 ? {} : _temp3;
     let statusText = "Unknown Server Error";
     let errorMessage = "Unknown @remix-run/router error";
 
@@ -3391,8 +3399,12 @@
     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;
     }
 
@@ -3402,7 +3414,7 @@
   }
 
   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) {