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

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # `@remix-run/router`
 
+## 1.0.5-pre.1
+
+### Patch Changes
+
+- Remove `instanceof Response` checks in favor of `isResponse` ([#9690](https://github.com/remix-run/react-router/pull/9690))
+- Fix URL creation in Remix integration tests ([#9689](https://github.com/remix-run/react-router/pull/9689))
+
+## 1.0.5-pre.0
+
+### Patch Changes
+
+- Fix URL creation in Cloudflare Pages or other non-browser-environment ([#9682](https://github.com/remix-run/react-router/pull/9682))
+- Fix requests sent to revalidating loaders so they reflect a GET request ([#9680](https://github.com/remix-run/react-router/pull/9680))
+
 ## 1.0.4
 
 ### Patch Changes
@@ -46,7 +60,7 @@ For an overview of the features provided by `react-router`, we recommend you go
 
 For an overview of the features provided by `@remix-run/router`, please check out the [`README`][remix-router-readme].
 
-[rr-docs]: https://reactrouter.com/
-[rr-feature-overview]: https://reactrouter.com/en/6.4.0/start/overview
-[rr-tutorial]: https://reactrouter.com/en/6.4.0/start/tutorial
+[rr-docs]: https://reactrouter.com
+[rr-feature-overview]: https://reactrouter.com/start/overview
+[rr-tutorial]: https://reactrouter.com/start/tutorial
 [remix-router-readme]: https://github.com/remix-run/react-router/blob/main/packages/router/README.md

package/dist/history.d.ts

@@ -214,6 +214,11 @@ export declare type HashHistoryOptions = UrlHistoryOptions;
  * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#createhashhistory
  */
 export declare function createHashHistory(options?: HashHistoryOptions): HashHistory;
+/**
+ * @private
+ */
+export declare function invariant(value: boolean, message?: string): asserts value;
+export declare function invariant<T>(value: T | null | undefined, message?: string): asserts value is T;
 /**
  * Creates a Location object with a unique key from the given Path
  */
@@ -226,7 +231,7 @@ export declare function createPath({ pathname, search, hash, }: Partial<Path>):
  * Parses a string URL path into its separate pathname, search, and hash components.
  */
 export declare function parsePath(path: string): Partial<Path>;
-export declare function createURL(location: Location | string): URL;
+export declare function createClientSideURL(location: Location | string): URL;
 export interface UrlHistory extends History {
 }
 export declare type UrlHistoryOptions = {

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { convertRoutesToDataRoutes, getPathContributingMatches } from "./utils";
 export type { ActionFunction, ActionFunctionArgs, AgnosticDataIndexRouteObject, AgnosticDataNonIndexRouteObject, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, TrackedPromise, FormEncType, FormMethod, JsonFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathPattern, RedirectFunction, ShouldRevalidateFunction, Submission, } from "./utils";
-export { AbortedDeferredError, ErrorResponse, defer, generatePath, getToPathname, invariant, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, resolvePath, resolveTo, stripBasename, warning, } from "./utils";
+export { AbortedDeferredError, ErrorResponse, defer, generatePath, getToPathname, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, resolvePath, resolveTo, stripBasename, warning, } from "./utils";
 export type { BrowserHistory, BrowserHistoryOptions, HashHistory, HashHistoryOptions, History, InitialEntry, Location, MemoryHistory, MemoryHistoryOptions, Path, To, } from "./history";
-export { Action, createBrowserHistory, createPath, createHashHistory, createMemoryHistory, parsePath, } from "./history";
+export { Action, createBrowserHistory, createPath, createHashHistory, createMemoryHistory, invariant, parsePath, } from "./history";
 export * from "./router";
 /** @internal */
 export { convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes, getPathContributingMatches as UNSAFE_getPathContributingMatches, };

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.4
+ * @remix-run/router v1.0.5-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -281,6 +281,16 @@ function createHashHistory(options) {
 //#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
@@ -379,12 +389,13 @@ function parsePath(path) {
 
   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);
 }
 
@@ -479,7 +490,7 @@ function getUrlBasedHistory(getLocation, createHref, validateLocation, options)
 
     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,
@@ -555,7 +566,7 @@ function convertRoutesToDataRoutes(routes, parentPath, allIds) {
 /**
  * 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) {
@@ -718,7 +729,7 @@ function matchRouteBranch(branch, pathname) {
 /**
  * Returns a path with params interpolated.
  *
- * @see https://reactrouter.com/docs/en/v6/utils/generate-path
+ * @see https://reactrouter.com/utils/generate-path
  */
 
 
@@ -751,7 +762,7 @@ function generatePath(path, params) {
  * 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") {
@@ -873,15 +884,6 @@ function stripBasename(pathname, basename) {
  * @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
@@ -900,7 +902,7 @@ function warning(cond, message) {
 /**
  * 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) {
@@ -1624,7 +1626,7 @@ function createRouter(init) {
 
 
     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;
 
@@ -1654,7 +1656,11 @@ function createRouter(init) {
         location
       }, opts.submission);
 
-      loadingNavigation = navigation;
+      loadingNavigation = navigation; // Create a GET request for the loaders
+
+      request = new Request(request.url, {
+        signal: request.signal
+      });
     } // Call loaders
 
 
@@ -1943,7 +1949,7 @@ function createRouter(init) {
     }); // 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);
 
@@ -1987,7 +1993,7 @@ function createRouter(init) {
 
 
     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;
@@ -2107,7 +2113,7 @@ function createRouter(init) {
     }); // 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
@@ -2187,21 +2193,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
 
@@ -2248,7 +2260,7 @@ function createRouter(init) {
     // 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);
@@ -2532,7 +2544,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
@@ -2598,7 +2610,7 @@ function unstable_createStaticHandler(routes, opts) {
 
     let result = await queryImpl(request, location, matches, match);
 
-    if (result instanceof Response) {
+    if (isResponse(result)) {
       return result;
     }
 
@@ -2627,7 +2639,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: {}
       });
@@ -2659,7 +2671,7 @@ function unstable_createStaticHandler(routes, opts) {
     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
       });
 
@@ -2734,9 +2746,13 @@ function unstable_createStaticHandler(routes, opts) {
           [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
     } : {}, {
@@ -2755,7 +2771,7 @@ function unstable_createStaticHandler(routes, opts) {
     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
       });
     }
@@ -2949,9 +2965,9 @@ function isNewRouteInstance(currentMatch, match) {
 }
 
 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
@@ -3021,20 +3037,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 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) {
@@ -3058,8 +3072,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
@@ -3117,10 +3130,13 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
     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
   };
@@ -3374,8 +3390,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;
   }
 
@@ -3385,7 +3405,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) {