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

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # `@react-router/dev`
 
+### Patch Changes
+- Copy `server.watch` config options from `vite.config.(ts|js)` file to child vite server in development mode.
+
 ## 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.8.3-alpha.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -217,7 +217,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path9, message]) => `Path: routes.${path9}
+          ([path8, message]) => `Path: routes.${path8}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -311,8 +311,7 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes,
-  validateConfig
+  skipRoutes
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -330,12 +329,6 @@ async function resolveConfig({
         return err(`${reactRouterConfigFile} must export a config`);
       }
       reactRouterUserConfig = configModule.default;
-      if (validateConfig) {
-        const error = validateConfig(reactRouterUserConfig);
-        if (error) {
-          return err(error);
-        }
-      }
     } catch (error) {
       return err(`Error loading ${reactRouterConfigFile}: ${error}`);
     }
@@ -484,7 +477,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
+    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -514,8 +507,7 @@ async function createConfigLoader({
   rootDirectory: root,
   watch: watch2,
   mode,
-  skipRoutes,
-  validateConfig
+  skipRoutes
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -534,13 +526,7 @@ async function createConfigLoader({
     });
   };
   updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({
-    root,
-    viteNodeContext,
-    reactRouterConfigFile,
-    skipRoutes,
-    validateConfig
-  });
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
@@ -562,11 +548,11 @@ async function createConfigLoader({
       if (!fsWatcher) {
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
-          ignored: (path9) => {
-            let dirname5 = import_pathe3.default.dirname(path9);
+          ignored: (path8) => {
+            let dirname5 = import_pathe3.default.dirname(path8);
             return !dirname5.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
-            path9 !== root && // Watch the root directory itself
+            path8 !== root && // Watch the root directory itself
             dirname5 !== root;
           }
         });
@@ -890,7 +876,7 @@ function fullpath(lineage2) {
   if (lineage2.length === 1 && route?.id === "root") return "/";
   const isLayout = route && route.index !== true && route.path === void 0;
   if (isLayout) return void 0;
-  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path9) => path9 !== void 0 && path9 !== "").join("/");
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path8) => path8 !== void 0 && path8 !== "").join("/");
 }
 var init_route = __esm({
   "typegen/route.ts"() {
@@ -911,7 +897,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        unstable_middleware: ${ctx.config.future.unstable_middleware}
       }
     }
   `;
@@ -1050,8 +1036,8 @@ function routeFilesType({
   );
 }
 function isInAppDirectory(ctx, routeFile) {
-  const path9 = Path3.resolve(ctx.config.appDirectory, routeFile);
-  return path9.startsWith(ctx.config.appDirectory);
+  const path8 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path8.startsWith(ctx.config.appDirectory);
 }
 function getRouteAnnotations({
   ctx,
@@ -1132,11 +1118,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // middleware
-        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
+        // unstable_middleware
+        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        // clientMiddleware
-        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
+        // unstable_clientMiddleware
+        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -1163,21 +1149,21 @@ function getRouteAnnotations({
   return { filename: filename2, content };
 }
 function relativeImportSource(from, to) {
-  let path9 = Path3.relative(Path3.dirname(from), to);
-  let extension = Path3.extname(path9);
-  path9 = Path3.join(Path3.dirname(path9), Pathe.filename(path9));
-  if (!path9.startsWith("../")) path9 = "./" + path9;
+  let path8 = Path3.relative(Path3.dirname(from), to);
+  let extension = Path3.extname(path8);
+  path8 = Path3.join(Path3.dirname(path8), Pathe.filename(path8));
+  if (!path8.startsWith("../")) path8 = "./" + path8;
   if (!extension || /\.(js|ts)x?$/.test(extension)) {
     extension = ".js";
   }
-  return path9 + extension;
+  return path8 + extension;
 }
 function rootDirsPath(ctx, typesPath) {
   const rel = Path3.relative(typesDirectory(ctx), typesPath);
   return Path3.join(ctx.rootDirectory, rel);
 }
-function paramsType(path9) {
-  const params = parse2(path9);
+function paramsType(path8) {
+  const params = parse2(path8);
   return t2.tsTypeLiteral(
     Object.entries(params).map(([param, isRequired]) => {
       const property = t2.tsPropertySignature(
@@ -1298,36 +1284,6 @@ var init_typegen = __esm({
   }
 });
 
-// vite/has-rsc-plugin.ts
-async function hasReactRouterRscPlugin({
-  root,
-  viteBuildOptions: { config, logLevel, mode }
-}) {
-  const vite2 = await import("vite");
-  const viteConfig = await vite2.resolveConfig(
-    {
-      configFile: config,
-      logLevel,
-      mode: mode ?? "production",
-      root
-    },
-    "build",
-    // command
-    "production",
-    // default mode
-    "production"
-    // default NODE_ENV
-  );
-  return viteConfig.plugins.some(
-    (plugin) => plugin?.name === "react-router/rsc"
-  );
-}
-var init_has_rsc_plugin = __esm({
-  "vite/has-rsc-plugin.ts"() {
-    "use strict";
-  }
-});
-
 // vite/node-adapter.ts
 var import_node_events, import_node_tls, import_node_stream, import_set_cookie_parser, import_node;
 var init_node_adapter = __esm({
@@ -1381,16 +1337,6 @@ var init_virtual_module = __esm({
   }
 });
 
-// vite/resolve-relative-route-file-path.ts
-var import_pathe4;
-var init_resolve_relative_route_file_path = __esm({
-  "vite/resolve-relative-route-file-path.ts"() {
-    "use strict";
-    import_pathe4 = __toESM(require("pathe"));
-    init_vite();
-  }
-});
-
 // vite/combine-urls.ts
 var init_combine_urls = __esm({
   "vite/combine-urls.ts"() {
@@ -1408,13 +1354,6 @@ var init_remove_exports = __esm({
   }
 });
 
-// vite/has-dependency.ts
-var init_has_dependency = __esm({
-  "vite/has-dependency.ts"() {
-    "use strict";
-  }
-});
-
 // vite/cache.ts
 var init_cache = __esm({
   "vite/cache.ts"() {
@@ -1454,7 +1393,7 @@ var init_route_chunks = __esm({
     routeChunkExportNames = [
       "clientAction",
       "clientLoader",
-      "clientMiddleware",
+      "unstable_clientMiddleware",
       "HydrateFallback"
     ];
     mainChunkName = "main";
@@ -1464,23 +1403,12 @@ var init_route_chunks = __esm({
       main: `${routeChunkQueryStringPrefix}main`,
       clientAction: `${routeChunkQueryStringPrefix}clientAction`,
       clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
-      clientMiddleware: `${routeChunkQueryStringPrefix}clientMiddleware`,
+      unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
       HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
     };
   }
 });
 
-// vite/optimize-deps-entries.ts
-var import_tinyglobby;
-var init_optimize_deps_entries = __esm({
-  "vite/optimize-deps-entries.ts"() {
-    "use strict";
-    import_tinyglobby = require("tinyglobby");
-    init_resolve_relative_route_file_path();
-    init_vite();
-  }
-});
-
 // vite/with-props.ts
 var init_with_props = __esm({
   "vite/with-props.ts"() {
@@ -1538,8 +1466,8 @@ function getServerBundleIds(ctx) {
 async function cleanBuildDirectory(viteConfig, ctx) {
   let buildDirectory = ctx.reactRouterConfig.buildDirectory;
   let isWithinRoot = () => {
-    let relativePath = path7.relative(ctx.rootDirectory, buildDirectory);
-    return !relativePath.startsWith("..") && !path7.isAbsolute(relativePath);
+    let relativePath = path6.relative(ctx.rootDirectory, buildDirectory);
+    return !relativePath.startsWith("..") && !path6.isAbsolute(relativePath);
   };
   if (viteConfig.build.emptyOutDir ?? isWithinRoot()) {
     await (0, import_promises2.rm)(buildDirectory, { force: true, recursive: true });
@@ -1550,7 +1478,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     ([environmentName, options]) => {
       let outDir = options.build?.outDir;
       invariant(outDir, `Expected build.outDir for ${environmentName}`);
-      return path7.join(outDir, ".vite/manifest.json");
+      return path6.join(outDir, ".vite/manifest.json");
     }
   );
   await Promise.all(
@@ -1560,7 +1488,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
       if (!ctx.viteManifestEnabled) {
         await (0, import_promises2.rm)(viteManifestPath, { force: true, recursive: true });
       }
-      let viteDir = path7.dirname(viteManifestPath);
+      let viteDir = path6.dirname(viteManifestPath);
       let viteDirFiles = await (0, import_promises2.readdir)(viteDir, { recursive: true });
       if (viteDirFiles.length === 0) {
         await (0, import_promises2.rm)(viteDir, { force: true, recursive: true });
@@ -1577,10 +1505,10 @@ function mergeEnvironmentOptions(base, ...overrides) {
 }
 async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
-  let packageRoot = path7.dirname(
+  let packageRoot = path6.dirname(
     require.resolve("@react-router/dev/package.json")
   );
-  let { moduleSyncEnabled } = await import(`file:///${path7.join(packageRoot, "module-sync-enabled/index.mjs")}`);
+  let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
   function getBaseOptions({
     viteUserConfig
@@ -1659,7 +1587,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
             ctx.entryClientFilePath,
             ...Object.values(ctx.reactRouterConfig.routes).flatMap(
               (route) => {
-                let routeFilePath = path7.resolve(
+                let routeFilePath = path6.resolve(
                   ctx.reactRouterConfig.appDirectory,
                   route.file
                 );
@@ -1683,7 +1611,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
               let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
-              return path7.posix.join(
+              return path6.posix.join(
                 assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
               );
@@ -1733,18 +1661,19 @@ 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, path6, url, babel2, import_react_router2, import_es_module_lexer, import_tinyglobby, 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 init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
     import_node_fs3 = require("fs");
     import_promises2 = require("fs/promises");
-    path7 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     url = __toESM(require("url"));
     babel2 = __toESM(require("@babel/core"));
     import_react_router2 = require("react-router");
     import_es_module_lexer = require("es-module-lexer");
+    import_tinyglobby = require("tinyglobby");
     import_pick3 = __toESM(require("lodash/pick"));
     import_jsesc = __toESM(require("jsesc"));
     import_picocolors4 = __toESM(require("picocolors"));
@@ -1756,21 +1685,18 @@ var init_plugin = __esm({
     init_styles();
     init_virtual_module();
     init_resolve_file_url();
-    init_resolve_relative_route_file_path();
     init_combine_urls();
     init_remove_exports();
     init_ssr_externals();
-    init_has_dependency();
     init_route_chunks();
     init_vite();
     init_config();
-    init_optimize_deps_entries();
     init_with_props();
     init_validate_plugin_order();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
-      "clientMiddleware",
+      "unstable_clientMiddleware",
       "handle",
       "meta",
       "links",
@@ -1792,20 +1718,20 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path7.join(
+    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path6.join(
       reactRouterConfig.buildDirectory,
       "server",
       ...serverBundleId ? [serverBundleId] : []
     );
-    getClientBuildDirectory = (reactRouterConfig) => path7.join(reactRouterConfig.buildDirectory, "client");
-    defaultEntriesDir = path7.resolve(
-      path7.dirname(require.resolve("@react-router/dev/package.json")),
+    getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
+    defaultEntriesDir = path6.resolve(
+      path6.dirname(require.resolve("@react-router/dev/package.json")),
       "dist",
       "config",
       "defaults"
     );
     defaultEntries = (0, import_node_fs3.readdirSync)(defaultEntriesDir).map(
-      (filename2) => path7.join(defaultEntriesDir, filename2)
+      (filename2) => path6.join(defaultEntriesDir, filename2)
     );
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
@@ -1851,14 +1777,14 @@ async function build(root, viteBuildOptions) {
     throw new Error(configResult.error);
   }
   let config = configResult.value;
+  let unstable_viteEnvironmentApi = config.future.unstable_viteEnvironmentApi;
   let viteMajor = parseInt(vite2.version.split(".")[0], 10);
-  if (config.future.unstable_viteEnvironmentApi && viteMajor === 5) {
+  if (unstable_viteEnvironmentApi && viteMajor === 5) {
     throw new Error(
       "The future.unstable_viteEnvironmentApi option is not supported in Vite 5"
     );
   }
-  const useViteEnvironmentApi = config.future.unstable_viteEnvironmentApi || await hasReactRouterRscPlugin({ root, viteBuildOptions });
-  return await (useViteEnvironmentApi ? viteAppBuild(root, viteBuildOptions) : viteBuild(root, viteBuildOptions));
+  return await (unstable_viteEnvironmentApi ? viteAppBuild(root, viteBuildOptions) : viteBuild(root, viteBuildOptions));
 }
 async function viteAppBuild(root, {
   assetsInlineLimit,
@@ -2014,7 +1940,6 @@ var init_build = __esm({
     init_plugin();
     init_invariant();
     init_vite();
-    init_has_rsc_plugin();
   }
 });
 
@@ -2091,7 +2016,7 @@ var import_picocolors8 = __toESM(require("picocolors"));
 // cli/commands.ts
 var import_node_fs4 = require("fs");
 var import_promises3 = require("fs/promises");
-var path8 = __toESM(require("path"));
+var path7 = __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"));
@@ -2176,7 +2101,6 @@ async function transpile(tsx, options = {}) {
 init_profiler();
 init_typegen();
 init_vite();
-init_has_rsc_plugin();
 async function routes(rootDirectory, flags = {}) {
   rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({
@@ -2221,26 +2145,12 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   type: "conjunction"
 });
 async function generateEntry(entry, rootDirectory, flags = {}) {
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
-  if (await hasReactRouterRscPlugin({
-    root: rootDirectory,
-    viteBuildOptions: {
-      config: flags.config,
-      mode: flags.mode
-    }
-  })) {
-    console.error(
-      import_picocolors7.default.red(
-        `The reveal command is currently not supported in RSC Framework Mode.`
-      )
-    );
-    process.exit(1);
-  }
   if (!entry) {
     await generateEntry("entry.client", rootDirectory, flags);
     await generateEntry("entry.server", rootDirectory, flags);
     return;
   }
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({
     rootDirectory,
     mode: flags.mode ?? "production"
@@ -2264,14 +2174,14 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     console.error(import_picocolors7.default.red(`No default server entry detected.`));
     return;
   }
-  let defaultsDirectory = path8.resolve(
-    path8.dirname(require.resolve("@react-router/dev/package.json")),
+  let defaultsDirectory = path7.resolve(
+    path7.dirname(require.resolve("@react-router/dev/package.json")),
     "dist",
     "config",
     "defaults"
   );
-  let defaultEntryClient = path8.resolve(defaultsDirectory, "entry.client.tsx");
-  let defaultEntryServer = path8.resolve(
+  let defaultEntryClient = path7.resolve(defaultsDirectory, "entry.client.tsx");
+  let defaultEntryServer = path7.resolve(
     defaultsDirectory,
     `entry.server.node.tsx`
   );
@@ -2280,7 +2190,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
   let useTypeScript = flags.typescript ?? true;
   let outputExtension = useTypeScript ? "tsx" : "jsx";
   let outputEntry = `${entry}.${outputExtension}`;
-  let outputFile = path8.resolve(appDirectory, outputEntry);
+  let outputFile = path7.resolve(appDirectory, outputEntry);
   if (!useTypeScript) {
     let javascript = await transpile(contents, {
       cwd: rootDirectory,
@@ -2292,7 +2202,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
   }
   console.log(
     import_picocolors7.default.blue(
-      `Entry file ${entry} created at ${path8.relative(
+      `Entry file ${entry} created at ${path7.relative(
         rootDirectory,
         outputFile
       )}.`
@@ -2301,16 +2211,16 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
 }
 function resolveRootDirectory(root, flags) {
   if (root) {
-    return path8.resolve(root);
+    return path7.resolve(root);
   }
-  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path8.dirname(path8.resolve(flags.config)) : process.cwd());
+  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path7.dirname(path7.resolve(flags.config)) : process.cwd());
 }
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
-    let entryPath = path8.resolve(appDirectory, entry);
+    let entryPath = path7.resolve(appDirectory, entry);
     let exists = (0, import_node_fs4.existsSync)(entryPath);
     if (exists) {
-      let relative7 = path8.relative(rootDirectory, entryPath);
+      let relative7 = path7.relative(rootDirectory, entryPath);
       console.error(import_picocolors7.default.red(`Entry file ${relative7} already exists.`));
       return process.exit(1);
     }

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

@@ -24,11 +24,7 @@ setServerCallback(
 );
 
 createFromReadableStream<RSCPayload>(getRSCStream()).then((payload) => {
-  // @ts-expect-error - on 18 types, requires 19.
-  startTransition(async () => {
-    const formState =
-      payload.type === "render" ? await payload.formState : undefined;
-
+  startTransition(() => {
     hydrateRoot(
       document,
       <StrictMode>
@@ -37,10 +33,6 @@ 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,7 +1,6 @@
 import {
   createTemporaryReferenceSet,
   decodeAction,
-  decodeFormState,
   decodeReply,
   loadServerAction,
   renderToReadableStream,
@@ -9,18 +8,15 @@ import {
 import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
 
 import routes from "virtual:react-router/unstable_rsc/routes";
-import basename from "virtual:react-router/unstable_rsc/basename";
 
 export async function fetchServer(request: Request) {
   return await matchRSCServerRequest({
     createTemporaryReferenceSet,
-    decodeAction,
-    decodeFormState,
     decodeReply,
+    decodeAction,
     loadServerAction,
     request,
     routes,
-    basename,
     generateResponse(match, options) {
       return new Response(renderToReadableStream(match.payload, options), {
         status: match.statusCode,
@@ -36,7 +32,3 @@ export default async function handler(request: Request) {
   >("ssr", "index");
   return ssr.default(request, fetchServer);
 }
-
-if (import.meta.hot) {
-  import.meta.hot.accept();
-}

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

@@ -12,22 +12,16 @@ export default async function handler(
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
-
   return routeRSCServerRequest({
     request,
     fetchServer,
     createFromReadableStream,
-    async renderHTML(getPayload) {
-      const payload = await getPayload();
-      const formState =
-        payload.type === "render" ? await payload.formState : undefined;
-
+    renderHTML(getPayload) {
       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: RouterContextProvider
+  // loadContext: unstable_RouterContextProvider
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;

package/dist/config.d.ts

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

package/dist/config.js

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