@react-router/dev 0.0.0-experimental-35027c3be → 0.0.0-experimental-47c4c03cf

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # `@react-router/dev`
 
+## 7.4.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.4.0`
+  - `@react-router/node@7.4.0`
+  - `@react-router/serve@7.4.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`
+  - `@react-router/node@7.3.0`
+  - `@react-router/serve@7.3.0`
+
 ## 7.2.0
 
 ### Minor Changes

package/README.md

@@ -1,5 +1,5 @@
 Dev tools and CLI for React Router that enables framework features through bundler integration like server rendering, code splitting, HMR, etc.
 
 ```sh
-npm install @react-router/dev
+npm install @react-router/dev --save-dev
 ```

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-35027c3be
+ * @react-router/dev v0.0.0-experimental-47c4c03cf
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -419,7 +419,6 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -861,7 +860,7 @@ 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");
+  const virtualPath = Path4.join(typegenDir, "+virtual.d.ts");
   import_node_fs3.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
@@ -1048,6 +1047,7 @@ var init_route_chunks = __esm({
     routeChunkExportNames = [
       "clientAction",
       "clientLoader",
+      "unstable_clientMiddleware",
       "HydrateFallback"
     ];
     mainChunkName = "main";
@@ -1057,6 +1057,7 @@ var init_route_chunks = __esm({
       main: `${routeChunkQueryStringPrefix}main`,
       clientAction: `${routeChunkQueryStringPrefix}clientAction`,
       clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
+      unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
       HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
     };
   }
@@ -1099,12 +1100,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) {
@@ -1198,13 +1199,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
@@ -1254,7 +1250,10 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
           output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
             entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
-              let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId) : null;
+              let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId)?.replace(
+                "unstable_",
+                ""
+              ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
               return path7.posix.join(
                 (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
@@ -1289,21 +1288,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") {
@@ -1323,12 +1308,11 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, fs4, 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, virtual2, 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";
     import_node_crypto = require("crypto");
-    fs4 = __toESM(require("fs"));
     path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));
@@ -1374,12 +1358,6 @@ 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);
-    };
     virtual2 = {
       serverBuild: create("server-build"),
       serverManifest: create("server-manifest"),

package/dist/config.d.ts

@@ -46,7 +46,6 @@ interface FutureConfig {
      * Automatically split route modules into multiple chunks when possible.
      */
     unstable_splitRouteModules: boolean | "enforce";
-    unstable_subResourceIntegrity: boolean;
     /**
      * Use Vite Environment API (experimental)
      */

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-35027c3be
+ * @react-router/dev v0.0.0-experimental-47c4c03cf
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-35027c3be
+ * @react-router/dev v0.0.0-experimental-47c4c03cf
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/static/refresh-utils.cjs

@@ -45,7 +45,12 @@ const enqueueUpdate = debounce(async () => {
 
     let needsRevalidation = new Set(
       Array.from(routeUpdates.values())
-        .filter((route) => route.hasLoader || route.hasClientLoader)
+        .filter(
+          (route) =>
+            route.hasLoader ||
+            route.hasClientLoader ||
+            route.hasClientMiddleware
+        )
         .map((route) => route.id)
     );
 

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-35027c3be
+ * @react-router/dev v0.0.0-experimental-47c4c03cf
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -512,7 +512,6 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-35027c3be
+ * @react-router/dev v0.0.0-experimental-47c4c03cf
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,7 +46,6 @@ module.exports = __toCommonJS(vite_exports);
 
 // vite/plugin.ts
 var import_node_crypto = require("crypto");
-var fs3 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var fse = __toESM(require("fs-extra"));
@@ -476,7 +475,6 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -827,7 +825,7 @@ 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");
+  const virtualPath = Path4.join(typegenDir, "+virtual.d.ts");
   import_node_fs2.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
@@ -1819,6 +1817,7 @@ function detectRouteChunks(code, cache, cacheKey) {
 var routeChunkExportNames = [
   "clientAction",
   "clientLoader",
+  "unstable_clientMiddleware",
   "HydrateFallback"
 ];
 var mainChunkName = "main";
@@ -1834,6 +1833,7 @@ var routeChunkQueryStrings = {
   main: `${routeChunkQueryStringPrefix}main`,
   clientAction: `${routeChunkQueryStringPrefix}clientAction`,
   clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
+  unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
   HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
 };
 function getRouteChunkModuleId(filePath, chunkName) {
@@ -2016,12 +2016,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) {
@@ -2400,34 +2397,6 @@ var reactRouterVitePlugin = () => {
     );
     return /* @__PURE__ */ new Set([...cssUrlPaths, ...chunkAssetPaths]);
   };
-  let generateSriManifest = async (ctx2) => {
-    let clientBuildDirectory = getClientBuildDirectory(ctx2.reactRouterConfig);
-    let entries = fs3.readdirSync(clientBuildDirectory, {
-      withFileTypes: true,
-      recursive: true
-    });
-    let sriManifest = {};
-    for (const entry of entries) {
-      if (entry.isFile() && entry.name.endsWith(".js")) {
-        let contents;
-        try {
-          contents = await fse.readFile(
-            path6.join(entry.path, entry.name),
-            "utf-8"
-          );
-        } catch (e) {
-          logger.error(`Failed to read file for SRI generation: ${entry.name}`);
-          throw e;
-        }
-        let hash = (0, import_node_crypto.createHash)("sha384").update(contents).digest().toString("base64");
-        let filepath = getVite().normalizePath(
-          path6.relative(clientBuildDirectory, path6.join(entry.path, entry.name))
-        );
-        sriManifest[`${ctx2.publicPath}${filepath}`] = `sha384-${hash}`;
-      }
-    }
-    return sriManifest;
-  };
   let generateReactRouterManifestsForBuild = async ({
     routeIds
   }) => {
@@ -2453,6 +2422,9 @@ var reactRouterVitePlugin = () => {
       let isRootRoute = route.parentId === void 0;
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
+      let hasClientMiddleware = sourceExports.includes(
+        "unstable_clientMiddleware"
+      );
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let { hasRouteChunkByExportName } = await detectRouteChunksIfEnabled(
         cache,
@@ -2467,6 +2439,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
+            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -2481,6 +2454,7 @@ var reactRouterVitePlugin = () => {
         hasLoader: sourceExports.includes("loader"),
         hasClientAction,
         hasClientLoader,
+        hasClientMiddleware,
         hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
         ...getReactRouterManifestBuildAssets(
           ctx,
@@ -2501,6 +2475,11 @@ var reactRouterVitePlugin = () => {
           viteManifest,
           getRouteChunkModuleId(routeFile, "clientLoader")
         ) : void 0,
+        clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware ? getPublicModulePathForEntry(
+          ctx,
+          viteManifest,
+          getRouteChunkModuleId(routeFile, "unstable_clientMiddleware")
+        ) : void 0,
         hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback ? getPublicModulePathForEntry(
           ctx,
           viteManifest,
@@ -2522,8 +2501,7 @@ var reactRouterVitePlugin = () => {
     let nonFingerprintedValues = { url: url2, version };
     let reactRouterBrowserManifest = {
       ...fingerprintedValues,
-      ...nonFingerprintedValues,
-      sri: void 0
+      ...nonFingerprintedValues
     };
     await writeFileSafe(
       path6.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
@@ -2531,14 +2509,9 @@ var reactRouterVitePlugin = () => {
         reactRouterBrowserManifest
       )};`
     );
-    let sri = void 0;
-    if (ctx.reactRouterConfig.future.unstable_subResourceIntegrity) {
-      sri = await generateSriManifest(ctx);
-    }
     let reactRouterServerManifest = {
       ...reactRouterBrowserManifest,
-      routes: serverRoutes,
-      sri
+      routes: serverRoutes
     };
     return {
       reactRouterBrowserManifest,
@@ -2558,6 +2531,9 @@ var reactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[key];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
+      let hasClientMiddleware = sourceExports.includes(
+        "unstable_clientMiddleware"
+      );
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let routeModulePath = combineURLs(
         ctx.publicPath,
@@ -2579,6 +2555,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
+            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -2593,16 +2570,17 @@ var reactRouterVitePlugin = () => {
         // Split route modules are a build-time optimization
         clientActionModule: void 0,
         clientLoaderModule: void 0,
+        clientMiddlewareModule: void 0,
         hydrateFallbackModule: void 0,
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
         hasClientAction,
         hasClientLoader,
+        hasClientMiddleware,
         hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
         imports: []
       };
     }
-    let sri = void 0;
     let reactRouterManifestForDev = {
       version: String(Math.random()),
       url: combineURLs(ctx.publicPath, virtual2.browserManifest.url),
@@ -2616,7 +2594,6 @@ var reactRouterVitePlugin = () => {
         ),
         imports: []
       },
-      sri,
       routes
     };
     currentReactRouterManifestForDev = reactRouterManifestForDev;
@@ -2796,6 +2773,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;
@@ -2828,6 +2840,9 @@ var reactRouterVitePlugin = () => {
             );
           }
         }
+        const childCompilerPlugins = await asyncFlatten(
+          childCompilerConfigFile.config.plugins ?? []
+        );
         viteChildCompiler = await vite2.createServer({
           ...viteUserConfig,
           // Ensure child compiler cannot overwrite the default cache directory
@@ -2841,9 +2856,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) {
@@ -2972,6 +2991,7 @@ var reactRouterVitePlugin = () => {
                   let vite2 = getVite();
                   let ssrEnvironment = viteDevServer.environments.ssr;
                   if (!vite2.isRunnableDevEnvironment(ssrEnvironment)) {
+                    next();
                     return;
                   }
                   build = await ssrEnvironment.runner.import(
@@ -3189,6 +3209,9 @@ var reactRouterVitePlugin = () => {
             valid: {
               clientAction: !exportNames.includes("clientAction"),
               clientLoader: !exportNames.includes("clientLoader"),
+              unstable_clientMiddleware: !exportNames.includes(
+                "unstable_clientMiddleware"
+              ),
               HydrateFallback: !exportNames.includes("HydrateFallback")
             }
           });
@@ -3461,6 +3484,8 @@ var reactRouterVitePlugin = () => {
             "hasAction",
             "hasClientAction",
             "clientActionModule",
+            "hasClientMiddleware",
+            "clientMiddlewareModule",
             "hasErrorBoundary",
             "hydrateFallbackModule"
           ].some((key) => oldRouteMetadata[key] !== newRouteMetadata[key])) {
@@ -3614,11 +3639,13 @@ async function getRouteMetadata(cache, ctx, viteChildCompiler, route, readRouteF
     // Ensure the Vite dev server responds with a JS module
     clientActionModule: hasRouteChunkByExportName.clientAction ? `${getRouteChunkModuleId(moduleUrl, "clientAction")}` : void 0,
     clientLoaderModule: hasRouteChunkByExportName.clientLoader ? `${getRouteChunkModuleId(moduleUrl, "clientLoader")}` : void 0,
+    clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware ? `${getRouteChunkModuleId(moduleUrl, "unstable_clientMiddleware")}` : void 0,
     hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback ? `${getRouteChunkModuleId(moduleUrl, "HydrateFallback")}` : void 0,
     hasAction: sourceExports.includes("action"),
     hasClientAction: sourceExports.includes("clientAction"),
     hasLoader: sourceExports.includes("loader"),
     hasClientLoader: sourceExports.includes("clientLoader"),
+    hasClientMiddleware: sourceExports.includes("unstable_clientMiddleware"),
     hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
     imports: []
   };
@@ -3807,7 +3834,7 @@ async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDire
   let data = await response.text();
   if (response.status !== 200) {
     throw new Error(
-      `Prerender (data): Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${path6}\` path.
+      `Prerender (data): Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${prerenderPath}\` path.
 ${normalizedPath}`
     );
   }
@@ -4041,6 +4068,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 {
@@ -4049,6 +4079,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
       hasRouteChunkByExportName: {
         clientAction: false,
         clientLoader: false,
+        unstable_clientMiddleware: false,
         HydrateFallback: false
       }
     };
@@ -4056,7 +4087,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);
@@ -4079,6 +4110,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;
@@ -4250,13 +4284,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
@@ -4306,7 +4335,10 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
           output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
             entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
-              let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId) : null;
+              let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId)?.replace(
+                "unstable_",
+                ""
+              ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
               return path6.posix.join(
                 (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
@@ -4341,21 +4373,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") {
@@ -4385,6 +4403,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": "0.0.0-experimental-35027c3be",
+  "version": "0.0.0-experimental-47c4c03cf",
   "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": "0.0.0-experimental-35027c3be"
+    "@react-router/node": "0.0.0-experimental-47c4c03cf"
   },
   "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": "0.0.0-experimental-35027c3be",
-    "react-router": "^0.0.0-experimental-35027c3be"
+    "react-router": "^0.0.0-experimental-47c4c03cf",
+    "@react-router/serve": "0.0.0-experimental-47c4c03cf"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-35027c3be",
-    "react-router": "^0.0.0-experimental-35027c3be"
+    "@react-router/serve": "^0.0.0-experimental-47c4c03cf",
+    "react-router": "^0.0.0-experimental-47c4c03cf"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {