react-router 8.3.1 → 8.5.0

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

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

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

@@ -1,5 +1,5 @@
 
-import { Location, Path, To } from "./history.js";
+import { Action, Location, Path, To } from "./history.js";
 import * as React$1 from "react";
 
 //#region lib/router/utils.d.ts
@@ -389,6 +389,11 @@ interface DataStrategyMatch extends RouteMatch<string, DataRouteObject> {
    */
   resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
+/**
+ * The operation that initiated a data strategy execution. Static handler
+ * executions use `"static"`.
+ */
+type DataStrategyInitiator = "initialization" | "navigation" | "fetcher" | "revalidation" | "static";
 interface DataStrategyFunctionArgs<Context = DefaultContext> extends DataFunctionArgs<Context> {
   /**
    * Matches for this route extended with Data strategy APIs
@@ -396,8 +401,23 @@ interface DataStrategyFunctionArgs<Context = DefaultContext> extends DataFunctio
   matches: DataStrategyMatch[];
   runClientMiddleware: (cb: DataStrategyFunction<Context>) => Promise<Record<string, DataStrategyResult>>;
   /**
-   * The key of the fetcher we are calling `dataStrategy` for, otherwise `null`
-   * for navigational executions
+   * The operation that initiated this data strategy execution
+   *
+   * This field is experimental and subject to breaking changes.
+   */
+  unstable_initiator: DataStrategyInitiator;
+  /**
+   * The history action (`"PUSH"`, `"REPLACE"`, or `"POP"`) for a navigation-
+   * initiated execution, including fetchers reloaded by that navigation.
+   * `null` for initialization, fetcher, revalidation, and static executions.
+   *
+   * This field is experimental and subject to breaking changes.
+   */
+  unstable_navigationType: Action | null;
+  /**
+   * The key of the fetcher targeted by this data strategy execution, otherwise
+   * `null`. Fetchers reloaded during a navigation or revalidation retain that
+   * `unstable_initiator` while providing their key here.
    */
   fetcherKey: string | null;
 }
@@ -430,7 +450,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 +508,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.
    */
@@ -957,4 +982,4 @@ declare class ErrorResponseImpl implements ErrorResponse {
  */
 declare function isRouteErrorResponse(error: any): error is ErrorResponse;
 //#endregion
-export { ActionFunction, ActionFunctionArgs, BaseRouteObject, DataRouteMatch, DataRouteObject, DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyMatch, DataStrategyResult, DataWithResponseInit, ErrorResponse, ErrorResponseImpl, FormEncType, FormMethod, HTMLFormMethod, IndexRouteObject, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, MapRoutePropertiesFunction, MaybePromise, MiddlewareFunction, MiddlewareNextFunction, NonIndexRouteObject, ParamParseKey, Params, PatchRoutesOnNavigationFunction, PatchRoutesOnNavigationFunctionArgs, PathMatch, PathParam, PathPattern, RedirectFunction, RouteBranch, RouteData, RouteManifest, RouteMatch, RouteObject, RouterContext, RouterContextProvider, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, Submission, TrackedPromise, UIMatch, createContext, data, defaultMapRouteProperties, generatePath, isRouteErrorResponse, matchPath, matchRoutes, redirect, redirectDocument, replace, resolvePath };
+export { ActionFunction, ActionFunctionArgs, BaseRouteObject, DataRouteMatch, DataRouteObject, DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyInitiator, DataStrategyMatch, DataStrategyResult, DataWithResponseInit, ErrorResponse, ErrorResponseImpl, FormEncType, FormMethod, HTMLFormMethod, IndexRouteObject, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, MapRoutePropertiesFunction, MaybePromise, MiddlewareFunction, MiddlewareNextFunction, NonIndexRouteObject, ParamParseKey, Params, PatchRoutesOnNavigationFunction, PatchRoutesOnNavigationFunctionArgs, PathMatch, PathParam, PathPattern, RedirectFunction, RouteBranch, RouteData, RouteManifest, RouteMatch, RouteObject, RouterContext, RouterContextProvider, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, Submission, TrackedPromise, UIMatch, createContext, data, defaultMapRouteProperties, generatePath, isRouteErrorResponse, matchPath, matchRoutes, redirect, redirectDocument, replace, resolvePath };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -129,13 +129,15 @@ var RouterContextProvider = class {
 		this.#map.set(context, value);
 	}
 };
+var DiscoveryCancelledError = class extends Error {};
 const unsupportedLazyRouteObjectKeys = new Set([
 	"lazy",
 	"caseSensitive",
 	"path",
 	"id",
 	"index",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteObjectKey(key) {
 	return unsupportedLazyRouteObjectKeys.has(key);
@@ -147,7 +149,8 @@ const unsupportedLazyRouteFunctionKeys = new Set([
 	"id",
 	"index",
 	"middleware",
-	"children"
+	"children",
+	"unstable_validateParams"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
 	return unsupportedLazyRouteFunctionKeys.has(key);
@@ -521,7 +524,7 @@ function compilePath(path, caseSensitive = false, end = true) {
 			return "(?:/([^\\/]*))?";
 		}
 		return "/([^\\/]+)";
-	}).replace(/\/([\w-]+)\?(?=\/|$|\()/g, "(?:/$1)?");
+	}).replace(/\/((?:[^/?()[\]*^\\]|\\.)+)\?(?=\/|$|\()/g, "(?:/$1)?");
 	if (path.endsWith("*")) {
 		params.push({ paramName: "*" });
 		regexpSource += path === "*" || path === "/*" ? "(.*)$" : "(?:\\/(.+)|\\/*)$";
@@ -882,4 +885,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 { DiscoveryCancelledError, 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 };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,12 +14,12 @@ import { ErrorResponseImpl, createContext, resolvePath } from "../router/utils.j
 import { validateNavigationTarget } from "../router/navigation.js";
 import { createRouter, hasInvalidProtocol, isMutationMethod } from "../router/router.js";
 import { RSCRouterContext } from "../context.js";
-import { RouterProvider } from "../components.js";
 import { createRequestInit } from "../dom/ssr/data.js";
 import { getSingleFetchDataStrategyImpl, singleFetchUrl, stripIndexParam } from "../dom/ssr/single-fetch.js";
 import { noActionDefinedError, shouldHydrateRouteLoader } from "../dom/ssr/routes.js";
 import { getPathsWithAncestors, handleClientVersionMismatch } from "../dom/ssr/fog-of-war.js";
 import { FrameworkContext, setIsHydrated } from "../dom/ssr/components.js";
+import { RouterProvider } from "../components.js";
 import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries.js";
 import { populateRSCRouteModules } from "./route-modules.js";
 import { getHydrationData } from "../dom/ssr/hydration.js";
@@ -169,6 +169,7 @@ function createRouterFromPayload({ fetchImplementation, createFromReadableStream
 			},
 			location: payload.location,
 			basename: payload.basename,
+			future: {},
 			isSpaMode: false
 		}),
 		async patchRoutesOnNavigation({ path, signal, fetcherKey }) {

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,6 +8,7 @@
  *
  * @license MIT
  */
+import { escapeAttribute } from "../../dom/ssr/markup.js";
 //#region lib/rsc/html-stream/server.ts
 const encoder = new TextEncoder();
 const trailer = "</body></html>";
@@ -20,11 +21,31 @@ function injectRSCPayload(rscStream, { nonce } = {}) {
 	let rscReader = null;
 	let buffered = [];
 	let timeout = null;
+	async function stop(reason) {
+		cancelled = true;
+		if (timeout) {
+			clearTimeout(timeout);
+			timeout = null;
+		}
+		buffered.length = 0;
+		resolveFlightDataPromise();
+		if (rscReader && rscStream.locked) await rscReader.cancel(reason).catch(() => {});
+		else await rscStream.cancel(reason).catch(() => {});
+	}
+	function tryEnqueue(controller, chunk) {
+		try {
+			controller.enqueue(chunk);
+			return true;
+		} catch (error) {
+			stop(error);
+			return false;
+		}
+	}
 	function flushBufferedChunks(controller) {
 		for (let chunk of buffered) {
 			let buf = decoder.decode(chunk, { stream: true });
 			if (buf.endsWith(trailer)) buf = buf.slice(0, -14);
-			controller.enqueue(encoder.encode(buf));
+			if (!tryEnqueue(controller, encoder.encode(buf))) return;
 		}
 		buffered.length = 0;
 		timeout = null;
@@ -49,18 +70,10 @@ function injectRSCPayload(rscStream, { nonce } = {}) {
 				clearTimeout(timeout);
 				flushBufferedChunks(controller);
 			}
-			controller.enqueue(encoder.encode("</body></html>"));
+			tryEnqueue(controller, encoder.encode("</body></html>"));
 		},
 		async cancel(reason) {
-			cancelled = true;
-			if (timeout) {
-				clearTimeout(timeout);
-				timeout = null;
-			}
-			buffered.length = 0;
-			if (rscReader) await rscReader.cancel(reason).catch(() => {});
-			else await rscStream.cancel(reason).catch(() => {});
-			resolveFlightDataPromise();
+			await stop(reason);
 		}
 	});
 }
@@ -87,9 +100,6 @@ function writeChunk(chunk, controller, nonce) {
 	let nonceAttr = nonce == null ? "" : ` nonce="${escapeAttribute(nonce)}"`;
 	controller.enqueue(encoder.encode(`<script${nonceAttr}>${escapeScript(`(self.__FLIGHT_DATA||=[]).push(${chunk})`)}<\/script>`));
 }
-function escapeAttribute(value) {
-	return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
 function escapeScript(script) {
 	return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
 }

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

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

package/dist/development/lib/rsc/server.rsc.d.ts

@@ -1,6 +1,6 @@
 
 import { Location } from "../router/history.js";
-import { ActionFunction, LoaderFunction, Params, RouterContextProvider, ShouldRevalidateFunction } from "../router/utils.js";
+import { ActionFunction, LoaderFunction, MiddlewareFunction, Params, RouterContextProvider, ShouldRevalidateFunction } from "../router/utils.js";
 import { ClientActionFunction, ClientLoaderFunction, HeadersFunction, LinksFunction, MetaFunction } from "../dom/ssr/routeModules.js";
 import * as React$1 from "react";
 import { ReactFormState } from "react-dom/client";
@@ -19,6 +19,7 @@ type RSCRouteConfigEntryBase = {
   links?: LinksFunction;
   loader?: LoaderFunction;
   meta?: MetaFunction;
+  middleware?: MiddlewareFunction<any>[];
   shouldRevalidate?: ShouldRevalidateFunction;
 };
 type RSCRouteConfigEntry = RSCRouteConfigEntryBase & {
@@ -116,6 +117,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,
@@ -197,7 +205,7 @@ declare function matchRSCServerRequest({
   onError,
   request,
   routes,
-  generateResponse
+  generateResponse: encodeResponse
 }: {
   allowedActionOrigins?: string[];
   createTemporaryReferenceSet: () => unknown;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,10 +9,10 @@
  * @license MIT
  */
 import { isRouteErrorResponse } from "../router/utils.js";
-import { hasInvalidProtocol } from "../router/router.js";
+import { createDataRouteMatcher, hasInvalidProtocol } from "../router/router.js";
 import { RSCRouterContext } from "../context.js";
 import { decodeRedirectErrorDigest, decodeRouteErrorResponseDigest } from "../errors.js";
-import { escapeHtml } from "../dom/ssr/markup.js";
+import { escapeAttribute } from "../dom/ssr/markup.js";
 import { shouldHydrateRouteLoader } from "../dom/ssr/routes.js";
 import { FrameworkContext } from "../dom/ssr/components.js";
 import { StaticRouterProvider, createStaticRouter } from "../dom/server.js";
@@ -179,7 +179,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 		const redirectTransform = new TransformStream({ flush(controller) {
 			if (renderRedirect) {
 				if (hasInvalidProtocol(renderRedirect.location)) return;
-				controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`));
+				controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeAttribute(renderRedirect.location)}"/>`));
 			}
 		} });
 		if (!hydrate) return new Response(html.pipeThrough(redirectTransform), {
@@ -258,7 +258,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 			const retryRedirectTransform = new TransformStream({ flush(controller) {
 				if (retryRedirect) {
 					if (hasInvalidProtocol(retryRedirect.location)) return;
-					controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`));
+					controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeAttribute(retryRedirect.location)}"/>`));
 				}
 			} });
 			if (!hydrate) return new Response(html.pipeThrough(retryRedirectTransform), {
@@ -333,6 +333,24 @@ function RSCStaticRouter({ getPayload, nonce }) {
 	if (payload.type !== "render") return null;
 	let patchedLoaderData = { ...payload.loaderData };
 	for (const match of payload.matches) if (shouldHydrateRouteLoader(match.id, match.clientLoader, match.hasLoader, false) && (match.hydrateFallbackElement || !match.hasLoader)) delete patchedLoaderData[match.id];
+	const routes = payload.matches.reduceRight((previous, match) => {
+		const route = {
+			id: match.id,
+			action: match.hasAction || !!match.clientAction,
+			element: match.element,
+			errorElement: match.errorElement,
+			handle: match.handle,
+			hydrateFallbackElement: match.hydrateFallbackElement,
+			index: match.index,
+			loader: match.hasLoader || !!match.clientLoader,
+			path: match.path,
+			shouldRevalidate: match.shouldRevalidate
+		};
+		if (previous.length > 0) route.children = previous;
+		return [route];
+	}, []);
+	const dataRouteMatcher = createDataRouteMatcher({}, payload.basename || "/");
+	dataRouteMatcher.update(routes);
 	const context = {
 		get _deepestRenderedBoundaryId() {
 			return decoded._deepestRenderedBoundaryId ?? null;
@@ -348,6 +366,7 @@ function RSCStaticRouter({ getPayload, nonce }) {
 		loaderHeaders: {},
 		location: payload.location,
 		statusCode: 200,
+		_match: (locationArg) => dataRouteMatcher.match(locationArg),
 		matches: payload.matches.map((match) => ({
 			params: match.params,
 			pathname: match.pathname,
@@ -363,22 +382,7 @@ function RSCStaticRouter({ getPayload, nonce }) {
 			}
 		}))
 	};
-	const router = createStaticRouter(payload.matches.reduceRight((previous, match) => {
-		const route = {
-			id: match.id,
-			action: match.hasAction || !!match.clientAction,
-			element: match.element,
-			errorElement: match.errorElement,
-			handle: match.handle,
-			hydrateFallbackElement: match.hydrateFallbackElement,
-			index: match.index,
-			loader: match.hasLoader || !!match.clientLoader,
-			path: match.path,
-			shouldRevalidate: match.shouldRevalidate
-		};
-		if (previous.length > 0) route.children = previous;
-		return [route];
-	}, []), context);
+	const router = createStaticRouter(routes, context);
 	const frameworkContext = {
 		future: {},
 		isSpaMode: false,

package/dist/development/lib/server-runtime/build.d.ts

@@ -19,7 +19,21 @@ interface ServerBuild {
   publicPath: string;
   assetsBuildDirectory: string;
   future: FutureConfig;
+  /**
+   * Whether runtime server requests are supported, including API-only builds.
+   */
   ssr: boolean;
+  /**
+   * The origin to use for server requests in API-only mode.
+   * @internal
+   */
+  unstable_apiServerOrigin?: string;
+  /**
+   * Whether production document rendering is disabled while data and route
+   * discovery requests remain supported.
+   * @internal
+   */
+  unstable_apiOnly?: boolean;
   unstable_getCriticalCss?: (args: {
     pathname: string;
   }) => OptionalCriticalCss | Promise<OptionalCriticalCss>;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,11 +8,10 @@
  *
  * @license MIT
  */
-import { matchRoutesImpl } from "../router/utils.js";
 import invariant from "./invariant.js";
 //#region lib/server-runtime/routeMatching.ts
-function matchServerRoutes(manifest, dataRoutes, branches, pathname, basename) {
-	let matches = matchRoutesImpl(dataRoutes, pathname, basename ?? "/", false, branches);
+function matchServerRoutes(manifest, staticHandler, pathname) {
+	let matches = staticHandler.match(pathname);
 	if (!matches) return null;
 	return matches.map((match) => {
 		let route = manifest[match.route.id];

package/dist/development/lib/server-runtime/routes.d.ts

@@ -1,7 +1,7 @@
 
 import { RouteManifest } from "../router/utils.js";
-import { ServerRouteModule } from "../dom/ssr/routeModules.js";
 import { Route } from "../dom/ssr/routes.js";
+import { ServerRouteModule } from "../dom/ssr/routeModules.js";
 
 //#region lib/server-runtime/routes.d.ts
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -58,7 +58,7 @@ function derive(build, mode) {
 		let normalizedPath = getNormalizedPath(request);
 		let normalizedPathname = normalizedPath.pathname;
 		let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
-		if (!build.ssr) {
+		if (!build.ssr || build.unstable_apiOnly) {
 			let decodedPath = decodeURI(normalizedPathname);
 			if (build.basename && build.basename !== "/") {
 				let strippedPath = stripBasename(decodedPath, build.basename);
@@ -76,7 +76,7 @@ function derive(build, mode) {
 				decodedPath = strippedPath;
 			}
 			if (build.prerender.length === 0) isSpaMode = true;
-			else if (!build.prerender.some((p) => removeTrailingSlash(p) === removeTrailingSlash(decodedPath))) if (requestUrl.pathname.endsWith(".data")) {
+			else if (!build.prerender.some((p) => removeTrailingSlash(p) === removeTrailingSlash(decodedPath))) if (requestUrl.pathname.endsWith(".data") && !build.unstable_apiOnly) {
 				errorHandler(new ErrorResponseImpl(404, "Not Found", `Refusing to SSR the path \`${decodedPath}\` because \`ssr:false\` is set and the path is not included in the \`prerender\` config, so in production the path will be a 404.`), {
 					context: loadContext,
 					params,
@@ -90,12 +90,16 @@ function derive(build, mode) {
 		}
 		let manifestUrl = getManifestPath(build.routeDiscovery.manifestPath, build.basename);
 		if (build.routeDiscovery.mode === "lazy" && requestUrl.pathname === manifestUrl) try {
-			return await handleManifestRequest(build, staticHandler.dataRoutes, staticHandler._internalRouteBranches, requestUrl);
+			return await handleManifestRequest(build, staticHandler, requestUrl);
 		} catch (e) {
 			handleError(e);
 			return new Response("Unknown Server Error", { status: 500 });
 		}
-		let matches = matchServerRoutes(build.routes, staticHandler.dataRoutes, staticHandler._internalRouteBranches, normalizedPathname, build.basename);
+		if (build.unstable_apiOnly && serverMode !== "development" && !requestUrl.pathname.endsWith(".data") && getBuildTimeHeader(request, "X-React-Router-SPA-Mode") !== "yes" && getBuildTimeHeader(request, "X-React-Router-Prerender") !== "yes") return new Response(null, {
+			status: 404,
+			statusText: "Not Found"
+		});
+		let matches = matchServerRoutes(build.routes, staticHandler, normalizedPathname);
 		if (matches && matches.length > 0) Object.assign(params, matches[0].params);
 		if (requestHandlerInstrumentations?.length) loadContext.set(instrumentationResultMetaContext, {
 			url: createDataFunctionUrl(request, normalizedPath),
@@ -173,7 +177,7 @@ const createRequestHandler = (build, mode) => {
 		return _requestHandler(request, initialContext);
 	};
 };
-async function handleManifestRequest(build, dataRoutes, branches, url) {
+async function handleManifestRequest(build, staticHandler, url) {
 	if (url.toString().length > 7680) return new Response(null, {
 		statusText: "Bad Request",
 		status: 400
@@ -188,7 +192,7 @@ async function handleManifestRequest(build, dataRoutes, branches, url) {
 		let paths = new Set(pathParam.split(",").filter(Boolean));
 		for (let path of paths) {
 			if (!path.startsWith("/")) path = `/${path}`;
-			let matches = matchServerRoutes(build.routes, dataRoutes, branches, path, build.basename);
+			let matches = matchServerRoutes(build.routes, staticHandler, path);
 			if (matches) for (let match of matches) {
 				let routeId = match.route.id;
 				let route = build.assets.routes[routeId];
@@ -252,11 +256,13 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			future: build.future,
 			routeDiscovery: build.routeDiscovery,
 			ssr: build.ssr,
-			isSpaMode
+			isSpaMode,
+			unstable_apiOnly: build.unstable_apiOnly,
+			unstable_apiServerOrigin: build.unstable_apiServerOrigin
 		};
 		let entryContext = {
 			manifest: build.assets,
-			branches: staticHandler._internalRouteBranches,
+			branches: [],
 			routeModules: createEntryRouteModules(build.routes),
 			staticHandlerContext: context,
 			criticalCss,
@@ -270,6 +276,8 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			ssr: build.ssr,
 			routeDiscovery: build.routeDiscovery,
 			isSpaMode,
+			unstable_apiOnly: build.unstable_apiOnly,
+			unstable_apiServerOrigin: build.unstable_apiServerOrigin,
 			serializeError: (err) => serializeError(err, serverMode)
 		};
 		let handleDocumentRequestFunction = build.entry.module.default;
@@ -291,6 +299,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			};
 			entryContext = {
 				...entryContext,
+				branches: [],
 				staticHandlerContext: context,
 				serverHandoffString: createServerHandoffString(baseServerHandoff),
 				serverHandoffStream: encodeViaTurboStream(state, request.signal, build.entry.module.streamTimeout, serverMode),

package/dist/development/lib/server-runtime/serverHandoff.d.ts

@@ -0,0 +1,17 @@
+
+import { CriticalCss, FutureConfig } from "../dom/ssr/entry.js";
+import { ServerBuild } from "./build.js";
+
+//#region lib/server-runtime/serverHandoff.d.ts
+type ServerHandoff = {
+  criticalCss?: CriticalCss;
+  basename: string | undefined;
+  future: FutureConfig;
+  ssr: boolean;
+  isSpaMode: boolean;
+  unstable_apiOnly?: boolean;
+  unstable_apiServerOrigin?: string;
+  routeDiscovery: ServerBuild["routeDiscovery"];
+};
+//#endregion
+export { ServerHandoff };

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

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

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

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