@c0va23/react-router-dev 7.8.3-alpha.1 → 7.9.4-patch.1

package/CHANGELOG.md

@@ -1,5 +1,178 @@
 # `@react-router/dev`
 
+### Patch Changes
+- Copy `server.watch` config options from `vite.config.(ts|js)` file to child vite server in development mode.
+
+## 7.9.4
+
+### Patch Changes
+
+- Update `valibot` dependency to `^1.1.0` ([#14379](https://github.com/remix-run/react-router/pull/14379))
+
+- New (unstable) `useRoute` hook for accessing data from specific routes ([#14407](https://github.com/remix-run/react-router/pull/14407))
+
+  For example, let's say you have an `admin` route somewhere in your app and you want any child routes of `admin` to all have access to the `loaderData` and `actionData` from `admin.`
+
+  ```tsx
+  // app/routes/admin.tsx
+  import { Outlet } from "react-router";
+
+  export const loader = () => ({ message: "Hello, loader!" });
+
+  export const action = () => ({ count: 1 });
+
+  export default function Component() {
+    return (
+      <div>
+        {/* ... */}
+        <Outlet />
+        {/* ... */}
+      </div>
+    );
+  }
+  ```
+
+  You might even want to create a reusable widget that all of the routes nested under `admin` could use:
+
+  ```tsx
+  import { unstable_useRoute as useRoute } from "react-router";
+
+  export function AdminWidget() {
+    // How to get `message` and `count` from `admin` route?
+  }
+  ```
+
+  In framework mode, `useRoute` knows all your app's routes and gives you TS errors when invalid route IDs are passed in:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/dmin");
+    //                      ^^^^^^^^^^^
+  }
+  ```
+
+  `useRoute` returns `undefined` if the route is not part of the current page:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/admin");
+    if (!admin) {
+      throw new Error(`AdminWidget used outside of "routes/admin"`);
+    }
+  }
+  ```
+
+  Note: the `root` route is the exception since it is guaranteed to be part of the current page.
+  As a result, `useRoute` never returns `undefined` for `root`.
+
+  `loaderData` and `actionData` are marked as optional since they could be accessed before the `action` is triggered or after the `loader` threw an error:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/admin");
+    if (!admin) {
+      throw new Error(`AdminWidget used outside of "routes/admin"`);
+    }
+    const { loaderData, actionData } = admin;
+    console.log(loaderData);
+    //          ^? { message: string } | undefined
+    console.log(actionData);
+    //          ^? { count: number } | undefined
+  }
+  ```
+
+  If instead of a specific route, you wanted access to the _current_ route's `loaderData` and `actionData`, you can call `useRoute` without arguments:
+
+  ```tsx
+  export function AdminWidget() {
+    const currentRoute = useRoute();
+    currentRoute.loaderData;
+    currentRoute.actionData;
+  }
+  ```
+
+  This usage is equivalent to calling `useLoaderData` and `useActionData`, but consolidates all route data access into one hook: `useRoute`.
+
+  Note: when calling `useRoute()` (without a route ID), TS has no way to know which route is the current route.
+  As a result, `loaderData` and `actionData` are typed as `unknown`.
+  If you want more type-safety, you can either narrow the type yourself with something like `zod` or you can refactor your app to pass down typed props to your `AdminWidget`:
+
+  ```tsx
+  export function AdminWidget({
+    message,
+    count,
+  }: {
+    message: string;
+    count: number;
+  }) {
+    /* ... */
+  }
+  ```
+
+- Updated dependencies:
+  - `react-router@7.9.4`
+  - `@react-router/node@7.9.4`
+  - `@react-router/serve@7.9.4`
+
+## 7.9.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.9.3`
+  - `@react-router/node@7.9.3`
+  - `@react-router/serve@7.9.3`
+
+## 7.9.2
+
+### Patch Changes
+
+- Fix preset future flags being ignored during config resolution ([#14369](https://github.com/remix-run/react-router/pull/14369))
+
+  Fixes a bug where future flags defined by presets were completely ignored. The config resolution was incorrectly reading from `reactRouterUserConfig.future` instead of the merged `userAndPresetConfigs.future`, causing all preset-defined future flags to be lost.
+
+  This fix ensures presets can properly enable experimental features as intended by the preset system design.
+
+- Add unstable support for RSC Framework Mode ([#14336](https://github.com/remix-run/react-router/pull/14336))
+
+- Switch internal vite plugin Response logic to use `@remix-run/node-fetch-server` ([#13927](https://github.com/remix-run/react-router/pull/13927))
+
+- Updated dependencies:
+  - `react-router@7.9.2`
+  - `@react-router/serve@7.9.2`
+  - `@react-router/node@7.9.2`
+
+## 7.9.1
+
+### Patch Changes
+
+- Fix internal `Future` interface naming from `middleware` -> `v8_middleware` ([#14327](https://github.com/remix-run/react-router/pull/14327))
+- Updated dependencies:
+  - `react-router@7.9.1`
+  - `@react-router/node@7.9.1`
+  - `@react-router/serve@7.9.1`
+
+## 7.9.0
+
+### Minor Changes
+
+- Stabilize middleware and context APIs. ([#14215](https://github.com/remix-run/react-router/pull/14215))
+
+  We have removed the `unstable_` prefix from the following APIs and they are now considered stable and ready for production use:
+  - [`RouterContextProvider`](https://reactrouter.com/api/utils/RouterContextProvider)
+  - [`createContext`](https://reactrouter.com/api/utils/createContext)
+  - `createBrowserRouter` [`getContext`](https://reactrouter.com/api/data-routers/createBrowserRouter#optsgetcontext) option
+  - `<HydratedRouter>` [`getContext`](https://reactrouter.com/api/framework-routers/HydratedRouter#getcontext) prop
+
+  Please see the [Middleware Docs](https://reactrouter.com/how-to/middleware), the [Middleware RFC](https://github.com/remix-run/remix/discussions/7642), and the [Client-side Context RFC](https://github.com/remix-run/react-router/discussions/9856) for more information.
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.9.0`
+  - `@react-router/node@7.9.0`
+  - `@react-router/serve@7.9.0`
+
 ## 7.8.2
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.1
+ * @c0va23/react-router-dev v7.9.4-patch.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -424,7 +424,7 @@ async function resolveConfig({
   }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
-  let rootRouteFile = findEntry(appDirectory, "root");
+  let rootRouteFile = findEntry(appDirectory, "root", { absolute: true });
   if (!rootRouteFile) {
     let rootRouteDisplayPath = import_pathe3.default.relative(
       root,
@@ -465,7 +465,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -484,11 +484,11 @@ async function resolveConfig({
     }
   }
   let future = {
-    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,
-    unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
+    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -812,7 +812,8 @@ var init_profiler = __esm({
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -823,7 +824,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 var init_context = __esm({
@@ -911,7 +913,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        v8_middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -978,9 +980,10 @@ function generateRoutes(ctx) {
           interface Register {
             pages: Pages
             routeFiles: RouteFiles
+            routeModules: RouteModules
           }
         }
-      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code
+      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code + "\n\n" + generate(routeModulesType(ctx)).code
   };
   const allAnnotations = Array.from(fileToRoutes.entries()).filter(([file]) => isInAppDirectory(ctx, file)).map(
     ([file, routeIds]) => getRouteAnnotations({ ctx, file, routeIds, lineages })
@@ -1049,6 +1052,28 @@ function routeFilesType({
     )
   );
 }
+function routeModulesType(ctx) {
+  return t2.tsTypeAliasDeclaration(
+    t2.identifier("RouteModules"),
+    null,
+    t2.tsTypeLiteral(
+      Object.values(ctx.config.routes).map(
+        (route) => t2.tsPropertySignature(
+          t2.stringLiteral(route.id),
+          t2.tsTypeAnnotation(
+            t2.tsTypeQuery(
+              t2.tsImportType(
+                t2.stringLiteral(
+                  `./${Path3.relative(ctx.rootDirectory, ctx.config.appDirectory)}/${route.file}`
+                )
+              )
+            )
+          )
+        )
+      )
+    )
+  );
+}
 function isInAppDirectory(ctx, routeFile) {
   const path9 = Path3.resolve(ctx.config.appDirectory, routeFile);
   return path9.startsWith(ctx.config.appDirectory);
@@ -1116,7 +1141,7 @@ function getRouteAnnotations({
         module: Module
       }>
     ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
-      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }, ${ctx.rsc}>;
 
       export namespace Route {
         // links
@@ -1240,8 +1265,8 @@ async function write(...files) {
     })
   );
 }
-async function run(rootDirectory, { mode }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: false });
+async function run(rootDirectory, { mode, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: false });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1249,8 +1274,8 @@ async function run(rootDirectory, { mode }) {
     ...generateRoutes(ctx)
   );
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { mode, logger, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: true });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1329,15 +1354,11 @@ var init_has_rsc_plugin = __esm({
 });
 
 // vite/node-adapter.ts
-var import_node_events, import_node_tls, import_node_stream, import_set_cookie_parser, import_node;
+var import_node_fetch_server;
 var init_node_adapter = __esm({
   "vite/node-adapter.ts"() {
     "use strict";
-    import_node_events = require("events");
-    import_node_tls = require("tls");
-    import_node_stream = require("stream");
-    import_set_cookie_parser = require("set-cookie-parser");
-    import_node = require("@react-router/node");
+    import_node_fetch_server = require("@remix-run/node-fetch-server");
     init_invariant();
   }
 });
@@ -1489,6 +1510,13 @@ var init_with_props = __esm({
   }
 });
 
+// vite/load-dotenv.ts
+var init_load_dotenv = __esm({
+  "vite/load-dotenv.ts"() {
+    "use strict";
+  }
+});
+
 // vite/plugins/validate-plugin-order.ts
 var init_validate_plugin_order = __esm({
   "vite/plugins/validate-plugin-order.ts"() {
@@ -1496,6 +1524,16 @@ var init_validate_plugin_order = __esm({
   }
 });
 
+// vite/plugins/warn-on-client-source-maps.ts
+var import_picocolors4;
+var init_warn_on_client_source_maps = __esm({
+  "vite/plugins/warn-on-client-source-maps.ts"() {
+    "use strict";
+    import_picocolors4 = __toESM(require("picocolors"));
+    init_invariant();
+  }
+});
+
 // vite/plugin.ts
 async function resolveViteConfig({
   configFile,
@@ -1733,7 +1771,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, import_node_fs3, import_promises2, path7, url, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, import_node_fs3, import_promises2, path7, url, babel2, import_node_fetch_server2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors5, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1743,11 +1781,12 @@ var init_plugin = __esm({
     path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     babel2 = __toESM(require("@babel/core"));
+    import_node_fetch_server2 = require("@remix-run/node-fetch-server");
     import_react_router2 = require("react-router");
     import_es_module_lexer = require("es-module-lexer");
     import_pick3 = __toESM(require("lodash/pick"));
     import_jsesc = __toESM(require("jsesc"));
-    import_picocolors4 = __toESM(require("picocolors"));
+    import_picocolors5 = __toESM(require("picocolors"));
     import_kebabCase = __toESM(require("lodash/kebabCase"));
     init_typegen();
     init_invariant();
@@ -1766,7 +1805,9 @@ var init_plugin = __esm({
     init_config();
     init_optimize_deps_entries();
     init_with_props();
+    init_load_dotenv();
     init_validate_plugin_order();
+    init_warn_on_client_source_maps();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
@@ -1948,7 +1989,7 @@ async function viteBuild(root, {
   let ctx = extractPluginContext(viteConfig);
   if (!ctx) {
     console.error(
-      import_picocolors5.default.red("React Router Vite plugin not found in Vite config")
+      import_picocolors6.default.red("React Router Vite plugin not found in Vite config")
     );
     process.exit(1);
   }
@@ -2005,11 +2046,11 @@ async function viteBuild(root, {
     viteConfig
   });
 }
-var import_picocolors5;
+var import_picocolors6;
 var init_build = __esm({
   "vite/build.ts"() {
     "use strict";
-    import_picocolors5 = __toESM(require("picocolors"));
+    import_picocolors6 = __toESM(require("picocolors"));
     init_config();
     init_plugin();
     init_invariant();
@@ -2050,7 +2091,7 @@ async function dev(root, {
     (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")
+      import_picocolors7.default.red("React Router Vite plugin not found in Vite config")
     );
     process.exit(1);
   }
@@ -2073,11 +2114,11 @@ async function dev(root, {
   ];
   server.bindCLIShortcuts({ print: true, customShortcuts });
 }
-var import_picocolors6;
+var import_picocolors7;
 var init_dev = __esm({
   "vite/dev.ts"() {
     "use strict";
-    import_picocolors6 = __toESM(require("picocolors"));
+    import_picocolors7 = __toESM(require("picocolors"));
     init_vite();
     init_profiler();
   }
@@ -2086,7 +2127,7 @@ var init_dev = __esm({
 // cli/run.ts
 var import_arg = __toESM(require("arg"));
 var import_semver = __toESM(require("semver"));
-var import_picocolors8 = __toESM(require("picocolors"));
+var import_picocolors9 = __toESM(require("picocolors"));
 
 // cli/commands.ts
 var import_node_fs4 = require("fs");
@@ -2094,7 +2135,7 @@ var import_promises3 = require("fs/promises");
 var path8 = __toESM(require("path"));
 var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
-var import_picocolors7 = __toESM(require("picocolors"));
+var import_picocolors8 = __toESM(require("picocolors"));
 var import_react_router3 = require("react-router");
 init_config();
 
@@ -2184,7 +2225,7 @@ async function routes(rootDirectory, flags = {}) {
     mode: flags.mode ?? "production"
   });
   if (!configResult.ok) {
-    console.error(import_picocolors7.default.red(configResult.error));
+    console.error(import_picocolors8.default.red(configResult.error));
     process.exit(1);
   }
   let format = flags.json ? "json" : "jsx";
@@ -2230,7 +2271,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     }
   })) {
     console.error(
-      import_picocolors7.default.red(
+      import_picocolors8.default.red(
         `The reveal command is currently not supported in RSC Framework Mode.`
       )
     );
@@ -2246,7 +2287,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     mode: flags.mode ?? "production"
   });
   if (!configResult.ok) {
-    console.error(import_picocolors7.default.red(configResult.error));
+    console.error(import_picocolors8.default.red(configResult.error));
     return;
   }
   let appDirectory = configResult.value.appDirectory;
@@ -2254,14 +2295,14 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     let entriesArray = Array.from(entries);
     let list = conjunctionListFormat.format(entriesArray);
     console.error(
-      import_picocolors7.default.red(`Invalid entry file. Valid entry files are ${list}`)
+      import_picocolors8.default.red(`Invalid entry file. Valid entry files are ${list}`)
     );
     return;
   }
   let pkgJson = await import_package_json2.default.load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
   if (!deps["@react-router/node"]) {
-    console.error(import_picocolors7.default.red(`No default server entry detected.`));
+    console.error(import_picocolors8.default.red(`No default server entry detected.`));
     return;
   }
   let defaultsDirectory = path8.resolve(
@@ -2291,7 +2332,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     await (0, import_promises3.writeFile)(outputFile, contents, "utf-8");
   }
   console.log(
-    import_picocolors7.default.blue(
+    import_picocolors8.default.blue(
       `Entry file ${entry} created at ${path8.relative(
         rootDirectory,
         outputFile
@@ -2311,7 +2352,7 @@ async function checkForEntry(rootDirectory, appDirectory, entries2) {
     let exists = (0, import_node_fs4.existsSync)(entryPath);
     if (exists) {
       let relative7 = path8.relative(rootDirectory, entryPath);
-      console.error(import_picocolors7.default.red(`Entry file ${relative7} already exists.`));
+      console.error(import_picocolors8.default.red(`Entry file ${relative7} already exists.`));
       return process.exit(1);
     }
   }
@@ -2328,12 +2369,20 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
 }
 async function typegen(root, flags) {
   root = resolveRootDirectory(root, flags);
+  const rsc = await hasReactRouterRscPlugin({
+    root,
+    viteBuildOptions: {
+      config: flags.config,
+      mode: flags.mode
+    }
+  });
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
     await watch(root, {
       mode: flags.mode ?? "development",
+      rsc,
       logger
     });
     await new Promise(() => {
@@ -2341,20 +2390,21 @@ async function typegen(root, flags) {
     return;
   }
   await run(root, {
-    mode: flags.mode ?? "production"
+    mode: flags.mode ?? "production",
+    rsc
   });
 }
 
 // cli/run.ts
 var helpText = `
-${import_picocolors8.default.blueBright("react-router")}
+${import_picocolors9.default.blueBright("react-router")}
 
-  ${import_picocolors8.default.underline("Usage")}:
-    $ react-router build [${import_picocolors8.default.yellowBright("projectDir")}]
-    $ react-router dev [${import_picocolors8.default.yellowBright("projectDir")}]
-    $ react-router routes [${import_picocolors8.default.yellowBright("projectDir")}]
+  ${import_picocolors9.default.underline("Usage")}:
+    $ react-router build [${import_picocolors9.default.yellowBright("projectDir")}]
+    $ react-router dev [${import_picocolors9.default.yellowBright("projectDir")}]
+    $ react-router routes [${import_picocolors9.default.yellowBright("projectDir")}]
 
-  ${import_picocolors8.default.underline("Options")}:
+  ${import_picocolors9.default.underline("Options")}:
     --help, -h          Print this help message and exit
     --version, -v       Print the CLI version and exit
     --no-color          Disable ANSI colors in console output
@@ -2390,22 +2440,22 @@ ${import_picocolors8.default.blueBright("react-router")}
   \`typegen\` Options:
     --watch             Automatically regenerate types whenever route config (\`routes.ts\`) or route modules change
 
-  ${import_picocolors8.default.underline("Build your project")}:
+  ${import_picocolors9.default.underline("Build your project")}:
 
     $ react-router build
 
-  ${import_picocolors8.default.underline("Run your project locally in development")}:
+  ${import_picocolors9.default.underline("Run your project locally in development")}:
 
     $ react-router dev
 
-  ${import_picocolors8.default.underline("Show all routes in your app")}:
+  ${import_picocolors9.default.underline("Show all routes in your app")}:
 
     $ react-router routes
     $ react-router routes my-app
     $ react-router routes --json
     $ react-router routes --config vite.react-router.config.ts
 
-  ${import_picocolors8.default.underline("Reveal the used entry point")}:
+  ${import_picocolors9.default.underline("Reveal the used entry point")}:
 
     $ react-router reveal entry.client
     $ react-router reveal entry.server
@@ -2413,7 +2463,7 @@ ${import_picocolors8.default.blueBright("react-router")}
     $ react-router reveal entry.server --no-typescript
     $ react-router reveal entry.server --config vite.react-router.config.ts
 
-  ${import_picocolors8.default.underline("Generate types for route modules")}:
+  ${import_picocolors9.default.underline("Generate types for route modules")}:
 
    $ react-router typegen
    $ react-router typegen --watch

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

@@ -10,6 +10,7 @@ import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-r
 
 import routes from "virtual:react-router/unstable_rsc/routes";
 import basename from "virtual:react-router/unstable_rsc/basename";
+import unstable_reactRouterServeConfig from "virtual:react-router/unstable_rsc/react-router-serve-config";
 
 export async function fetchServer(request: Request) {
   return await matchRSCServerRequest({
@@ -30,6 +31,8 @@ export async function fetchServer(request: Request) {
   });
 }
 
+export { unstable_reactRouterServeConfig };
+
 export default async function handler(request: Request) {
   const ssr = await import.meta.viteRsc.loadModule<
     typeof import("./entry.ssr")

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

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

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.1
+ * @c0va23/react-router-dev v7.9.4-patch.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.1
+ * @c0va23/react-router-dev v7.9.4-patch.1
  *
  * Copyright (c) Remix Software Inc.
  *