@react-router/dev 7.3.0-pre.1 → 7.4.0-pre.0

package/CHANGELOG.md

@@ -1,37 +1,55 @@
 # `@react-router/dev`
 
-## 7.3.0-pre.1
+## 7.4.0-pre.0
+
+### Minor Changes
+
+- Generate types for `virtual:react-router/server-build` module ([#13152](https://github.com/remix-run/react-router/pull/13152))
 
 ### Patch Changes
 
+- When `future.unstable_splitRouteModules` is set to `"enforce"`, allow both splittable and unsplittable root route exports since it's always in a single chunk. ([#13238](https://github.com/remix-run/react-router/pull/13238))
+- When `future.unstable_viteEnvironmentApi` is enabled, allow plugins that override the default SSR environment (such as `@cloudflare/vite-plugin`) to be placed before or after the React Router plugin. ([#13183](https://github.com/remix-run/react-router/pull/13183))
+- Fix conflicts with other Vite plugins that use the `configureServer` and/or `configurePreviewServer` hooks ([#13184](https://github.com/remix-run/react-router/pull/13184))
 - Updated dependencies:
-  - `react-router@7.3.0-pre.1`
-  - `@react-router/node@7.3.0-pre.1`
-  - `@react-router/serve@7.3.0-pre.1`
+  - `react-router@7.4.0-pre.0`
+  - `@react-router/node@7.4.0-pre.0`
+  - `@react-router/serve@7.4.0-pre.0`
 
-## 7.3.0-pre.0
+## 7.3.0
 
 ### Patch Changes
 
 - Fix support for custom client `build.rollupOptions.output.entryFileNames` ([#13098](https://github.com/remix-run/react-router/pull/13098))
+
 - Fix usage of `prerender` option when `serverBundles` option has been configured or provided by a preset, e.g. `vercelPreset` from `@vercel/react-router` ([#13082](https://github.com/remix-run/react-router/pull/13082))
+
 - Fix support for custom `build.assetsDir` ([#13077](https://github.com/remix-run/react-router/pull/13077))
+
 - Remove unused dependencies ([#13134](https://github.com/remix-run/react-router/pull/13134))
+
 - Stub all routes except root in "SPA Mode" server builds to avoid issues when route modules or their dependencies import non-SSR-friendly modules ([#13023](https://github.com/remix-run/react-router/pull/13023))
+
 - Fix errors with `future.unstable_viteEnvironmentApi` when the `ssr` environment has been configured by another plugin to be a custom `Vite.DevEnvironment` rather than the default `Vite.RunnableDevEnvironment` ([#13008](https://github.com/remix-run/react-router/pull/13008))
+
 - Remove unused Vite file system watcher ([#13133](https://github.com/remix-run/react-router/pull/13133))
+
 - Fix support for custom SSR build input when `serverBundles` option has been configured ([#13107](https://github.com/remix-run/react-router/pull/13107))
 
   Note that for consumers using the `future.unstable_viteEnvironmentApi` and `serverBundles` options together, hyphens are no longer supported in server bundle IDs since they also need to be valid Vite environment names.
 
 - Fix dev server when using HTTPS by stripping HTTP/2 pseudo headers from dev server requests ([#12830](https://github.com/remix-run/react-router/pull/12830))
+
 - Lazy load Cloudflare platform proxy on first dev server request when using the `cloudflareDevProxy` Vite plugin to avoid creating unnecessary workerd processes ([#13016](https://github.com/remix-run/react-router/pull/13016))
+
 - When `future.unstable_viteEnvironmentApi` is enabled and the `ssr` environment has `optimizeDeps.noDiscovery` disabled, define `optimizeDeps.entries` and `optimizeDeps.include` ([#13007](https://github.com/remix-run/react-router/pull/13007))
+
 - Fix duplicated entries in typegen for layout routes and their corresponding index route ([#13140](https://github.com/remix-run/react-router/pull/13140))
+
 - Updated dependencies:
-  - `react-router@7.3.0-pre.0`
-  - `@react-router/node@7.3.0-pre.0`
-  - `@react-router/serve@7.3.0-pre.0`
+  - `react-router@7.3.0`
+  - `@react-router/node@7.3.0`
+  - `@react-router/serve@7.3.0`
 
 ## 7.2.0
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.3.0-pre.1
+ * @react-router/dev v7.4.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -860,6 +860,8 @@ async function writeAll(ctx) {
   });
   const registerPath = Path4.join(typegenDir, "+register.ts");
   import_node_fs3.default.writeFileSync(registerPath, register(ctx));
+  const virtualPath = Path4.join(typegenDir, "+virtual.ts");
+  import_node_fs3.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
   const register2 = import_dedent2.default`
@@ -905,7 +907,7 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
-var import_node_fs3, import_dedent2, Path4, import_picocolors3;
+var import_node_fs3, import_dedent2, Path4, import_picocolors3, virtual;
 var init_typegen = __esm({
   "typegen/index.ts"() {
     "use strict";
@@ -919,6 +921,22 @@ var init_typegen = __esm({
     init_paths();
     init_params();
     init_route();
+    virtual = import_dedent2.default`
+  declare module "virtual:react-router/server-build" {
+    import { ServerBuild } from "react-router";
+    export const assets: ServerBuild["assets"];
+    export const assetsBuildDirectory: ServerBuild["assetsBuildDirectory"];
+    export const basename: ServerBuild["basename"];
+    export const entry: ServerBuild["entry"];
+    export const future: ServerBuild["future"];
+    export const isSpaMode: ServerBuild["isSpaMode"];
+    export const prerender: ServerBuild["prerender"];
+    export const publicPath: ServerBuild["publicPath"];
+    export const routes: ServerBuild["routes"];
+    export const ssr: ServerBuild["ssr"];
+    export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
+  }
+`;
   }
 });
 
@@ -1080,12 +1098,12 @@ async function resolveViteConfig({
 function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
-function isSeverBundleEnvironmentName(name) {
+function isSsrBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
 function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => ctx.buildManifest?.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr"
   );
 }
 function getServerEnvironmentKeys(ctx, record) {
@@ -1179,13 +1197,8 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
-          // This check is required to honor the "noExternal: true" config
-          // provided by vite-plugin-cloudflare within this repo. When compiling
-          // for Cloudflare, all server dependencies are externalized, but our
-          // `ssrExternals` config inadvertently overrides this. This doesn't
-          // impact consumers because for them `ssrExternals` is undefined and
-          // Cloudflare's "noExternal: true" config remains intact.
-          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.resolve?.noExternal === true ? void 0 : ssrExternals
+          // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
+          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
         ),
         conditions,
         externalConditions: conditions
@@ -1200,7 +1213,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual2.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -1270,21 +1283,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), {
       build: {
         outDir: getServerBuildDirectory(ctx.reactRouterConfig)
-      },
-      optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
-        entries: [
-          vite2.normalizePath(ctx.entryServerFilePath),
-          ...Object.values(ctx.reactRouterConfig.routes).map(
-            (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-          )
-        ],
-        include: [
-          "react",
-          "react/jsx-dev-runtime",
-          "react-dom/server",
-          "react-router"
-        ]
-      } : void 0
+      }
     });
   }
   if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
@@ -1304,7 +1303,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, resolveRelativeRouteFilePath, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1354,13 +1353,7 @@ var init_plugin = __esm({
     CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
     virtualHmrRuntime = create("hmr-runtime");
     virtualInjectHmrRuntime = create("inject-hmr-runtime");
-    resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
-      let vite2 = getVite();
-      let file = route.file;
-      let fullPath = path7.resolve(reactRouterConfig.appDirectory, file);
-      return vite2.normalizePath(fullPath);
-    };
-    virtual = {
+    virtual2 = {
       serverBuild: create("server-build"),
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.3.0-pre.1
+ * @react-router/dev v7.4.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.3.0-pre.1
+ * @react-router/dev v7.4.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.3.0-pre.1
+ * @react-router/dev v7.4.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.3.0-pre.1
+ * @react-router/dev v7.4.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -825,6 +825,8 @@ async function writeAll(ctx) {
   });
   const registerPath = Path4.join(typegenDir, "+register.ts");
   import_node_fs2.default.writeFileSync(registerPath, register(ctx));
+  const virtualPath = Path4.join(typegenDir, "+virtual.ts");
+  import_node_fs2.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
   const register2 = import_dedent2.default`
@@ -870,6 +872,22 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
+var virtual = import_dedent2.default`
+  declare module "virtual:react-router/server-build" {
+    import { ServerBuild } from "react-router";
+    export const assets: ServerBuild["assets"];
+    export const assetsBuildDirectory: ServerBuild["assetsBuildDirectory"];
+    export const basename: ServerBuild["basename"];
+    export const entry: ServerBuild["entry"];
+    export const future: ServerBuild["future"];
+    export const isSpaMode: ServerBuild["isSpaMode"];
+    export const prerender: ServerBuild["prerender"];
+    export const publicPath: ServerBuild["publicPath"];
+    export const routes: ServerBuild["routes"];
+    export const ssr: ServerBuild["ssr"];
+    export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
+  }
+`;
 
 // vite/node-adapter.ts
 var import_node_events = require("events");
@@ -1996,12 +2014,9 @@ function isSsrBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
 var CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
-function isSeverBundleEnvironmentName(name) {
-  return name.startsWith(SSR_BUNDLE_PREFIX);
-}
 function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => ctx.buildManifest?.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr"
   );
 }
 function getServerEnvironmentValues(ctx, record) {
@@ -2014,7 +2029,7 @@ var isRouteVirtualModule = (id) => {
   return isRouteEntryModuleId(id) || isRouteChunkModuleId(id);
 };
 var isServerBuildVirtualModuleId = (id) => {
-  return id.split("?")[0] === virtual.serverBuild.id;
+  return id.split("?")[0] === virtual2.serverBuild.id;
 };
 var getServerBuildFile = (viteManifest) => {
   let serverBuildIds = Object.keys(viteManifest).filter(
@@ -2044,13 +2059,13 @@ var resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
   let fullPath = path6.resolve(reactRouterConfig.appDirectory, file);
   return vite2.normalizePath(fullPath);
 };
-var virtual = {
+var virtual2 = {
   serverBuild: create("server-build"),
   serverManifest: create("server-manifest"),
   browserManifest: create("browser-manifest")
 };
 var invalidateVirtualModules = (viteDevServer) => {
-  Object.values(virtual).forEach((vmod2) => {
+  Object.values(virtual2).forEach((vmod2) => {
     let mod = viteDevServer.moduleGraph.getModuleById(vmod2.resolvedId);
     if (mod) {
       viteDevServer.moduleGraph.invalidateModule(mod);
@@ -2322,7 +2337,7 @@ var reactRouterVitePlugin = () => {
       }
     }).join("\n")}
       export { default as assets } from ${JSON.stringify(
-      virtual.serverManifest.id
+      virtual2.serverManifest.id
     )};
       export const assetsBuildDirectory = ${JSON.stringify(
       path6.relative(
@@ -2351,7 +2366,7 @@ var reactRouterVitePlugin = () => {
     }).join(",\n  ")}
       };
       ${ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve" ? `
-              export const getCriticalCss = ({ pathname }) => {
+              export const unstable_getCriticalCss = ({ pathname }) => {
                 return {
                   rel: "stylesheet",
                   href: "${viteUserConfig.base ?? "/"}@react-router/critical.css?pathname=" + pathname,
@@ -2550,7 +2565,7 @@ var reactRouterVitePlugin = () => {
     }
     let reactRouterManifestForDev = {
       version: String(Math.random()),
-      url: combineURLs(ctx.publicPath, virtual.browserManifest.url),
+      url: combineURLs(ctx.publicPath, virtual2.browserManifest.url),
       hmr: {
         runtime: combineURLs(ctx.publicPath, virtualInjectHmrRuntime.url)
       },
@@ -2740,6 +2755,41 @@ var reactRouterVitePlugin = () => {
           }
         };
       },
+      configEnvironment(name, options) {
+        if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && (ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr")) {
+          const vite2 = getVite();
+          return {
+            resolve: {
+              external: (
+                // This check is required to honor the "noExternal: true" config
+                // provided by vite-plugin-cloudflare within this repo. When compiling
+                // for Cloudflare, all server dependencies are pre-bundled, but our
+                // `ssrExternals` config inadvertently overrides this. This doesn't
+                // impact consumers because for them `ssrExternals` is undefined and
+                // Cloudflare's "noExternal: true" config remains intact.
+                options.resolve?.noExternal === true ? void 0 : ssrExternals
+              )
+            },
+            optimizeDeps: options.optimizeDeps?.noDiscovery === false ? {
+              entries: [
+                vite2.normalizePath(ctx.entryServerFilePath),
+                ...Object.values(ctx.reactRouterConfig.routes).map(
+                  (route) => resolveRelativeRouteFilePath(
+                    route,
+                    ctx.reactRouterConfig
+                  )
+                )
+              ],
+              include: [
+                "react",
+                "react/jsx-dev-runtime",
+                "react-dom/server",
+                "react-router"
+              ]
+            } : void 0
+          };
+        }
+      },
       async configResolved(resolvedViteConfig) {
         await import_es_module_lexer.init;
         viteConfig = resolvedViteConfig;
@@ -2772,6 +2822,9 @@ var reactRouterVitePlugin = () => {
             );
           }
         }
+        const childCompilerPlugins = await asyncFlatten(
+          childCompilerConfigFile.config.plugins ?? []
+        );
         viteChildCompiler = await vite2.createServer({
           ...viteUserConfig,
           // Ensure child compiler cannot overwrite the default cache directory
@@ -2785,9 +2838,13 @@ var reactRouterVitePlugin = () => {
           configFile: false,
           envFile: false,
           plugins: [
-            ...(childCompilerConfigFile.config.plugins ?? []).flat().filter(
+            childCompilerPlugins.filter(
               (plugin2) => typeof plugin2 === "object" && plugin2 !== null && "name" in plugin2 && plugin2.name !== "react-router" && plugin2.name !== "react-router:route-exports" && plugin2.name !== "react-router:hmr-updates"
-            ),
+            ).map((plugin2) => ({
+              ...plugin2,
+              configureServer: void 0,
+              configurePreviewServer: void 0
+            })),
             {
               name: "react-router:override-optimize-deps",
               config(userConfig) {
@@ -2916,14 +2973,15 @@ var reactRouterVitePlugin = () => {
                   let vite2 = getVite();
                   let ssrEnvironment = viteDevServer.environments.ssr;
                   if (!vite2.isRunnableDevEnvironment(ssrEnvironment)) {
+                    next();
                     return;
                   }
                   build = await ssrEnvironment.runner.import(
-                    virtual.serverBuild.id
+                    virtual2.serverBuild.id
                   );
                 } else {
                   build = await viteDevServer.ssrLoadModule(
-                    virtual.serverBuild.id
+                    virtual2.serverBuild.id
                   );
                 }
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
@@ -3144,16 +3202,16 @@ var reactRouterVitePlugin = () => {
       name: "react-router:virtual-modules",
       enforce: "pre",
       resolveId(id) {
-        const vmod2 = Object.values(virtual).find((vmod3) => vmod3.id === id);
+        const vmod2 = Object.values(virtual2).find((vmod3) => vmod3.id === id);
         if (vmod2) return vmod2.resolvedId;
       },
       async load(id) {
         switch (id) {
-          case virtual.serverBuild.resolvedId: {
+          case virtual2.serverBuild.resolvedId: {
             let routeIds = getServerBundleRouteIds(this, ctx);
             return await getServerEntry({ routeIds });
           }
-          case virtual.serverManifest.resolvedId: {
+          case virtual2.serverManifest.resolvedId: {
             let routeIds = getServerBundleRouteIds(this, ctx);
             let reactRouterManifest = viteCommand === "build" ? (await generateReactRouterManifestsForBuild({
               routeIds
@@ -3171,7 +3229,7 @@ var reactRouterVitePlugin = () => {
               es6: true
             })};`;
           }
-          case virtual.browserManifest.resolvedId: {
+          case virtual2.browserManifest.resolvedId: {
             if (viteCommand === "build") {
               throw new Error("This module only exists in development");
             }
@@ -3985,6 +4043,9 @@ var resolveRouteFileCode = async (ctx, input) => {
     input.readRouteFile
   );
 };
+function isRootRouteModuleId(ctx, id) {
+  return normalizeRelativeFilePath(id, ctx.reactRouterConfig) === ctx.reactRouterConfig.routes.root.file;
+}
 async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
   function noRouteChunks() {
     return {
@@ -4000,7 +4061,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
   if (!ctx.reactRouterConfig.future.unstable_splitRouteModules) {
     return noRouteChunks();
   }
-  if (normalizeRelativeFilePath(id, ctx.reactRouterConfig) === ctx.reactRouterConfig.routes.root.file) {
+  if (isRootRouteModuleId(ctx, id)) {
     return noRouteChunks();
   }
   let code = await resolveRouteFileCode(ctx, input);
@@ -4023,6 +4084,9 @@ function validateRouteChunks({
   id,
   valid
 }) {
+  if (isRootRouteModuleId(ctx, id)) {
+    return;
+  }
   let invalidChunks = Object.entries(valid).filter(([_, isValid]) => !isValid).map(([chunkName]) => chunkName);
   if (invalidChunks.length === 0) {
     return;
@@ -4194,13 +4258,8 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
-          // This check is required to honor the "noExternal: true" config
-          // provided by vite-plugin-cloudflare within this repo. When compiling
-          // for Cloudflare, all server dependencies are externalized, but our
-          // `ssrExternals` config inadvertently overrides this. This doesn't
-          // impact consumers because for them `ssrExternals` is undefined and
-          // Cloudflare's "noExternal: true" config remains intact.
-          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.resolve?.noExternal === true ? void 0 : ssrExternals
+          // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
+          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
         ),
         conditions,
         externalConditions: conditions
@@ -4215,7 +4274,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual2.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -4285,21 +4344,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), {
       build: {
         outDir: getServerBuildDirectory(ctx.reactRouterConfig)
-      },
-      optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
-        entries: [
-          vite2.normalizePath(ctx.entryServerFilePath),
-          ...Object.values(ctx.reactRouterConfig.routes).map(
-            (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-          )
-        ],
-        include: [
-          "react",
-          "react/jsx-dev-runtime",
-          "react-dom/server",
-          "react-router"
-        ]
-      } : void 0
+      }
     });
   }
   if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
@@ -4329,6 +4374,12 @@ async function getEnvironmentsOptions(ctx, viteCommand, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
+async function asyncFlatten(arr) {
+  do {
+    arr = (await Promise.all(arr)).flat(Infinity);
+  } while (arr.some((v2) => v2?.then));
+  return arr;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   reactRouter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.3.0-pre.1",
+  "version": "7.4.0-pre.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "7.3.0-pre.1"
+    "@react-router/node": "7.4.0-pre.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^3.109.2",
-    "@react-router/serve": "7.3.0-pre.1",
-    "react-router": "^7.3.0-pre.1"
+    "@react-router/serve": "7.4.0-pre.0",
+    "react-router": "^7.4.0-pre.0"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^7.3.0-pre.1",
-    "react-router": "^7.3.0-pre.1"
+    "@react-router/serve": "^7.4.0-pre.0",
+    "react-router": "^7.4.0-pre.0"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {