@react-router/dev 0.0.0-experimental-7ed11be → 0.0.0-experimental-795b50c5b

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@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

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * 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`
     };
   }
@@ -1696,7 +1696,7 @@ var init_plugin = __esm({
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
-      "unstable_clientMiddleware",
+      "clientMiddleware",
       "handle",
       "meta",
       "links",

package/dist/config/default-rsc-entries/entry.client.tsx

@@ -24,7 +24,11 @@ setServerCallback(
 );
 
 createFromReadableStream<RSCPayload>(getRSCStream()).then((payload) => {
-  startTransition(() => {
+  // @ts-expect-error - on 18 types, requires 19.
+  startTransition(async () => {
+    const formState =
+      payload.type === "render" ? await payload.formState : undefined;
+
     hydrateRoot(
       document,
       <StrictMode>
@@ -33,6 +37,10 @@ createFromReadableStream<RSCPayload>(getRSCStream()).then((payload) => {
           createFromReadableStream={createFromReadableStream}
         />
       </StrictMode>,
+      {
+        // @ts-expect-error - no types for this yet
+        formState,
+      },
     );
   });
 });

package/dist/config/default-rsc-entries/entry.rsc.tsx

@@ -1,6 +1,7 @@
 import {
   createTemporaryReferenceSet,
   decodeAction,
+  decodeFormState,
   decodeReply,
   loadServerAction,
   renderToReadableStream,
@@ -12,8 +13,9 @@ import routes from "virtual:react-router/unstable_rsc/routes";
 export async function fetchServer(request: Request) {
   return await matchRSCServerRequest({
     createTemporaryReferenceSet,
-    decodeReply,
     decodeAction,
+    decodeFormState,
+    decodeReply,
     loadServerAction,
     request,
     routes,

package/dist/config/default-rsc-entries/entry.ssr.tsx

@@ -12,16 +12,22 @@ export default async function handler(
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
+
   return routeRSCServerRequest({
     request,
     fetchServer,
     createFromReadableStream,
-    renderHTML(getPayload) {
+    async renderHTML(getPayload) {
+      const payload = await getPayload();
+      const formState =
+        payload.type === "render" ? await payload.formState : undefined;
+
       return ReactDomServer.renderToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,
         {
           bootstrapScriptContent,
           signal: request.signal,
+          formState,
         },
       );
     },

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;

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-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * 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"
   });
@@ -1698,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
+        });
       }
     },
     {
@@ -1759,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, {
@@ -1788,7 +1868,13 @@ function reactRouterRSCVitePlugin() {
       name: "react-router/rsc/hmr/updates",
       async hotUpdate({ server, file, modules }) {
         if (this.environment.name !== "rsc") return;
-        const isServerOnlyChange = (server.environments.client.moduleGraph.getModulesByFile(file)?.size ?? 0) === 0;
+        const clientModules = server.environments.client.moduleGraph.getModulesByFile(file);
+        const vite2 = await import("vite");
+        const isServerOnlyChange = !clientModules || clientModules.size === 0 || // Handle CSS injected from server-first routes (with ?direct query
+        // string) since the client graph has a reference to the CSS
+        vite2.isCSSRequest(file) && Array.from(clientModules).some(
+          (mod) => mod.id?.includes("?direct")
+        );
         for (const mod of getModulesWithImporters(modules)) {
           if (!mod.file) continue;
           const normalizedPath = import_pathe5.default.normalize(mod.file);

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * 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-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * 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-7ed11be
+ * @react-router/dev v0.0.0-experimental-795b50c5b
  *
  * 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) {
@@ -2359,16 +2359,11 @@ function validatePluginOrder() {
 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",
@@ -2851,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,
@@ -2868,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
           }
         });
@@ -2902,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,
@@ -2964,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,
@@ -2988,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
           }
         });
@@ -3656,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")
             }
           });
@@ -4085,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: []
   };
@@ -4539,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-7ed11be",
+  "version": "0.0.0-experimental-795b50c5b",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -73,7 +73,7 @@
     "@babel/traverse": "^7.27.7",
     "@babel/types": "^7.27.7",
     "@npmcli/package-json": "^4.0.1",
-    "@vitejs/plugin-rsc": "0.4.11",
+    "@vitejs/plugin-rsc": "0.4.25",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
     "chokidar": "^4.0.0",
@@ -91,7 +91,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-7ed11be"
+    "@react-router/node": "0.0.0-experimental-795b50c5b"
   },
   "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-7ed11be",
-    "react-router": "^0.0.0-experimental-7ed11be"
+    "@react-router/serve": "0.0.0-experimental-795b50c5b",
+    "react-router": "^0.0.0-experimental-795b50c5b"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-7ed11be",
-    "react-router": "^0.0.0-experimental-7ed11be"
+    "@react-router/serve": "^0.0.0-experimental-795b50c5b",
+    "react-router": "^0.0.0-experimental-795b50c5b"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {