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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.4
+ * @remix-run/router v1.0.5-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -283,6 +283,16 @@
   //#region UTILS
   ////////////////////////////////////////////////////////////////////////////////
 
+  /**
+   * @private
+   */
+
+  function invariant(value, message) {
+    if (value === false || value === null || typeof value === "undefined") {
+      throw new Error(message);
+    }
+  }
+
   function warning$1(cond, message) {
     if (!cond) {
       // eslint-disable-next-line no-console
@@ -381,12 +391,13 @@
 
     return parsedPath;
   }
-  function createURL(location) {
+  function createClientSideURL(location) {
     // window.location.origin is "null" (the literal string value) in Firefox
     // under certain conditions, notably when serving from a local HTML file
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=878297
-    let base = typeof window !== "undefined" && typeof window.location !== "undefined" && window.location.origin !== "null" ? window.location.origin : "unknown://unknown";
+    let base = typeof window !== "undefined" && typeof window.location !== "undefined" && window.location.origin !== "null" ? window.location.origin : window.location.href;
     let href = typeof location === "string" ? location : createPath(location);
+    invariant(base, "No window.location.(origin|href) available to create URL for href: " + href);
     return new URL(href, base);
   }
 
@@ -481,7 +492,7 @@
 
       encodeLocation(to) {
         // Encode a Location the same way window.location would
-        let url = createURL(typeof to === "string" ? to : createPath(to));
+        let url = createClientSideURL(typeof to === "string" ? to : createPath(to));
         return {
           pathname: url.pathname,
           search: url.search,
@@ -557,7 +568,7 @@
   /**
    * Matches the given routes to a location and returns the match data.
    *
-   * @see https://reactrouter.com/docs/en/v6/utils/match-routes
+   * @see https://reactrouter.com/utils/match-routes
    */
 
   function matchRoutes(routes, locationArg, basename) {
@@ -720,7 +731,7 @@
   /**
    * Returns a path with params interpolated.
    *
-   * @see https://reactrouter.com/docs/en/v6/utils/generate-path
+   * @see https://reactrouter.com/utils/generate-path
    */
 
 
@@ -753,7 +764,7 @@
    * Performs pattern matching on a URL pathname and returns information about
    * the match.
    *
-   * @see https://reactrouter.com/docs/en/v6/utils/match-path
+   * @see https://reactrouter.com/utils/match-path
    */
   function matchPath(pattern, pathname) {
     if (typeof pattern === "string") {
@@ -875,15 +886,6 @@
    * @private
    */
 
-  function invariant(value, message) {
-    if (value === false || value === null || typeof value === "undefined") {
-      throw new Error(message);
-    }
-  }
-  /**
-   * @private
-   */
-
   function warning(cond, message) {
     if (!cond) {
       // eslint-disable-next-line no-console
@@ -902,7 +904,7 @@
   /**
    * Returns a resolved path object relative to the given pathname.
    *
-   * @see https://reactrouter.com/docs/en/v6/utils/resolve-path
+   * @see https://reactrouter.com/utils/resolve-path
    */
 
   function resolvePath(to, fromPathname) {
@@ -1626,7 +1628,7 @@
 
 
       pendingNavigationController = new AbortController();
-      let request = createRequest(location, pendingNavigationController.signal, opts && opts.submission);
+      let request = createClientSideRequest(location, pendingNavigationController.signal, opts && opts.submission);
       let pendingActionData;
       let pendingError;
 
@@ -1656,7 +1658,11 @@
           location
         }, opts.submission);
 
-        loadingNavigation = navigation;
+        loadingNavigation = navigation; // Create a GET request for the loaders
+
+        request = new Request(request.url, {
+          signal: request.signal
+        });
       } // Call loaders
 
 
@@ -1945,7 +1951,7 @@
       }); // Call the action for the fetcher
 
       let abortController = new AbortController();
-      let fetchRequest = createRequest(path, abortController.signal, submission);
+      let fetchRequest = createClientSideRequest(path, abortController.signal, submission);
       fetchControllers.set(key, abortController);
       let actionResult = await callLoaderOrAction("action", fetchRequest, match, requestMatches, router.basename);
 
@@ -1989,7 +1995,7 @@
 
 
       let nextLocation = state.navigation.location || state.location;
-      let revalidationRequest = createRequest(nextLocation, abortController.signal);
+      let revalidationRequest = createClientSideRequest(nextLocation, abortController.signal);
       let matches = state.navigation.state !== "idle" ? matchRoutes(dataRoutes, state.navigation.location, init.basename) : state.matches;
       invariant(matches, "Didn't find any matches after fetcher action");
       let loadId = ++incrementingLoadId;
@@ -2109,7 +2115,7 @@
       }); // Call the loader for this fetcher route match
 
       let abortController = new AbortController();
-      let fetchRequest = createRequest(path, abortController.signal);
+      let fetchRequest = createClientSideRequest(path, abortController.signal);
       fetchControllers.set(key, abortController);
       let result = await callLoaderOrAction("loader", fetchRequest, match, matches, router.basename); // Deferred isn't supported or fetcher loads, await everything and treat it
       // as a normal load.  resolveDeferredData will return undefined if this
@@ -2189,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
 
@@ -2250,7 +2262,7 @@
       // accordingly
       let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, router.basename)), ...fetchersToLoad.map(_ref8 => {
         let [, href, match, fetchMatches] = _ref8;
-        return callLoaderOrAction("loader", createRequest(href, request.signal), match, fetchMatches, router.basename);
+        return callLoaderOrAction("loader", createClientSideRequest(href, request.signal), match, fetchMatches, router.basename);
       })]);
       let loaderResults = results.slice(0, matchesToLoad.length);
       let fetcherResults = results.slice(matchesToLoad.length);
@@ -2534,7 +2546,7 @@
 
       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
@@ -2600,7 +2612,7 @@
 
       let result = await queryImpl(request, location, matches, match);
 
-      if (result instanceof Response) {
+      if (isResponse(result)) {
         return result;
       }
 
@@ -2629,7 +2641,7 @@
         }
 
         let result = await loadRouteData(request, matches, routeMatch);
-        return result instanceof Response ? result : _extends({}, result, {
+        return isResponse(result) ? result : _extends({}, result, {
           actionData: null,
           actionHeaders: {}
         });
@@ -2661,7 +2673,7 @@
       if (!actionMatch.route.action) {
         let error = getInternalRouterError(405, {
           method: request.method,
-          pathname: createURL(request.url).pathname,
+          pathname: new URL(request.url).pathname,
           routeId: actionMatch.route.id
         });
 
@@ -2736,9 +2748,13 @@
             [actionMatch.route.id]: result.headers
           } : {})
         });
-      }
+      } // Create a GET request for the loaders
+
 
-      let context = await loadRouteData(request, matches);
+      let loaderRequest = new Request(request.url, {
+        signal: request.signal
+      });
+      let context = await loadRouteData(loaderRequest, matches);
       return _extends({}, context, result.statusCode ? {
         statusCode: result.statusCode
       } : {}, {
@@ -2757,7 +2773,7 @@
       if (isRouteRequest && !(routeMatch != null && routeMatch.route.loader)) {
         throw getInternalRouterError(400, {
           method: request.method,
-          pathname: createURL(request.url).pathname,
+          pathname: new URL(request.url).pathname,
           routeId: routeMatch == null ? void 0 : routeMatch.route.id
         });
       }
@@ -2951,9 +2967,9 @@
   }
 
   function shouldRevalidateLoader(currentLocation, currentMatch, submission, location, match, isRevalidationRequired, actionResult) {
-    let currentUrl = createURL(currentLocation);
+    let currentUrl = createClientSideURL(currentLocation);
     let currentParams = currentMatch.params;
-    let nextUrl = createURL(location);
+    let nextUrl = createClientSideURL(location);
     let nextParams = match.params; // This is the default implementation as to when we revalidate.  If the route
     // provides it's own implementation, then we give them full control but
     // provide this value so they can leverage it if needed after they check
@@ -3023,20 +3039,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
-
-        let external = createURL(location).origin !== createURL("/").origin; // 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 requestPath = createURL(request.url).pathname;
-          let resolvedLocation = resolveTo(location, routePathnames, requestPath);
+          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) {
@@ -3060,8 +3074,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
@@ -3119,10 +3132,13 @@
       type: ResultType.data,
       data: result
     };
-  }
+  } // Utility method for creating the Request instances for loaders/actions during
+  // client-side navigations and fetches.  During SSR we will always have a
+  // Request instance from the static handler (query/queryRoute)
+
 
-  function createRequest(location, signal, submission) {
-    let url = createURL(stripHashFromPath(location)).toString();
+  function createClientSideRequest(location, signal, submission) {
+    let url = createClientSideURL(stripHashFromPath(location)).toString();
     let init = {
       signal
     };
@@ -3376,8 +3392,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;
     }
 
@@ -3387,7 +3407,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) {