@react-router/dev 0.0.0-experimental-3d7dcee → 0.0.0-experimental-426e5caec

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # `@react-router/dev`
 
+## 7.8.2
+
+### Patch Changes
+
+- fix: memory leak in default entry.server ([#14200](https://github.com/remix-run/react-router/pull/14200))
+- Updated dependencies:
+  - `react-router@7.8.2`
+  - `@react-router/node@7.8.2`
+  - `@react-router/serve@7.8.2`
+
+## 7.8.1
+
+### Patch Changes
+
+- Update generated `Route.MetaArgs` type so `loaderData` is only potentially undefined when an `ErrorBoundary` export is present ([#14173](https://github.com/remix-run/react-router/pull/14173))
+- Updated dependencies:
+  - `react-router@7.8.1`
+  - `@react-router/node@7.8.1`
+  - `@react-router/serve@7.8.1`
+
 ## 7.8.0
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -477,7 +477,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -897,7 +897,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
+        middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1118,11 +1118,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // middleware
+        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientMiddleware
+        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -1393,7 +1393,7 @@ var init_route_chunks = __esm({
     routeChunkExportNames = [
       "clientAction",
       "clientLoader",
-      "unstable_clientMiddleware",
+      "clientMiddleware",
       "HydrateFallback"
     ];
     mainChunkName = "main";
@@ -1403,7 +1403,7 @@ var init_route_chunks = __esm({
       main: `${routeChunkQueryStringPrefix}main`,
       clientAction: `${routeChunkQueryStringPrefix}clientAction`,
       clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
-      unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
+      clientMiddleware: `${routeChunkQueryStringPrefix}clientMiddleware`,
       HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
     };
   }
@@ -1417,6 +1417,13 @@ var init_with_props = __esm({
   }
 });
 
+// vite/plugins/validate-plugin-order.ts
+var init_validate_plugin_order = __esm({
+  "vite/plugins/validate-plugin-order.ts"() {
+    "use strict";
+  }
+});
+
 // vite/plugin.ts
 async function resolveViteConfig({
   configFile,
@@ -1685,10 +1692,11 @@ var init_plugin = __esm({
     init_vite();
     init_config();
     init_with_props();
+    init_validate_plugin_order();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
-      "unstable_clientMiddleware",
+      "clientMiddleware",
       "handle",
       "meta",
       "links",
@@ -1824,7 +1832,7 @@ async function viteAppBuild(root, {
         },
         configResolved(config) {
           let hasReactRouterPlugin = config.plugins.find(
-            (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
+            (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc"
           );
           if (!hasReactRouterPlugin) {
             throw new Error(
@@ -1964,7 +1972,7 @@ async function dev(root, {
     logLevel
   });
   if (!server.config.plugins.find(
-    (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
+    (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc"
   )) {
     console.error(
       import_picocolors6.default.red("React Router Vite plugin not found in Vite config")

package/dist/config/defaults/entry.server.node.tsx

@@ -16,7 +16,7 @@ export default function handleRequest(
   routerContext: EntryContext,
   loadContext: AppLoadContext,
   // If you have middleware enabled:
-  // loadContext: unstable_RouterContextProvider
+  // loadContext: RouterContextProvider
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
@@ -29,24 +29,38 @@ export default function handleRequest(
         ? "onAllReady"
         : "onShellReady";
 
+    // Abort the rendering stream after the `streamTimeout` so it has time to
+    // flush down the rejected boundaries
+    let timeoutId: ReturnType<typeof setTimeout> | undefined = setTimeout(
+      () => abort(),
+      streamTimeout + 1000,
+    );
+
     const { pipe, abort } = renderToPipeableStream(
       <ServerRouter context={routerContext} url={request.url} />,
       {
         [readyOption]() {
           shellRendered = true;
-          const body = new PassThrough();
+          const body = new PassThrough({
+            final(callback) {
+              // Clear the timeout to prevent retaining the closure and memory leak
+              clearTimeout(timeoutId);
+              timeoutId = undefined;
+              callback();
+            },
+          });
           const stream = createReadableStreamFromReadable(body);
 
           responseHeaders.set("Content-Type", "text/html");
 
+          pipe(body);
+
           resolve(
             new Response(stream, {
               headers: responseHeaders,
               status: responseStatusCode,
             }),
           );
-
-          pipe(body);
         },
         onShellError(error: unknown) {
           reject(error);
@@ -62,9 +76,5 @@ export default function handleRequest(
         },
       },
     );
-
-    // Abort the rendering stream after the `streamTimeout` so it has time to
-    // flush down the rejected boundaries
-    setTimeout(abort, streamTimeout + 1000);
   });
 }

package/dist/config.d.ts

@@ -40,7 +40,7 @@ interface FutureConfig {
     /**
      * Enable route middleware
      */
-    unstable_middleware: boolean;
+    v8_middleware: boolean;
     unstable_optimizeDeps: boolean;
     /**
      * Automatically split route modules into multiple chunks when possible.

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -510,7 +510,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -801,7 +801,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
+        middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1023,11 +1023,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // middleware
+        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientMiddleware
+        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -1348,23 +1348,43 @@ function invalidDestructureError(name) {
 }
 
 // vite/rsc/virtual-route-modules.ts
+var SERVER_ONLY_COMPONENT_EXPORTS = ["ServerComponent"];
 var SERVER_ONLY_ROUTE_EXPORTS = [
+  ...SERVER_ONLY_COMPONENT_EXPORTS,
   "loader",
   "action",
-  "unstable_middleware",
-  "headers",
-  "ServerComponent"
+  "middleware",
+  "headers"
 ];
-var COMPONENT_EXPORTS = [
-  "default",
+var SERVER_ONLY_ROUTE_EXPORTS_SET = new Set(SERVER_ONLY_ROUTE_EXPORTS);
+function isServerOnlyRouteExport(name) {
+  return SERVER_ONLY_ROUTE_EXPORTS_SET.has(name);
+}
+var COMMON_COMPONENT_EXPORTS = [
   "ErrorBoundary",
   "HydrateFallback",
   "Layout"
 ];
+var SERVER_FIRST_COMPONENT_EXPORTS = [
+  ...COMMON_COMPONENT_EXPORTS,
+  ...SERVER_ONLY_COMPONENT_EXPORTS
+];
+var SERVER_FIRST_COMPONENT_EXPORTS_SET = new Set(
+  SERVER_FIRST_COMPONENT_EXPORTS
+);
+function isServerFirstComponentExport(name) {
+  return SERVER_FIRST_COMPONENT_EXPORTS_SET.has(
+    name
+  );
+}
+var CLIENT_COMPONENT_EXPORTS = [
+  ...COMMON_COMPONENT_EXPORTS,
+  "default"
+];
 var CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "handle",
   "meta",
   "links",
@@ -1376,25 +1396,43 @@ function isClientNonComponentExport(name) {
 }
 var CLIENT_ROUTE_EXPORTS = [
   ...CLIENT_NON_COMPONENT_EXPORTS,
-  ...COMPONENT_EXPORTS
+  ...CLIENT_COMPONENT_EXPORTS
 ];
 var CLIENT_ROUTE_EXPORTS_SET = new Set(CLIENT_ROUTE_EXPORTS);
 function isClientRouteExport(name) {
   return CLIENT_ROUTE_EXPORTS_SET.has(name);
 }
+var ROUTE_EXPORTS = [
+  ...SERVER_ONLY_ROUTE_EXPORTS,
+  ...CLIENT_ROUTE_EXPORTS
+];
+var ROUTE_EXPORTS_SET = new Set(ROUTE_EXPORTS);
+function isRouteExport(name) {
+  return ROUTE_EXPORTS_SET.has(name);
+}
+function isCustomRouteExport(name) {
+  return !isRouteExport(name);
+}
+function hasReactServerCondition(viteEnvironment) {
+  return viteEnvironment.config.resolve.conditions.includes("react-server");
+}
 function transformVirtualRouteModules({
   id,
   code,
-  viteCommand
+  viteCommand,
+  routeIdByFile,
+  viteEnvironment
 }) {
-  if (!id.includes("route-module")) {
-    return;
-  }
-  if (isVirtualRouteModuleId(id)) {
-    return createVirtualRouteModuleCode({ id, code, viteCommand });
+  if (isVirtualRouteModuleId(id) || routeIdByFile.has(id)) {
+    return createVirtualRouteModuleCode({
+      id,
+      code,
+      viteCommand,
+      viteEnvironment
+    });
   }
   if (isVirtualServerRouteModuleId(id)) {
-    return createVirtualServerRouteModuleCode({ id, code });
+    return createVirtualServerRouteModuleCode({ id, code, viteEnvironment });
   }
   if (isVirtualClientRouteModuleId(id)) {
     return createVirtualClientRouteModuleCode({ id, code, viteCommand });
@@ -1403,22 +1441,44 @@ function transformVirtualRouteModules({
 async function createVirtualRouteModuleCode({
   id,
   code: routeSource,
-  viteCommand
+  viteCommand,
+  viteEnvironment
 }) {
+  const isReactServer = hasReactServerCondition(viteEnvironment);
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
   const clientModuleId = getVirtualClientModuleId(id);
   const serverModuleId = getVirtualServerModuleId(id);
   let code = "";
   if (isServerFirstRoute) {
+    if (staticExports.some(isServerFirstComponentExport)) {
+      code += `import React from "react";
+`;
+    }
     for (const staticExport of staticExports) {
       if (isClientNonComponentExport(staticExport)) {
         code += `export { ${staticExport} } from "${clientModuleId}";
 `;
-      } else if (staticExport === "ServerComponent") {
-        code += `export { ServerComponent as default } from "${serverModuleId}";
+      } else if (isReactServer && isServerFirstComponentExport(staticExport) && // Layout wraps all other component exports so doesn't need CSS injected
+      staticExport !== "Layout") {
+        code += `import { ${staticExport} as ${staticExport}WithoutCss } from "${serverModuleId}";
+`;
+        code += `export ${staticExport === "ServerComponent" ? "default " : " "}function ${staticExport}(props) {
+`;
+        code += `  return React.createElement(React.Fragment, null,
+`;
+        code += `    import.meta.viteRsc.loadCss(),
+`;
+        code += `    React.createElement(${staticExport}WithoutCss, props),
+`;
+        code += `  );
+`;
+        code += `}
 `;
-      } else {
+      } else if (isReactServer && isRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${serverModuleId}";
+`;
+      } else if (isCustomRouteExport(staticExport)) {
+        code += `export { ${staticExport} } from "${isReactServer ? serverModuleId : clientModuleId}";
 `;
       }
     }
@@ -1431,8 +1491,11 @@ async function createVirtualRouteModuleCode({
       if (isClientRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${clientModuleId}";
 `;
-      } else {
+      } else if (isReactServer && isServerOnlyRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${serverModuleId}";
+`;
+      } else if (isCustomRouteExport(staticExport)) {
+        code += `export { ${staticExport} } from "${isReactServer ? serverModuleId : clientModuleId}";
 `;
       }
     }
@@ -1445,8 +1508,18 @@ async function createVirtualRouteModuleCode({
 }
 function createVirtualServerRouteModuleCode({
   id,
-  code: routeSource
+  code: routeSource,
+  viteEnvironment
 }) {
+  if (!hasReactServerCondition(viteEnvironment)) {
+    throw new Error(
+      [
+        "Virtual server route module was loaded outside of the RSC environment.",
+        `Environment Name: ${viteEnvironment.name}`,
+        `Module ID: ${id}`
+      ].join("\n")
+    );
+  }
   const { staticExports, isServerFirstRoute } = parseRouteExports(routeSource);
   const clientModuleId = getVirtualClientModuleId(id);
   const serverRouteModuleAst = import_parser.parse(routeSource, {
@@ -1474,7 +1547,7 @@ function createVirtualClientRouteModuleCode({
   viteCommand
 }) {
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
-  const exportsToRemove = isServerFirstRoute ? [...SERVER_ONLY_ROUTE_EXPORTS, ...COMPONENT_EXPORTS] : SERVER_ONLY_ROUTE_EXPORTS;
+  const exportsToRemove = isServerFirstRoute ? [...SERVER_ONLY_ROUTE_EXPORTS, ...CLIENT_COMPONENT_EXPORTS] : SERVER_ONLY_ROUTE_EXPORTS;
   const clientRouteModuleAst = import_parser.parse(routeSource, {
     sourceType: "module"
   });
@@ -1534,6 +1607,32 @@ function isVirtualServerRouteModuleId(id) {
   return /(\?|&)server-route-module(&|$)/.test(id);
 }
 
+// vite/plugins/validate-plugin-order.ts
+function validatePluginOrder() {
+  return {
+    name: "react-router:validate-plugin-order",
+    configResolved(viteConfig) {
+      let pluginIndex = (pluginName) => {
+        pluginName = Array.isArray(pluginName) ? pluginName : [pluginName];
+        return viteConfig.plugins.findIndex(
+          (plugin) => pluginName.includes(plugin.name)
+        );
+      };
+      let rollupPrePlugins = [
+        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
+      ];
+      for (let prePlugin of rollupPrePlugins) {
+        let prePluginIndex = pluginIndex(prePlugin.pluginName);
+        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
+          throw new Error(
+            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
+          );
+        }
+      }
+    }
+  };
+}
+
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
   let configLoader;
@@ -1543,7 +1642,7 @@ function reactRouterRSCVitePlugin() {
   let routeIdByFile;
   return [
     {
-      name: "react-router/rsc/config",
+      name: "react-router/rsc",
       async config(viteUserConfig, { command, mode }) {
         await import_es_module_lexer2.init;
         viteCommand = command;
@@ -1586,9 +1685,21 @@ function reactRouterRSCVitePlugin() {
             jsxDev: viteCommand !== "build"
           },
           environments: {
-            client: { build: { outDir: "build/client" } },
-            rsc: { build: { outDir: "build/server" } },
-            ssr: { build: { outDir: "build/server/__ssr_build" } }
+            client: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "client")
+              }
+            },
+            rsc: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server")
+              }
+            },
+            ssr: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server/__ssr_build")
+              }
+            }
           },
           build: {
             rollupOptions: {
@@ -1660,7 +1771,14 @@ function reactRouterRSCVitePlugin() {
     {
       name: "react-router/rsc/virtual-route-modules",
       transform(code, id) {
-        return transformVirtualRouteModules({ code, id, viteCommand });
+        if (!routeIdByFile) return;
+        return transformVirtualRouteModules({
+          code,
+          id,
+          viteCommand,
+          routeIdByFile,
+          viteEnvironment: this.environment
+        });
       }
     },
     {
@@ -1721,8 +1839,8 @@ function reactRouterRSCVitePlugin() {
         const isJSX = filepath.endsWith("x");
         const useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
         if (!useFastRefresh) return;
-        const routeId = routeIdByFile?.get(filepath);
-        if (routeId !== void 0) {
+        if (isVirtualClientRouteModuleId(id)) {
+          const routeId = routeIdByFile?.get(filepath);
           return { code: addRefreshWrapper({ routeId, code, id }) };
         }
         const result = await babel.transformAsync(code, {
@@ -1783,6 +1901,7 @@ function reactRouterRSCVitePlugin() {
         return modules;
       }
     },
+    validatePluginOrder(),
     (0, import_plugin_rsc.default)({ entries: getRscEntries() })
   ];
 }

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { UNSAFE_MiddlewareEnabled, unstable_RouterContextProvider, AppLoadContext } from 'react-router';
+import { UNSAFE_MiddlewareEnabled, RouterContextProvider, AppLoadContext } from 'react-router';
 import { Plugin } from 'vite';
 import { PlatformProxy, GetPlatformProxyOptions } from 'wrangler';
 
@@ -10,7 +10,7 @@ type LoadContext<Env, Cf extends CfProperties> = {
 type GetLoadContext<Env, Cf extends CfProperties> = (args: {
     request: Request;
     context: LoadContext<Env, Cf>;
-}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<unstable_RouterContextProvider> : MaybePromise<AppLoadContext>;
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<RouterContextProvider> : MaybePromise<AppLoadContext>;
 /**
  * Vite plugin that provides [Node proxies to local workerd
  * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -573,7 +573,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-426e5caec
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -533,7 +533,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -883,7 +883,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
+        middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1105,11 +1105,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // middleware
+        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientMiddleware
+        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -2210,7 +2210,7 @@ function detectRouteChunks(code, cache, cacheKey) {
 var routeChunkExportNames = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "HydrateFallback"
 ];
 var mainChunkName = "main";
@@ -2226,7 +2226,7 @@ var routeChunkQueryStrings = {
   main: `${routeChunkQueryStringPrefix}main`,
   clientAction: `${routeChunkQueryStringPrefix}clientAction`,
   clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
-  unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
+  clientMiddleware: `${routeChunkQueryStringPrefix}clientMiddleware`,
   HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
 };
 function getRouteChunkModuleId(filePath, chunkName) {
@@ -2329,20 +2329,41 @@ function toFunctionExpression(decl) {
   );
 }
 
+// vite/plugins/validate-plugin-order.ts
+function validatePluginOrder() {
+  return {
+    name: "react-router:validate-plugin-order",
+    configResolved(viteConfig) {
+      let pluginIndex = (pluginName) => {
+        pluginName = Array.isArray(pluginName) ? pluginName : [pluginName];
+        return viteConfig.plugins.findIndex(
+          (plugin) => pluginName.includes(plugin.name)
+        );
+      };
+      let rollupPrePlugins = [
+        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
+      ];
+      for (let prePlugin of rollupPrePlugins) {
+        let prePluginIndex = pluginIndex(prePlugin.pluginName);
+        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
+          throw new Error(
+            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
+          );
+        }
+      }
+    }
+  };
+}
+
 // vite/plugin.ts
 function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
-var SERVER_ONLY_ROUTE_EXPORTS = [
-  "loader",
-  "action",
-  "unstable_middleware",
-  "headers"
-];
+var SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "middleware", "headers"];
 var CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "handle",
   "meta",
   "links",
@@ -2671,10 +2692,6 @@ var reactRouterVitePlugin = () => {
       buildManifest
     };
   };
-  let pluginIndex = (pluginName) => {
-    invariant(viteConfig);
-    return viteConfig.plugins.findIndex((plugin) => plugin.name === pluginName);
-  };
   let getServerEntry = async ({ routeIds }) => {
     invariant(viteConfig, "viteconfig required to generate the server entry");
     let routes = routeIds ? (
@@ -2829,9 +2846,7 @@ var reactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[route.id];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware"
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let { hasRouteChunkByExportName } = await detectRouteChunksIfEnabled(
         cache,
@@ -2846,7 +2861,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
+            clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -2880,10 +2895,10 @@ var reactRouterVitePlugin = () => {
           viteManifest,
           getRouteChunkModuleId(routeFile, "clientLoader")
         ) : void 0,
-        clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware ? getPublicModulePathForEntry(
+        clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware ? getPublicModulePathForEntry(
           ctx,
           viteManifest,
-          getRouteChunkModuleId(routeFile, "unstable_clientMiddleware")
+          getRouteChunkModuleId(routeFile, "clientMiddleware")
         ) : void 0,
         hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback ? getPublicModulePathForEntry(
           ctx,
@@ -2942,9 +2957,7 @@ var reactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[key];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware"
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let routeModulePath = combineURLs(
         ctx.publicPath,
@@ -2966,7 +2979,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
+            clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -3238,17 +3251,6 @@ var reactRouterVitePlugin = () => {
           childCompilerConfigFile,
           "Vite config file was unable to be resolved for React Router child compiler"
         );
-        let rollupPrePlugins = [
-          { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
-        ];
-        for (let prePlugin of rollupPrePlugins) {
-          let prePluginIndex = pluginIndex(prePlugin.pluginName);
-          if (prePluginIndex >= 0 && prePluginIndex > pluginIndex("react-router")) {
-            throw new Error(
-              `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
-            );
-          }
-        }
         const childCompilerPlugins = await asyncFlatten(
           childCompilerConfigFile.config.plugins ?? []
         );
@@ -3266,7 +3268,7 @@ var reactRouterVitePlugin = () => {
           envFile: false,
           plugins: [
             childCompilerPlugins.filter(
-              (plugin) => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router:route-exports" && plugin.name !== "react-router:hmr-updates"
+              (plugin) => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router:route-exports" && plugin.name !== "react-router:hmr-updates" && plugin.name !== "react-router:validate-plugin-order"
             ).map((plugin) => ({
               ...plugin,
               configureServer: void 0,
@@ -3645,9 +3647,7 @@ var reactRouterVitePlugin = () => {
             valid: {
               clientAction: !exportNames.includes("clientAction"),
               clientLoader: !exportNames.includes("clientLoader"),
-              unstable_clientMiddleware: !exportNames.includes(
-                "unstable_clientMiddleware"
-              ),
+              clientMiddleware: !exportNames.includes("clientMiddleware"),
               HydrateFallback: !exportNames.includes("HydrateFallback")
             }
           });
@@ -3955,7 +3955,8 @@ var reactRouterVitePlugin = () => {
           server.environments.client.reloadModule(clientModule);
         }
       }
-    }
+    },
+    validatePluginOrder()
   ];
 };
 function getParentClientNodes(clientModuleGraph, module2) {
@@ -4073,13 +4074,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,
+    clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware ? `${getRouteChunkModuleId(moduleUrl, "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"),
+    hasClientMiddleware: sourceExports.includes("clientMiddleware"),
     hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
     imports: []
   };
@@ -4527,7 +4528,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
       hasRouteChunkByExportName: {
         clientAction: false,
         clientLoader: false,
-        unstable_clientMiddleware: false,
+        clientMiddleware: false,
         HydrateFallback: false
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-3d7dcee",
+  "version": "0.0.0-experimental-426e5caec",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -91,7 +91,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-3d7dcee"
+    "@react-router/node": "0.0.0-experimental-426e5caec"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -114,15 +114,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-3d7dcee",
-    "react-router": "^0.0.0-experimental-3d7dcee"
+    "@react-router/serve": "0.0.0-experimental-426e5caec",
+    "react-router": "^0.0.0-experimental-426e5caec"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "react-router": "^0.0.0-experimental-3d7dcee",
-    "@react-router/serve": "^0.0.0-experimental-3d7dcee"
+    "@react-router/serve": "^0.0.0-experimental-426e5caec",
+    "react-router": "^0.0.0-experimental-426e5caec"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {