react-router 8.5.0 → 8.5.1

package/dist/production/lib/href.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/history.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/instrumentation.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/matcher-route-pattern.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/matcher-route-pattern.preload.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/matcher.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,12 +14,17 @@ var V6RegExMatcher = class {
 	#routes = [];
 	#branches = [];
 	#basename;
+	#matchCost = 0;
 	constructor(basename) {
 		this.#basename = basename;
 	}
 	update(routes) {
 		this.#routes = routes;
 		this.#branches = flattenAndRankRoutes(routes);
+		this.#matchCost = this.#branches.reduce((total, branch) => total + branch.routesMeta.length, 0);
+	}
+	get matchCost() {
+		return this.#matchCost;
 	}
 	match(locationArg, allowPartial = false) {
 		return matchRoutesImpl(this.#routes, locationArg, this.#basename, allowPartial, this.#branches);

package/dist/production/lib/router/navigation.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/router.d.ts

@@ -353,6 +353,8 @@ interface StaticHandler {
    * The set of data routes managed by this handler
    */
   dataRoutes: DataRouteObject[];
+  /** @private Estimated route metadata visits per regex match. */
+  readonly _matchCost?: number;
   /**
    * @private
    * PRIVATE - DO NOT USE

package/dist/production/lib/router/router.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -408,7 +408,7 @@ function createRouter(init) {
 		pendingPreventScrollReset = false;
 		pendingViewTransitionEnabled = false;
 		isUninterruptedRevalidation = false;
-		isRevalidationRequired = false;
+		isRevalidationRequired = fetchReloadIds.size > 0;
 	}
 	async function navigate(to, opts) {
 		if (pendingDiscoveryCancellation) await pendingDiscoveryCancellation;
@@ -446,8 +446,9 @@ function createRouter(init) {
 		validateNavigationTarget(to == null ? init.history.createHref(state.location) : typeof to === "string" ? to : createPath(to), init.history.createHref(nextLocation.mask || nextLocation), init.history.createURL("/"), "reject");
 		let userReplace = opts && opts.replace != null ? opts.replace : void 0;
 		let historyAction = "PUSH";
+		let currentPath = state.location.pathname + state.location.search;
 		if (userReplace === true) historyAction = "REPLACE";
-		else if (userReplace === false) {} else if (submission != null && isMutationMethod(submission.formMethod) && submission.formAction === state.location.pathname + state.location.search) historyAction = "REPLACE";
+		else if (userReplace === false) {} else if (submission != null && isMutationMethod(submission.formMethod) && (submission.formAction === currentPath || nextLocation.pathname + nextLocation.search === currentPath)) historyAction = "REPLACE";
 		let preventScrollReset = opts && "preventScrollReset" in opts ? opts.preventScrollReset === true : void 0;
 		let flushSync = (opts && opts.flushSync) === true;
 		let blockerKey = shouldBlockNavigation({
@@ -789,12 +790,16 @@ function createRouter(init) {
 			abortFetcher(rf.key);
 			if (rf.controller) fetchControllers.set(rf.key, rf.controller);
 		});
-		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((f) => abortFetcher(f.key));
+		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => {
+			if (fetchControllers.get(rf.key) === rf.controller) abortFetcher(rf.key);
+		});
 		if (pendingNavigationController) pendingNavigationController.signal.addEventListener("abort", abortPendingFetchRevalidations);
 		let { loaderResults, fetcherResults } = await callLoadersAndMaybeResolveData(dsMatches, revalidatingFetchers, request, location, scopedContext, dataStrategyInitiator, historyAction);
 		if (request.signal.aborted) return { shortCircuited: true };
 		if (pendingNavigationController) pendingNavigationController.signal.removeEventListener("abort", abortPendingFetchRevalidations);
-		revalidatingFetchers.forEach((rf) => fetchControllers.delete(rf.key));
+		revalidatingFetchers.forEach((rf) => {
+			if (fetchControllers.get(rf.key) === rf.controller) fetchControllers.delete(rf.key);
+		});
 		let redirect = findRedirect(loaderResults);
 		if (redirect) {
 			await startRedirectNavigation(request, redirect.result, true, dataStrategyInitiator, { replace });
@@ -923,30 +928,39 @@ function createRouter(init) {
 			return;
 		}
 		if (fetchersQueuedForDeletion.has(key)) {
-			if (isRedirectResult(actionResult) || isErrorResult(actionResult)) {
+			if (isErrorResult(actionResult)) {
 				updateFetcherState(key, getDoneFetcher(void 0));
 				return;
 			}
-		} else {
 			if (isRedirectResult(actionResult)) {
+				isRevalidationRequired = true;
+				actionResult = {
+					type: "data",
+					data: void 0
+				};
+			}
+		} else {
+			if (isRedirectResult(actionResult)) if (pendingNavigationLoadId > originatingLoadId) {
+				isRevalidationRequired = true;
+				actionResult = {
+					type: "data",
+					data: void 0
+				};
+			} else {
 				fetchControllers.delete(key);
-				if (pendingNavigationLoadId > originatingLoadId) {
-					updateFetcherState(key, getDoneFetcher(void 0));
-					return;
-				} else {
-					fetchRedirectIds.add(key);
-					updateFetcherState(key, getLoadingFetcher(submission));
-					return startRedirectNavigation(fetchRequest, actionResult, false, "fetcher", {
-						fetcherSubmission: submission,
-						preventScrollReset
-					});
-				}
+				fetchRedirectIds.add(key);
+				updateFetcherState(key, getLoadingFetcher(submission));
+				return startRedirectNavigation(fetchRequest, actionResult, false, "fetcher", {
+					fetcherSubmission: submission,
+					preventScrollReset
+				});
 			}
 			if (isErrorResult(actionResult)) {
 				setFetcherError(key, routeId, actionResult.error);
 				return;
 			}
 		}
+		isRevalidationRequired = true;
 		let nextLocation = state.navigation.location || state.location;
 		let revalidationRequest = createClientSideRequest(init.history, nextLocation, abortController.signal);
 		let matches = state.navigation.state !== "idle" ? dataRouteMatcher.match(state.navigation.location) : state.matches;
@@ -966,7 +980,9 @@ function createRouter(init) {
 			if (rf.controller) fetchControllers.set(staleKey, rf.controller);
 		});
 		updateState({ fetchers: workingFetchers });
-		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => abortFetcher(rf.key));
+		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => {
+			if (fetchControllers.get(rf.key) === rf.controller) abortFetcher(rf.key);
+		});
 		abortController.signal.addEventListener("abort", abortPendingFetchRevalidations);
 		let { loaderResults, fetcherResults } = await callLoadersAndMaybeResolveData(dsMatches, revalidatingFetchers, revalidationRequest, nextLocation, scopedContext, "fetcher");
 		if (abortController.signal.aborted) {
@@ -976,7 +992,9 @@ function createRouter(init) {
 		abortController.signal.removeEventListener("abort", abortPendingFetchRevalidations);
 		fetchReloadIds.delete(key);
 		fetchControllers.delete(key);
-		revalidatingFetchers.forEach((r) => fetchControllers.delete(r.key));
+		revalidatingFetchers.forEach((r) => {
+			if (fetchControllers.get(r.key) === r.controller) fetchControllers.delete(r.key);
+		});
 		let fetcherIsMounted = state.fetchers.has(key);
 		let getRedirectStateWithDoneFetcher = (s) => {
 			if (!fetcherIsMounted) return s;
@@ -1005,6 +1023,7 @@ function createRouter(init) {
 		if (state.navigation.state === "loading" && loadId > pendingNavigationLoadId) {
 			invariant(pendingAction, "Expected pending action");
 			pendingNavigationController && pendingNavigationController.abort();
+			markFetchRedirectsDone(finalFetchers);
 			completeNavigation(state.navigation.location, {
 				matches,
 				loaderData,
@@ -1017,7 +1036,7 @@ function createRouter(init) {
 				loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors),
 				fetchers: finalFetchers
 			});
-			isRevalidationRequired = false;
+			isRevalidationRequired = fetchReloadIds.size > 0;
 		}
 	}
 	async function handleFetcherLoader(key, loadMatch, matches, scopedContext, flushSync, preventScrollReset, submission) {
@@ -1877,6 +1896,9 @@ function createStaticHandler(routes, opts) {
 	}
 	return {
 		dataRoutes,
+		get _matchCost() {
+			return dataRouteMatcher instanceof V6RegExMatcher ? dataRouteMatcher.matchCost : void 0;
+		},
 		match,
 		query,
 		queryRoute
@@ -2262,6 +2284,9 @@ const loadLazyRouteProperty = ({ key, route, manifest, mapRouteProperties }) =>
 		}
 	})();
 	cache[key] = propertyPromise;
+	propertyPromise.catch(() => {
+		if (cache[key] === propertyPromise) delete cache[key];
+	});
 	return propertyPromise;
 };
 const lazyRouteFunctionCache = /* @__PURE__ */ new WeakMap();
@@ -2303,7 +2328,9 @@ function loadLazyRoute(route, type, manifest, mapRouteProperties, lazyRoutePrope
 			});
 		})();
 		lazyRouteFunctionCache.set(routeToUpdate, lazyRoutePromise);
-		lazyRoutePromise.catch(() => {});
+		lazyRoutePromise.catch(() => {
+			if (lazyRouteFunctionCache.get(routeToUpdate) === lazyRoutePromise) lazyRouteFunctionCache.delete(routeToUpdate);
+		});
 		return {
 			lazyRoutePromise,
 			lazyHandlerPromise: lazyRoutePromise
@@ -2595,10 +2622,13 @@ async function callLoaderOrAction({ request, path, pattern, match, lazyHandlerPr
 					pathname,
 					routeId: match.route.id
 				});
-			} else return {
-				type: "data",
-				result: void 0
-			};
+			} else {
+				await lazyRoutePromise;
+				return {
+					type: "data",
+					result: void 0
+				};
+			}
 		}
 		else if (!handler) {
 			let url = new URL(request.url);
@@ -2793,12 +2823,12 @@ function processRouteLoaderData(matches, results, pendingActionResult, isStaticH
 function processLoaderData(state, matches, results, pendingActionResult, revalidatingFetchers, fetcherResults, workingFetchers) {
 	let { loaderData, errors } = processRouteLoaderData(matches, results, pendingActionResult);
 	revalidatingFetchers.filter((f) => !f.matches || f.matches.some((m) => m.shouldLoad)).forEach((rf) => {
-		let { key, match, controller } = rf;
+		let { key, routeId, controller } = rf;
 		if (controller && controller.signal.aborted) return;
 		let result = fetcherResults[key];
 		invariant(result, "Did not find corresponding fetcher result");
 		if (isErrorResult(result)) {
-			let boundaryMatch = findNearestBoundary(state.matches, match?.route.id);
+			let boundaryMatch = findNearestBoundary(state.matches, routeId);
 			if (!(errors && errors[boundaryMatch.route.id])) errors = {
 				...errors,
 				[boundaryMatch.route.id]: result.error

package/dist/production/lib/router/url.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/router/utils.d.ts

@@ -185,6 +185,13 @@ interface DataFunctionArgs<Context> {
    * In Framework mode, this is a normalized URL with React-Router-specific
    * implementation details removed (`.data` suffixes, `index`/`_routes` search
    * params). For the raw incoming URL, use `request.url`.
+   *
+   * This normalization preserves standard URL pathname encoding and casing.
+   * For example, a request to `/%61dmin.data` produces a `url.pathname` of
+   * `/%61dmin`. This is not a canonical representation of the matched route.
+   * For authorization, attach {@link https://reactrouter.com/how-to/middleware#authentication server middleware}
+   * to the protected route or a common ancestor instead of relying on literal
+   * pathname-prefix comparisons.
    */
   url: URL;
   /**

package/dist/production/lib/router/utils.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/browser.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -17,7 +17,7 @@ import { RSCRouterContext } from "../context.js";
 import { createRequestInit } from "../dom/ssr/data.js";
 import { getSingleFetchDataStrategyImpl, singleFetchUrl, stripIndexParam } from "../dom/ssr/single-fetch.js";
 import { noActionDefinedError, shouldHydrateRouteLoader } from "../dom/ssr/routes.js";
-import { getPathsWithAncestors, handleClientVersionMismatch } from "../dom/ssr/fog-of-war.js";
+import { getManifestPathsParam, getPathsWithAncestors, handleClientVersionMismatch } from "../dom/ssr/fog-of-war.js";
 import { FrameworkContext, setIsHydrated } from "../dom/ssr/components.js";
 import { RouterProvider } from "../components.js";
 import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries.js";
@@ -539,7 +539,7 @@ function getManifestUrl(paths, clientVersion) {
 	else {
 		let basename = (window.__reactRouterDataRouter.basename ?? "").replace(/^\/|\/$/g, "");
 		url = new URL(`${basename}/.manifest`, window.location.origin);
-		url.searchParams.set("paths", paths.sort().join(","));
+		url.searchParams.set("paths", getManifestPathsParam(paths));
 	}
 	if (clientVersion !== void 0) url.searchParams.set("version", clientVersion);
 	return url;

package/dist/production/lib/rsc/errorBoundaries.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/html-stream/browser.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/html-stream/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/route-modules.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/server.ssr.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/cookies.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/crypto.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/data.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/dev.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/entry.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/errors.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/headers.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/invariant.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/mode.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/routeMatching.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/routes.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 import { ErrorResponseImpl, RouterContextProvider, createDataFunctionUrl, defaultMapRouteProperties, getRoutePattern, isRouteErrorResponse, removeTrailingSlash, stripBasename } from "../router/utils.js";
 import { instrumentHandler, instrumentationResultMetaContext } from "../router/instrumentation.js";
 import { createStaticHandler, getStaticContextFromError, isMutationMethod, isRedirectResponse, isResponse } from "../router/router.js";
-import { getManifestPath } from "../dom/ssr/fog-of-war.js";
+import { getManifestPath, isFogOfWarEnabled, shouldUseInitialRouteDiscovery } from "../dom/ssr/fog-of-war.js";
 import { createEntryRouteModules } from "./entry.js";
 import { isServerMode } from "./mode.js";
 import { sanitizeErrors, serializeError } from "./errors.js";
@@ -59,7 +59,10 @@ function derive(build, mode) {
 		let normalizedPathname = normalizedPath.pathname;
 		let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
 		if (!build.ssr || build.unstable_apiOnly) {
-			let decodedPath = decodeURI(normalizedPathname);
+			let decodedPath = normalizedPathname;
+			try {
+				decodedPath = decodeURI(normalizedPathname);
+			} catch {}
 			if (build.basename && build.basename !== "/") {
 				let strippedPath = stripBasename(decodedPath, build.basename);
 				if (strippedPath == null) {
@@ -251,10 +254,15 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			actionData: context.actionData,
 			errors: context.errors
 		};
+		let routeDiscovery = build.routeDiscovery;
+		if (isFogOfWarEnabled(routeDiscovery, build.ssr) && shouldUseInitialRouteDiscovery(context.location.pathname, staticHandler._matchCost)) routeDiscovery = {
+			...routeDiscovery,
+			mode: "initial"
+		};
 		let baseServerHandoff = {
 			basename: build.basename,
 			future: build.future,
-			routeDiscovery: build.routeDiscovery,
+			routeDiscovery,
 			ssr: build.ssr,
 			isSpaMode,
 			unstable_apiOnly: build.unstable_apiOnly,
@@ -274,7 +282,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			renderMeta: {},
 			future: build.future,
 			ssr: build.ssr,
-			routeDiscovery: build.routeDiscovery,
+			routeDiscovery,
 			isSpaMode,
 			unstable_apiOnly: build.unstable_apiOnly,
 			unstable_apiServerOrigin: build.unstable_apiServerOrigin,

package/dist/production/lib/server-runtime/serverHandoff.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/sessions/cookieStorage.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/sessions/memoryStorage.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/sessions.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -99,7 +99,7 @@ function createSessionStorage({ cookie: cookieArg, createData, readData, updateD
 			return cookie.serialize(id, options);
 		},
 		async destroySession(session, options) {
-			await deleteData(session.id);
+			if (session.id) await deleteData(session.id);
 			return cookie.serialize("", {
 				...options,
 				maxAge: void 0,

package/dist/production/lib/server-runtime/single-fetch.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/urls.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/warnings.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/internal.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/route-pattern.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/vendor/turbo-stream-v2/flatten.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/vendor/turbo-stream-v2/turbo-stream.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *