@react-router/dev 0.0.0-experimental-cb0fdf114 → 0.0.0-experimental-34996874d

package/CHANGELOG.md

@@ -1,5 +1,112 @@
 # `@react-router/dev`
 
+## v7.14.2
+
+### Patch Changes
+
+- Fix typegen for layouts without pages ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+
+  Previously, typegen could produce `pages: ;` in `.react-router/types/+routes.ts` when a route corresponded to 0 pages.
+  Now, `pages: never;` is correctly generated for those cases.
+
+### Unstable Changes
+
+⚠️ _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+
+- For `unstable_reactRouterRSC` Vite plugin consumers, require `@vitejs/plugin-react` in user Vite config, and more reliably split route modules. ([#14965](https://github.com/remix-run/react-router/pull/14965)) ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+  - ⚠️ This is a breaking change if you have begun using the `unstable_reactRouterRSC` Vite plugin - please install `@vitejs/plugin-react` and add the `react` plugin to your Vite plugins array.
+
+- Updated dependencies:
+  - [`react-router@7.14.2`](https://github.com/remix-run/react-router/releases/tag/react-router@7.14.2)
+  - [`@react-router/node@7.14.2`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.14.2)
+  - [`@react-router/serve@7.14.2`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.14.2)
+
+## v7.14.1
+
+### Patch Changes
+
+- Add TypeScript 6 support to peer dependency ranges
+- Updated dependencies:
+  - [`react-router@7.14.1`](https://github.com/remix-run/react-router/releases/tag/react-router@7.14.1)
+  - [`@react-router/node@7.14.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.14.1)
+  - [`@react-router/serve@7.14.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.14.1)
+
+## 7.14.0
+
+### Minor Changes
+
+- Add support for Vite 8 ([#14876](https://github.com/remix-run/react-router/pull/14876))
+
+### Patch Changes
+
+- support for prerendering multiple server bundles with v8_viteEnvironmentApi ([#14921](https://github.com/remix-run/react-router/pull/14921))
+
+- rsc framework mode prerender / spa mode support ([#14907](https://github.com/remix-run/react-router/pull/14907))
+
+- UNSTABLE RSC FRAMEWORK MODE BREAKING CHANGE - Existing route module exports remain unchanged from stable v7 non-RSC mode, but new exports are added for RSC mode. If you want to use RSC features, you will need to update your route modules to export the new annotations. ([#14901](https://github.com/remix-run/react-router/pull/14901))
+
+  If you are using RSC framework mode currently, you will need to update your route modules to the new conventions. The following route module components have their own mutually exclusive server component counterparts:
+
+  | Server Component Export | Client Component  |
+  | ----------------------- | ----------------- |
+  | `ServerComponent`       | `default`         |
+  | `ServerErrorBoundary`   | `ErrorBoundary`   |
+  | `ServerLayout`          | `Layout`          |
+  | `ServerHydrateFallback` | `HydrateFallback` |
+
+  If you were previously exporting a `ServerComponent`, your `ErrorBoundary`, `Layout`, and `HydrateFallback` were also server components. If you want to keep those as server components, you can rename them and prefix them with `Server`. If you were previously importing the implementations of those components from a client module, you can simply inline them.
+
+  Example:
+
+  Before
+
+  ```tsx
+  import { ErrorBoundary as ClientErrorBoundary } from "./client";
+
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    return <ClientErrorBoundary />;
+  }
+
+  export function Layout() {
+    // ...
+  }
+
+  export function HydrateFallback() {
+    // ...
+  }
+  ```
+
+  After
+
+  ```tsx
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    // previous implementation of ClientErrorBoundary, this is now a client component
+  }
+
+  export function ServerLayout() {
+    // rename previous Layout export to ServerLayout to make it a server component
+  }
+
+  export function ServerHydrateFallback() {
+    // rename previous HydrateFallback export to ServerHydrateFallback to make it a server component
+  }
+  ```
+
+- update the reveal command to support rsc for `entry.client`, `entry.rsc`, `entry.ssr` ([#14904](https://github.com/remix-run/react-router/pull/14904))
+
+- Updated dependencies:
+  - `react-router@7.14.0`
+  - `@react-router/node@7.14.0`
+  - `@react-router/serve@7.14.0`
+
 ## 7.13.2
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-cb0fdf114
+ * @react-router/dev v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -398,10 +398,10 @@ async function resolveConfig({
         "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
       );
     }
-    let isValidConcurrencyConfig = typeof prerender2 != "object" || !("unstable_concurrency" in prerender2) || typeof prerender2.unstable_concurrency === "number" && Number.isInteger(prerender2.unstable_concurrency) && prerender2.unstable_concurrency > 0;
+    let isValidConcurrencyConfig = typeof prerender2 != "object" || !("concurrency" in prerender2) || typeof prerender2.concurrency === "number" && Number.isInteger(prerender2.concurrency) && prerender2.concurrency > 0;
     if (!isValidConcurrencyConfig) {
       return err(
-        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+        "The `prerender.concurrency` config must be a positive integer if specified."
       );
     }
   }
@@ -503,10 +503,14 @@ async function resolveConfig({
       'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
     );
   }
+  if (futureConfig?.unstable_passThroughRequests !== void 0) {
+    return err(
+      'The "future.unstable_passThroughRequests" flag has been stabilized as "future.v8_passThroughRequests"'
+    );
+  }
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_passThroughRequests: userAndPresetConfigs.future?.unstable_passThroughRequests ?? false,
-    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    v8_passThroughRequests: userAndPresetConfigs.future?.v8_passThroughRequests ?? false,
     unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     unstable_previewServerPrerendering: userAndPresetConfigs.future?.unstable_previewServerPrerendering ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
@@ -514,6 +518,7 @@ async function resolveConfig({
     v8_viteEnvironmentApi: (userAndPresetConfigs.future?.v8_viteEnvironmentApi || userAndPresetConfigs.future?.unstable_previewServerPrerendering) ?? false
   };
   let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
+  let subResourceIntegrity = userAndPresetConfigs.subResourceIntegrity ?? false;
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename: basename3,
@@ -527,6 +532,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    subResourceIntegrity,
     allowedActionOrigins,
     unstable_routeConfig: routeConfig
   });
@@ -1078,7 +1084,7 @@ function routeFilesType({
                   t2.tsPropertySignature(
                     t2.identifier("page"),
                     t2.tsTypeAnnotation(
-                      pages ? t2.tsUnionType(
+                      pages.size > 0 ? t2.tsUnionType(
                         Array.from(pages).map(
                           (page) => t2.tsLiteralType(t2.stringLiteral(page))
                         )

package/dist/config.d.ts

@@ -38,8 +38,7 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
     unstable_optimizeDeps: boolean;
-    unstable_passThroughRequests: boolean;
-    unstable_subResourceIntegrity: boolean;
+    v8_passThroughRequests: boolean;
     unstable_trailingSlashAwareDataRequests: boolean;
     /**
      * Prerender with Vite Preview server
@@ -103,7 +102,7 @@ type ReactRouterConfig = {
      * An array of URLs to prerender to HTML files at build time.  Can also be a
      * function returning an array to dynamically generate URLs.
      *
-     * `unstable_concurrency` defaults to 1, which means "no concurrency" - fully serial execution.
+     * `concurrency` defaults to 1, which means "no concurrency" - fully serial execution.
      * Setting it to a value more than 1 enables concurrent prerendering.
      * Setting it to a value higher than one can increase the speed of the build,
      * but may consume more resources, and send more concurrent requests to the
@@ -111,7 +110,7 @@ type ReactRouterConfig = {
      */
     prerender?: PrerenderPaths | {
         paths: PrerenderPaths;
-        unstable_concurrency?: number;
+        concurrency?: number;
     };
     /**
      * An array of React Router plugin config presets to ease integration with
@@ -153,6 +152,11 @@ type ReactRouterConfig = {
      * SPA without server-rendering. Default's to `true`.
      */
     ssr?: boolean;
+    /**
+     * Enable subresource integrity hashes on asset script tags. Defaults to
+     * `false`.
+     */
+    subResourceIntegrity?: boolean;
     /**
      * An array of allowed origin hosts for action submissions to UI routes (does not apply
      * to resource routes). Supports micromatch glob patterns (`*` to match one segment,
@@ -259,6 +263,10 @@ type ResolvedReactRouterConfig = Readonly<{
      * SPA without server-rendering. Default's to `true`.
      */
     ssr: boolean;
+    /**
+     * Whether to generate subresource integrity hashes for asset script tags.
+     */
+    subResourceIntegrity: boolean;
     /**
      * The allowed origins for actions / mutations. Does not apply to routes
      * without a component. micromatch glob patterns are supported.

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-cb0fdf114
+ * @react-router/dev v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-cb0fdf114
+ * @react-router/dev v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-cb0fdf114
+ * @react-router/dev v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -424,10 +424,10 @@ async function resolveConfig({
         "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
       );
     }
-    let isValidConcurrencyConfig = typeof prerender != "object" || !("unstable_concurrency" in prerender) || typeof prerender.unstable_concurrency === "number" && Number.isInteger(prerender.unstable_concurrency) && prerender.unstable_concurrency > 0;
+    let isValidConcurrencyConfig = typeof prerender != "object" || !("concurrency" in prerender) || typeof prerender.concurrency === "number" && Number.isInteger(prerender.concurrency) && prerender.concurrency > 0;
     if (!isValidConcurrencyConfig) {
       return err(
-        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+        "The `prerender.concurrency` config must be a positive integer if specified."
       );
     }
   }
@@ -529,10 +529,14 @@ async function resolveConfig({
       'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
     );
   }
+  if (futureConfig?.unstable_passThroughRequests !== void 0) {
+    return err(
+      'The "future.unstable_passThroughRequests" flag has been stabilized as "future.v8_passThroughRequests"'
+    );
+  }
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_passThroughRequests: userAndPresetConfigs.future?.unstable_passThroughRequests ?? false,
-    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    v8_passThroughRequests: userAndPresetConfigs.future?.v8_passThroughRequests ?? false,
     unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     unstable_previewServerPrerendering: userAndPresetConfigs.future?.unstable_previewServerPrerendering ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
@@ -540,6 +544,7 @@ async function resolveConfig({
     v8_viteEnvironmentApi: (userAndPresetConfigs.future?.v8_viteEnvironmentApi || userAndPresetConfigs.future?.unstable_previewServerPrerendering) ?? false
   };
   let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
+  let subResourceIntegrity = userAndPresetConfigs.subResourceIntegrity ?? false;
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename,
@@ -553,6 +558,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    subResourceIntegrity,
     allowedActionOrigins,
     unstable_routeConfig: routeConfig
   });

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-cb0fdf114
+ * @react-router/dev v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -461,10 +461,10 @@ async function resolveConfig({
         "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
       );
     }
-    let isValidConcurrencyConfig = typeof prerender2 != "object" || !("unstable_concurrency" in prerender2) || typeof prerender2.unstable_concurrency === "number" && Number.isInteger(prerender2.unstable_concurrency) && prerender2.unstable_concurrency > 0;
+    let isValidConcurrencyConfig = typeof prerender2 != "object" || !("concurrency" in prerender2) || typeof prerender2.concurrency === "number" && Number.isInteger(prerender2.concurrency) && prerender2.concurrency > 0;
     if (!isValidConcurrencyConfig) {
       return err(
-        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+        "The `prerender.concurrency` config must be a positive integer if specified."
       );
     }
   }
@@ -566,10 +566,14 @@ async function resolveConfig({
       'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
     );
   }
+  if (futureConfig?.unstable_passThroughRequests !== void 0) {
+    return err(
+      'The "future.unstable_passThroughRequests" flag has been stabilized as "future.v8_passThroughRequests"'
+    );
+  }
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_passThroughRequests: userAndPresetConfigs.future?.unstable_passThroughRequests ?? false,
-    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    v8_passThroughRequests: userAndPresetConfigs.future?.v8_passThroughRequests ?? false,
     unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     unstable_previewServerPrerendering: userAndPresetConfigs.future?.unstable_previewServerPrerendering ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
@@ -577,6 +581,7 @@ async function resolveConfig({
     v8_viteEnvironmentApi: (userAndPresetConfigs.future?.v8_viteEnvironmentApi || userAndPresetConfigs.future?.unstable_previewServerPrerendering) ?? false
   };
   let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
+  let subResourceIntegrity = userAndPresetConfigs.subResourceIntegrity ?? false;
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename: basename3,
@@ -590,6 +595,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    subResourceIntegrity,
     allowedActionOrigins,
     unstable_routeConfig: routeConfig
   });
@@ -1096,7 +1102,7 @@ function routeFilesType({
                   t2.tsPropertySignature(
                     t2.identifier("page"),
                     t2.tsTypeAnnotation(
-                      pages ? t2.tsUnionType(
+                      pages.size > 0 ? t2.tsUnionType(
                         Array.from(pages).map(
                           (page) => t2.tsLiteralType(t2.stringLiteral(page))
                         )
@@ -3354,7 +3360,7 @@ var reactRouterVitePlugin = () => {
       )};`
     );
     let sri = void 0;
-    if (ctx.reactRouterConfig.future.unstable_subResourceIntegrity) {
+    if (ctx.reactRouterConfig.subResourceIntegrity) {
       sri = await generateSriManifest(ctx);
     }
     let reactRouterServerManifest = {
@@ -4928,8 +4934,8 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
   };
   let concurrency = 1;
   let { prerender: prerender2 } = reactRouterConfig;
-  if (typeof prerender2 === "object" && "unstable_concurrency" in prerender2) {
-    concurrency = prerender2.unstable_concurrency ?? 1;
+  if (typeof prerender2 === "object" && "concurrency" in prerender2) {
+    concurrency = prerender2.concurrency ?? 1;
   }
   const pMap = await import("p-map");
   await pMap.default(build.prerender, prerenderSinglePath, { concurrency });
@@ -5611,8 +5617,8 @@ function assertPrerenderPathsMatchRoutes(config, prerenderPaths) {
 function getPrerenderConcurrencyConfig(reactRouterConfig) {
   let concurrency = 1;
   let { prerender: prerender2 } = reactRouterConfig;
-  if (typeof prerender2 === "object" && "unstable_concurrency" in prerender2) {
-    concurrency = prerender2.unstable_concurrency ?? 1;
+  if (typeof prerender2 === "object" && "concurrency" in prerender2) {
+    concurrency = prerender2.concurrency ?? 1;
   }
   return concurrency;
 }
@@ -5819,17 +5825,19 @@ import * as ___EnsureClientRouteModuleForHMR_REACT___ from "react";
 export function EnsureClientRouteModuleForHMR___() { return ___EnsureClientRouteModuleForHMR_REACT___.createElement(___EnsureClientRouteModuleForHMR_REACT___.Fragment, null) }
 `;
 function virtualRouteModulesPlugin({
+  enforceSplitRouteModules,
   environments: { client = ["client", "ssr"], server = ["rsc"] } = {},
-  isRouteModule,
+  getRouteIdForFile,
   isRootRouteModule,
-  transformToJs
+  transformToJs,
+  shouldTransform
 }) {
   let clientEnvironments = new Set(client);
   let serverEnvironments = new Set(server);
   let cache = /* @__PURE__ */ new Map();
-  async function createClientRouteEntry(id, code) {
+  async function createClientRouteEntry(id, code, isRootRouteModule2, routeId) {
     let result = "";
-    let routeChunks = detectRouteChunks2(cache, id, code);
+    let routeChunks = detectRouteChunks2(cache, id, code, isRootRouteModule2);
     let { staticExports } = await parseRouteExports(code);
     validateRouteModuleExports(staticExports);
     let needsReactImport = false;
@@ -5861,13 +5869,29 @@ function virtualRouteModulesPlugin({
       result = `import * as React from "react";
 ${result}`;
     }
+    if (enforceSplitRouteModules() && !isRootRouteModule2) {
+      let { hasRouteChunkByExportName } = routeChunks;
+      let hasClientAction = staticExports.includes("clientAction");
+      let hasClientLoader = staticExports.includes("clientLoader");
+      let hasClientMiddleware = staticExports.includes("clientMiddleware");
+      let hasHydrateFallback = staticExports.includes("HydrateFallback");
+      validateRouteChunks2({
+        id: routeId,
+        valid: {
+          clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
+          clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
+          clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
+          HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
+        }
+      });
+    }
     return {
       code: '"use client";\n' + result
     };
   }
-  async function createServerRouteEntry(id, code, isRootRouteModule2) {
+  async function createServerRouteEntry(id, code, isRootRouteModule2, routeId) {
     let result = "";
-    let routeChunks = detectRouteChunks2(cache, id, code);
+    let routeChunks = detectRouteChunks2(cache, id, code, isRootRouteModule2);
     let { staticExports } = await parseRouteExports(code);
     validateRouteModuleExports(staticExports);
     let needsReactImport = false;
@@ -5912,6 +5936,22 @@ ${result}`;
       result += `export { ErrorBoundary } from "${createId(id, "client-route-module", "shared")}";
 `;
     }
+    if (enforceSplitRouteModules() && !isRootRouteModule2) {
+      let { hasRouteChunkByExportName } = routeChunks;
+      let hasClientAction = staticExports.includes("clientAction");
+      let hasClientLoader = staticExports.includes("clientLoader");
+      let hasClientMiddleware = staticExports.includes("clientMiddleware");
+      let hasHydrateFallback = staticExports.includes("HydrateFallback");
+      validateRouteChunks2({
+        id: routeId,
+        valid: {
+          clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
+          clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
+          clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
+          HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
+        }
+      });
+    }
     return {
       code: result
     };
@@ -5923,8 +5963,8 @@ ${result}`;
     removeExports(ast, CLIENT_ROUTE_EXPORTS2);
     return generate(ast);
   }
-  async function createClientRouteModuleChunk(id, code, chunk, isRootRouteModule2) {
-    let routeChunks = detectRouteChunks2(cache, id, code);
+  async function createClientRouteModuleChunk(id, code, chunk, routeId, isRootRouteModule2, isDevMode) {
+    let routeChunks = detectRouteChunks2(cache, id, code, isRootRouteModule2);
     const ast = import_parser.parse(code, {
       sourceType: "module"
     });
@@ -5958,59 +5998,91 @@ import { createElement as __rr_createElement } from "react";
       }
       result += ENSURE_CLIENT_ROUTE_MODULE_CHUNK_FOR_HMR;
     }
-    result += `
-if (import.meta.hot) {
+    let hasAction = staticExports.includes("action");
+    let hasLoader = staticExports.includes("loader");
+    let hasComponent = staticExports.includes("default") || staticExports.includes("ServerComponent");
+    let hasErrorBoundary = staticExports.includes("ErrorBoundary") || staticExports.includes("ServerErrorBoundary");
+    if (isDevMode) {
+      result += `export function ReactRouterHMRMeta___() {return null;};
 `;
-    result += `  import.meta.hot.accept((mod) => {
-      if (typeof __reactRouterDataRouter === "object" && !mod.default) {
-        __reactRouterDataRouter.revalidate();
-      }
-    });
+      result += `Object.assign(ReactRouterHMRMeta___, {
+        hasAction: ${JSON.stringify(hasAction)},
+        hasComponent: ${JSON.stringify(hasComponent)},
+        hasErrorBoundary: ${JSON.stringify(hasErrorBoundary)},
+        hasLoader: ${JSON.stringify(hasLoader)},
+        hasClientLoader: ${JSON.stringify(staticExports.includes("clientLoader"))},
+      });
 `;
-    result += `}
+      result += `
+if (import.meta.hot) {
+`;
+      result += `  import.meta.hot.accept((mod) => {
+          if (typeof __reactRouterDataRouter === "object") {
+            __reactRouterDataRouter._updateRoutesForHMR(new Map([[${JSON.stringify(routeId)}, {
+              routeModule: mod,
+              ...mod.ReactRouterHMRMeta___,
+            }]]));
+
+            if (${chunk === "shared" ? "!mod.default || " : ""}mod.clientLoader || (
+              mod.ReactRouterHMRMeta___.hasClientLoader || ReactRouterHMRMeta___.hasClientLoader || ReactRouterHMRMeta___.hasLoader
+            )) {
+              __reactRouterDataRouter.revalidate();
+            }
+          }
+        });
+      `;
+      result += `}
 `;
+    }
     return {
       code: result
     };
   }
   return {
     name: "react-router-rsc-virtual-route-modules",
-    transform: {
-      order: "pre",
-      async handler(_code, id) {
-        const [filename2, ...rest] = id.split("?");
-        if (!isRouteModule(filename2)) {
-          return;
-        }
-        let isClientEnvironment = clientEnvironments.has(this.environment.name);
-        let isServerEnvironment = serverEnvironments.has(this.environment.name);
-        if (!isClientEnvironment && !isServerEnvironment) {
-          return;
-        }
-        let code = await transformToJs(_code, filename2);
-        let searchParams = rest.length > 0 ? new URLSearchParams(rest.join("?")) : null;
-        let clientRouteModuleType = searchParams?.get("client-route-module");
-        let isServerRouteModule = searchParams?.has("server-route-module");
-        if (clientRouteModuleType) {
-          return await createClientRouteModuleChunk(
-            id,
-            code,
-            clientRouteModuleType,
-            isRootRouteModule(filename2)
-          );
-        }
-        if (isServerRouteModule) {
-          return createServerRouteModule(code);
-        }
-        if (isClientEnvironment) {
-          return await createClientRouteEntry(id, code);
-        }
-        return await createServerRouteEntry(
+    enforce: "pre",
+    async transform(_code, id) {
+      const [filename2, ...rest] = id.split("?");
+      const routeId = getRouteIdForFile(filename2);
+      if (!routeId || shouldTransform && !shouldTransform?.(filename2)) {
+        return;
+      }
+      let isClientEnvironment = clientEnvironments.has(this.environment.name);
+      let isServerEnvironment = serverEnvironments.has(this.environment.name);
+      if (!isClientEnvironment && !isServerEnvironment) {
+        return;
+      }
+      let code = await transformToJs(_code, filename2);
+      let searchParams = rest.length > 0 ? new URLSearchParams(rest.join("?")) : null;
+      let clientRouteModuleType = searchParams?.get("client-route-module");
+      let isServerRouteModule = searchParams?.has("server-route-module");
+      if (clientRouteModuleType) {
+        return await createClientRouteModuleChunk(
           id,
           code,
-          isRootRouteModule(filename2)
+          clientRouteModuleType,
+          routeId,
+          isRootRouteModule(filename2),
+          this.environment.mode === "dev"
         );
       }
+      if (isServerRouteModule) {
+        return createServerRouteModule(code);
+      }
+      if (isClientEnvironment) {
+        return await createClientRouteEntry(
+          id,
+          code,
+          isRootRouteModule(filename2),
+          routeId
+        );
+      }
+      return await createServerRouteEntry(
+        id,
+        code,
+        isRootRouteModule(filename2),
+        routeId
+      );
     }
   };
 }
@@ -6100,7 +6172,7 @@ function validateRouteModuleExports(toValidate) {
     );
   }
 }
-function detectRouteChunks2(cache, id, code) {
+function detectRouteChunks2(cache, id, code, isRootRouteModule) {
   function noRouteChunks() {
     return {
       chunkedExports: [],
@@ -6113,6 +6185,9 @@ function detectRouteChunks2(cache, id, code) {
       }
     };
   }
+  if (isRootRouteModule) {
+    return noRouteChunks();
+  }
   if (!Array.from(CLIENT_MODULE_CHUNKS).some(
     (exportName) => code.includes(exportName)
   )) {
@@ -6121,6 +6196,23 @@ function detectRouteChunks2(cache, id, code) {
   let [filename2] = id.split("?");
   return detectRouteChunks(code, cache, filename2);
 }
+function validateRouteChunks2({
+  id,
+  valid
+}) {
+  let invalidChunks = Object.entries(valid).filter(([_, isValid]) => !isValid).map(([chunkName]) => chunkName);
+  if (invalidChunks.length === 0) {
+    return;
+  }
+  let plural = invalidChunks.length > 1;
+  throw new Error(
+    [
+      `Error splitting route module: ${id}`,
+      invalidChunks.map((name) => `- ${name}`).join("\n"),
+      `${plural ? "These exports" : "This export"} could not be split into ${plural ? "their own chunks" : "its own chunk"} because ${plural ? "they share" : "it shares"} code with other exports. You should extract any shared code into its own module and then import it within the route module.`
+    ].join("\n\n")
+  );
+}
 
 // vite/rsc/plugin.ts
 var redirectStatusCodes2 = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
@@ -6145,19 +6237,56 @@ function reactRouterRSCVitePlugin() {
       newConfig.routes.root.file
     );
   }
-  function isRouteModule(id) {
-    if (routeIdByFile?.has(id)) {
-      return true;
-    }
-    return false;
-  }
   function isRootRouteModule(id) {
     return import_pathe6.default.normalize(id) === import_pathe6.default.normalize(rootRouteFile);
   }
+  function getRouteIdForFile(file) {
+    let normalizedFile = import_pathe6.default.normalize(file);
+    let directMatch = routeIdByFile?.get(normalizedFile);
+    if (directMatch) {
+      return directMatch;
+    }
+    return Array.from(routeIdByFile ?? []).find(
+      ([routeFile]) => import_pathe6.default.normalize(routeFile).endsWith(normalizedFile)
+    )?.[1];
+  }
+  function isMdxRouteModule(filename2) {
+    let extension = import_pathe6.default.extname(filename2).toLowerCase();
+    return extension === ".md" || extension === ".mdx";
+  }
+  function getTransformLanguage(filename2) {
+    let extension = import_pathe6.default.extname(filename2).toLowerCase();
+    switch (extension) {
+      case ".ts":
+      case ".cts":
+      case ".mts":
+        return "ts";
+      case ".tsx":
+        return "tsx";
+      case ".js":
+      case ".cjs":
+      case ".mjs":
+      case ".jsx":
+      case ".md":
+      case ".mdx":
+        return "jsx";
+      default:
+        return void 0;
+    }
+  }
   async function transformToJs(code, filename2) {
     await preloadVite();
     let vite2 = getVite();
-    return (await vite2.transformWithEsbuild(code, filename2, {
+    let lang = getTransformLanguage(filename2);
+    return ("transformWithOxc" in vite2 && typeof vite2.transformWithOxc === "function" ? await vite2.transformWithOxc(code, filename2, {
+      lang,
+      jsx: {
+        runtime: "automatic",
+        development: viteCommand !== "build",
+        target: "esnext"
+      }
+    }) : await vite2.transformWithEsbuild(code, filename2, {
+      loader: lang,
       target: "esnext",
       format: "esm",
       jsx: "automatic",
@@ -6189,12 +6318,10 @@ function reactRouterRSCVitePlugin() {
             if (userConfig.serverBundles) errors.push("serverBundles");
             if (userConfig.future?.v8_middleware === false)
               errors.push("future.v8_middleware: false");
-            if (userConfig.future?.v8_splitRouteModules)
-              errors.push("future.v8_splitRouteModules");
             if (userConfig.future?.v8_viteEnvironmentApi === false)
               errors.push("future.v8_viteEnvironmentApi: false");
-            if (userConfig.future?.unstable_subResourceIntegrity)
-              errors.push("future.unstable_subResourceIntegrity");
+            if (userConfig.subResourceIntegrity)
+              errors.push("subResourceIntegrity");
             if (errors.length) {
               return `RSC Framework Mode does not currently support the following React Router config:
 ${errors.map((x) => ` - ${x}`).join("\n")}
@@ -6500,9 +6627,10 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         client: ["client", "ssr"],
         server: ["rsc"]
       },
-      isRouteModule,
+      getRouteIdForFile,
       isRootRouteModule,
-      transformToJs
+      transformToJs,
+      enforceSplitRouteModules: () => config.future.v8_splitRouteModules === "enforce"
     }),
     {
       name: "react-router/rsc/virtual-basename",
@@ -6548,126 +6676,18 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           `if (import.meta.hot) {
   import.meta.hot.accept();
   import.meta.hot.on('rsc:update', () => {
-    __reactRouterDataRouter.revalidate()
+    // Defer revalidation to the next animation frame so React Fast Refresh
+    // can apply pending client component updates first. Without this delay,
+    // the RSC payload (showing updated text) can arrive and be reconciled
+    // against a DOM that still has the old text, causing a hydration mismatch.
+    requestAnimationFrame(() => {
+      __reactRouterDataRouter.revalidate()
+    });
   })
 }`
         ].join("\n") : "";
       }
     },
-    // {
-    //   name: "react-router/rsc/hmr/runtime",
-    //   enforce: "pre",
-    //   resolveId(id) {
-    //     if (id === virtual.hmrRuntime.id) return virtual.hmrRuntime.resolvedId;
-    //   },
-    //   async load(id) {
-    //     if (id !== virtual.hmrRuntime.resolvedId) return;
-    //     const reactRefreshDir = path.dirname(
-    //       require.resolve("react-refresh/package.json"),
-    //     );
-    //     const reactRefreshRuntimePath = join(
-    //       reactRefreshDir,
-    //       "cjs/react-refresh-runtime.development.js",
-    //     );
-    //     return [
-    //       "const exports = {}",
-    //       await readFile(reactRefreshRuntimePath, "utf8"),
-    //       await readFile(
-    //         require.resolve("./static/rsc-refresh-utils.mjs"),
-    //         "utf8",
-    //       ),
-    //       "export default exports",
-    //     ].join("\n");
-    //   },
-    // },
-    // {
-    //   name: "react-router/rsc/hmr/react-refresh",
-    //   async transform(code, id, options) {
-    //     if (viteCommand !== "serve") return;
-    //     if (id.includes("/node_modules/")) return;
-    //     const filepath = id.split("?")[0];
-    //     const extensionsRE = /\.(jsx?|tsx?|mdx?)$/;
-    //     if (!extensionsRE.test(filepath)) return;
-    //     const devRuntime = "react/jsx-dev-runtime";
-    //     const ssr = options?.ssr === true;
-    //     const isJSX = filepath.endsWith("x");
-    //     const useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
-    //     if (!useFastRefresh) return;
-    //     // if (isVirtualClientRouteModuleId(id)) {
-    //     //   const routeId = routeIdByFile?.get(filepath);
-    //     //   return { code: addRefreshWrapper({ routeId, code, id }) };
-    //     // }
-    //     const result = await babel.transformAsync(code, {
-    //       babelrc: false,
-    //       configFile: false,
-    //       filename: id,
-    //       sourceFileName: filepath,
-    //       parserOpts: {
-    //         sourceType: "module",
-    //         allowAwaitOutsideFunction: true,
-    //       },
-    //       plugins: [[require("react-refresh/babel"), { skipEnvCheck: true }]],
-    //       sourceMaps: true,
-    //     });
-    //     if (result === null) return;
-    //     code = result.code!;
-    //     const refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
-    //     if (refreshContentRE.test(code)) {
-    //       code = addRefreshWrapper({ code, id });
-    //     }
-    //     return { code, map: result.map };
-    //   },
-    // },
-    // {
-    //   name: "react-router/rsc/hmr/updates",
-    //   async hotUpdate(this, { server, file, modules }) {
-    //     if (this.environment.name !== "rsc") return;
-    //     const clientModules =
-    //       server.environments.client.moduleGraph.getModulesByFile(file);
-    //     const vite = 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
-    //       (vite.isCSSRequest(file) &&
-    //         Array.from(clientModules).some((mod) =>
-    //           mod.id?.includes("?direct"),
-    //         ));
-    //     for (const mod of getModulesWithImporters(modules)) {
-    //       if (!mod.file) continue;
-    //       const normalizedPath = path.normalize(mod.file);
-    //       const routeId = routeIdByFile?.get(normalizedPath);
-    //       if (routeId !== undefined) {
-    //         const routeSource = await readFile(normalizedPath, "utf8");
-    //         const virtualRouteModuleCode = (
-    //           await server.environments.rsc.pluginContainer.transform(
-    //             routeSource,
-    //             `${normalizedPath}?route-module`,
-    //           )
-    //         ).code;
-    //         const { staticExports } = parseRouteExports(virtualRouteModuleCode);
-    //         const hasAction = staticExports.includes("action");
-    //         const hasComponent = staticExports.includes("default");
-    //         const hasErrorBoundary = staticExports.includes("ErrorBoundary");
-    //         const hasLoader = staticExports.includes("loader");
-    //         server.hot.send({
-    //           type: "custom",
-    //           event: "react-router:hmr",
-    //           data: {
-    //             routeId,
-    //             isServerOnlyChange,
-    //             hasAction,
-    //             hasComponent,
-    //             hasErrorBoundary,
-    //             hasLoader,
-    //           },
-    //         });
-    //       }
-    //     }
-    //     return modules;
-    //   },
-    // },
     {
       name: "react-router/rsc/virtual-react-router-serve-config",
       resolveId(id) {
@@ -6791,7 +6811,6 @@ var virtual2 = {
   routeConfig: create("unstable_rsc/routes"),
   routeDiscovery: create("unstable_rsc/route-discovery"),
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
-  // hmrRuntime: create("unstable_rsc/runtime"),
   basename: create("unstable_rsc/basename"),
   reactRouterServeConfig: create("unstable_rsc/react-router-serve-config")
 };
@@ -6812,8 +6831,8 @@ var getClientBuildDirectory2 = (reactRouterConfig) => import_pathe6.default.join
 function getPrerenderConcurrencyConfig2(reactRouterConfig) {
   let concurrency = 1;
   let { prerender: prerender2 } = reactRouterConfig;
-  if (typeof prerender2 === "object" && "unstable_concurrency" in prerender2) {
-    concurrency = prerender2.unstable_concurrency ?? 1;
+  if (typeof prerender2 === "object" && "concurrency" in prerender2) {
+    concurrency = prerender2.concurrency ?? 1;
   }
   return concurrency;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-cb0fdf114",
+  "version": "0.0.0-experimental-34996874d",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -92,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-cb0fdf114"
+    "@react-router/node": "0.0.0-experimental-34996874d"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -116,17 +116,17 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-cb0fdf114",
-    "react-router": "^0.0.0-experimental-cb0fdf114"
+    "@react-router/serve": "0.0.0-experimental-34996874d",
+    "react-router": "^0.0.0-experimental-34996874d"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.21",
     "react-server-dom-webpack": "^19.2.3",
-    "typescript": "^5.1.0",
+    "typescript": "^5.1.0 || ^6.0.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-cb0fdf114",
-    "react-router": "^0.0.0-experimental-cb0fdf114"
+    "@react-router/serve": "^0.0.0-experimental-34996874d",
+    "react-router": "^0.0.0-experimental-34996874d"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {