@react-router/dev 8.4.0 → 8.5.1

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # `@react-router/dev`
 
+## v8.5.1
+
+### Patch Changes
+
+- Use resolved Vite environment output directories when reading and writing build artifacts ([#15480](https://github.com/remix-run/react-router/pull/15480))
+  - Finalize server-bundle manifest paths after asynchronous Vite configuration hooks complete
+  - Preserve output-directory overrides applied when creating a Vite build environment
+- Run prerendering after other Vite plugins finish their application build hooks ([#15481](https://github.com/remix-run/react-router/pull/15481))
+  - Close React Router's build resources when another plugin's application build hook fails during `react-router build`
+- Updated dependencies:
+  - [`react-router@8.5.1`](https://github.com/remix-run/react-router/releases/tag/react-router@8.5.1)
+  - [`@react-router/node@8.5.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@8.5.1)
+  - [`@react-router/serve@8.5.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@8.5.1)
+
+## v8.5.0
+
+### Patch Changes
+
+- Fix critical CSS collection in dev registering server-only route imports as client dependencies, which triggered dependency re-optimization and full page reloads ([#15595](https://github.com/remix-run/react-router/pull/15595))
+- Fix intermittent `Prerender: Request failed for ... connect ECONNREFUSED` errors during prerendering ([#15325](https://github.com/remix-run/react-router/pull/15325))
+  - Send requests to the address the Vite preview server bound to
+  - Avoid re-resolving `localhost` for each request, which could select a different address family (`127.0.0.1` vs `::1`)
+
+### Unstable Changes
+
+⚠️ _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+
+- Add `ssr: "unstable_api-only"` to retain a runtime server for loaders, actions, and route discovery while disabling production document rendering ([#15601](https://github.com/remix-run/react-router/pull/15601))
+  - Generate a root-only SPA shell when prerendering is disabled
+  - Support prerendered pages and data files alongside runtime loaders and actions, with a SPA fallback for non-prerendered paths
+  - Default API-only builds to lazy route discovery
+  - Reject API-only configuration in RSC Framework Mode
+  - Preserve server-only route exports in additional Vite server environments in both API-only and SSR modes
+  - Serve prerendered pages and the SPA fallback in Vite preview while retaining live data requests and route discovery
+- Add the `future.unstable_customRouteDiscovery` flag to opt into application-controlled route discovery in conventional Framework Mode ([#15602](https://github.com/remix-run/react-router/pull/15602))
+- Fix source maps for route modules in unstable RSC Framework Mode ([#15479](https://github.com/remix-run/react-router/pull/15479))
+- Add `unstable_apiServerOrigin` to configure the origin for API-only loader, action, and route discovery requests ([#15601](https://github.com/remix-run/react-router/pull/15601))
+- Updated dependencies:
+  - [`react-router@8.5.0`](https://github.com/remix-run/react-router/releases/tag/react-router@8.5.0)
+  - [`@react-router/node@8.5.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@8.5.0)
+  - [`@react-router/serve@8.5.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@8.5.0)
+
 ## v8.4.0
 
 ### Patch Changes

package/dist/{build-CsJF5XUO.js → build-DjEus3HZ.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,12 +8,12 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-WywajSVn.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CqlAVM2O.js";
 //#region vite/build.ts
 async function build(root, viteBuildOptions) {
 	await preloadVite();
 	let { assetsInlineLimit, clearScreen, config: configFile, emptyOutDir, force, logLevel, minify, mode, sourcemapClient, sourcemapServer } = viteBuildOptions;
-	await (await getVite().createBuilder({
+	let builder = await getVite().createBuilder({
 		root,
 		mode,
 		configFile,
@@ -35,7 +35,13 @@ async function build(root, viteBuildOptions) {
 				if (!config.plugins.find((plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc")) throw new Error("React Router Vite plugin not found in Vite config");
 			}
 		}]
-	})).buildApp();
+	});
+	try {
+		await builder.buildApp();
+	} finally {
+		let { __reactRouterBuildContext: buildContext } = builder.config;
+		await buildContext?.close();
+	}
 }
 //#endregion
 export { build };

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,7 +9,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-WywajSVn.js";
+import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-CqlAVM2O.js";
 import { createRequire } from "node:module";
 import { parseArgs } from "node:util";
 import semver from "semver";
@@ -172,7 +172,7 @@ async function routes(rootDirectory, flags = {}) {
 }
 async function build(root, options = {}) {
 	root = resolveRootDirectory(root, options);
-	let { build } = await import("../build-CsJF5XUO.js");
+	let { build } = await import("../build-DjEus3HZ.js");
 	if (options.profile) await start();
 	try {
 		await build(root, options);
@@ -182,7 +182,7 @@ async function build(root, options = {}) {
 }
 async function dev(root, options = {}) {
 	if (developmentConditionEnabled) {
-		let { dev } = await import("../dev-_GaivbeG.js");
+		let { dev } = await import("../dev-LVfdDvQH.js");
 		if (options.profile) await start();
 		exitHook(() => stop(console.info));
 		root = resolveRootDirectory(root, options);

package/dist/{config-t89niiFv.d.ts → config-DP95WFpo.d.ts}

@@ -38,6 +38,7 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
+  unstable_customRouteDiscovery: boolean;
   unstable_enableNodeReadableStream: boolean;
   unstable_optimizeDeps: boolean;
 }
@@ -140,12 +141,30 @@ type ReactRouterConfig = {
    */
   serverBundles?: ServerBundlesFunction;
   /**
-   * Enable server-side rendering for your application. Disable to use "SPA
-   * Mode", which will request the `/` path at build-time and save it as an
-   * `index.html` file with your assets so your application can be deployed as a
-   * SPA without server-rendering. Default's to `true`.
+   * Control runtime server-side document rendering. Defaults to `true`.
+   *
+   * Set `false` to generate a static client build without a runtime server.
+   * Without prerendering, this generates a root-only SPA shell. With
+   * prerendering, it generates HTML and data files for selected paths plus
+   * a SPA fallback for non-prerendered paths.
+   *
+   * Set `"unstable_api-only"` to retain a runtime server for loaders, actions,
+   * and route discovery while disabling production document rendering.
+   * Documents follow the same prerendering and SPA fallback behavior as
+   * `ssr:false`, with runtime loaders and actions available for all routes.
+   * API-only mode is unstable and is not supported in RSC Framework Mode.
+   */
+  ssr?: boolean | "unstable_api-only";
+  /**
+   * The origin to use for server requests when `ssr` is `"unstable_api-only"`.
+   * This is ignored when `ssr` is `true` or `false`. Defaults to the same
+   * origin that serves the client build. Applies to loader, action, and route
+   * discovery requests.
+   *
+   * **Note:** The server origin will need to be configured appropriately for
+   * Cross-Origin Request Sharing (CORS).
    */
-  ssr?: boolean;
+  unstable_apiServerOrigin?: string;
   /**
    * Enable subresource integrity hashes on asset script tags. Defaults to
    * `false`.
@@ -256,12 +275,24 @@ type ResolvedReactRouterConfig = Readonly<{
    */
   serverModuleFormat: ServerModuleFormat;
   /**
-   * Enable server-side rendering for your application. Disable to use "SPA
-   * Mode", which will request the `/` path at build-time and save it as an
-   * `index.html` file with your assets so your application can be deployed as a
-   * SPA without server-rendering. Default's to `true`.
+   * Control runtime server-side document rendering. Defaults to `true`.
+   *
+   * Set `false` to generate a static client build without a runtime server.
+   * Without prerendering, this generates a root-only SPA shell. With
+   * prerendering, it generates HTML and data files for selected paths plus
+   * a SPA fallback for non-prerendered paths.
+   *
+   * Set `"unstable_api-only"` to retain a runtime server for loaders, actions,
+   * and route discovery while disabling production document rendering.
+   * Documents follow the same prerendering and SPA fallback behavior as
+   * `ssr:false`, with runtime loaders and actions available for all routes.
+   * API-only mode is unstable and is not supported in RSC Framework Mode.
+   */
+  ssr: boolean | "unstable_api-only";
+  /**
+   * The origin to use for server requests in API-only mode.
    */
-  ssr: boolean;
+  unstable_apiServerOrigin?: string;
   /**
    * Whether to generate subresource integrity hashes for asset script tags.
    */

package/dist/config.d.ts

@@ -1,3 +1,3 @@
 
-import { i as ServerBundlesFunction, n as Preset, r as ReactRouterConfig, t as BuildManifest } from "./config-t89niiFv.js";
+import { i as ServerBundlesFunction, n as Preset, r as ReactRouterConfig, t as BuildManifest } from "./config-DP95WFpo.js";
 export type { BuildManifest, ReactRouterConfig as Config, Preset, ServerBundlesFunction };

package/dist/config.js

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

package/dist/{dev-_GaivbeG.js → dev-LVfdDvQH.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-WywajSVn.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CqlAVM2O.js";
 import { n as start, r as stop, t as getSession } from "./cli/index.js";
 import colors from "picocolors";
 //#region vite/dev.ts

package/dist/{routes-BFdkiVnp.js → routes-DAb9gz9-.js}

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

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,5 +8,5 @@
  *
  * @license MIT
  */
-import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-BFdkiVnp.js";
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-DAb9gz9-.js";
 export { getAppDirectory, index, layout, prefix, relative, route };

package/dist/{typegen-WywajSVn.js → typegen-CqlAVM2O.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-BFdkiVnp.js";
+import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-DAb9gz9-.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import fs from "node:fs";
@@ -228,10 +228,18 @@ async function resolveConfig({ root, viteRunnerContext, reactRouterConfigFile, s
 		ssr: true
 	};
 	let userAndPresetConfigs = mergeReactRouterConfig(...presets, reactRouterUserConfig);
-	let { appDirectory: userAppDirectory, basename, buildDirectory: userBuildDirectory, buildEnd, prerender, routeDiscovery: userRouteDiscovery, serverBuildFile, serverBundles, serverModuleFormat, ssr } = {
+	let { appDirectory: userAppDirectory, basename, buildDirectory: userBuildDirectory, buildEnd, prerender, routeDiscovery: userRouteDiscovery, serverBuildFile, serverBundles, serverModuleFormat, ssr, unstable_apiServerOrigin } = {
 		...defaults,
 		...userAndPresetConfigs
 	};
+	if (ssr === "unstable_api-only" && unstable_apiServerOrigin != null) try {
+		let url = new URL(unstable_apiServerOrigin);
+		if (url.pathname !== "/" || url.search || url.hash) return err("The `unstable_apiServerOrigin` config must be an origin without a path, query, or hash.");
+		unstable_apiServerOrigin = url.origin;
+	} catch {
+		return err("The `unstable_apiServerOrigin` config must be a valid absolute URL.");
+	}
+	else unstable_apiServerOrigin = void 0;
 	if (!ssr && serverBundles) serverBundles = void 0;
 	if (prerender) {
 		let isValidPrerenderPathsConfig = (p) => typeof p === "boolean" || typeof p === "function" || Array.isArray(p);
@@ -295,6 +303,7 @@ async function resolveConfig({ root, viteRunnerContext, reactRouterConfigFile, s
 		if ("unstable_subResourceIntegrity" in futureConfig) return err("The `future.unstable_subResourceIntegrity` flag has been stabilized and moved to a top-level `config.subResourceIntegrity` field");
 	}
 	let future = {
+		unstable_customRouteDiscovery: userAndPresetConfigs.future?.unstable_customRouteDiscovery ?? false,
 		unstable_enableNodeReadableStream: userAndPresetConfigs.future?.unstable_enableNodeReadableStream ?? false,
 		unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false
 	};
@@ -314,6 +323,7 @@ async function resolveConfig({ root, viteRunnerContext, reactRouterConfigFile, s
 		serverBundles,
 		serverModuleFormat,
 		ssr,
+		unstable_apiServerOrigin,
 		splitRouteModules,
 		subResourceIntegrity,
 		allowedActionOrigins,
@@ -624,6 +634,8 @@ function generateServerBuild(ctx) {
       export const routeDiscovery: ServerBuild["routeDiscovery"];
       export const routes: ServerBuild["routes"];
       export const ssr: ServerBuild["ssr"];
+      export const unstable_apiOnly: ServerBuild["unstable_apiOnly"];
+      export const unstable_apiServerOrigin: ServerBuild["unstable_apiServerOrigin"];
       export const allowedActionOrigins: ServerBuild["allowedActionOrigins"];
       export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
     }

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.4.0
+ * @react-router/dev v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,8 +8,8 @@
  *
  * @license MIT
  */
-import { _ as getVite, a as t, c as createConfigLoader, d as resolveEntryFiles, f as resolveRSCEntryFiles, g as getUserBuildRollupOptions, h as defineOptimizeDepsCompilerOptions, i as parse$1, l as hasNodeDependency, m as defineCompilerOptions, n as watch, o as traverse, p as ssrExternals, r as generate, s as configRouteToBranchRoute, v as preloadVite } from "./typegen-WywajSVn.js";
-import { u as invariant } from "./routes-BFdkiVnp.js";
+import { _ as getVite, a as t, c as createConfigLoader, d as resolveEntryFiles, f as resolveRSCEntryFiles, g as getUserBuildRollupOptions, h as defineOptimizeDepsCompilerOptions, i as parse$1, l as hasNodeDependency, m as defineCompilerOptions, n as watch, o as traverse, p as ssrExternals, r as generate, s as configRouteToBranchRoute, v as preloadVite } from "./typegen-CqlAVM2O.js";
+import { u as invariant } from "./routes-DAb9gz9-.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
@@ -114,7 +114,8 @@ const findDeps = async (vite, node, deps) => {
 		}
 	}
 	async function addFromUrl(url) {
-		let node = await vite.moduleGraph.getModuleByUrl(url);
+		let ssrNode = await vite.environments.ssr.moduleGraph.getModuleByUrl(url);
+		let node = ssrNode?.id ? vite.moduleGraph.getModuleById(ssrNode.id) : void 0;
 		if (node) await addFromNode(node);
 	}
 	if (node.ssrTransformResult) {
@@ -788,90 +789,91 @@ function normalizePostProcessResult(result) {
 * Vite plugin for prerendering using the preview server
 */
 function prerender(options) {
-	const { config, requests, postProcess = defaultPostProcess, handleError = defaultHandleError, logFile, finalize } = options;
+	const { config, requests, postProcess = defaultPostProcess, handleError = defaultHandleError, logFile, finalize, cleanup } = options;
 	let viteConfig;
 	return {
 		name: "prerender",
+		enforce: "post",
 		sharedDuringBuild: true,
-		config: {
+		buildApp: {
 			order: "post",
-			handler({ builder: { buildApp } = {} }) {
-				return { builder: { async buildApp(builder) {
-					await buildApp?.(builder);
+			async handler() {
+				let ogIsBuildRequest = process.env.IS_RR_BUILD_REQUEST;
+				try {
 					const prerenderRequests = (typeof requests === "function" ? await requests() : requests).map(normalizePrerenderRequest);
 					if (prerenderRequests.length === 0) return;
-					const { buildDirectory = viteConfig.environments.client.build.outDir, concurrency = 1, retryCount = 0, retryDelay = 500, maxRedirects = 0, timeout = 1e4 } = (typeof config === "function" ? await config() : config) ?? {};
-					let ogIsBuildRequest = process.env.IS_RR_BUILD_REQUEST;
+					const { buildDirectory = path.resolve(viteConfig.root, viteConfig.environments.client.build.outDir), concurrency = 1, retryCount = 0, retryDelay = 500, maxRedirects = 0, timeout = 1e4 } = (typeof config === "function" ? await config() : config) ?? {};
 					process.env.IS_RR_BUILD_REQUEST = "yes";
+					const previewServer = await startPreviewServer(viteConfig);
 					try {
-						const previewServer = await startPreviewServer(viteConfig);
-						try {
-							const baseUrl = getResolvedUrl(previewServer);
-							async function prerenderRequest(input, metadata) {
-								let attemptCount = 0;
-								let redirectCount = 0;
-								const request = new Request(input);
-								const url = new URL(request.url);
-								if (url.origin !== baseUrl.origin) {
-									url.hostname = baseUrl.hostname;
-									url.protocol = baseUrl.protocol;
-									url.port = baseUrl.port;
-								}
-								async function attempt(url) {
-									try {
-										const signal = AbortSignal.timeout(timeout);
-										const response = await nodeHttpFetch(new Request(url, request), { signal });
-										if (response.status >= 300 && response.status < 400 && response.headers.has("location") && ++redirectCount <= maxRedirects) {
-											const location = response.headers.get("location");
-											const responseURL = new URL(response.url);
-											const locationUrl = new URL(location, response.url);
-											if (responseURL.origin !== locationUrl.origin) return await postProcess(request, response, metadata);
-											return await attempt(new URL(location, url));
-										}
-										if (response.status >= 500 && ++attemptCount <= retryCount) {
-											await new Promise((resolve) => setTimeout(resolve, retryDelay));
-											return attempt(url);
-										}
-										return await postProcess(request, response, metadata);
-									} catch (error) {
-										if (++attemptCount <= retryCount) {
-											await new Promise((resolve) => setTimeout(resolve, retryDelay));
-											return attempt(url);
-										}
-										handleError(request, error instanceof Error ? error : new Error(error?.toString() ?? "Unknown error"), metadata);
-										return [];
-									}
-								}
-								return attempt(url);
+						const baseUrl = getResolvedUrl(previewServer);
+						async function prerenderRequest(input, metadata) {
+							let attemptCount = 0;
+							let redirectCount = 0;
+							const request = new Request(input);
+							const url = new URL(request.url);
+							if (url.origin !== baseUrl.origin) {
+								url.hostname = baseUrl.hostname;
+								url.protocol = baseUrl.protocol;
+								url.port = baseUrl.port;
 							}
-							async function prerender(input, metadata) {
-								const { files, requests } = normalizePostProcessResult(await prerenderRequest(input, metadata));
-								for (const file of files) await writePrerenderFile(file, metadata);
-								for (const followUp of requests) {
-									const normalized = normalizePrerenderRequest(followUp);
-									await prerender(normalized.request, normalized.metadata);
+							async function attempt(url) {
+								try {
+									const signal = AbortSignal.timeout(timeout);
+									const response = await nodeHttpFetch(new Request(url, request), { signal });
+									if (response.status >= 300 && response.status < 400 && response.headers.has("location") && ++redirectCount <= maxRedirects) {
+										const location = response.headers.get("location");
+										const responseURL = new URL(response.url);
+										const locationUrl = new URL(location, response.url);
+										if (responseURL.origin !== locationUrl.origin) return await postProcess(request, response, metadata);
+										return await attempt(new URL(location, url));
+									}
+									if (response.status >= 500 && ++attemptCount <= retryCount) {
+										await new Promise((resolve) => setTimeout(resolve, retryDelay));
+										return attempt(url);
+									}
+									return await postProcess(request, response, metadata);
+								} catch (error) {
+									if (++attemptCount <= retryCount) {
+										await new Promise((resolve) => setTimeout(resolve, retryDelay));
+										return attempt(url);
+									}
+									handleError(request, error instanceof Error ? error : new Error(error?.toString() ?? "Unknown error"), metadata);
+									return [];
 								}
 							}
-							async function writePrerenderFile(file, metadata) {
-								const normalizedPath = file.path.startsWith("/") ? file.path.slice(1) : file.path;
-								const outputPath = path.join(buildDirectory, ...normalizedPath.split("/"));
-								await mkdir(path.dirname(outputPath), { recursive: true });
-								await writeFile(outputPath, file.contents);
-								const relativePath = path.relative(viteConfig.root, outputPath);
-								if (logFile) logFile(relativePath, metadata);
-								return relativePath;
+							return attempt(url);
+						}
+						async function prerender(input, metadata) {
+							const { files, requests } = normalizePostProcessResult(await prerenderRequest(input, metadata));
+							for (const file of files) await writePrerenderFile(file, metadata);
+							for (const followUp of requests) {
+								const normalized = normalizePrerenderRequest(followUp);
+								await prerender(normalized.request, normalized.metadata);
 							}
-							await (await import("p-map")).default(prerenderRequests, async ({ request, metadata }) => {
-								await prerender(request, metadata);
-							}, { concurrency });
-							if (finalize) await finalize(buildDirectory);
-						} finally {
-							await previewServer.close();
 						}
+						async function writePrerenderFile(file, metadata) {
+							const normalizedPath = file.path.startsWith("/") ? file.path.slice(1) : file.path;
+							const outputPath = path.join(buildDirectory, ...normalizedPath.split("/"));
+							await mkdir(path.dirname(outputPath), { recursive: true });
+							await writeFile(outputPath, file.contents);
+							const relativePath = path.relative(viteConfig.root, outputPath);
+							if (logFile) logFile(relativePath, metadata);
+							return relativePath;
+						}
+						await (await import("p-map")).default(prerenderRequests, async ({ request, metadata }) => {
+							await prerender(request, metadata);
+						}, { concurrency });
+						if (finalize) await finalize(buildDirectory);
 					} finally {
-						process.env.IS_RR_BUILD_REQUEST = ogIsBuildRequest;
+						await previewServer.close();
 					}
-				} } };
+				} catch (error) {
+					await cleanup?.();
+					throw error;
+				} finally {
+					process.env.IS_RR_BUILD_REQUEST = ogIsBuildRequest;
+				}
 			}
 		},
 		configResolved(resolvedConfig) {
@@ -916,7 +918,7 @@ async function nodeHttpFetch(request, { signal }) {
 	return new Promise((resolve, reject) => {
 		const req = http.request({
 			protocol: url.protocol,
-			hostname: url.hostname,
+			hostname: url.hostname.replace(/^\[|\]$/g, ""),
 			port: url.port || void 0,
 			path: url.pathname + url.search,
 			method: request.method,
@@ -966,9 +968,15 @@ async function startPreviewServer(viteConfig) {
 	}
 }
 function getResolvedUrl(previewServer) {
-	const baseUrl = previewServer.resolvedUrls?.local[0];
-	if (!baseUrl) throw new Error("Prerender: No resolved URL is available from the Vite preview server");
-	return new URL(baseUrl);
+	const printableUrl = previewServer.resolvedUrls?.local[0];
+	const address = previewServer.httpServer?.address();
+	if (address && typeof address === "object" && address.address !== "::" && address.address !== "0.0.0.0") {
+		const protocol = printableUrl ? new URL(printableUrl).protocol : "http:";
+		const hostname = address.family === "IPv6" ? `[${address.address}]` : address.address;
+		return new URL(`${protocol}//${hostname}:${address.port}/`);
+	}
+	if (!printableUrl) throw new Error("Prerender: No resolved URL is available from the Vite preview server");
+	return new URL(printableUrl);
 }
 //#endregion
 //#region vite/plugin.ts
@@ -1151,8 +1159,14 @@ const getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRout
 	if (!viteChildCompiler) throw new Error("Vite child compiler not found");
 	return getExportNames(await compileRouteFile(viteChildCompiler, ctx, routeFile, readRouteFile));
 };
-let getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path$2.join(reactRouterConfig.buildDirectory, "server", ...serverBundleId ? [serverBundleId] : []);
-let getClientBuildDirectory$1 = (reactRouterConfig) => path$2.join(reactRouterConfig.buildDirectory, "client");
+let getDefaultServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path$2.join(reactRouterConfig.buildDirectory, "server", ...serverBundleId ? [serverBundleId] : []);
+let getDefaultClientBuildDirectory = (reactRouterConfig) => path$2.join(reactRouterConfig.buildDirectory, "client");
+let getClientBuildDirectory$1 = (viteConfig) => path$2.resolve(viteConfig.root, viteConfig.environments.client.build.outDir);
+let getServerBuildDirectory = (viteConfig, environmentName = "ssr") => {
+	let environment = viteConfig.environments[environmentName];
+	invariant(environment, `Vite environment "${environmentName}" not found`);
+	return path$2.resolve(viteConfig.root, environment.build.outDir);
+};
 let getServerBundleRouteIds = (vitePluginContext, ctx) => {
 	if (!ctx.buildManifest) return;
 	let environmentName = vitePluginContext.environment.name;
@@ -1182,9 +1196,12 @@ const reactRouterVitePlugin = () => {
 	let logger;
 	let firstLoad = true;
 	let ctx;
-	let closePluginResources = async () => {
+	let closeChildCompiler = async () => {
 		await viteChildCompiler?.close();
 		viteChildCompiler = null;
+	};
+	let closePluginResources = async () => {
+		await closeChildCompiler();
 		await reactRouterConfigLoader.close();
 		await (await typegenWatcherPromise)?.close();
 		typegenWatcherPromise = void 0;
@@ -1226,6 +1243,12 @@ const reactRouterVitePlugin = () => {
 			buildManifest
 		};
 	};
+	let updateServerBundlePaths = () => {
+		if (!ctx.buildManifest?.serverBundles) return;
+		invariant(viteConfig);
+		let { normalizePath } = getVite();
+		for (let bundle of Object.values(ctx.buildManifest.serverBundles)) bundle.file = normalizePath(path$2.join(path$2.relative(ctx.rootDirectory, getServerBuildDirectory(viteConfig, `${SSR_BUNDLE_PREFIX}${bundle.id}`)), ctx.reactRouterConfig.serverBuildFile));
+	};
 	let getServerEntry = async ({ routeIds }) => {
 		invariant(viteConfig, "viteconfig required to generate the server entry");
 		let routes = routeIds ? pick(ctx.reactRouterConfig.routes, routeIds) : ctx.reactRouterConfig.routes;
@@ -1237,14 +1260,16 @@ const reactRouterVitePlugin = () => {
     import * as entryServer from ${JSON.stringify(resolveFileUrl(ctx, ctx.entryServerFilePath, { publicPath: ctx.publicPath }))};
     ${Object.keys(routes).map((key, index) => {
 			let route = routes[key];
-			if (isSpaMode && key !== "root") return `const route${index} = { default: () => null };`;
+			if (isSpaMode && !isApiOnlyMode(ctx.reactRouterConfig) && key !== "root") return `const route${index} = { default: () => null };`;
 			else return `import * as route${index} from ${JSON.stringify(resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig), { publicPath: ctx.publicPath }))};`;
 		}).join("\n")}
       export { default as assets } from ${JSON.stringify(virtual$1.serverManifest.id)};
-      export const assetsBuildDirectory = ${JSON.stringify(path$2.relative(ctx.rootDirectory, getClientBuildDirectory$1(ctx.reactRouterConfig)))};
+      export const assetsBuildDirectory = ${JSON.stringify(path$2.relative(ctx.rootDirectory, getClientBuildDirectory$1(viteConfig)))};
       export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
-      export const ssr = ${ctx.reactRouterConfig.ssr};
+      export const ssr = ${Boolean(ctx.reactRouterConfig.ssr)};
+      export const unstable_apiOnly = ${isApiOnlyMode(ctx.reactRouterConfig)};
+      export const unstable_apiServerOrigin = ${isApiOnlyMode(ctx.reactRouterConfig) ? JSON.stringify(ctx.reactRouterConfig.unstable_apiServerOrigin) : "undefined"};
       export const isSpaMode = ${isSpaMode};
       export const prerender = ${JSON.stringify(prerenderPaths)};
       export const routeDiscovery = ${JSON.stringify(ctx.reactRouterConfig.routeDiscovery)};
@@ -1283,8 +1308,8 @@ const reactRouterVitePlugin = () => {
 		let chunkAssetPaths = Object.values(viteManifest).flatMap((chunk) => chunk.assets ?? []);
 		return new Set([...cssUrlPaths, ...chunkAssetPaths]);
 	};
-	let generateSriManifest = async (ctx) => {
-		let clientBuildDirectory = getClientBuildDirectory$1(ctx.reactRouterConfig);
+	let generateSriManifest = async (ctx, viteConfig) => {
+		let clientBuildDirectory = getClientBuildDirectory$1(viteConfig);
 		let entries = readdirSync(clientBuildDirectory, {
 			withFileTypes: true,
 			recursive: true
@@ -1307,7 +1332,7 @@ const reactRouterVitePlugin = () => {
 	};
 	let generateReactRouterManifestsForBuild = async ({ viteConfig, routeIds }) => {
 		invariant(viteConfig);
-		let viteManifest = await loadViteManifest(getClientBuildDirectory$1(ctx.reactRouterConfig));
+		let viteManifest = await loadViteManifest(getClientBuildDirectory$1(viteConfig));
 		let allDynamicCssFiles = getAllDynamicCssFiles(ctx, viteManifest);
 		let entry = getReactRouterManifestBuildAssets(ctx, viteConfig, viteManifest, allDynamicCssFiles, ctx.entryClientFilePath, null);
 		let browserRoutes = {};
@@ -1372,9 +1397,9 @@ const reactRouterVitePlugin = () => {
 			...nonFingerprintedValues,
 			sri: void 0
 		};
-		await writeFileSafe(path$2.join(getClientBuildDirectory$1(ctx.reactRouterConfig), manifestPath), `window.__reactRouterManifest=${JSON.stringify(reactRouterBrowserManifest)};`);
+		await writeFileSafe(path$2.join(getClientBuildDirectory$1(viteConfig), manifestPath), `window.__reactRouterManifest=${JSON.stringify(reactRouterBrowserManifest)};`);
 		let sri = void 0;
-		if (ctx.reactRouterConfig.subResourceIntegrity) sri = await generateSriManifest(ctx);
+		if (ctx.reactRouterConfig.subResourceIntegrity) sri = await generateSriManifest(ctx, viteConfig);
 		return {
 			reactRouterBrowserManifest,
 			reactRouterServerManifest: {
@@ -1485,12 +1510,17 @@ const reactRouterVitePlugin = () => {
 					watch: viteCommand === "serve"
 				});
 				await updatePluginContext();
+				if (_viteConfigEnv.isPreview && ctx.reactRouterConfig.serverBundles) ctx.buildManifest = await getBuildManifest({
+					reactRouterConfig: ctx.reactRouterConfig,
+					rootDirectory: ctx.rootDirectory
+				});
 				let environments = await getEnvironmentsOptions(ctx, viteCommand, { viteUserConfig });
 				let serverEnvironment = getServerEnvironmentValues(ctx, environments)[0];
 				invariant(serverEnvironment);
 				return {
 					__reactRouterPluginContext: ctx,
-					appType: viteCommand === "serve" && _viteConfigEnv.mode === "production" && ctx.reactRouterConfig.ssr === false ? "spa" : "custom",
+					__reactRouterBuildContext: { close: closePluginResources },
+					appType: viteCommand === "serve" && _viteConfigEnv.mode === "production" && (!ctx.reactRouterConfig.ssr || ctx.reactRouterConfig.ssr === "unstable_api-only") ? isApiOnlyMode(ctx.reactRouterConfig) ? "mpa" : "spa" : "custom",
 					ssr: {
 						external: serverEnvironment.resolve?.external,
 						resolve: serverEnvironment.resolve
@@ -1543,7 +1573,7 @@ const reactRouterVitePlugin = () => {
 							await builder.build(builder.environments.client);
 							let serverEnvironments = getServerEnvironmentValues(ctx, builder.environments);
 							await Promise.all(serverEnvironments.map(builder.build));
-							await cleanViteManifests(environments, ctx);
+							await cleanViteManifests([builder.environments.client, ...serverEnvironments], ctx);
 						}
 					}
 				};
@@ -1676,11 +1706,10 @@ const reactRouterVitePlugin = () => {
 				let cachedHandler = null;
 				async function getHandler() {
 					if (cachedHandler) return cachedHandler;
+					invariant(viteConfig);
+					updateServerBundlePaths();
 					let bundledHandlers = [];
-					let buildManifest = ctx.buildManifest ?? (ctx.reactRouterConfig.serverBundles ? await getBuildManifest({
-						reactRouterConfig: ctx.reactRouterConfig,
-						rootDirectory: ctx.rootDirectory
-					}) : null);
+					let { buildManifest } = ctx;
 					if (buildManifest?.serverBundles) {
 						let routesByServerBundleId = getRoutesByServerBundleId(buildManifest);
 						for (let bundle of Object.values(buildManifest.serverBundles)) {
@@ -1691,7 +1720,7 @@ const reactRouterVitePlugin = () => {
 							});
 						}
 					} else {
-						let serverEntryPath = path$2.resolve(getServerBuildDirectory(ctx.reactRouterConfig), "index.js");
+						let serverEntryPath = path$2.resolve(getServerBuildDirectory(viteConfig), "index.js");
 						let build = await import(url.pathToFileURL(serverEntryPath).href);
 						bundledHandlers.push({
 							handler: createRequestHandler(build, "production"),
@@ -1723,6 +1752,21 @@ const reactRouterVitePlugin = () => {
 					previewServer.middlewares.use(async (req, res, next) => {
 						if (!ctx.reactRouterConfig.ssr && (!process.env.hasOwnProperty("IS_RR_BUILD_REQUEST") ? true : process.env.IS_RR_BUILD_REQUEST !== "yes")) return next();
 						try {
+							if (isApiOnlyMode(ctx.reactRouterConfig) && process.env.IS_RR_BUILD_REQUEST !== "yes") {
+								let { basename, routeDiscovery } = ctx.reactRouterConfig;
+								let manifestPath = routeDiscovery?.mode === "lazy" ? path$2.posix.join(basename, routeDiscovery.manifestPath ?? "/__manifest") : void 0;
+								let pathname = new URL(req.originalUrl ?? req.url ?? "/", "http://localhost").pathname;
+								if (!pathname.endsWith(".data") && pathname !== manifestPath) {
+									let clientBuildDirectory = getClientBuildDirectory$1(previewServer.config);
+									let previewPathname = decodeURIComponent(new URL(req.url ?? "/", "http://localhost").pathname);
+									if (previewPathname.endsWith(".html") && existsSync(path$2.join(clientBuildDirectory, previewPathname))) return next();
+									let fallbackFile = path$2.join(clientBuildDirectory, "__spa-fallback.html");
+									if (!existsSync(fallbackFile)) fallbackFile = path$2.join(clientBuildDirectory, "index.html");
+									res.setHeader("Content-Type", "text/html; charset=utf-8");
+									res.end(await readFile(fallbackFile));
+									return;
+								}
+							}
 							let handler = await getHandler();
 							let request = await fromNodeRequest(req, res);
 							await sendResponse(res, await handler(request, await reactRouterDevLoadContext(request)));
@@ -1735,9 +1779,8 @@ const reactRouterVitePlugin = () => {
 			writeBundle: { async handler() {
 				if (!isReactRouterServerEnvironment(ctx, this.environment.name)) return;
 				invariant(viteConfig);
-				let clientBuildDirectory = getClientBuildDirectory$1(ctx.reactRouterConfig);
-				let serverBuildDirectory = this.environment.config?.build?.outDir;
-				invariant(serverBuildDirectory);
+				let clientBuildDirectory = getClientBuildDirectory$1(viteConfig);
+				let serverBuildDirectory = path$2.resolve(this.environment.config.root, this.environment.config.build.outDir);
 				let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
 				let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
 				let userSsrEmitAssets = viteUserConfig.environments?.ssr?.build?.ssrEmitAssets ?? viteUserConfig.environments?.ssr?.build?.emitAssets ?? viteUserConfig.build?.ssrEmitAssets ?? false;
@@ -1795,8 +1838,8 @@ const reactRouterVitePlugin = () => {
 				logHandledAssets(copiedAssetPaths, `${copiedAssetPaths.length} asset${copiedAssetPaths.length > 1 ? "s" : ""} copied from React Router server build to client assets.`);
 				if (handledAssetPaths.length) viteConfig.logger.info("");
 			} },
-			async buildEnd() {
-				if (viteConfig?.command !== "build") await closePluginResources();
+			async buildEnd(error) {
+				if (viteConfig?.command !== "build" || error) await closePluginResources();
 			}
 		},
 		{
@@ -1955,7 +1998,8 @@ const reactRouterVitePlugin = () => {
 				if (isRouteChunkModuleId(id)) id = id.split("?")[0];
 				let route = getRoute(ctx.reactRouterConfig, id);
 				if (!route) return;
-				if (!options?.ssr && isSpaModeEnabled(ctx.reactRouterConfig)) {
+				let isServerEnvironment = isReactRouterServerEnvironment(ctx, this.environment.name);
+				if (!options?.ssr && isSpaModeEnabled(ctx.reactRouterConfig) && !isApiOnlyMode(ctx.reactRouterConfig)) {
 					let exportNames = getExportNames(code);
 					let serverOnlyExports = exportNames.filter((exp) => {
 						if (route.id === "root" && exp === "loader") return false;
@@ -1976,6 +2020,7 @@ const reactRouterVitePlugin = () => {
 				let [filepath] = id.split("?");
 				let ast = parse$1(code, { sourceType: "module" });
 				if (!options?.ssr) removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
+				else if (isApiOnlyMode(ctx.reactRouterConfig) && isServerEnvironment && !isPrerenderingEnabled(ctx.reactRouterConfig) && viteCommand === "build" && route.id !== "root") removeExports(ast, CLIENT_ROUTE_EXPORTS$1);
 				decorateComponentExportsWithProps(ast);
 				return generate(ast, {
 					sourceMaps: true,
@@ -2092,10 +2137,7 @@ const reactRouterVitePlugin = () => {
 		prerender({
 			config() {
 				process.env.IS_RR_BUILD_REQUEST = "yes";
-				return {
-					buildDirectory: getClientBuildDirectory$1(ctx.reactRouterConfig),
-					concurrency: getPrerenderConcurrencyConfig$1(ctx.reactRouterConfig)
-				};
+				return { concurrency: getPrerenderConcurrencyConfig$1(ctx.reactRouterConfig) };
 			},
 			async requests() {
 				invariant(viteConfig);
@@ -2117,7 +2159,7 @@ const reactRouterVitePlugin = () => {
 						else requests.push(createRouteRequest(prerenderPath, reactRouterConfig));
 					}
 				}
-				if (!ctx.reactRouterConfig.ssr) requests.push(createSpaModeRequest(ctx.reactRouterConfig));
+				if (!ctx.reactRouterConfig.ssr || ctx.reactRouterConfig.ssr === "unstable_api-only") requests.push(createSpaModeRequest(ctx.reactRouterConfig));
 				return requests;
 			},
 			async postProcess(request, response, metadata) {
@@ -2181,10 +2223,13 @@ const reactRouterVitePlugin = () => {
 				if (metadata.type === "spa") return;
 				viteConfig.logger.info(`Prerender (${metadata.type}): ${metadata.path} -> ${colors.bold(outputPath)}`);
 			},
+			cleanup() {
+				return closePluginResources();
+			},
 			async finalize(buildDirectory) {
 				invariant(viteConfig);
 				let { ssr } = ctx.reactRouterConfig;
-				if (!ssr) {
+				if (!ssr || ssr === "unstable_api-only") {
 					let spaFallback = path$2.join(buildDirectory, "__spa-fallback.html");
 					let index = path$2.join(buildDirectory, "index.html");
 					let finalSpaPath;
@@ -2202,6 +2247,7 @@ const reactRouterVitePlugin = () => {
 		}),
 		{
 			name: "react-router-build-end",
+			enforce: "post",
 			sharedDuringBuild: true,
 			config: {
 				order: "post",
@@ -2209,19 +2255,31 @@ const reactRouterVitePlugin = () => {
 					return { builder: { async buildApp(builder) {
 						try {
 							await buildApp?.(builder);
-							invariant(viteConfig);
-							let { buildManifest, reactRouterConfig } = ctx;
-							invariant(buildManifest, "Expected build manifest");
-							await reactRouterConfig.buildEnd?.({
-								buildManifest,
-								reactRouterConfig,
-								viteConfig
-							});
-						} finally {
+						} catch (error) {
 							await closePluginResources();
+							throw error;
 						}
+						await closeChildCompiler();
 					} } };
 				}
+			},
+			buildApp: {
+				order: "post",
+				async handler() {
+					try {
+						invariant(viteConfig);
+						let { buildManifest, reactRouterConfig } = ctx;
+						invariant(buildManifest, "Expected build manifest");
+						updateServerBundlePaths();
+						await reactRouterConfig.buildEnd?.({
+							buildManifest,
+							reactRouterConfig,
+							viteConfig
+						});
+					} finally {
+						await closePluginResources();
+					}
+				}
 			}
 		},
 		validatePluginOrder(),
@@ -2319,7 +2377,10 @@ function isPrerenderingEnabled(reactRouterConfig) {
 	return reactRouterConfig.prerender != null && reactRouterConfig.prerender !== false;
 }
 function isSpaModeEnabled(reactRouterConfig) {
-	return reactRouterConfig.ssr === false && !isPrerenderingEnabled(reactRouterConfig);
+	return (!reactRouterConfig.ssr || reactRouterConfig.ssr === "unstable_api-only") && !isPrerenderingEnabled(reactRouterConfig);
+}
+function isApiOnlyMode(reactRouterConfig) {
+	return reactRouterConfig.ssr === "unstable_api-only";
 }
 function getStaticPrerenderPaths(routes) {
 	let paths = ["/"];
@@ -2512,12 +2573,8 @@ async function cleanBuildDirectory(viteConfig, ctx) {
 		recursive: true
 	});
 }
-async function cleanViteManifests(environmentsOptions, ctx) {
-	let viteManifestPaths = Object.entries(environmentsOptions).map(([environmentName, options]) => {
-		let outDir = options.build?.outDir;
-		invariant(outDir, `Expected build.outDir for ${environmentName}`);
-		return path$2.join(outDir, ".vite/manifest.json");
-	});
+async function cleanViteManifests(environments, ctx) {
+	let viteManifestPaths = environments.map(({ config }) => path$2.resolve(config.root, config.build.outDir, ".vite/manifest.json"));
 	await Promise.all(viteManifestPaths.map(async (viteManifestPath) => {
 		if (!existsSync(viteManifestPath)) return;
 		if (!ctx.viteManifestEnabled) await rm(viteManifestPath, {
@@ -2535,7 +2592,7 @@ async function getBuildManifest({ reactRouterConfig, rootDirectory }) {
 	let { routes, serverBundles, appDirectory } = reactRouterConfig;
 	if (!serverBundles) return { routes };
 	let { normalizePath } = await import("vite");
-	let serverBuildDirectory = getServerBuildDirectory(reactRouterConfig);
+	let serverBuildDirectory = getDefaultServerBuildDirectory(reactRouterConfig);
 	let resolvedAppDirectory = path$2.resolve(rootDirectory, appDirectory);
 	let buildManifest = {
 		serverBundles: {},
@@ -2634,14 +2691,14 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
 				return path$2.posix.join(assetsDir, `[name]${routeChunkSuffix}-[hash].js`);
 			} }
 		},
-		outDir: getClientBuildDirectory$1(ctx.reactRouterConfig)
+		outDir: getDefaultClientBuildDirectory(ctx.reactRouterConfig)
 	} }) };
 	let serverBundleIds = getServerBundleIds(ctx);
 	if (serverBundleIds) for (let serverBundleId of serverBundleIds) {
 		const environmentName = `${SSR_BUNDLE_PREFIX}${serverBundleId}`;
-		environmentOptionsResolvers[environmentName] = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), { build: { outDir: getServerBuildDirectory(ctx.reactRouterConfig, { serverBundleId }) } }, viteUserConfig.environments?.ssr ?? {});
+		environmentOptionsResolvers[environmentName] = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), { build: { outDir: getDefaultServerBuildDirectory(ctx.reactRouterConfig, { serverBundleId }) } }, viteUserConfig.environments?.ssr ?? {});
 	}
-	else environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), { build: { outDir: getServerBuildDirectory(ctx.reactRouterConfig) } });
+	else environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), { build: { outDir: getDefaultServerBuildDirectory(ctx.reactRouterConfig) } });
 	return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
@@ -2677,7 +2734,7 @@ function createDataRequest(prerenderPath, reactRouterConfig, onlyRoutes, isResou
 	let url = new URL(`http://localhost${normalizedPath}`);
 	if (onlyRoutes?.length) url.searchParams.set("_routes", onlyRoutes.join(","));
 	return {
-		request: new Request(url),
+		request: new Request(url, { headers: { "X-React-Router-Prerender": "yes" } }),
 		metadata: {
 			type: "data",
 			path: prerenderPath,
@@ -2687,7 +2744,7 @@ function createDataRequest(prerenderPath, reactRouterConfig, onlyRoutes, isResou
 }
 function createRouteRequest(prerenderPath, reactRouterConfig, data) {
 	let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/");
-	let headers = new Headers();
+	let headers = new Headers({ "X-React-Router-Prerender": "yes" });
 	if (data) {
 		let encodedData = encodeURI(data);
 		if (encodedData.length < 8 * 1024) headers.set("X-React-Router-Prerender-Data", encodedData);
@@ -2702,8 +2759,13 @@ function createRouteRequest(prerenderPath, reactRouterConfig, data) {
 }
 function createResourceRouteRequest(prerenderPath, reactRouterConfig, requestInit) {
 	let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/").replace(/\/$/g, "");
+	let headers = new Headers(requestInit?.headers);
+	headers.set("X-React-Router-Prerender", "yes");
 	return {
-		request: new Request(`http://localhost${normalizedPath}`, requestInit),
+		request: new Request(`http://localhost${normalizedPath}`, {
+			...requestInit,
+			headers
+		}),
 		metadata: {
 			type: "resource",
 			path: prerenderPath
@@ -2863,6 +2925,38 @@ const ENSURE_CLIENT_ROUTE_MODULE_CHUNK_FOR_HMR = `
 import * as ___EnsureClientRouteModuleForHMR_REACT___ from "react";
 export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRouteModuleForHMR_REACT___.createElement(___EnsureClientRouteModuleForHMR_REACT___.Fragment, null) }
 `;
+function createEmptySourceMap() {
+	return {
+		version: 3,
+		names: [],
+		sources: [],
+		mappings: ""
+	};
+}
+function generateRouteModule(code, map, filename) {
+	const ast = parse$1(code, { sourceType: "module" });
+	const generatorOptions = {
+		sourceMaps: true,
+		sourceFileName: filename,
+		inputSourceMap: map
+	};
+	return {
+		ast,
+		generate: () => generate(ast, generatorOptions)
+	};
+}
+function prependUnmappedCode(prefix, generated) {
+	if (generated.map) generated.map.mappings = ";".repeat(prefix.match(/\n/g)?.length ?? 0) + generated.map.mappings;
+	return {
+		code: prefix + generated.code,
+		map: generated.map
+	};
+}
+function appendUnmappedCode(generated, code) {
+	if (!generated.code.endsWith("\n") && !code.startsWith("\n")) code = "\n" + code;
+	if (generated.map) generated.map.mappings += ";A".repeat(code.match(/\n/g)?.length ?? 0);
+	generated.code += code;
+}
 function virtualRouteModulesPlugin({ enforceSplitRouteModules, environments: { client = ["client", "ssr"], server = ["rsc"] } = {}, getRouteIdForFile, isRootRouteModule, transformToJs, shouldTransform }) {
 	let clientEnvironments = new Set(client);
 	let serverEnvironments = new Set(server);
@@ -2898,7 +2992,10 @@ function virtualRouteModulesPlugin({ enforceSplitRouteModules, environments: { c
 				}
 			});
 		}
-		return { code: "\"use client\";\n" + result };
+		return {
+			code: "\"use client\";\n" + result,
+			map: createEmptySourceMap()
+		};
 	}
 	async function createServerRouteEntry(id, code, isRootRouteModule, routeId) {
 		let result = "";
@@ -2938,16 +3035,19 @@ ${result}`;
 				}
 			});
 		}
-		return { code: result };
+		return {
+			code: result,
+			map: createEmptySourceMap()
+		};
 	}
-	function createServerRouteModule(code) {
-		const ast = parse$1(code, { sourceType: "module" });
+	function createServerRouteModule(code, map, filename) {
+		const { ast, generate } = generateRouteModule(code, map, filename);
 		removeExports(ast, CLIENT_ROUTE_EXPORTS);
-		return generate(ast);
+		return generate();
 	}
-	async function createClientRouteModuleChunk(id, code, chunk, routeId, isRootRouteModule, isDevMode) {
+	async function createClientRouteModuleChunk(id, code, chunk, routeId, isRootRouteModule, isDevMode, map, filename) {
 		let routeChunks = detectRouteChunks(cache, id, code, isRootRouteModule);
-		const ast = parse$1(code, { sourceType: "module" });
+		const { ast, generate } = generateRouteModule(code, map, filename);
 		const { staticExports } = await parseRouteExports(code);
 		if (chunk === "shared") removeExports(ast, [...SERVER_ROUTE_EXPORTS, ...routeChunks.chunkedExports]);
 		else {
@@ -2955,33 +3055,26 @@ ${result}`;
 			toRemove.delete(chunk);
 			removeExports(ast, Array.from(toRemove));
 		}
-		let result = "\"use client\";\n" + generate(ast).code;
+		let result = prependUnmappedCode("\"use client\";\n", generate());
 		if (chunk === "shared") {
-			if (isRootRouteModule && !staticExports.includes("ErrorBoundary") && !staticExports.includes("ServerErrorBoundary")) {
-				const hasRootLayout = staticExports.includes("Layout") || staticExports.includes("ServerLayout");
-				result += `\nimport { createElement as __rr_createElement } from "react";\n`;
-				result += `import { UNSAFE_RSCDefaultRootErrorBoundary } from "react-router";\n`;
-				result += `export function ErrorBoundary() {\n`;
-				result += `  return __rr_createElement(UNSAFE_RSCDefaultRootErrorBoundary, { hasRootLayout: ${hasRootLayout} });\n`;
-				result += `}\n`;
-			}
-			result += ENSURE_CLIENT_ROUTE_MODULE_CHUNK_FOR_HMR;
+			if (isRootRouteModule && !staticExports.includes("ErrorBoundary") && !staticExports.includes("ServerErrorBoundary")) appendUnmappedCode(result, `
+import { createElement as __rr_createElement } from "react";
+import { UNSAFE_RSCDefaultRootErrorBoundary } from "react-router";
+export function ErrorBoundary() {
+  return __rr_createElement(UNSAFE_RSCDefaultRootErrorBoundary, { hasRootLayout: ${staticExports.includes("Layout") || staticExports.includes("ServerLayout")} });\n}\n`);
+			appendUnmappedCode(result, ENSURE_CLIENT_ROUTE_MODULE_CHUNK_FOR_HMR);
 		}
 		let hasAction = staticExports.includes("action");
 		let hasLoader = staticExports.includes("loader");
 		let hasComponent = staticExports.includes("default") || staticExports.includes("ServerComponent");
 		let hasErrorBoundary = staticExports.includes("ErrorBoundary") || staticExports.includes("ServerErrorBoundary");
-		if (isDevMode) {
-			result += `export function ReactRouterHMRMeta___() {return null;};\n`;
-			result += `Object.assign(ReactRouterHMRMeta___, {
+		if (isDevMode) appendUnmappedCode(result, `export function ReactRouterHMRMeta___() {return null;};\nObject.assign(ReactRouterHMRMeta___, {
         hasAction: ${JSON.stringify(hasAction)},
         hasComponent: ${JSON.stringify(hasComponent)},
         hasErrorBoundary: ${JSON.stringify(hasErrorBoundary)},
         hasLoader: ${JSON.stringify(hasLoader)},
         hasClientLoader: ${JSON.stringify(staticExports.includes("clientLoader"))},
-      });\n`;
-			result += `\nif (import.meta.hot) {\n`;
-			result += `  import.meta.hot.accept((mod) => {
+      });\n\nif (import.meta.hot) {\n  import.meta.hot.accept((mod) => {
           if (typeof __reactRouterDataRouter === "object") {
             __reactRouterDataRouter._updateRoutesForHMR(new Map([[${JSON.stringify(routeId)}, {
               routeModule: mod,
@@ -2995,10 +3088,8 @@ ${result}`;
             }
           }
         });
-      `;
-			result += `}\n`;
-		}
-		return { code: result };
+      }\n`);
+		return result;
 	}
 	return {
 		name: "react-router-rsc-virtual-route-modules",
@@ -3010,12 +3101,13 @@ ${result}`;
 			let isClientEnvironment = clientEnvironments.has(this.environment.name);
 			let isServerEnvironment = serverEnvironments.has(this.environment.name);
 			if (!isClientEnvironment && !isServerEnvironment) return;
-			let code = await transformToJs(_code, filename);
+			let transformed = await transformToJs(_code, filename);
+			let code = transformed.code;
 			let searchParams = rest.length > 0 ? new URLSearchParams(rest.join("?")) : null;
 			let clientRouteModuleType = searchParams?.get("client-route-module");
 			let isServerRouteModule = searchParams?.has("server-route-module");
-			if (clientRouteModuleType) return await createClientRouteModuleChunk(id, code, clientRouteModuleType, routeId, isRootRouteModule(filename), this.environment.mode === "dev");
-			if (isServerRouteModule) return createServerRouteModule(code);
+			if (clientRouteModuleType) return await createClientRouteModuleChunk(id, code, clientRouteModuleType, routeId, isRootRouteModule(filename), this.environment.mode === "dev", transformed.map, filename);
+			if (isServerRouteModule) return createServerRouteModule(code, transformed.map, filename);
 			if (isClientEnvironment) return await createClientRouteEntry(id, code, isRootRouteModule(filename), routeId);
 			return await createServerRouteEntry(id, code, isRootRouteModule(filename), routeId);
 		}
@@ -3181,7 +3273,7 @@ function reactRouterRSCVitePlugin() {
 		await preloadVite();
 		let vite = getVite();
 		let lang = getTransformLanguage(filename);
-		return ("transformWithOxc" in vite && typeof vite.transformWithOxc === "function" ? await vite.transformWithOxc(code, filename, {
+		return "transformWithOxc" in vite && typeof vite.transformWithOxc === "function" ? await vite.transformWithOxc(code, filename, {
 			lang,
 			jsx: {
 				runtime: "automatic",
@@ -3194,7 +3286,7 @@ function reactRouterRSCVitePlugin() {
 			format: "esm",
 			jsx: "automatic",
 			jsxDev: viteCommand !== "build"
-		})).code;
+		});
 	}
 	async function getClientVersion(source) {
 		const digest = await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(source));
@@ -3223,6 +3315,7 @@ function reactRouterRSCVitePlugin() {
 						if (userConfig.buildEnd) errors.push("buildEnd");
 						if (userConfig.presets?.length) errors.push("presets");
 						if (userConfig.serverBundles) errors.push("serverBundles");
+						if (userConfig.ssr === "unstable_api-only") errors.push("ssr: \"unstable_api-only\"");
 						if (errors.length) return `RSC Framework Mode does not currently support the following React Router config:\n${errors.map((x) => ` - ${x}`).join("\n")}\n`;
 					}
 				});
@@ -3240,6 +3333,7 @@ function reactRouterRSCVitePlugin() {
 				});
 				let routeFiles = new Set(Object.values(config.routes).map((route) => resolveRelativeRouteFilePath(route, config)));
 				return {
+					__reactRouterBuildContext: { close: () => configLoader.close() },
 					resolve: { dedupe: [
 						"react",
 						"react/jsx-runtime",
@@ -3355,7 +3449,7 @@ format: config.serverModuleFormat }
 				});
 			},
 			configurePreviewServer(previewServer) {
-				const clientBuildDirectory = getClientBuildDirectory(config);
+				const clientBuildDirectory = getClientBuildDirectory(resolvedViteConfig);
 				if ((config.prerender || config.ssr === false) && process.env.IS_RR_BUILD_REQUEST !== "yes") {
 					previewServer.middlewares.use(async (req, res, next) => {
 						try {
@@ -3390,11 +3484,8 @@ format: config.serverModuleFormat }
 					};
 				}
 			},
-			buildApp: {
-				order: "post",
-				async handler() {
-					await configLoader.close();
-				}
+			async buildEnd(error) {
+				if (error) await configLoader.close();
 			}
 		},
 		(() => {
@@ -3561,12 +3652,10 @@ export default assetsManifest.clientVersion;
 		warnOnClientSourceMaps(),
 		prerender({
 			config() {
-				return {
-					buildDirectory: getClientBuildDirectory(config),
-					concurrency: getPrerenderConcurrencyConfig(config)
-				};
+				return { concurrency: getPrerenderConcurrencyConfig(config) };
 			},
 			logFile: (path) => logger.info(`Prerendered ${colors.bold(path)}`),
+			cleanup: () => configLoader.close(),
 			async requests() {
 				const prerenderPaths = new Set(await getPrerenderPaths(config.prerender, config.ssr, config.routes, true));
 				let basename = !config.basename || config.basename === "/" ? "/" : config.basename.endsWith("/") ? config.basename : config.basename + "/";
@@ -3622,7 +3711,18 @@ export default assetsManifest.clientVersion;
 				}
 				return files;
 			}
-		})
+		}),
+		{
+			name: "react-router/rsc/build-end",
+			enforce: "post",
+			sharedDuringBuild: true,
+			buildApp: {
+				order: "post",
+				async handler() {
+					await configLoader.close();
+				}
+			}
+		}
 	];
 }
 const virtual = {
@@ -3654,7 +3754,7 @@ function createRSCOptimizeDepsRouteModulesPlugin({ routeFiles, transformToJs })
 				let normalizedFilename = getVite().normalizePath(filename);
 				if (!routeFiles.has(normalizedFilename)) return;
 				return {
-					code: createClientRouteModuleForOptimizeDepsScan(await transformToJs(code, filename)).code,
+					code: createClientRouteModuleForOptimizeDepsScan((await transformToJs(code, filename)).code).code,
 					map: null,
 					moduleType: "js"
 				};
@@ -3662,7 +3762,7 @@ function createRSCOptimizeDepsRouteModulesPlugin({ routeFiles, transformToJs })
 		}
 	};
 }
-const getClientBuildDirectory = (reactRouterConfig) => path$1.join(reactRouterConfig.buildDirectory, "client");
+const getClientBuildDirectory = (viteConfig) => path$1.resolve(viteConfig.root, viteConfig.environments.client.build.outDir);
 function getPrerenderConcurrencyConfig(reactRouterConfig) {
 	let concurrency = 1;
 	let { prerender } = reactRouterConfig;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/dev",
   "type": "module",
-  "version": "8.4.0",
+  "version": "8.5.1",
   "description": "Dev tools and CLI for React Router",
   "keywords": [
     "react",
@@ -107,7 +107,7 @@
     "semver": "^7.8.1",
     "tinyglobby": "^0.2.16",
     "valibot": "^1.4.1",
-    "@react-router/node": "8.4.0"
+    "@react-router/node": "8.5.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-jsx": "^7.29.7",
@@ -132,8 +132,8 @@
     "vite": "^7.0.0",
     "wireit": "0.14.12",
     "wrangler": "^4.95.0",
-    "react-router": "^8.4.0",
-    "@react-router/serve": "8.4.0"
+    "@react-router/serve": "8.5.1",
+    "react-router": "^8.5.1"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.26",
@@ -141,8 +141,8 @@
     "typescript": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "vite": "^7.0.0 || ^8.0.0",
     "wrangler": "^4.0.0",
-    "@react-router/serve": "^8.4.0",
-    "react-router": "^8.4.0"
+    "@react-router/serve": "^8.5.1",
+    "react-router": "^8.5.1"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {