@react-router/dev 0.0.0-experimental-ce4015162 → 0.0.0-experimental-8cee090e4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # `@react-router/dev`
 
+## v7.16.0
+
+### Minor Changes
+
+- Stabilize `future.unstable_trailingSlashAwareDataRequests` as `future.v8_trailingSlashAwareDataRequests` ([#15098](https://github.com/remix-run/react-router/pull/15098))
+  - The unstable flag is no longer supported and will error during config resolution
+
+- Log future flag warnings for upcoming React Router v8 flags ([#15029](https://github.com/remix-run/react-router/pull/15029))
+  - `v8_middleware`, `v8_splitRouteModules`, `v8_viteEnvironmentApi`, `v8_passThroughRequests`, `v8_trailingSlashAwareDataRequests`
+
+### Patch Changes
+
+- Updated dependencies:
+  - [`react-router@7.16.0`](https://github.com/remix-run/react-router/releases/tag/react-router@7.16.0)
+  - [`@react-router/node@7.16.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.16.0)
+  - [`@react-router/serve@7.16.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.16.0)
+
 ## v7.15.1
 
 ### Patch Changes

package/dist/{build-BzQqIPQx.js → build-B3Cfdu0l.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { i as preloadVite, r as getVite } from "./vite-oFg2Sopv.js";
+import { g as preloadVite, h as getVite } from "./typegen-DTHWSW2W.js";
 //#region vite/build.ts
 async function build(root, viteBuildOptions) {
 	await preloadVite();

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,16 +9,15 @@
  *
  * @license MIT
  */
-import { l as loadConfig, n as watch, t as run$1 } from "../typegen-DfdqqoXA.js";
-import { i as preloadVite, r as getVite } from "../vite-oFg2Sopv.js";
+import { g as preloadVite, h as getVite, l as loadConfig, n as watch, t as run$1 } from "../typegen-DTHWSW2W.js";
 import { createRequire } from "node:module";
+import fs, { existsSync } from "node:fs";
+import * as path$1 from "node:path";
+import path from "node:path";
 import arg from "arg";
 import semver from "semver";
 import colors from "picocolors";
-import fs, { existsSync } from "node:fs";
 import { copyFile, readFile, writeFile } from "node:fs/promises";
-import * as path$1 from "node:path";
-import path from "node:path";
 import exitHook from "exit-hook";
 import { readPackageJSON } from "pkg-types";
 import "react-router";
@@ -142,7 +141,7 @@ async function routes(rootDirectory, flags = {}) {
 }
 async function build(root, options = {}) {
 	root = resolveRootDirectory(root, options);
-	let { build } = await import("../build-BzQqIPQx.js");
+	let { build } = await import("../build-B3Cfdu0l.js");
 	if (options.profile) await start();
 	try {
 		await build(root, options);
@@ -151,7 +150,7 @@ async function build(root, options = {}) {
 	}
 }
 async function dev(root, options = {}) {
-	let { dev } = await import("../dev--vS8KUm0.js");
+	let { dev } = await import("../dev-CJPpPQeG.js");
 	if (options.profile) await start();
 	exitHook(() => stop(console.info));
 	root = resolveRootDirectory(root, options);

package/dist/{config-DOhNF86o.d.ts → config-DvmRcD4Z.d.ts}

@@ -1,5 +1,5 @@
 
-import { i as RouteManifestEntry, n as RouteConfigEntry, r as RouteManifest } from "./routes-BbocpwgJ.js";
+import { i as RouteManifestEntry, n as RouteConfigEntry, r as RouteManifest } from "./routes-Kx8VZRs3.js";
 import * as Vite from "vite";
 
 //#region config/config.d.ts
@@ -39,7 +39,6 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
   unstable_optimizeDeps: boolean;
-  unstable_trailingSlashAwareDataRequests: boolean;
 }
 type SplitRouteModulesOption = boolean | "enforce";
 type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;

package/dist/config.d.ts

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

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/{dev--vS8KUm0.js → dev-CJPpPQeG.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { i as preloadVite, r as getVite } from "./vite-oFg2Sopv.js";
+import { g as preloadVite, h as getVite } from "./typegen-DTHWSW2W.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-DWLkrlkM.js → routes-sm_wl6yW.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,10 +8,17 @@
  *
  * @license MIT
  */
-import { t as invariant } from "./invariant-BCP1NPJ8.js";
 import * as Path from "pathe";
 import pick from "lodash/pick.js";
 import * as v from "valibot";
+//#region invariant.ts
+function invariant(value, message) {
+	if (value === false || value === null || typeof value === "undefined") {
+		console.error("The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose");
+		throw new Error(message);
+	}
+}
+//#endregion
 //#region config/routes.ts
 function setAppDirectory(directory) {
 	globalThis.__reactRouterAppDirectory = directory;
@@ -184,4 +191,4 @@ function joinRoutePaths(path1, path2) {
 	return [path1.replace(/\/+$/, ""), path2.replace(/^\/+/, "")].join("/");
 }
 //#endregion
-export { prefix as a, setAppDirectory as c, layout as i, validateRouteConfig as l, getAppDirectory as n, relative as o, index as r, route as s, configRoutesToRouteManifest as t };
+export { prefix as a, setAppDirectory as c, layout as i, validateRouteConfig as l, getAppDirectory as n, relative as o, index as r, route as s, configRoutesToRouteManifest as t, invariant as u };

package/dist/routes.d.ts

@@ -1,3 +1,3 @@
 
-import { a as getAppDirectory, c as prefix, l as relative, n as RouteConfigEntry, o as index, s as layout, t as RouteConfig, u as route } from "./routes-BbocpwgJ.js";
+import { a as getAppDirectory, c as prefix, l as relative, n as RouteConfigEntry, o as index, s as layout, t as RouteConfig, u as route } from "./routes-Kx8VZRs3.js";
 export { type RouteConfig, type RouteConfigEntry, getAppDirectory, index, layout, prefix, relative, route };

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * 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-DWLkrlkM.js";
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-sm_wl6yW.js";
 export { getAppDirectory, index, layout, prefix, relative, route };

package/dist/{typegen-DfdqqoXA.js → typegen-DTHWSW2W.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,11 +8,10 @@
  *
  * @license MIT
  */
-import { a as isReactRouterRepo, i as preloadVite, r as getVite } from "./vite-oFg2Sopv.js";
-import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest } from "./routes-DWLkrlkM.js";
+import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-sm_wl6yW.js";
 import { createRequire } from "node:module";
-import colors from "picocolors";
 import fs from "node:fs";
+import colors from "picocolors";
 import fs$1 from "node:fs/promises";
 import { readPackageJSON, sortPackage, updatePackage } from "pkg-types";
 import { execSync } from "node:child_process";
@@ -41,6 +40,33 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
+//#region config/is-react-router-repo.ts
+const nodeRequire$2 = createRequire(import.meta.url);
+function isReactRouterRepo() {
+	let serverRuntimePath = path.dirname(nodeRequire$2.resolve("@react-router/node/package.json"));
+	return path.basename(path.resolve(serverRuntimePath, "..")) === "packages";
+}
+//#endregion
+//#region vite/vite.ts
+const nodeRequire$1 = createRequire(import.meta.url);
+let vite;
+const viteImportSpecifier = isReactRouterRepo() ? `file:///${path.normalize(nodeRequire$1.resolve("vite/package.json", { paths: [process.cwd()] })).replace("package.json", "dist/node/index.js")}` : "vite";
+async function preloadVite() {
+	vite = await import(viteImportSpecifier);
+}
+function getVite() {
+	invariant(vite, "getVite() called before preloadVite()");
+	return vite;
+}
+function defineCompilerOptions(options) {
+	let vite = getVite();
+	return parseInt(vite.version.split(".")[0], 10) >= 8 ? { oxc: options.oxc } : { esbuild: options.esbuild };
+}
+function defineOptimizeDepsCompilerOptions(options) {
+	let vite = getVite();
+	return parseInt(vite.version.split(".")[0], 10) >= 8 ? { rolldownOptions: options.rolldown } : { esbuildOptions: options.esbuild };
+}
+//#endregion
 //#region vite/ssr-externals.ts
 const ssrExternals = isReactRouterRepo() ? [
 	"react-router",
@@ -52,15 +78,10 @@ const ssrExternals = isReactRouterRepo() ? [
 	"@react-router/serve"
 ] : void 0;
 //#endregion
-//#region vite/vite-node.ts
+//#region vite/vite-runner.ts
 async function createContext$1({ root, mode, customLogger }) {
 	await preloadVite();
 	const vite = getVite();
-	const [{ ViteNodeServer }, { ViteNodeRunner }, { installSourcemapsSupport }] = await Promise.all([
-		import("vite-node/server"),
-		import("vite-node/client"),
-		import("vite-node/source-map")
-	]);
 	const devServer = await vite.createServer({
 		root,
 		mode,
@@ -75,24 +96,21 @@ async function createContext$1({ root, mode, customLogger }) {
 		css: { postcss: {} },
 		configFile: false,
 		envFile: false,
-		plugins: []
+		plugins: [],
+		environments: { __config_loader: {
+			consumer: "server",
+			dev: { createEnvironment: (name, config, context) => vite.createRunnableDevEnvironment(name, config) }
+		} }
 	});
-	await devServer.pluginContainer.buildStart({});
-	const server = new ViteNodeServer(devServer);
-	installSourcemapsSupport({ getSourceMap: (source) => server.getSourceMap(source) });
+	const environment = devServer.environments.__config_loader;
+	if (!vite.isRunnableDevEnvironment(environment)) {
+		await devServer.close();
+		throw new Error("React Router config loading requires Vite's __config_loader environment to be runnable.");
+	}
 	return {
 		devServer,
-		server,
-		runner: new ViteNodeRunner({
-			root: devServer.config.root,
-			base: devServer.config.base,
-			fetchModule(id) {
-				return server.fetchModule(id);
-			},
-			resolveId(id, importer) {
-				return server.resolveId(id, importer);
-			}
-		})
+		environment,
+		runner: environment.runner
 	};
 }
 //#endregion
@@ -168,11 +186,11 @@ function err(error) {
 		error
 	};
 }
-async function resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes, validateConfig }) {
+async function resolveConfig({ root, viteRunnerContext, reactRouterConfigFile, skipRoutes, validateConfig }) {
 	let reactRouterUserConfig = {};
 	if (reactRouterConfigFile) try {
 		if (!fs.existsSync(reactRouterConfigFile)) return err(`${reactRouterConfigFile} no longer exists`);
-		let configModule = await viteNodeContext.runner.executeFile(reactRouterConfigFile);
+		let configModule = await viteRunnerContext.runner.import(reactRouterConfigFile);
 		if (configModule.default === void 0) return err(`${reactRouterConfigFile} must provide a default export`);
 		if (typeof configModule.default !== "object") return err(`${reactRouterConfigFile} must export a config`);
 		reactRouterUserConfig = configModule.default;
@@ -235,7 +253,7 @@ async function resolveConfig({ root, viteNodeContext, reactRouterConfigFile, ski
 		try {
 			if (!routeConfigFile) return err(`Route config file not found at "${path.relative(root, path.join(appDirectory, "routes.ts"))}".`);
 			setAppDirectory(appDirectory);
-			let routeConfigExport = (await viteNodeContext.runner.executeFile(path.join(appDirectory, routeConfigFile))).default;
+			let routeConfigExport = (await viteRunnerContext.runner.import(path.join(appDirectory, routeConfigFile))).default;
 			let result = validateRouteConfig({
 				routeConfigFile,
 				routeConfig: await routeConfigExport
@@ -260,12 +278,10 @@ async function resolveConfig({ root, viteNodeContext, reactRouterConfigFile, ski
 	if (futureConfig) {
 		if ("unstable_splitRouteModules" in futureConfig || "v8_splitRouteModules" in futureConfig) return err("The `future.v8_splitRouteModules` flag has been moved to a top-level `config.splitRouteModules` field (default `true`)");
 		if ("unstable_viteEnvironmentApi" in futureConfig || "v8_viteEnvironmentApi" in futureConfig) return err("The `future.v8_viteEnvironmentApi` flag has been removed because Vite Environment API usage is now always enabled");
+		if ("unstable_trailingSlashAwareDataRequests" in futureConfig || "v8_trailingSlashAwareDataRequests" in futureConfig) return err("The `future.v8_trailingSlashAwareDataRequests` flag has been removed because trailing slash-aware data requests are now the default behavior");
 		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_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-		unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false
-	};
+	let future = { unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false };
 	let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
 	let splitRouteModules = userAndPresetConfigs.splitRouteModules ?? true;
 	let subResourceIntegrity = userAndPresetConfigs.subResourceIntegrity ?? false;
@@ -293,7 +309,7 @@ async function resolveConfig({ root, viteNodeContext, reactRouterConfigFile, ski
 async function createConfigLoader({ rootDirectory: root, watch, mode, skipRoutes, validateConfig }) {
 	root = path.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
 	let vite = await import("vite");
-	let viteNodeContext = await createContext$1({
+	let viteRunnerContext = await createContext$1({
 		root,
 		mode,
 		customLogger: vite.createLogger("warn", { prefix: "[react-router]" })
@@ -305,7 +321,7 @@ async function createConfigLoader({ rootDirectory: root, watch, mode, skipRoutes
 	updateReactRouterConfigFile();
 	let getConfig = () => resolveConfig({
 		root,
-		viteNodeContext,
+		viteRunnerContext,
 		reactRouterConfigFile,
 		skipRoutes,
 		validateConfig
@@ -342,9 +358,9 @@ async function createConfigLoader({ rootDirectory: root, watch, mode, skipRoutes
 					let rootRelativeFilepath = path.relative(root, filepath);
 					let configFileAddedOrRemoved = fileAddedOrRemoved && isEntryFile("react-router.config", rootRelativeFilepath);
 					if (configFileAddedOrRemoved) updateReactRouterConfigFile();
-					if (!(configFileAddedOrRemoved || Boolean(viteNodeContext.devServer?.moduleGraph.getModuleById(filepath))) && !appFileAddedOrRemoved) return;
-					viteNodeContext.devServer?.moduleGraph.invalidateAll();
-					viteNodeContext.runner?.moduleCache.clear();
+					if (!(configFileAddedOrRemoved || Boolean(viteRunnerContext.environment.moduleGraph.getModuleById(filepath))) && !appFileAddedOrRemoved) return;
+					viteRunnerContext.environment.moduleGraph.invalidateAll();
+					viteRunnerContext.runner.clearCache();
 					let result = await getConfig();
 					let prevAppDirectory = appDirectory;
 					appDirectory = path.normalize((result.value ?? currentConfig).appDirectory);
@@ -352,9 +368,9 @@ async function createConfigLoader({ rootDirectory: root, watch, mode, skipRoutes
 						fsWatcher.unwatch(prevAppDirectory);
 						fsWatcher.add(appDirectory);
 					}
-					let configCodeChanged = configFileAddedOrRemoved || reactRouterConfigFile !== void 0 && isEntryFileDependency(viteNodeContext.devServer.moduleGraph, reactRouterConfigFile, filepath);
+					let configCodeChanged = configFileAddedOrRemoved || reactRouterConfigFile !== void 0 && isEntryFileDependency(viteRunnerContext.environment.moduleGraph, reactRouterConfigFile, filepath);
 					let routeConfigFile = !skipRoutes ? findEntry(appDirectory, "routes", { absolute: true }) : void 0;
-					let routeConfigCodeChanged = routeConfigFile !== void 0 && isEntryFileDependency(viteNodeContext.devServer.moduleGraph, routeConfigFile, filepath);
+					let routeConfigCodeChanged = routeConfigFile !== void 0 && isEntryFileDependency(viteRunnerContext.environment.moduleGraph, routeConfigFile, filepath);
 					let configChanged = result.ok && !isEqual(omitRoutes(currentConfig), omitRoutes(result.value));
 					let routeConfigChanged = result.ok && !isEqual(currentConfig?.routes, result.value.routes);
 					for (let handler of changeHandlers) handler({
@@ -375,7 +391,7 @@ async function createConfigLoader({ rootDirectory: root, watch, mode, skipRoutes
 		},
 		close: async () => {
 			changeHandlers = [];
-			await viteNodeContext.devServer.close();
+			await viteRunnerContext.devServer.close();
 			await fsWatcher?.close();
 		}
 	};
@@ -838,4 +854,4 @@ async function watch(rootDirectory, { mode, logger, rsc }) {
 	return { close: async () => await ctx.configLoader.close() };
 }
 //#endregion
-export { t$1 as a, createConfigLoader as c, resolveRSCEntryFiles as d, ssrExternals as f, parse$1 as i, loadConfig as l, watch as n, traverse as o, generate as r, configRouteToBranchRoute as s, run as t, resolveEntryFiles as u };
+export { t$1 as a, createConfigLoader as c, resolveRSCEntryFiles as d, ssrExternals as f, preloadVite as g, getVite as h, parse$1 as i, loadConfig as l, defineOptimizeDepsCompilerOptions as m, watch as n, traverse as o, defineCompilerOptions as p, generate as r, configRouteToBranchRoute as s, run as t, resolveEntryFiles as u };

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ce4015162
+ * @react-router/dev v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,15 +8,14 @@
  *
  * @license MIT
  */
-import { a as t, c as createConfigLoader, d as resolveRSCEntryFiles, f as ssrExternals, i as parse$1, n as watch, o as traverse, r as generate, s as configRouteToBranchRoute, u as resolveEntryFiles } from "./typegen-DfdqqoXA.js";
-import { t as invariant } from "./invariant-BCP1NPJ8.js";
-import { i as preloadVite, n as defineOptimizeDepsCompilerOptions, r as getVite, t as defineCompilerOptions } from "./vite-oFg2Sopv.js";
+import { a as t, c as createConfigLoader, d as resolveRSCEntryFiles, f as ssrExternals, g as preloadVite, h as getVite, i as parse$1, m as defineOptimizeDepsCompilerOptions, n as watch, o as traverse, p as defineCompilerOptions, r as generate, s as configRouteToBranchRoute, u as resolveEntryFiles } from "./typegen-DTHWSW2W.js";
+import { u as invariant } from "./routes-sm_wl6yW.js";
 import { createRequire } from "node:module";
-import colors from "picocolors";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
-import { cp, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import * as path$2 from "node:path";
 import path from "node:path";
+import colors from "picocolors";
+import { cp, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { createRequestHandler, matchRoutes, unstable_setDevServerHooks } from "react-router";
 import * as Path from "pathe";
 import path$1, { join } from "pathe";
@@ -1173,6 +1172,13 @@ const reactRouterVitePlugin = () => {
 	let logger;
 	let firstLoad = true;
 	let ctx;
+	let closePluginResources = async () => {
+		await viteChildCompiler?.close();
+		viteChildCompiler = null;
+		await reactRouterConfigLoader.close();
+		await (await typegenWatcherPromise)?.close();
+		typegenWatcherPromise = void 0;
+	};
 	/** Mutates `ctx` as a side effect */
 	let updatePluginContext = async () => {
 		let reactRouterConfig;
@@ -1523,19 +1529,23 @@ const reactRouterVitePlugin = () => {
 						async buildApp(builder) {
 							invariant(viteConfig);
 							viteConfig.logger.info("Using Vite Environment API");
-							let { reactRouterConfig } = ctx;
-							await cleanBuildDirectory(viteConfig, ctx);
-							await builder.build(builder.environments.client);
-							let serverEnvironments = getServerEnvironmentValues(ctx, builder.environments);
-							await Promise.all(serverEnvironments.map(builder.build));
-							await cleanViteManifests(environments, ctx);
-							let { buildManifest } = ctx;
-							invariant(buildManifest, "Expected build manifest");
-							await reactRouterConfig.buildEnd?.({
-								buildManifest,
-								reactRouterConfig,
-								viteConfig
-							});
+							try {
+								let { reactRouterConfig } = ctx;
+								await cleanBuildDirectory(viteConfig, ctx);
+								await builder.build(builder.environments.client);
+								let serverEnvironments = getServerEnvironmentValues(ctx, builder.environments);
+								await Promise.all(serverEnvironments.map(builder.build));
+								await cleanViteManifests(environments, ctx);
+								let { buildManifest } = ctx;
+								invariant(buildManifest, "Expected build manifest");
+								await reactRouterConfig.buildEnd?.({
+									buildManifest,
+									reactRouterConfig,
+									viteConfig
+								});
+							} finally {
+								await closePluginResources();
+							}
 						}
 					}
 				};
@@ -1604,7 +1614,9 @@ const reactRouterVitePlugin = () => {
 						});
 					},
 					processRequestError: (error) => {
-						if (error instanceof Error) viteDevServer.ssrFixStacktrace(error);
+						if (error instanceof Error) {
+							if (!getVite().isRunnableDevEnvironment(viteDevServer.environments.ssr)) viteDevServer.ssrFixStacktrace(error);
+						}
 					}
 				});
 				reactRouterConfigLoader.onChange(async ({ result, configCodeChanged, routeConfigCodeChanged, configChanged, routeConfigChanged }) => {
@@ -1786,9 +1798,7 @@ const reactRouterVitePlugin = () => {
 				if (handledAssetPaths.length) viteConfig.logger.info("");
 			} },
 			async buildEnd() {
-				await viteChildCompiler?.close();
-				await reactRouterConfigLoader.close();
-				await (await typegenWatcherPromise)?.close();
+				if (viteConfig?.command !== "build") await closePluginResources();
 			}
 		},
 		{
@@ -2629,7 +2639,8 @@ function getPrerenderConcurrencyConfig$1(reactRouterConfig) {
 	return concurrency;
 }
 function createDataRequest(prerenderPath, reactRouterConfig, onlyRoutes, isResourceRoute) {
-	let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? reactRouterConfig.future.unstable_trailingSlashAwareDataRequests ? "/_.data" : "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
+	let dataRequestPath = prerenderPath.endsWith("/") ? `${prerenderPath}_.data` : `${prerenderPath}.data`;
+	let normalizedPath = `${reactRouterConfig.basename}${dataRequestPath}`.replace(/\/\/+/g, "/");
 	let url = new URL(`http://localhost${normalizedPath}`);
 	if (onlyRoutes?.length) url.searchParams.set("_routes", onlyRoutes.join(","));
 	return {
@@ -2977,6 +2988,11 @@ ${result}`;
 		}
 	};
 }
+function createClientRouteModuleForOptimizeDepsScan(code) {
+	const ast = parse$1(code, { sourceType: "module" });
+	removeExports(ast, SERVER_ROUTE_EXPORTS);
+	return generate(ast);
+}
 function createId(id, type, value) {
 	let [base, ...rest] = id.split("?");
 	const searchParams = new URLSearchParams(rest.join("?"));
@@ -3182,6 +3198,11 @@ function reactRouterRSCVitePlugin() {
 				logger = (await import("vite")).createLogger(viteUserConfig.logLevel, { prefix: "[react-router]" });
 				entries = await resolveRSCEntryFiles({ reactRouterConfig: config });
 				let viteNormalizePath = (await import("vite")).normalizePath;
+				let optimizeDepsEntries = getOptimizeDepsEntries({
+					entryClientFilePath: entries.client,
+					reactRouterConfig: config
+				});
+				let routeFiles = new Set(Object.values(config.routes).map((route) => resolveRelativeRouteFilePath(route, config)));
 				return {
 					resolve: { dedupe: [
 						"react",
@@ -3198,12 +3219,15 @@ function reactRouterRSCVitePlugin() {
 						}) ? ["react-server-dom-webpack"] : []
 					] },
 					optimizeDeps: {
-						entries: getOptimizeDepsEntries({
-							entryClientFilePath: entries.client,
-							reactRouterConfig: config
-						}),
+						entries: optimizeDepsEntries,
 						...defineOptimizeDepsCompilerOptions({
-							rolldown: { transform: { jsx: "react-jsx" } },
+							rolldown: {
+								transform: { jsx: "react-jsx" },
+								plugins: config.future.unstable_optimizeDeps ? [createRSCOptimizeDepsRouteModulesPlugin({
+									routeFiles,
+									transformToJs
+								})] : []
+							},
 							esbuild: { jsx: "automatic" }
 						}),
 						include: [
@@ -3219,9 +3243,7 @@ function reactRouterRSCVitePlugin() {
 								"react-router",
 								"react-router/dom",
 								"react-router/internal/react-server-client"
-							],
-							"react-router > cookie",
-							"react-router > set-cookie-parser"
+							]
 						]
 					},
 					...defineCompilerOptions({
@@ -3332,8 +3354,11 @@ format: config.serverModuleFormat }
 					};
 				}
 			},
-			async buildEnd() {
-				await configLoader.close();
+			buildApp: {
+				order: "post",
+				async handler() {
+					await configLoader.close();
+				}
 			}
 		},
 		(() => {
@@ -3536,6 +3561,25 @@ function invalidateVirtualModules(viteDevServer) {
 function getRootDirectory(viteUserConfig) {
 	return viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 }
+const jsRouteModuleRE = /\.[cm]?[jt]sx?$/;
+function createRSCOptimizeDepsRouteModulesPlugin({ routeFiles, transformToJs }) {
+	return {
+		name: "react-router:rsc-optimize-deps-route-modules",
+		transform: {
+			filter: { id: jsRouteModuleRE },
+			async handler(code, id) {
+				let filename = id.split("?")[0];
+				let normalizedFilename = getVite().normalizePath(filename);
+				if (!routeFiles.has(normalizedFilename)) return;
+				return {
+					code: createClientRouteModuleForOptimizeDepsScan(await transformToJs(code, filename)).code,
+					map: null,
+					moduleType: "js"
+				};
+			}
+		}
+	};
+}
 const getClientBuildDirectory = (reactRouterConfig) => path$1.join(reactRouterConfig.buildDirectory, "client");
 function getPrerenderConcurrencyConfig(reactRouterConfig) {
 	let concurrency = 1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/dev",
   "type": "module",
-  "version": "0.0.0-experimental-ce4015162",
+  "version": "0.0.0-experimental-8cee090e4",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -62,19 +62,19 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/generator": "^7.29.1",
-    "@babel/parser": "^7.29.3",
-    "@babel/plugin-syntax-jsx": "^7.28.6",
-    "@babel/preset-typescript": "^7.28.5",
-    "@babel/traverse": "^7.29.0",
-    "@babel/types": "^7.29.0",
-    "@remix-run/node-fetch-server": "^0.13.0",
+    "@babel/core": "^7.29.7",
+    "@babel/generator": "^7.29.7",
+    "@babel/parser": "^7.29.7",
+    "@babel/plugin-syntax-jsx": "^7.29.7",
+    "@babel/preset-typescript": "^7.29.7",
+    "@babel/traverse": "^7.29.7",
+    "@babel/types": "^7.29.7",
+    "@remix-run/node-fetch-server": "^0.13.3",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.12",
     "chokidar": "^5.0.0",
     "dedent": "^1.7.2",
-    "es-module-lexer": "^2.0.0",
+    "es-module-lexer": "^2.1.0",
     "exit-hook": "5.1.0",
     "isbot": "^5.1.40",
     "jsesc": "3.1.0",
@@ -84,46 +84,43 @@
     "picocolors": "^1.1.1",
     "pkg-types": "^2.3.1",
     "prettier": "^3.8.3",
-    "react-refresh": "^0.14.0",
-    "semver": "^7.8.0",
-    "tinyglobby": "^0.2.14",
-    "valibot": "^1.4.0",
-    "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-ce4015162"
+    "react-refresh": "^0.18.0",
+    "semver": "^7.8.1",
+    "tinyglobby": "^0.2.16",
+    "valibot": "^1.4.1",
+    "@react-router/node": "0.0.0-experimental-8cee090e4"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.27.0",
     "@types/babel__traverse": "^7.28.0",
     "@types/dedent": "^0.7.0",
-    "@types/express": "^4.17.9",
-    "@types/jest": "^29.5.4",
+    "@types/jest": "^30.0.0",
     "@types/jsesc": "^3.0.1",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^22.19.0",
+    "@types/node": "^22.19.19",
     "@types/npmcli__package-json": "^4.0.0",
     "@types/semver": "^7.7.1",
-    "@vitejs/plugin-rsc": "~0.5.21",
+    "@vitejs/plugin-rsc": "~0.5.26",
     "esbuild-register": "^3.6.0",
     "execa": "9.6.1",
-    "express": "^4.19.2",
     "fast-glob": "3.3.3",
-    "tsdown": "^0.21.10",
+    "tsdown": "^0.22.0",
     "typescript": "^6.0.3",
     "vite": "^7.0.0",
-    "wireit": "0.14.9",
-    "wrangler": "^4.93.1",
-    "@react-router/serve": "0.0.0-experimental-ce4015162",
-    "react-router": "^0.0.0-experimental-ce4015162"
+    "wireit": "0.14.12",
+    "wrangler": "^4.95.0",
+    "@react-router/serve": "0.0.0-experimental-8cee090e4",
+    "react-router": "^0.0.0-experimental-8cee090e4"
   },
   "peerDependencies": {
-    "@vitejs/plugin-rsc": "~0.5.21",
+    "@vitejs/plugin-rsc": "~0.5.26",
     "react-server-dom-webpack": "^19.2.6",
     "typescript": "^5.1.0 || ^6.0.0",
     "vite": "^7.0.0 || ^8.0.0",
     "wrangler": "^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-ce4015162",
-    "react-router": "^0.0.0-experimental-ce4015162"
+    "react-router": "^0.0.0-experimental-8cee090e4",
+    "@react-router/serve": "^0.0.0-experimental-8cee090e4"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {

package/dist/invariant-BCP1NPJ8.js

@@ -1,19 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-ce4015162
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-//#region invariant.ts
-function invariant(value, message) {
-	if (value === false || value === null || typeof value === "undefined") {
-		console.error("The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose");
-		throw new Error(message);
-	}
-}
-//#endregion
-export { invariant as t };

package/dist/vite-oFg2Sopv.js

@@ -1,41 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-ce4015162
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-import { t as invariant } from "./invariant-BCP1NPJ8.js";
-import { createRequire } from "node:module";
-import path from "pathe";
-//#region config/is-react-router-repo.ts
-const nodeRequire$1 = createRequire(import.meta.url);
-function isReactRouterRepo() {
-	let serverRuntimePath = path.dirname(nodeRequire$1.resolve("@react-router/node/package.json"));
-	return path.basename(path.resolve(serverRuntimePath, "..")) === "packages";
-}
-//#endregion
-//#region vite/vite.ts
-const nodeRequire = createRequire(import.meta.url);
-let vite;
-const viteImportSpecifier = isReactRouterRepo() ? `file:///${path.normalize(nodeRequire.resolve("vite/package.json", { paths: [process.cwd()] })).replace("package.json", "dist/node/index.js")}` : "vite";
-async function preloadVite() {
-	vite = await import(viteImportSpecifier);
-}
-function getVite() {
-	invariant(vite, "getVite() called before preloadVite()");
-	return vite;
-}
-function defineCompilerOptions(options) {
-	let vite = getVite();
-	return parseInt(vite.version.split(".")[0], 10) >= 8 ? { oxc: options.oxc } : { esbuild: options.esbuild };
-}
-function defineOptimizeDepsCompilerOptions(options) {
-	let vite = getVite();
-	return parseInt(vite.version.split(".")[0], 10) >= 8 ? { rolldownOptions: options.rolldown } : { esbuildOptions: options.esbuild };
-}
-//#endregion
-export { isReactRouterRepo as a, preloadVite as i, defineOptimizeDepsCompilerOptions as n, getVite as r, defineCompilerOptions as t };