react-router 8.3.0 → 8.4.0

package/dist/production/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.
@@ -597,7 +597,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 +655,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.
    */
@@ -791,7 +796,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;
@@ -811,30 +816,6 @@ interface UIMatch<Data = unknown, Handle = unknown> {
    */
   handle: Handle;
 }
-interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
-  relativePath: string;
-  caseSensitive: boolean;
-  childrenIndex: number;
-  route: RouteObjectType;
-  matcher?: RegExp;
-  compiledParams?: CompiledPathParam[];
-}
-/**
- * @private
- * PRIVATE - DO NOT USE
- *
- * A "branch" of routes that match a given route pattern.
- * This is an internal interface not intended for direct external usage.
- */
-interface RouteBranch<RouteObjectType extends RouteObject = RouteObject> {
-  path: string;
-  score: number;
-  routesMeta: RouteMeta<RouteObjectType>[];
-}
-type CompiledPathParam = {
-  paramName: string;
-  isOptional?: boolean;
-};
 declare class DataWithResponseInit<D> {
   type: string;
   data: D;
@@ -1143,9 +1124,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 +1212,15 @@ 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
+   *
+   * Utility function to create a URL for the given location
+   * @param location
+   */
+  createURL?(to: To): URL;
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -1338,7 +1328,7 @@ interface RouterState {
   /**
    * The current location reflected by the router
    */
-  location: Location;
+  location: Location$1;
   /**
    * The current set of route matches
    */
@@ -1399,7 +1389,10 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
 /**
  * Future flags to toggle new feature behavior
  */
-interface FutureConfig {}
+interface FutureConfig {
+  /** Enables route-pattern matching after calling `unstable_preloadRoutePattern()`. */
+  unstable_routePatternMatching?: boolean;
+}
 /**
  * Initialization options for createRouter
  */
@@ -1431,6 +1424,8 @@ interface StaticHandlerContext {
   loaderHeaders: Record<string, Headers>;
   actionHeaders: Record<string, Headers>;
   _deepestRenderedBoundaryId?: string | null;
+  /** @private */
+  _match: StaticHandler["match"];
 }
 /**
  * A StaticHandler instance manages a singular SSR navigation/fetch event
@@ -1444,10 +1439,10 @@ interface StaticHandler {
    * @private
    * PRIVATE - DO NOT USE
    *
-   * The route branches derived from the data routes, used for internal route
-   * matching in Framework Mode
+   * Match routes against a location using the handler's configured route
+   * matching implementation.
    */
-  _internalRouteBranches: RouteBranch<DataRouteObject>[];
+  match(locationArg: Partial<Location$1> | string): DataRouteMatch[] | null;
   /**
    * Perform a query for a given request - executing all matched route
    * loaders/actions.  Used for document requests.
@@ -1495,8 +1490,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 +1509,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 +1591,7 @@ type NavigationStates = {
   };
   Loading: {
     state: "loading";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"] | undefined;
@@ -1608,7 +1603,7 @@ type NavigationStates = {
   };
   Submitting: {
     state: "submitting";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"];
@@ -1698,7 +1693,7 @@ interface BlockerBlocked {
   state: "blocked";
   reset: () => void;
   proceed: () => void;
-  location: Location;
+  location: Location$1;
 }
 interface BlockerUnblocked {
   state: "unblocked";
@@ -1710,12 +1705,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 +1995,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 +2316,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[]>;
@@ -2369,6 +2364,13 @@ type RouteDiscovery = {
  * encoding an {@link unstable_RSCPayload} for consumption by an [RSC](https://react.dev/reference/rsc/server-components)
  * enabled client router.
  *
+ * Treat every React Server Function as a public endpoint. Server Functions are
+ * not inherently associated with a route. Any route middleware that runs is
+ * selected from the URL used to call a Server Function, but the client controls
+ * both the Server Function identifier and the URL. Perform all access control
+ * checks within each Server Function, or use a route action for
+ * middleware-driven access control.
+ *
  * @example
  * import {
  *   createTemporaryReferenceSet,

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -24,7 +24,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 +207,8 @@ const unsupportedLazyRouteObjectKeys = new Set([
 	"path",
 	"id",
 	"index",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteObjectKey(key) {
 	return unsupportedLazyRouteObjectKeys.has(key);
@@ -219,7 +220,8 @@ const unsupportedLazyRouteFunctionKeys = new Set([
 	"id",
 	"index",
 	"middleware",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
 	return unsupportedLazyRouteFunctionKeys.has(key);
@@ -506,13 +508,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;
@@ -581,7 +583,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 {
@@ -642,7 +644,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;
@@ -1027,6 +1033,23 @@ function getReadonlyContext(context) {
 	return { get: (ctx) => context.get(ctx) };
 }
 //#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);
+	}
+	match(locationArg, allowPartial = false) {
+		return matchRoutesImpl(this.#routes, locationArg, this.#basename, allowPartial, this.#branches);
+	}
+};
+//#endregion
 //#region lib/router/router.ts
 const validMutationMethodsArr = [
 	"POST",
@@ -1045,6 +1068,14 @@ const redirectStatusCodes = new Set([
 	308
 ]);
 const ResetLoaderDataSymbol = Symbol("ResetLoaderData");
+function createDataRouteMatcher(future, basename) {
+	if (future.unstable_routePatternMatching) {
+		let RoutePatternMatcher = void 0;
+		invariant$1(RoutePatternMatcher, "You must call unstable_preloadRoutePattern() from \"react-router/route-pattern\" before enabling future.unstable_routePatternMatching.");
+		return new RoutePatternMatcher(basename);
+	}
+	return new V6RegExMatcher(basename);
+}
 /**
 * Create a static handler to perform server-side data loading
 *
@@ -1081,7 +1112,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) => {
@@ -1092,7 +1123,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
@@ -1123,7 +1155,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 });
@@ -1137,7 +1169,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) {
@@ -1152,7 +1185,8 @@ function createStaticHandler(routes, opts) {
 				errors: { [route.id]: error },
 				statusCode: error.status,
 				loaderHeaders: {},
-				actionHeaders: {}
+				actionHeaders: {},
+				_match: match
 			};
 			return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
 		}
@@ -1175,7 +1209,8 @@ function createStaticHandler(routes, opts) {
 						renderedStaticContext = {
 							location,
 							basename,
-							...result
+							...result,
+							_match: match
 						};
 						return renderedStaticContext;
 					});
@@ -1201,7 +1236,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));
 					}
@@ -1218,7 +1254,8 @@ function createStaticHandler(routes, opts) {
 		return {
 			location,
 			basename,
-			...result
+			...result,
+			_match: match
 		};
 	}
 	/**
@@ -1251,7 +1288,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 });
@@ -1432,7 +1469,7 @@ function createStaticHandler(routes, opts) {
 	}
 	return {
 		dataRoutes,
-		_internalRouteBranches: routeBranches,
+		match,
 		query,
 		queryRoute
 	};
@@ -1807,7 +1844,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 }) {
@@ -2208,14 +2245,19 @@ function getPathsWithAncestors(paths) {
 function throwIfPotentialCSRFAttack(request, allowedActionOrigins) {
 	let originHeader = request.headers.get("origin");
 	let originDomain = null;
+	let originUrl = null;
 	try {
-		originDomain = typeof originHeader === "string" && originHeader !== "null" ? new URL(originHeader).host : originHeader;
+		if (typeof originHeader === "string" && originHeader !== "null") {
+			originUrl = new URL(originHeader);
+			originDomain = originUrl.host;
+		} else originDomain = originHeader;
 	} catch {
 		throw new Error(`\`origin\` header is not a valid URL. Aborting the action.`);
 	}
-	let host = new URL(request.url).host;
-	if (originDomain && originDomain !== host) {
-		if (!isAllowedOrigin(originDomain, allowedActionOrigins)) throw new Error("The `request.url` host does not match `origin` header from a forwarded action request. Aborting the action.");
+	let requestUrl = new URL(request.url);
+	let originMatchesRequest = originUrl ? originUrl.origin === requestUrl.origin : originDomain === requestUrl.host;
+	if (originDomain && !originMatchesRequest) {
+		if (!isAllowedOrigin(originDomain, allowedActionOrigins)) throw new Error("The `request.url` origin does not match `origin` header from a forwarded action request. Aborting the action.");
 	}
 }
 function matchWildcardDomain(domain, pattern) {
@@ -2319,6 +2361,13 @@ const Await = (async ({ children, resolve, errorElement }) => {
 * encoding an {@link unstable_RSCPayload} for consumption by an [RSC](https://react.dev/reference/rsc/server-components)
 * enabled client router.
 *
+* Treat every React Server Function as a public endpoint. Server Functions are
+* not inherently associated with a route. Any route middleware that runs is
+* selected from the URL used to call a Server Function, but the client controls
+* both the Server Function identifier and the URL. Perform all access control
+* checks within each Server Function, or use a route action for
+* middleware-driven access control.
+*
 * @example
 * import {
 *   createTemporaryReferenceSet,
@@ -2406,11 +2455,12 @@ 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 staticHandler = createStaticHandler(routes, { basename });
+	let matches = staticHandler.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);
-	let response = await generateRenderResponse(routerRequest, routes, basename, isDataRequest, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, generateResponse, temporaryReferences, allowedActionOrigins, routeDiscovery, clientVersion);
+	if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) return generateResourceResponse(routerRequest, staticHandler, leafMatch.route.id, requestContext, onError);
+	let response = await generateRenderResponse(routerRequest, staticHandler, basename, isDataRequest, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, generateResponse, temporaryReferences, allowedActionOrigins, routeDiscovery, clientVersion);
 	response.headers.set("X-Remix-Response", "yes");
 	return response;
 }
@@ -2443,9 +2493,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 staticHandler = routes.length > 0 ? createStaticHandler(routes, { basename }) : void 0;
 	let routeIds = /* @__PURE__ */ new Set();
-	let matchedRoutes = pathnames.flatMap((pathname) => {
-		let pathnameMatches = matchRoutes(routes, pathname, basename);
+	let matchedRoutes = staticHandler ? pathnames.flatMap((pathname) => {
+		let pathnameMatches = staticHandler.match(pathname);
 		return pathnameMatches?.map((m, i) => ({
 			...m.route,
 			parentId: pathnameMatches[i - 1]?.route.id
@@ -2456,10 +2507,10 @@ async function generateManifestResponse(routes, basename, request, generateRespo
 			return true;
 		}
 		return false;
-	});
+	}) : [];
 	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)), staticHandler ? getAdditionalRoutePatches(pathnames, staticHandler, Array.from(routeIds)) : Promise.resolve([])]).then((r) => r.flat(1))
 	};
 	return generateResponse({
 		statusCode: 200,
@@ -2529,9 +2580,9 @@ async function processServerAction(request, basename, decodeReply, loadServerAct
 		}
 	}
 }
-async function generateResourceResponse(request, routes, basename, routeId, requestContext, onError) {
+async function generateResourceResponse(request, staticHandler, routeId, requestContext, onError) {
 	try {
-		return await createStaticHandler(routes, { basename }).queryRoute(request, {
+		return await staticHandler.queryRoute(request, {
 			routeId,
 			requestContext,
 			async generateMiddlewareResponse(queryRoute) {
@@ -2572,12 +2623,11 @@ async function generateResourceResponse(request, routes, basename, routeId, requ
 		});
 	}
 }
-async function generateRenderResponse(request, routes, basename, isDataRequest, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, generateResponse, temporaryReferences, allowedActionOrigins, routeDiscovery, clientVersion) {
+async function generateRenderResponse(request, staticHandler, basename, isDataRequest, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, generateResponse, temporaryReferences, allowedActionOrigins, routeDiscovery, clientVersion) {
 	let statusCode = 200;
 	let url = new URL(request.url);
 	let isSubmission = isMutationMethod(request.method);
 	let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes").split(",") : null;
-	const staticHandler = createStaticHandler(routes, { basename });
 	let actionResult;
 	const ctx = {
 		request,
@@ -2625,7 +2675,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
 				staticContext.errors[staticContext.matches[0].route.id] = potentialCSRFAttackError;
 				staticContext.statusCode = 400;
 			}
-			return generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, ctx.redirect?.headers, routeDiscovery, clientVersion);
+			return generateStaticContextResponse(staticHandler, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, ctx.redirect?.headers, routeDiscovery, clientVersion);
 		}
 	}));
 	if (isRedirectResponse(result)) return generateRedirectResponse(result, actionResult, basename, isDataRequest, generateResponse, temporaryReferences, ctx.redirect?.headers);
@@ -2659,7 +2709,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
 		onError: defaultOnError
 	});
 }
-async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders, routeDiscovery, clientVersion) {
+async function generateStaticContextResponse(staticHandler, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders, routeDiscovery, clientVersion) {
 	statusCode = staticContext.statusCode ?? statusCode;
 	if (staticContext.errors) staticContext.errors = Object.fromEntries(Object.entries(staticContext.errors).map(([key, error]) => [key, isRouteErrorResponse(error) ? Object.fromEntries(Object.entries(error)) : error]));
 	staticContext.matches.forEach((m) => {
@@ -2680,7 +2730,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
 		location: staticContext.location,
 		formState
 	};
-	const renderPayloadPromise = () => getRenderPayload(baseRenderPayload, routes, basename, routeIdsToLoad, isDataRequest, staticContext, routeDiscovery);
+	const renderPayloadPromise = () => getRenderPayload(baseRenderPayload, staticHandler, basename, routeIdsToLoad, isDataRequest, staticContext, routeDiscovery);
 	let payload;
 	if (actionResult) payload = {
 		type: "action",
@@ -2702,7 +2752,8 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
 		onError: defaultOnError
 	});
 }
-async function getRenderPayload(baseRenderPayload, routes, basename, routeIdsToLoad, isDataRequest, staticContext, routeDiscovery) {
+async function getRenderPayload(baseRenderPayload, staticHandler, basename, routeIdsToLoad, isDataRequest, staticContext, routeDiscovery) {
+	let routes = staticHandler.dataRoutes;
 	let deepestRenderedRouteIdx = staticContext.matches.length - 1;
 	let parentIds = {};
 	staticContext.matches.forEach((m, i) => {
@@ -2720,7 +2771,9 @@ 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 patches = getAdditionalRoutePatches(getPathsWithAncestors([staticContext.location.pathname]), staticHandler, staticContext.matches.map((m) => m.route.id));
 	return {
 		...baseRenderPayload,
 		matches: await matchesPromise,
@@ -2824,13 +2877,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, staticHandler, 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 = staticHandler.match(pathname) || [];
 		matches.forEach((m, i) => {
 			if (patchRouteMatches.get(m.route.id)) return;
 			patchRouteMatches.set(m.route.id, {
@@ -2939,7 +2992,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;
 	}
 };
@@ -3037,7 +3090,7 @@ function encodeData(value) {
 function decodeData(value) {
 	try {
 		return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-	} catch (e) {
+	} catch {
 		return {};
 	}
 }