react-router 8.3.0 → 8.4.0

package/dist/development/lib/router/router.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,8 +10,11 @@
  */
 import { PROTOCOL_RELATIVE_URL_REGEX, normalizeProtocolRelativeUrl } from "./url.js";
 import { createBrowserURLImpl, createLocation, createPath, invariant, parsePath, warning } from "./history.js";
-import { ErrorResponseImpl, RouterContextProvider, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createDataFunctionUrl, flattenAndRankRoutes, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, matchRoutesImpl, prependBasename, removeDoubleSlashes, resolveTo, stripBasename } from "./utils.js";
+import { ErrorResponseImpl, RouterContextProvider, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createDataFunctionUrl, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, prependBasename, removeDoubleSlashes, resolveTo, stripBasename } from "./utils.js";
 import { consumeInstrumentationClientResultMetaReceiver, getRouteInstrumentationUpdates, instrumentClientSideRouter } from "./instrumentation.js";
+import { V6RegExMatcher } from "./matcher.js";
+import { getRoutePatternMatcher } from "./matcher-route-pattern.preload.js";
+import { validateNavigationTarget } from "./navigation.js";
 //#region lib/router/router.ts
 const validMutationMethodsArr = [
 	"POST",
@@ -60,18 +63,26 @@ const IDLE_BLOCKER = {
 };
 const TRANSITIONS_STORAGE_KEY = "remix-router-transitions";
 const ResetLoaderDataSymbol = Symbol("ResetLoaderData");
+function createDataRouteMatcher(future, basename) {
+	if (future.unstable_routePatternMatching) {
+		let RoutePatternMatcher = getRoutePatternMatcher();
+		invariant(RoutePatternMatcher, "You must call unstable_preloadRoutePattern() from \"react-router/route-pattern\" before enabling future.unstable_routePatternMatching.");
+		return new RoutePatternMatcher(basename);
+	}
+	return new V6RegExMatcher(basename);
+}
 /**
 * Encapsulates the stable and in-flight route trees together with their
 * pre-computed branch caches so the structures always stay in sync.
 */
 var DataRoutes = class {
 	#routes;
-	#branches;
 	#hmrRoutes;
-	#hmrBranches;
-	constructor(routes) {
+	#matcher;
+	constructor(routes, matcher) {
 		this.#routes = routes;
-		this.#branches = flattenAndRankRoutes(routes);
+		this.#matcher = matcher;
+		this.#matcher.update(routes);
 	}
 	/** The stable route tree */
 	get stableRoutes() {
@@ -81,30 +92,25 @@ var DataRoutes = class {
 	get activeRoutes() {
 		return this.#hmrRoutes ?? this.#routes;
 	}
-	/** Pre-computed branches */
-	get branches() {
-		return this.#hmrBranches ?? this.#branches;
-	}
 	get hasHMRRoutes() {
 		return this.#hmrRoutes != null;
 	}
 	/** Replace the stable route tree and recompute its branches */
 	setRoutes(routes) {
 		this.#routes = routes;
-		this.#branches = flattenAndRankRoutes(routes);
+		if (!this.#hmrRoutes) this.#matcher.update(routes);
 	}
 	/** Set a new in-flight route tree and recompute its branches */
 	setHmrRoutes(routes) {
 		this.#hmrRoutes = routes;
-		this.#hmrBranches = flattenAndRankRoutes(routes);
+		this.#matcher.update(routes);
 	}
 	/** Commit in-flight routes/branches to the stable slot and clear in-flight */
 	commitHmrRoutes() {
 		if (this.#hmrRoutes) {
 			this.#routes = this.#hmrRoutes;
-			this.#branches = this.#hmrBranches;
 			this.#hmrRoutes = void 0;
-			this.#hmrBranches = void 0;
+			this.#matcher.update(this.#routes);
 		}
 	}
 };
@@ -127,12 +133,13 @@ function createRouter(init) {
 			};
 		};
 	}
-	let manifest = {};
-	let dataRoutes = new DataRoutes(convertRoutesToDataRoutes(init.routes, mapRouteProperties, void 0, manifest));
+	let future = { ...init.future };
 	let basename = init.basename || "/";
 	if (!basename.startsWith("/")) basename = `/${basename}`;
+	let dataRouteMatcher = createDataRouteMatcher(future, basename);
+	let manifest = {};
+	let dataRoutes = new DataRoutes(convertRoutesToDataRoutes(init.routes, mapRouteProperties, void 0, manifest), dataRouteMatcher);
 	let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware;
-	let future = { ...init.future };
 	let unlistenHistory = null;
 	let subscribers = /* @__PURE__ */ new Set();
 	let bufferedInitialStateUpdate = null;
@@ -140,7 +147,7 @@ function createRouter(init) {
 	let getScrollRestorationKey = null;
 	let getScrollPosition = null;
 	let initialScrollRestored = init.hydrationData != null;
-	let initialMatches = matchRoutesImpl(dataRoutes.activeRoutes, init.history.location, basename, false, dataRoutes.branches);
+	let initialMatches = dataRouteMatcher.match(init.history.location);
 	let initialMatchesIsFOW = false;
 	let initialErrors = null;
 	let initialized;
@@ -154,13 +161,13 @@ function createRouter(init) {
 		initialErrors = { [route.id]: error };
 	} else {
 		if (initialMatches && !init.hydrationData) {
-			if (checkFogOfWar(initialMatches, dataRoutes.activeRoutes, init.history.location.pathname).active) initialMatches = null;
+			if (checkFogOfWar(initialMatches, init.history.location.pathname).active) initialMatches = null;
 		}
 		if (!initialMatches) {
 			initialized = false;
 			renderFallback = !initialized;
 			initialMatches = [];
-			let fogOfWar = checkFogOfWar(null, dataRoutes.activeRoutes, init.history.location.pathname);
+			let fogOfWar = checkFogOfWar(null, init.history.location.pathname);
 			if (fogOfWar.active && fogOfWar.matches) {
 				initialMatchesIsFOW = true;
 				initialMatches = fogOfWar.matches;
@@ -351,7 +358,7 @@ function createRouter(init) {
 		if (isUninterruptedRevalidation) {} else if (pendingAction === "POP") {} else if (pendingAction === "PUSH") init.history.push(location, location.state);
 		else if (pendingAction === "REPLACE") init.history.replace(location, location.state);
 		let viewTransitionOpts;
-		if (pendingAction === "POP") {
+		if (pendingAction === "POP" && !isUninterruptedRevalidation && location !== state.location) {
 			let priorPaths = appliedViewTransitions.get(state.location.pathname);
 			if (priorPaths && priorPaths.has(location.pathname)) viewTransitionOpts = {
 				currentLocation: state.location,
@@ -412,21 +419,27 @@ function createRouter(init) {
 		let instrumentationNavigateMetaReceiver = consumeInstrumentationClientResultMetaReceiver(router);
 		let { path, submission, error } = normalizeNavigateOptions(false, normalizeTo(state.location, state.matches, basename, to, opts?.fromRouteId, opts?.relative), opts);
 		let maskPath;
-		if (opts?.mask) maskPath = {
-			pathname: "",
-			search: "",
-			hash: "",
-			...typeof opts.mask === "string" ? parsePath(opts.mask) : {
+		if (opts?.mask) {
+			let partialPath = typeof opts.mask === "string" ? parsePath(opts.mask) : {
 				...state.location.mask,
 				...opts.mask
-			}
-		};
+			};
+			maskPath = {
+				pathname: partialPath.pathname ?? "",
+				search: partialPath.search ?? "",
+				hash: partialPath.hash ?? ""
+			};
+			if (PROTOCOL_RELATIVE_URL_REGEX.test(maskPath.pathname)) throw new Error("External navigation is not allowed");
+			else if (maskPath.pathname.startsWith("\\")) maskPath.pathname = maskPath.pathname.replace(/^\\+/, "/");
+			validateNavigationTarget(typeof opts.mask === "string" ? opts.mask : createPath(opts.mask), createPath(maskPath), init.history.createURL("/"), "reject");
+		}
 		let currentLocation = state.location;
 		let nextLocation = createLocation(currentLocation, path, opts && opts.state, void 0, maskPath);
 		nextLocation = {
 			...nextLocation,
 			...init.history.encodeLocation(nextLocation)
 		};
+		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";
 		if (userReplace === true) historyAction = "REPLACE";
@@ -494,14 +507,13 @@ function createRouter(init) {
 		saveScrollPosition(state.location, state.matches);
 		pendingPreventScrollReset = (opts && opts.preventScrollReset) === true;
 		pendingViewTransitionEnabled = (opts && opts.enableViewTransition) === true;
-		let routesToUse = dataRoutes.activeRoutes;
-		let matches = opts?.initialHydration && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? state.matches : matchRoutesImpl(routesToUse, location, basename, false, dataRoutes.branches);
+		let matches = opts?.initialHydration && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? state.matches : dataRouteMatcher.match(location);
 		let flushSync = (opts && opts.flushSync) === true;
 		if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
 			completeNavigation(location, { matches }, { flushSync });
 			return;
 		}
-		let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
+		let fogOfWar = checkFogOfWar(matches, location.pathname);
 		if (fogOfWar.active && fogOfWar.matches) matches = fogOfWar.matches;
 		if (opts?.instrumentationNavigateMetaReceiver) {
 			let meta = getInstrumentationNavigateMeta(init.history, location, matches);
@@ -687,8 +699,7 @@ function createRouter(init) {
 				};
 			} else matches = discoverResult.matches;
 		}
-		let routesToUse = dataRoutes.activeRoutes;
-		let { dsMatches, revalidatingFetchers } = getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest, init.history, state, matches, activeSubmission, location, initialHydration ? [] : hydrationRouteProperties, initialHydration === true, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, init.patchRoutesOnNavigation != null, dataRoutes.branches, pendingActionResult, callSiteDefaultShouldRevalidate);
+		let { dsMatches, revalidatingFetchers } = getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest, init.history, state, matches, activeSubmission, location, initialHydration ? [] : hydrationRouteProperties, initialHydration === true, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, dataRouteMatcher, pendingActionResult, callSiteDefaultShouldRevalidate);
 		pendingNavigationLoadId = ++incrementingLoadId;
 		if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.middleware && m.route.middleware.length > 0) && revalidatingFetchers.length === 0) {
 			let workingFetchers = new Map(state.fetchers);
@@ -767,10 +778,9 @@ function createRouter(init) {
 		abortFetcher(key);
 		let flushSync = (opts && opts.flushSync) === true;
 		let instrumentationResultMetaReceiver = consumeInstrumentationClientResultMetaReceiver(router);
-		let routesToUse = dataRoutes.activeRoutes;
 		let normalizedPath = normalizeTo(state.location, state.matches, basename, href, routeId, opts?.relative);
-		let matches = matchRoutesImpl(routesToUse, normalizedPath, basename, false, dataRoutes.branches);
-		let fogOfWar = checkFogOfWar(matches, routesToUse, normalizedPath);
+		let matches = dataRouteMatcher.match(normalizedPath);
+		let fogOfWar = checkFogOfWar(matches, normalizedPath);
 		if (fogOfWar.active && fogOfWar.matches) matches = fogOfWar.matches;
 		if (instrumentationResultMetaReceiver) instrumentationResultMetaReceiver(getInstrumentationNavigateMeta(init.history, normalizedPath, matches));
 		if (!matches) {
@@ -788,11 +798,13 @@ function createRouter(init) {
 			await handleFetcherAction(key, routeId, path, matches, scopedContext, fogOfWar.active, flushSync, preventScrollReset, submission, opts && opts.defaultShouldRevalidate);
 			return;
 		}
-		fetchLoadMatches.set(key, {
+		let loadMatch = {
 			routeId,
-			path
-		});
-		await handleFetcherLoader(key, routeId, path, matches, scopedContext, fogOfWar.active, flushSync, preventScrollReset, submission);
+			path,
+			isDiscovering: fogOfWar.active
+		};
+		fetchLoadMatches.set(key, loadMatch);
+		await handleFetcherLoader(key, loadMatch, matches, scopedContext, flushSync, preventScrollReset, submission);
 	}
 	async function handleFetcherAction(key, routeId, path, requestMatches, scopedContext, isFogOfWar, flushSync, preventScrollReset, submission, callSiteDefaultShouldRevalidate) {
 		interruptActiveLoads();
@@ -862,12 +874,11 @@ function createRouter(init) {
 		}
 		let nextLocation = state.navigation.location || state.location;
 		let revalidationRequest = createClientSideRequest(init.history, nextLocation, abortController.signal);
-		let routesToUse = dataRoutes.activeRoutes;
-		let matches = state.navigation.state !== "idle" ? matchRoutesImpl(routesToUse, state.navigation.location, basename, false, dataRoutes.branches) : state.matches;
+		let matches = state.navigation.state !== "idle" ? dataRouteMatcher.match(state.navigation.location) : state.matches;
 		invariant(matches, "Didn't find any matches after fetcher action");
 		let loadId = ++incrementingLoadId;
 		fetchReloadIds.set(key, loadId);
-		let { dsMatches, revalidatingFetchers } = getMatchesToLoad(revalidationRequest, scopedContext, mapRouteProperties, manifest, init.history, state, matches, submission, nextLocation, hydrationRouteProperties, false, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, init.patchRoutesOnNavigation != null, dataRoutes.branches, [match.route.id, actionResult], callSiteDefaultShouldRevalidate);
+		let { dsMatches, revalidatingFetchers } = getMatchesToLoad(revalidationRequest, scopedContext, mapRouteProperties, manifest, init.history, state, matches, submission, nextLocation, hydrationRouteProperties, false, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, dataRouteMatcher, [match.route.id, actionResult], callSiteDefaultShouldRevalidate);
 		let loadFetcher = getLoadingFetcher(submission, actionResult.data);
 		let workingFetchers = new Map(state.fetchers);
 		workingFetchers.set(key, loadFetcher);
@@ -883,7 +894,10 @@ function createRouter(init) {
 		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => abortFetcher(rf.key));
 		abortController.signal.addEventListener("abort", abortPendingFetchRevalidations);
 		let { loaderResults, fetcherResults } = await callLoadersAndMaybeResolveData(dsMatches, revalidatingFetchers, revalidationRequest, nextLocation, scopedContext);
-		if (abortController.signal.aborted) return;
+		if (abortController.signal.aborted) {
+			if (fetchReloadIds.get(key) === loadId) fetchReloadIds.delete(key);
+			return;
+		}
 		abortController.signal.removeEventListener("abort", abortPendingFetchRevalidations);
 		fetchReloadIds.delete(key);
 		fetchControllers.delete(key);
@@ -931,12 +945,13 @@ function createRouter(init) {
 			isRevalidationRequired = false;
 		}
 	}
-	async function handleFetcherLoader(key, routeId, path, matches, scopedContext, isFogOfWar, flushSync, preventScrollReset, submission) {
+	async function handleFetcherLoader(key, loadMatch, matches, scopedContext, flushSync, preventScrollReset, submission) {
+		let { routeId, path } = loadMatch;
 		let existingFetcher = state.fetchers.get(key);
 		updateFetcherState(key, getLoadingFetcher(submission, existingFetcher ? existingFetcher.data : void 0), { flushSync });
 		let abortController = new AbortController();
 		let fetchRequest = createClientSideRequest(init.history, path, abortController.signal);
-		if (isFogOfWar) {
+		if (loadMatch.isDiscovering) {
 			let discoverResult = await discoverRoutes(matches, new URL(fetchRequest.url).pathname, fetchRequest.signal, key);
 			if (discoverResult.type === "aborted") return;
 			else if (discoverResult.type === "error") {
@@ -945,7 +960,10 @@ function createRouter(init) {
 			} else if (!discoverResult.matches) {
 				setFetcherError(key, routeId, getInternalRouterError(404, { pathname: path }), { flushSync });
 				return;
-			} else matches = discoverResult.matches;
+			} else {
+				matches = discoverResult.matches;
+				loadMatch.isDiscovering = false;
+			}
 		}
 		let match = getTargetMatch(matches, path);
 		fetchControllers.set(key, abortController);
@@ -1005,7 +1023,10 @@ function createRouter(init) {
 		if (redirect.response.headers.has("X-Remix-Revalidate")) isRevalidationRequired = true;
 		let location = redirect.response.headers.get("Location");
 		invariant(location, "Expected a Location header on the redirect Response");
-		location = normalizeRedirectLocation(location, new URL(request.url), basename, init.history);
+		let originalLocation = location;
+		let currentUrl = new URL(request.url);
+		location = normalizeRedirectLocation(location, currentUrl, basename, init.history);
+		validateNavigationTarget(originalLocation, location, currentUrl, "allow-explicit");
 		let redirectLocation = createLocation(state.location, location, { _isRedirect: true });
 		if (isBrowser) {
 			let isDocumentReload = false;
@@ -1251,16 +1272,15 @@ function createRouter(init) {
 		}
 		return null;
 	}
-	function checkFogOfWar(matches, routesToUse, pathname) {
+	function checkFogOfWar(matches, pathname) {
 		if (init.patchRoutesOnNavigation) {
-			let activeBranches = dataRoutes.branches;
 			if (!matches) return {
 				active: true,
-				matches: matchRoutesImpl(routesToUse, pathname, basename, true, activeBranches) || []
+				matches: dataRouteMatcher.match(pathname, true) || []
 			};
 			else if (Object.keys(matches[0].params).length > 0) return {
 				active: true,
-				matches: matchRoutesImpl(routesToUse, pathname, basename, true, activeBranches)
+				matches: dataRouteMatcher.match(pathname, true)
 			};
 		}
 		return {
@@ -1295,21 +1315,20 @@ function createRouter(init) {
 				};
 			}
 			if (signal.aborted) return { type: "aborted" };
-			let activeBranches = dataRoutes.branches;
-			let newMatches = matchRoutesImpl(dataRoutes.activeRoutes, pathname, basename, false, activeBranches);
+			let newMatches = dataRouteMatcher.match(pathname);
 			let newPartialMatches = null;
 			if (newMatches) if (Object.keys(newMatches[0].params).length === 0) return {
 				type: "success",
 				matches: newMatches
 			};
 			else {
-				newPartialMatches = matchRoutesImpl(dataRoutes.activeRoutes, pathname, basename, true, activeBranches);
+				newPartialMatches = dataRouteMatcher.match(pathname, true);
 				if (!(newPartialMatches && partialMatches.length < newPartialMatches.length && compareMatches(partialMatches, newPartialMatches.slice(0, partialMatches.length)))) return {
 					type: "success",
 					matches: newMatches
 				};
 			}
-			if (!newPartialMatches) newPartialMatches = matchRoutesImpl(dataRoutes.activeRoutes, pathname, basename, true, activeBranches);
+			if (!newPartialMatches) newPartialMatches = dataRouteMatcher.match(pathname, true);
 			if (!newPartialMatches || compareMatches(partialMatches, newPartialMatches)) return {
 				type: "success",
 				matches: null
@@ -1341,8 +1360,8 @@ function createRouter(init) {
 		get routes() {
 			return dataRoutes.stableRoutes;
 		},
-		get branches() {
-			return dataRoutes.branches;
+		match(locationArg) {
+			return dataRouteMatcher.match(locationArg);
 		},
 		get manifest() {
 			return manifest;
@@ -1357,6 +1376,7 @@ function createRouter(init) {
 		fetch,
 		revalidate,
 		createHref: (to) => init.history.createHref(to),
+		createURL: (to) => init.history.createURL(to),
 		encodeLocation: (to) => init.history.encodeLocation(to),
 		getFetcher,
 		resetFetcher,
@@ -1410,7 +1430,7 @@ function createStaticHandler(routes, opts) {
 	let basename = (opts ? opts.basename : null) || "/";
 	let _mapRouteProperties = opts?.mapRouteProperties;
 	let mapRouteProperties = _mapRouteProperties ? _mapRouteProperties : () => ({});
-	({ ...opts?.future });
+	let dataRouteMatcher = createDataRouteMatcher({ ...opts?.future }, basename);
 	if (opts?.instrumentations) {
 		let instrumentations = opts.instrumentations;
 		mapRouteProperties = (route) => {
@@ -1421,7 +1441,8 @@ function createStaticHandler(routes, opts) {
 		};
 	}
 	let dataRoutes = convertRoutesToDataRoutes(routes, mapRouteProperties, void 0, manifest);
-	let routeBranches = flattenAndRankRoutes(dataRoutes);
+	dataRouteMatcher.update(dataRoutes);
+	let match = (locationArg) => dataRouteMatcher.match(locationArg);
 	/**
 	* The query() method is intended for document requests, in which we want to
 	* call an optional action and potentially multiple loaders for all nested
@@ -1452,7 +1473,7 @@ function createStaticHandler(routes, opts) {
 		let normalizePathImpl = normalizePath || defaultNormalizePath;
 		let method = request.method;
 		let location = createLocation("", normalizePathImpl(request), null, "default");
-		let matches = matchRoutesImpl(dataRoutes, location, basename, false, routeBranches);
+		let matches = dataRouteMatcher.match(location);
 		requestContext = requestContext != null ? requestContext : new RouterContextProvider();
 		if (!isValidMethod(method) && method !== "HEAD") {
 			let error = getInternalRouterError(405, { method });
@@ -1466,7 +1487,8 @@ function createStaticHandler(routes, opts) {
 				errors: { [route.id]: error },
 				statusCode: error.status,
 				loaderHeaders: {},
-				actionHeaders: {}
+				actionHeaders: {},
+				_match: match
 			};
 			return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
 		} else if (!matches) {
@@ -1481,7 +1503,8 @@ function createStaticHandler(routes, opts) {
 				errors: { [route.id]: error },
 				statusCode: error.status,
 				loaderHeaders: {},
-				actionHeaders: {}
+				actionHeaders: {},
+				_match: match
 			};
 			return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
 		}
@@ -1504,7 +1527,8 @@ function createStaticHandler(routes, opts) {
 						renderedStaticContext = {
 							location,
 							basename,
-							...result
+							...result,
+							_match: match
 						};
 						return renderedStaticContext;
 					});
@@ -1530,7 +1554,8 @@ function createStaticHandler(routes, opts) {
 							errors: { [skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, matches.find((m) => m.route.id === routeId || m.route.loader)?.route.id || routeId).route.id]: error },
 							statusCode: isRouteErrorResponse(error) ? error.status : 500,
 							actionHeaders: {},
-							loaderHeaders: {}
+							loaderHeaders: {},
+							_match: match
 						};
 						return generateMiddlewareResponse(() => Promise.resolve(staticContext));
 					}
@@ -1547,7 +1572,8 @@ function createStaticHandler(routes, opts) {
 		return {
 			location,
 			basename,
-			...result
+			...result,
+			_match: match
 		};
 	}
 	/**
@@ -1580,7 +1606,7 @@ function createStaticHandler(routes, opts) {
 		let normalizePathImpl = normalizePath || defaultNormalizePath;
 		let method = request.method;
 		let location = createLocation("", normalizePathImpl(request), null, "default");
-		let matches = matchRoutesImpl(dataRoutes, location, basename, false, routeBranches);
+		let matches = dataRouteMatcher.match(location);
 		requestContext = requestContext != null ? requestContext : new RouterContextProvider();
 		if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") throw getInternalRouterError(405, { method });
 		else if (!matches) throw getInternalRouterError(404, { pathname: location.pathname });
@@ -1761,7 +1787,7 @@ function createStaticHandler(routes, opts) {
 	}
 	return {
 		dataRoutes,
-		_internalRouteBranches: routeBranches,
+		match,
 		query,
 		queryRoute
 	};
@@ -1876,7 +1902,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
 						text: void 0
 					}
 				};
-			} catch (e) {
+			} catch {
 				return getInvalidBodyError();
 			}
 		}
@@ -1899,7 +1925,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
 	} else try {
 		searchParams = new URLSearchParams(opts.body);
 		formData = convertSearchParamsToFormData(searchParams);
-	} catch (e) {
+	} catch {
 		return getInvalidBodyError();
 	}
 	let submission = {
@@ -1922,7 +1948,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
 		submission
 	};
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, branches, pendingActionResult, callSiteDefaultShouldRevalidate) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, dataRouteMatcher, pendingActionResult, callSiteDefaultShouldRevalidate) {
 	let actionResult = pendingActionResult ? isErrorResult(pendingActionResult[1]) ? pendingActionResult[1].error : pendingActionResult[1].data : void 0;
 	let currentUrl = history.createURL(state.location);
 	let nextUrl = history.createURL(location);
@@ -1972,12 +1998,11 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest,
 	});
 	let revalidatingFetchers = [];
 	fetchLoadMatches.forEach((f, key) => {
-		if (initialHydration || !matches.some((m) => m.route.id === f.routeId) || fetchersQueuedForDeletion.has(key)) return;
+		if (initialHydration || !matches.some((m) => m.route.id === f.routeId) || fetchersQueuedForDeletion.has(key) || f.isDiscovering) return;
 		let fetcher = state.fetchers.get(key);
 		let isMidInitialLoad = fetcher && fetcher.state !== "idle" && fetcher.data === void 0;
-		let fetcherMatches = matchRoutesImpl(routesToUse, f.path, basename ?? "/", false, branches);
+		let fetcherMatches = dataRouteMatcher.match(f.path);
 		if (!fetcherMatches) {
-			if (hasPatchRoutesOnNavigation && isMidInitialLoad) return;
 			revalidatingFetchers.push({
 				key,
 				routeId: f.routeId,
@@ -2415,7 +2440,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fe
 	});
 	try {
 		await Promise.all(matches.flatMap((m) => [m._lazyPromises?.handler, m._lazyPromises?.route]));
-	} catch (e) {}
+	} catch {}
 	return results;
 }
 async function callLoaderOrAction({ request, path, pattern, match, lazyHandlerPromise, lazyRoutePromise, handlerOverride, scopedContext }) {
@@ -2598,7 +2623,7 @@ function normalizeRedirectLocation(location, currentUrl, basename, historyInstan
 	}
 	try {
 		if (hasInvalidProtocol(historyInstance.createURL(location).toString())) throw new Error("Invalid redirect location");
-	} catch (e) {}
+	} catch {}
 	return location;
 }
 function createClientSideRequest(history, location, signal, submission) {
@@ -2703,12 +2728,16 @@ function mergeLoaderData(loaderData, newLoaderData, matches, errors) {
 		merged[k] = v;
 		return merged;
 	}, {});
+	let preservedCount = 0;
 	for (let match of matches) {
 		let id = match.route.id;
-		if (!newLoaderData.hasOwnProperty(id) && loaderData.hasOwnProperty(id) && match.route.loader) mergedLoaderData[id] = loaderData[id];
+		if (!newLoaderData.hasOwnProperty(id) && loaderData.hasOwnProperty(id) && match.route.loader) {
+			mergedLoaderData[id] = loaderData[id];
+			preservedCount++;
+		}
 		if (errors && errors.hasOwnProperty(id)) break;
 	}
-	return mergedLoaderData;
+	return Object.keys(newLoaderData).length === 0 && preservedCount === Object.keys(loaderData).length ? loaderData : mergedLoaderData;
 }
 function getActionDataForCommit(pendingActionResult) {
 	if (!pendingActionResult) return {};
@@ -2948,7 +2977,7 @@ function restoreAppliedTransitions(_window, transitions) {
 			let json = JSON.parse(sessionPositions);
 			for (let [k, v] of Object.entries(json || {})) if (v && Array.isArray(v)) transitions.set(k, new Set(v || []));
 		}
-	} catch (e) {}
+	} catch {}
 }
 function persistAppliedTransitions(_window, transitions) {
 	if (transitions.size > 0) {
@@ -2969,13 +2998,13 @@ function createDeferred() {
 			res(val);
 			try {
 				await promise;
-			} catch (e) {}
+			} catch {}
 		};
 		reject = async (error) => {
 			rej(error);
 			try {
 				await promise;
-			} catch (e) {}
+			} catch {}
 		};
 	});
 	return {
@@ -2985,4 +3014,4 @@ function createDeferred() {
 	};
 }
 //#endregion
-export { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, createRouter, createStaticHandler, getStaticContextFromError, hasInvalidProtocol, isDataWithResponseInit, isMutationMethod, isRedirectResponse, isRedirectStatusCode, isResponse };
+export { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, createDataRouteMatcher, createRouter, createStaticHandler, getStaticContextFromError, hasInvalidProtocol, isDataWithResponseInit, isMutationMethod, isRedirectResponse, isRedirectStatusCode, isResponse };

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

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

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

@@ -430,7 +430,7 @@ interface MapRoutePropertiesFunction {
  * onto the route. Either they're meaningful to the router, or they'll get
  * ignored.
  */
-type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
+type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children" | "unstable_validateParams";
 /**
  * Keys we cannot change from within a lazy() function. We spread all other keys
  * onto the route. Either they're meaningful to the router, or they'll get
@@ -488,6 +488,11 @@ type BaseRouteObject = {
    * See [`shouldRevalidate`](../../start/data/route-object#shouldRevalidate).
    */
   shouldRevalidate?: ShouldRevalidateFunction;
+  /**
+   * A map of route param names to regular expressions used to validate params
+   * after a route-pattern match.
+   */
+  unstable_validateParams?: Record<string, RegExp>;
   /**
    * The route handle.
    */

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -135,7 +135,8 @@ const unsupportedLazyRouteObjectKeys = new Set([
 	"path",
 	"id",
 	"index",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteObjectKey(key) {
 	return unsupportedLazyRouteObjectKeys.has(key);
@@ -147,7 +148,8 @@ const unsupportedLazyRouteFunctionKeys = new Set([
 	"id",
 	"index",
 	"middleware",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
 	return unsupportedLazyRouteFunctionKeys.has(key);
@@ -489,13 +491,13 @@ function matchPathImpl(pattern, pathname, matcher, compiledParams) {
 	let match = pathname.match(matcher);
 	if (!match) return null;
 	let matchedPathname = match[0];
-	let pathnameBase = matchedPathname.replace(/(.)\/+$/, "$1");
+	let pathnameBase = removeTrailingSlash(matchedPathname, 1);
 	let captureGroups = match.slice(1);
 	return {
 		params: compiledParams.reduce((memo, { paramName, isOptional }, index) => {
 			if (paramName === "*") {
 				let splatValue = captureGroups[index] || "";
-				pathnameBase = matchedPathname.slice(0, matchedPathname.length - splatValue.length).replace(/(.)\/+$/, "$1");
+				pathnameBase = removeTrailingSlash(matchedPathname.slice(0, matchedPathname.length - splatValue.length), 1);
 			}
 			const value = captureGroups[index];
 			if (isOptional && !value) memo[paramName] = void 0;
@@ -564,7 +566,7 @@ function resolvePath(to, fromPathname = "/") {
 	let pathname;
 	if (toPathname) {
 		toPathname = removeDoubleSlashes(toPathname);
-		if (toPathname.startsWith("/")) pathname = resolvePathname(toPathname.substring(1), "/");
+		if (toPathname.startsWith("/") || toPathname.startsWith("\\")) pathname = resolvePathname(toPathname.substring(1), "/");
 		else pathname = resolvePathname(toPathname, fromPathname);
 	} else pathname = fromPathname;
 	return {
@@ -625,7 +627,11 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
 }
 const removeDoubleSlashes = (path) => path.replace(/[\\/]{2,}/g, "/");
 const joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
-const removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+function removeTrailingSlash(path, minLength = 0) {
+	let end = path.length;
+	while (end > minLength && path.charCodeAt(end - 1) === 47) end--;
+	return end === path.length ? path : path.slice(0, end);
+}
 const normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 const normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 const normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
@@ -868,7 +874,7 @@ function parseToInfo(_to, basename) {
 		let path = stripBasename(targetUrl.pathname, basename);
 		if (targetUrl.origin === currentUrl.origin && path != null) to = path + targetUrl.search + targetUrl.hash;
 		else isExternal = true;
-	} catch (e) {
+	} catch {
 		warning(false, `<Link to="${to}"> contains an invalid URL which will probably break when clicked - please update to a valid URL path.`);
 	}
 	return {
@@ -878,4 +884,4 @@ function parseToInfo(_to, basename) {
 	};
 }
 //#endregion
-export { ErrorResponseImpl, RouterContextProvider, SUPPORTED_ERROR_TYPES, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, createDataFunctionUrl, data, decodePath, defaultMapRouteProperties, encodePathParam, flattenAndRankRoutes, generatePath, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isBrowser, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, joinPaths, matchPath, matchRoutes, matchRoutesImpl, parseToInfo, prependBasename, redirect, redirectDocument, removeDoubleSlashes, removeTrailingSlash, replace, resolvePath, resolveTo, stripBasename };
+export { ErrorResponseImpl, RouterContextProvider, SUPPORTED_ERROR_TYPES, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, createDataFunctionUrl, data, decodePath, defaultMapRouteProperties, encodePathParam, explodeOptionalSegments, flattenAndRankRoutes, generatePath, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isBrowser, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, joinPaths, matchPath, matchRoutes, matchRoutesImpl, normalizePathname, parseToInfo, prependBasename, redirect, redirectDocument, removeDoubleSlashes, removeTrailingSlash, replace, resolvePath, resolveTo, stripBasename };