react-router 0.0.0-experimental-479e73b7b → 0.0.0-experimental-2a01b6fd8

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-479e73b7b
+ * react-router v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/index-react-server-client.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-479e73b7b
+ * react-router v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/index-react-server.d.ts

@@ -50,7 +50,7 @@ interface Path {
  * An entry in a history stack. A location contains information about the
  * URL path, as well as possibly some arbitrary state and a key.
  */
-interface Location<State = any> extends Path {
+interface Location$1<State = any> extends Path {
   /**
    * A value of arbitrary data associated with this location.
    */
@@ -79,7 +79,7 @@ interface Update {
   /**
    * The new location.
    */
-  location: Location;
+  location: Location$1;
   /**
    * The delta between this location and the former location in the history stack
    */
@@ -113,7 +113,7 @@ interface History {
   /**
    * The current location. This value is mutable.
    */
-  readonly location: Location;
+  readonly location: Location$1;
   /**
    * Returns a valid href for the given `to` value that may be used as
    * the value of an <a href> attribute.
@@ -488,6 +488,9 @@ interface ShouldRevalidateFunctionArgs {
 interface ShouldRevalidateFunction {
   (args: ShouldRevalidateFunctionArgs): boolean;
 }
+interface UnstableValidateParamsFunction {
+  (params: Params): boolean;
+}
 interface DataStrategyMatch extends RouteMatch<string, DataRouteObject> {
   /**
    * @private
@@ -597,7 +600,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
@@ -655,6 +658,10 @@ type BaseRouteObject = {
    * See [`shouldRevalidate`](../../start/data/route-object#shouldRevalidate).
    */
   shouldRevalidate?: ShouldRevalidateFunction;
+  /**
+   * Validate route params after a route-pattern match.
+   */
+  unstable_validateParams?: UnstableValidateParamsFunction;
   /**
    * The route handle.
    */
@@ -791,7 +798,7 @@ interface DataRouteMatch extends RouteMatch<string, DataRouteObject> {}
  * Defaults to `/`.
  * @returns An array of matched routes, or `null` if no matches were found.
  */
-declare function matchRoutes<RouteObjectType extends RouteObject = RouteObject>(routes: RouteObjectType[], locationArg: Partial<Location> | string, basename?: string): RouteMatch<string, RouteObjectType>[] | null;
+declare function matchRoutes<RouteObjectType extends RouteObject = RouteObject>(routes: RouteObjectType[], locationArg: Partial<Location$1> | string, basename?: string): RouteMatch<string, RouteObjectType>[] | null;
 interface UIMatch<Data = unknown, Handle = unknown> {
   id: string;
   pathname: string;
@@ -1143,9 +1150,10 @@ interface Router$1 {
    * @private
    * PRIVATE - DO NOT USE
    *
-   * Return the route branches for this router instance
+   * Match routes against a location using the router's configured route
+   * matching implementation.
    */
-  get branches(): RouteBranch<DataRouteObject>[] | undefined;
+  match(locationArg: Partial<Location$1> | string): DataRouteMatch[] | null;
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -1230,7 +1238,7 @@ interface Router$1 {
    * Utility function to create an href for the given location
    * @param location
    */
-  createHref(location: Location | URL): string;
+  createHref(location: Location$1 | URL): string;
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -1338,7 +1346,7 @@ interface RouterState {
   /**
    * The current location reflected by the router
    */
-  location: Location;
+  location: Location$1;
   /**
    * The current set of route matches
    */
@@ -1399,7 +1407,9 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
 /**
  * Future flags to toggle new feature behavior
  */
-interface FutureConfig {}
+interface FutureConfig {
+  unstable_routePatternMatching?: boolean;
+}
 /**
  * Initialization options for createRouter
  */
@@ -1495,8 +1505,8 @@ interface StaticHandler {
   }): Promise<any>;
 }
 type ViewTransitionOpts = {
-  currentLocation: Location;
-  nextLocation: Location;
+  currentLocation: Location$1;
+  nextLocation: Location$1;
 };
 /**
  * Subscriber function signature for changes to router state
@@ -1514,7 +1524,7 @@ interface RouterSubscriber {
  * for a given location
  */
 interface GetScrollRestorationKeyFunction {
-  (location: Location, matches: UIMatch[]): string | null;
+  (location: Location$1, matches: UIMatch[]): string | null;
 }
 /**
  * Function signature for determining the current scroll position
@@ -1596,7 +1606,7 @@ type NavigationStates = {
   };
   Loading: {
     state: "loading";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"] | undefined;
@@ -1608,7 +1618,7 @@ type NavigationStates = {
   };
   Submitting: {
     state: "submitting";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"];
@@ -1698,7 +1708,7 @@ interface BlockerBlocked {
   state: "blocked";
   reset: () => void;
   proceed: () => void;
-  location: Location;
+  location: Location$1;
 }
 interface BlockerUnblocked {
   state: "unblocked";
@@ -1710,12 +1720,12 @@ interface BlockerProceeding {
   state: "proceeding";
   reset: undefined;
   proceed: undefined;
-  location: Location;
+  location: Location$1;
 }
 type Blocker = BlockerUnblocked | BlockerBlocked | BlockerProceeding;
 type BlockerFunction = (args: {
-  currentLocation: Location;
-  nextLocation: Location;
+  currentLocation: Location$1;
+  nextLocation: Location$1;
   historyAction: Action;
 }) => boolean;
 interface CreateStaticHandlerOptions {
@@ -2000,7 +2010,7 @@ type MetaMatches<MatchLoaders extends Record<string, LoaderFunction | ClientLoad
 interface MetaArgs<Loader extends LoaderFunction | ClientLoaderFunction | unknown = unknown, MatchLoaders extends Record<string, LoaderFunction | ClientLoaderFunction | unknown> = Record<string, unknown>> {
   loaderData: (Loader extends LoaderFunction | ClientLoaderFunction ? SerializeFrom<Loader> : unknown) | undefined;
   params: Params;
-  location: Location;
+  location: Location$1;
   matches: MetaMatches<MatchLoaders>;
   error?: unknown;
 }
@@ -2321,7 +2331,7 @@ type RSCRenderPayload = {
   clientVersion?: string;
   errors: Record<string, any> | null;
   loaderData: Record<string, any>;
-  location: Location;
+  location: Location$1;
   routeDiscovery: RouteDiscovery;
   matches: RSCRouteMatch[];
   patches?: Promise<RSCRouteManifest[]>;

package/dist/development/index-react-server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-479e73b7b
+ * react-router v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,6 +10,7 @@
  */
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as React from "react";
+import { createMultiMatcher } from "@remix-run/route-pattern/match";
 import { parse, serialize, splitSetCookieString } from "cookie-es";
 import { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLink, Navigate, Outlet, Outlet as Outlet$1, Route, Router, RouterProvider, Routes, ScrollRestoration, StaticRouter, StaticRouterProvider, UNSAFE_AwaitContextProvider, UNSAFE_WithComponentProps, UNSAFE_WithErrorBoundaryProps, UNSAFE_WithHydrateFallbackProps, unstable_HistoryRouter } from "react-router/internal/react-server-client";
 //#region lib/router/url.ts
@@ -24,7 +25,7 @@ function warning(cond, message) {
 		if (typeof console !== "undefined") console.warn(message);
 		try {
 			throw new Error(message);
-		} catch (e) {}
+		} catch {}
 	}
 }
 function createKey$1() {
@@ -207,7 +208,8 @@ const unsupportedLazyRouteObjectKeys = new Set([
 	"path",
 	"id",
 	"index",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteObjectKey(key) {
 	return unsupportedLazyRouteObjectKeys.has(key);
@@ -219,7 +221,8 @@ const unsupportedLazyRouteFunctionKeys = new Set([
 	"id",
 	"index",
 	"middleware",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
 	return unsupportedLazyRouteFunctionKeys.has(key);
@@ -335,11 +338,11 @@ function convertRouteMatchToUiMatch(match, loaderData) {
 	};
 }
 function flattenAndRankRoutes(routes) {
-	let branches = flattenRoutes(routes);
+	let branches = flattenRoutes$1(routes);
 	rankRouteBranches(branches);
 	return branches;
 }
-function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "", _hasParentOptionalSegments = false) {
+function flattenRoutes$1(routes, branches = [], parentsMeta = [], parentPath = "", _hasParentOptionalSegments = false) {
 	let flattenRoute = (route, index, hasParentOptionalSegments = _hasParentOptionalSegments, relativePath) => {
 		let meta = {
 			relativePath: relativePath === void 0 ? route.path || "" : relativePath,
@@ -356,7 +359,7 @@ function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "",
 		let routesMeta = parentsMeta.concat(meta);
 		if (route.children && route.children.length > 0) {
 			invariant$1(route.index !== true, `Index routes must not have child routes. Please remove all child routes from route path "${path}".`);
-			flattenRoutes(route.children, branches, routesMeta, path, hasParentOptionalSegments);
+			flattenRoutes$1(route.children, branches, routesMeta, path, hasParentOptionalSegments);
 		}
 		if (route.path == null && !route.index) return;
 		branches.push({
@@ -1036,6 +1039,223 @@ function getReadonlyContext(context) {
 	return { get: (ctx) => context.get(ctx) };
 }
 //#endregion
+//#region lib/router/matcher-route-pattern.ts
+var RoutePatternDataRouteMatcher = class {
+	#state;
+	#basename;
+	constructor(basename) {
+		this.#basename = basename;
+	}
+	update(routes) {
+		let branches = flattenRoutes(routes);
+		let matcher = createMultiMatcher();
+		let partialMatcher = createMultiMatcher();
+		for (let branch of branches) {
+			let routePattern = convertReactRouterPathToRoutePattern(branch.path);
+			validateRoutePatternSplat(branch.path, routePattern);
+			routePattern = addOptionalTrailingSlash(routePattern);
+			matcher.add(routePattern, branch);
+			if (!branch.routesMeta[branch.routesMeta.length - 1].route.index) partialMatcher.add(routePattern === "/" ? `/*__rr_partial` : `${routePattern}(/*__rr_partial)`, branch);
+		}
+		this.#state = {
+			branches,
+			matcher,
+			partialMatcher
+		};
+		return branches;
+	}
+	match(locationArg, allowPartial = false) {
+		let pathname = stripBasename((typeof locationArg === "string" ? parsePath(locationArg) : locationArg).pathname || "/", this.#basename);
+		if (pathname == null) return null;
+		let decoded = decodePath(pathname);
+		let url = new URL(decoded, "http://reactrouter.local");
+		invariant$1(this.#state, "Route pattern routes must be initialized before matching.");
+		let matches = this.#state.matcher.matchAll(url);
+		if (allowPartial) matches.push(...this.#state.partialMatcher.matchAll(url));
+		for (let match of prioritizeValidatedMatches(matches)) {
+			let routeMatches = convertRoutePatternMatchToRouteMatches(match, pathname, allowPartial);
+			if (routeMatches && validateRouteMatchParams(routeMatches)) return routeMatches;
+		}
+		return null;
+	}
+};
+function validateRoutePatternSplat(routePath, routePattern) {
+	invariant$1(getRoutePatternSplatIndexes(routePattern).length <= 1 && isTerminalRoutePatternSplat(routePattern), `Route path "${routePath}" is not supported with \`future.unstable_routePatternMatching\` because React Router only supports a single splat at the end of a route path.`);
+}
+function getRoutePatternSplatIndexes(routePattern) {
+	let splatIndexes = [];
+	for (let i = 0; i < routePattern.length; i++) {
+		let char = routePattern[i];
+		if (char === "\\") {
+			i++;
+			continue;
+		}
+		if (char === "*") splatIndexes.push(i);
+	}
+	return splatIndexes;
+}
+function isTerminalRoutePatternSplat(routePattern) {
+	for (let i = 0; i < routePattern.length; i++) {
+		let char = routePattern[i];
+		if (char === "\\") {
+			i++;
+			continue;
+		}
+		if (char !== "*") continue;
+		let suffix = routePattern.slice(i + 1);
+		return /^[a-zA-Z_$][a-zA-Z_$0-9]*$/.test(suffix) || suffix === "";
+	}
+	return true;
+}
+function addOptionalTrailingSlash(routePattern) {
+	return routePattern === "/" ? routePattern : `${routePattern.replace(/\/+$/, "")}(/)`;
+}
+function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "") {
+	routes.forEach((route, index) => {
+		invariant$1(route.caseSensitive !== true, "`caseSensitive` routes are not supported with `future.unstable_routePatternMatching`.");
+		let meta = {
+			relativePath: route.path || "",
+			caseSensitive: false,
+			childrenIndex: index,
+			route
+		};
+		if (meta.relativePath.startsWith("/")) {
+			invariant$1(meta.relativePath.startsWith(parentPath), `Absolute route path "${meta.relativePath}" nested under path "${parentPath}" is not valid. An absolute child route path must start with the combined path of all its parent routes.`);
+			meta.relativePath = meta.relativePath.slice(parentPath.length);
+		}
+		let routesMeta = parentsMeta.concat(meta);
+		let path = meta.relativePath ? joinPaths([parentPath, meta.relativePath]) : parentPath;
+		if (route.children && route.children.length > 0) {
+			invariant$1(route.index !== true, `Index routes must not have child routes. Please remove all child routes from route path "${path}".`);
+			flattenRoutes(route.children, branches, routesMeta, path);
+			if (route.children?.some((child) => child.index)) return;
+		}
+		if (route.path != null || route.index) branches.push({
+			path,
+			score: 0,
+			routesMeta
+		});
+	});
+	return branches;
+}
+function convertReactRouterPathToRoutePattern(path) {
+	warning(path === "*" || !path.endsWith("*") || path.endsWith("/*"), `Route path "${path}" will be treated as if it were "${path.replace(/\*$/, "/*")}" because the \`*\` character must always follow a \`/\` in the pattern. To get rid of this warning, please change the route path to "${path.replace(/\*$/, "/*")}".`);
+	if (path.endsWith("*") && path !== "*" && !path.endsWith("/*")) path = path.replace(/\*$/, "/*");
+	path = path.replace(/^\/*/, "/");
+	if (path === "") return "/";
+	let segments = path.split("/");
+	let pattern = segments.shift() || "";
+	for (let i = 0; i < segments.length;) {
+		let optionalRun = [];
+		while (i < segments.length && isOptionalRouteSegment(segments[i])) {
+			optionalRun.push(convertRouteSegment(segments[i].slice(0, -1)));
+			i++;
+		}
+		if (optionalRun.length > 0) {
+			let nested = optionalRun.reduceRight((child, segment) => `/${segment}${child ? `(${child})` : ""}`, "");
+			pattern += `(${nested})`;
+			continue;
+		}
+		pattern += `/${convertRouteSegment(segments[i])}`;
+		i++;
+	}
+	return pattern || "/";
+}
+function isOptionalRouteSegment(segment) {
+	return segment.endsWith("?");
+}
+function convertRouteSegment(segment) {
+	if (segment === "*") return "*__rr_splat";
+	let paramMatch = segment.match(/^:([\w-]+)(\?)?(.*)$/);
+	if (paramMatch) {
+		let [, paramName, optional, suffix] = paramMatch;
+		let converted = `:${paramName}${escapeRoutePatternLiteral(suffix)}`;
+		return optional ? `(:${paramName})${escapeRoutePatternLiteral(suffix)}` : converted;
+	}
+	return escapeRoutePatternLiteral(segment);
+}
+function escapeRoutePatternLiteral(value) {
+	return value.replace(/[\\():*]/g, "\\$&");
+}
+function validateRouteMatchParams(matches) {
+	return matches.every(({ route, params }) => {
+		try {
+			return typeof route.unstable_validateParams !== "function" || route.unstable_validateParams(params) === true;
+		} catch (e) {
+			warning(false, `Route "${route.id || route.path}" failed param validation with the following error:\n` + (e instanceof Error ? e.message : String(e)));
+		}
+	});
+}
+function prioritizeValidatedMatches(matches) {
+	let validatedMatches = [];
+	let unvalidatedMatches = [];
+	for (let match of matches) if (match.data.routesMeta.some((meta) => typeof meta.route.unstable_validateParams === "function")) validatedMatches.push(match);
+	else unvalidatedMatches.push(match);
+	return validatedMatches.concat(unvalidatedMatches);
+}
+function convertRoutePatternMatchToRouteMatches(match, pathname, allowPartial) {
+	let pathSegments = pathname.replace(/^\//, "").split("/").filter(Boolean);
+	let splatParamName = match.paramsMeta.pathname.find((meta) => meta.type === "*")?.name;
+	let matchedParams = Object.entries(match.params).reduce((params, [key, value]) => {
+		if (key === "__rr_partial" || value === void 0) return params;
+		params[key === "__rr_splat" || key === splatParamName ? "*" : key] = value;
+		return params;
+	}, {});
+	let consumedSegments = 0;
+	let matches = [];
+	for (let i = 0; i < match.data.routesMeta.length; i++) {
+		let meta = match.data.routesMeta[i];
+		let splatBaseSegments = null;
+		let routeSegments = meta.relativePath.replace(/^\//, "").split("/").filter(Boolean);
+		for (let segment of routeSegments) {
+			if (segment === "*") {
+				splatBaseSegments = consumedSegments;
+				consumedSegments = pathSegments.length;
+				break;
+			}
+			if (segment.endsWith("?")) {
+				let routeSegment = segment.slice(0, -1);
+				if (routeSegment.startsWith(":")) {
+					if (matchedParams[routeSegment.slice(1)] !== void 0) consumedSegments++;
+				} else if (pathSegments[consumedSegments] === routeSegment) consumedSegments++;
+				continue;
+			}
+			consumedSegments++;
+		}
+		let routePathname = getRoutePatternMatchPathname(pathSegments, consumedSegments);
+		let pathnameBase = splatBaseSegments == null ? routePathname : getRoutePatternMatchPathname(pathSegments, splatBaseSegments);
+		matches.push({
+			params: matchedParams,
+			pathname: routePathname,
+			pathnameBase,
+			route: meta.route
+		});
+	}
+	if (!allowPartial && pathSegments.length > consumedSegments && !match.data.routesMeta[match.data.routesMeta.length - 1].route.index) return null;
+	return matches;
+}
+function getRoutePatternMatchPathname(pathSegments, consumedSegments) {
+	return consumedSegments === 0 ? "/" : `/${pathSegments.slice(0, consumedSegments).join("/")}`;
+}
+//#endregion
+//#region lib/router/matcher.ts
+var V6RegExMatcher = class {
+	#routes = [];
+	#branches = [];
+	#basename;
+	constructor(basename) {
+		this.#basename = basename;
+	}
+	update(routes) {
+		this.#routes = routes;
+		this.#branches = flattenAndRankRoutes(routes);
+		return this.#branches;
+	}
+	match(locationArg, allowPartial = false) {
+		return matchRoutesImpl(this.#routes, locationArg, this.#basename, allowPartial, this.#branches);
+	}
+};
+//#endregion
 //#region lib/router/router.ts
 const validMutationMethodsArr = [
 	"POST",
@@ -1054,6 +1274,9 @@ const redirectStatusCodes = new Set([
 	308
 ]);
 const ResetLoaderDataSymbol = Symbol("ResetLoaderData");
+function createDataRouteMatcher(future, basename) {
+	return future.unstable_routePatternMatching ? new RoutePatternDataRouteMatcher(basename) : new V6RegExMatcher(basename);
+}
 /**
 * Create a static handler to perform server-side data loading
 *
@@ -1090,7 +1313,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) => {
@@ -1101,7 +1324,7 @@ function createStaticHandler(routes, opts) {
 		};
 	}
 	let dataRoutes = convertRoutesToDataRoutes(routes, mapRouteProperties, void 0, manifest);
-	let routeBranches = flattenAndRankRoutes(dataRoutes);
+	let routeBranches = dataRouteMatcher.update(dataRoutes);
 	/**
 	* The query() method is intended for document requests, in which we want to
 	* call an optional action and potentially multiple loaders for all nested
@@ -1132,7 +1355,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 });
@@ -1260,7 +1483,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 });
@@ -1816,7 +2039,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 }) {
@@ -2321,6 +2544,11 @@ const Await = (async ({ children, resolve, errorElement }) => {
 		}
 	});
 });
+function createRSCDataRouteMatcher(routes, basename) {
+	let dataRouteMatcher = createDataRouteMatcher({}, basename ?? "/");
+	dataRouteMatcher.update(routes);
+	return dataRouteMatcher;
+}
 /**
 * Matches the given routes to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
 * and returns an [RSC](https://react.dev/reference/rsc/server-components)
@@ -2415,7 +2643,7 @@ async function matchRSCServerRequest({ allowedActionOrigins, createTemporaryRefe
 	const requestUrl = new URL(request.url);
 	if (isManifestRequest(requestUrl)) return await generateManifestResponse(routes, basename, request, generateResponse, temporaryReferences, routeDiscovery, clientVersion);
 	let isDataRequest = isReactServerRequest(requestUrl);
-	let matches = matchRoutes(routes, url.pathname, basename);
+	let matches = createRSCDataRouteMatcher(routes, basename).match(url.pathname);
 	if (matches) await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
 	const leafMatch = matches?.[matches.length - 1];
 	if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) return generateResourceResponse(routerRequest, routes, basename, leafMatch.route.id, requestContext, onError);
@@ -2452,9 +2680,10 @@ async function generateManifestResponse(routes, basename, request, generateRespo
 	}
 	let pathParam = url.searchParams.get("paths");
 	let pathnames = pathParam ? pathParam.split(",").filter(Boolean) : [url.pathname.replace(/\.manifest$/, "")];
+	let dataRouteMatcher = createRSCDataRouteMatcher(routes, basename);
 	let routeIds = /* @__PURE__ */ new Set();
 	let matchedRoutes = pathnames.flatMap((pathname) => {
-		let pathnameMatches = matchRoutes(routes, pathname, basename);
+		let pathnameMatches = dataRouteMatcher.match(pathname);
 		return pathnameMatches?.map((m, i) => ({
 			...m.route,
 			parentId: pathnameMatches[i - 1]?.route.id
@@ -2468,7 +2697,7 @@ async function generateManifestResponse(routes, basename, request, generateRespo
 	});
 	let payload = {
 		type: "manifest",
-		patches: Promise.all([...matchedRoutes.map((route) => getManifestRoute(route)), getAdditionalRoutePatches(pathnames, routes, basename, Array.from(routeIds))]).then((r) => r.flat(1))
+		patches: Promise.all([...matchedRoutes.map((route) => getManifestRoute(route)), getAdditionalRoutePatches(pathnames, dataRouteMatcher, Array.from(routeIds))]).then((r) => r.flat(1))
 	};
 	return generateResponse({
 		statusCode: 200,
@@ -2729,7 +2958,12 @@ async function getRenderPayload(baseRenderPayload, routes, basename, routeIdsToL
 			parentId
 		});
 	}));
-	let patches = routeDiscovery?.mode === "initial" && !isDataRequest ? getAllRoutePatches(routes, basename).then((patches) => patches.filter((patch) => !staticContext.matches.some((m) => m.route.id === patch.id))) : getAdditionalRoutePatches(getPathsWithAncestors([staticContext.location.pathname]), routes, basename, staticContext.matches.map((m) => m.route.id));
+	let patches;
+	if (routeDiscovery?.mode === "initial" && !isDataRequest) patches = getAllRoutePatches(routes, basename).then((patches) => patches.filter((patch) => !staticContext.matches.some((m) => m.route.id === patch.id)));
+	else {
+		let dataRouteMatcher = createRSCDataRouteMatcher(routes, basename);
+		patches = getAdditionalRoutePatches(getPathsWithAncestors([staticContext.location.pathname]), dataRouteMatcher, staticContext.matches.map((m) => m.route.id));
+	}
 	return {
 		...baseRenderPayload,
 		matches: await matchesPromise,
@@ -2833,13 +3067,13 @@ async function getAllRoutePatches(routes, basename) {
 	for (let route of routes) await traverse(route, void 0);
 	return patches.filter((p) => !!p.parentId);
 }
-async function getAdditionalRoutePatches(pathnames, routes, basename, matchedRouteIds) {
+async function getAdditionalRoutePatches(pathnames, dataRouteMatcher, matchedRouteIds) {
 	let patchRouteMatches = /* @__PURE__ */ new Map();
 	let matchedPaths = /* @__PURE__ */ new Set();
 	for (const pathname of pathnames) {
 		if (matchedPaths.has(pathname)) continue;
 		matchedPaths.add(pathname);
-		let matches = matchRoutes(routes, pathname, basename) || [];
+		let matches = dataRouteMatcher.match(pathname) || [];
 		matches.forEach((m, i) => {
 			if (patchRouteMatches.get(m.route.id)) return;
 			patchRouteMatches.set(m.route.id, {
@@ -2948,7 +3182,7 @@ const unsign = async (cookie, secret) => {
 	try {
 		let signature = byteStringToUint8Array(atob(hash));
 		return await crypto.subtle.verify("HMAC", key, signature, data) ? value : false;
-	} catch (e) {
+	} catch {
 		return false;
 	}
 };
@@ -3046,7 +3280,7 @@ function encodeData(value) {
 function decodeData(value) {
 	try {
 		return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-	} catch (e) {
+	} catch {
 		return {};
 	}
 }