@react-router/dev 8.5.0 → 8.5.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # `@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
@@ -11,7 +25,7 @@
 
 ### Unstable Changes
 
-⚠️  _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+⚠️ _[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

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.5.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-CiHN93zF.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.5.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-CiHN93zF.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-ZbZgdE7Y.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-DGFm0uWr.js");
+		let { dev } = await import("../dev-LVfdDvQH.js");
 		if (options.profile) await start();
 		exitHook(() => stop(console.info));
 		root = resolveRootDirectory(root, options);

package/dist/config.js

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

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.5.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-CiHN93zF.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-Cyup1Gnm.js → routes-DAb9gz9-.js}

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

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.5.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-Cyup1Gnm.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-CiHN93zF.js → typegen-CqlAVM2O.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.5.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-Cyup1Gnm.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";

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.5.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-CiHN93zF.js";
-import { u as invariant } from "./routes-Cyup1Gnm.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";
@@ -789,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) {
@@ -1158,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;
@@ -1189,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;
@@ -1233,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;
@@ -1248,7 +1264,7 @@ const reactRouterVitePlugin = () => {
 			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 = ${Boolean(ctx.reactRouterConfig.ssr)};
@@ -1292,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
@@ -1316,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 = {};
@@ -1381,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: {
@@ -1494,11 +1510,16 @@ 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,
+					__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,
@@ -1552,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);
 						}
 					}
 				};
@@ -1685,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)) {
@@ -1700,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"),
@@ -1737,7 +1757,7 @@ const reactRouterVitePlugin = () => {
 								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(ctx.reactRouterConfig);
+									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");
@@ -1759,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;
@@ -1819,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();
 			}
 		},
 		{
@@ -2118,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);
@@ -2207,6 +2223,9 @@ 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;
@@ -2228,6 +2247,7 @@ const reactRouterVitePlugin = () => {
 		}),
 		{
 			name: "react-router-build-end",
+			enforce: "post",
 			sharedDuringBuild: true,
 			config: {
 				order: "post",
@@ -2235,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(),
@@ -2541,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, {
@@ -2564,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: {},
@@ -2663,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) {
@@ -3305,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",
@@ -3420,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 {
@@ -3455,11 +3484,8 @@ format: config.serverModuleFormat }
 					};
 				}
 			},
-			buildApp: {
-				order: "post",
-				async handler() {
-					await configLoader.close();
-				}
+			async buildEnd(error) {
+				if (error) await configLoader.close();
 			}
 		},
 		(() => {
@@ -3626,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 + "/";
@@ -3687,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 = {
@@ -3727,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.5.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.5.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.5.0",
-    "@react-router/serve": "8.5.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.5.0",
-    "react-router": "^8.5.0"
+    "@react-router/serve": "^8.5.1",
+    "react-router": "^8.5.1"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {