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

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,
@@ -8,15 +9,19 @@ 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";
+import unstable_reactRouterServeConfig from "virtual:react-router/unstable_rsc/react-router-serve-config";
 
 export async function fetchServer(request: Request) {
   return await matchRSCServerRequest({
     createTemporaryReferenceSet,
-    decodeReply,
     decodeAction,
+    decodeFormState,
+    decodeReply,
     loadServerAction,
     request,
     routes,
+    basename,
     generateResponse(match, options) {
       return new Response(renderToReadableStream(match.payload, options), {
         status: match.statusCode,
@@ -26,9 +31,15 @@ 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")
   >("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,16 +12,20 @@ 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 = getPayload();
+
       return ReactDomServer.renderToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,
         {
           bootstrapScriptContent,
           signal: request.signal,
+          formState: await payload.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 @@
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.2
+ * @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.2
+ * @c0va23/react-router-dev v7.9.4-patch.1
  *
  * 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 @@
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.2
+ * @c0va23/react-router-dev v7.9.4-patch.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -45,14 +45,11 @@ __export(cloudflare_exports, {
 module.exports = __toCommonJS(cloudflare_exports);
 
 // vite/cloudflare-dev-proxy.ts
+var import_node_fetch_server2 = require("@remix-run/node-fetch-server");
 var import_react_router = require("react-router");
 
 // vite/node-adapter.ts
-var import_node_events = require("events");
-var import_node_tls = require("tls");
-var import_node_stream = require("stream");
-var import_set_cookie_parser = require("set-cookie-parser");
-var import_node = require("@react-router/node");
+var import_node_fetch_server = require("@remix-run/node-fetch-server");
 
 // invariant.ts
 function invariant(value, message) {
@@ -65,76 +62,13 @@ function invariant(value, message) {
 }
 
 // vite/node-adapter.ts
-function fromNodeHeaders(nodeReq) {
-  let nodeHeaders = nodeReq.headers;
-  if (nodeReq.httpVersionMajor >= 2) {
-    nodeHeaders = { ...nodeHeaders };
-    if (nodeHeaders[":authority"]) {
-      nodeHeaders.host = nodeHeaders[":authority"];
-    }
-    delete nodeHeaders[":authority"];
-    delete nodeHeaders[":method"];
-    delete nodeHeaders[":path"];
-    delete nodeHeaders[":scheme"];
-  }
-  let headers = new Headers();
-  for (let [key, values] of Object.entries(nodeHeaders)) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (let value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
-}
 function fromNodeRequest(nodeReq, nodeRes) {
-  let protocol = nodeReq.socket instanceof import_node_tls.TLSSocket && nodeReq.socket.encrypted ? "https" : "http";
-  let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin : `${protocol}://${nodeReq.headers.host}`;
   invariant(
     nodeReq.originalUrl,
     "Expected `nodeReq.originalUrl` to be defined"
   );
-  let url = new URL(nodeReq.originalUrl, origin);
-  let controller = new AbortController();
-  let init = {
-    method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq),
-    signal: controller.signal
-  };
-  nodeRes.on("finish", () => controller = null);
-  nodeRes.on("close", () => controller?.abort());
-  if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {
-    init.body = (0, import_node.createReadableStreamFromReadable)(nodeReq);
-    init.duplex = "half";
-  }
-  return new Request(url.href, init);
-}
-async function toNodeRequest(res, nodeRes) {
-  nodeRes.statusCode = res.status;
-  if (!nodeRes.req || nodeRes.req.httpVersionMajor < 2) {
-    nodeRes.statusMessage = res.statusText;
-  }
-  let cookiesStrings = [];
-  for (let [name, value] of res.headers) {
-    if (name === "set-cookie") {
-      cookiesStrings.push(...(0, import_set_cookie_parser.splitCookiesString)(value));
-    } else nodeRes.setHeader(name, value);
-  }
-  if (cookiesStrings.length) {
-    nodeRes.setHeader("set-cookie", cookiesStrings);
-  }
-  if (res.body) {
-    let responseBody = res.body;
-    let readable = import_node_stream.Readable.from(responseBody);
-    readable.pipe(nodeRes);
-    await (0, import_node_events.once)(readable, "end");
-  } else {
-    nodeRes.end();
-  }
+  nodeReq.url = nodeReq.originalUrl;
+  return (0, import_node_fetch_server.createRequest)(nodeReq, nodeRes);
 }
 
 // vite/vite.ts
@@ -407,7 +341,8 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -425,6 +360,12 @@ 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}`);
     }
@@ -513,7 +454,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,
@@ -554,7 +495,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -573,11 +514,11 @@ async function resolveConfig({
     }
   }
   let future = {
-    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,
-    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,
@@ -603,7 +544,8 @@ async function createConfigLoader({
   rootDirectory: root,
   watch,
   mode,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -622,7 +564,13 @@ async function createConfigLoader({
     });
   };
   updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
+  let getConfig = () => resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
@@ -870,7 +818,7 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
               context ??= await getContext();
               let loadContext = getLoadContext ? await getLoadContext({ request: req, context }) : context;
               let res = await handler(req, loadContext);
-              await toNodeRequest(res, nodeRes);
+              await (0, import_node_fetch_server2.sendResponse)(nodeRes, res);
             } catch (error) {
               next(error);
             }

package/dist/vite.d.ts

@@ -8,4 +8,6 @@ type ReactRouterVitePlugin = () => Vite.Plugin[];
  */
 declare const reactRouterVitePlugin: ReactRouterVitePlugin;
 
-export { reactRouterVitePlugin as reactRouter };
+declare function reactRouterRSCVitePlugin(): Vite.PluginOption[];
+
+export { reactRouterVitePlugin as reactRouter, reactRouterRSCVitePlugin as unstable_reactRouterRSC };