@react-router/dev 0.0.0-experimental-4cf5bd08c → 0.0.0-experimental-fbc98d36c

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-4cf5bd08c
+ * @react-router/dev v0.0.0-experimental-fbc98d36c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1331,15 +1331,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();
   }
 });
@@ -1752,7 +1748,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_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 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";
@@ -1762,6 +1758,7 @@ 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"));

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

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4cf5bd08c
+ * @react-router/dev v0.0.0-experimental-fbc98d36c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4cf5bd08c
+ * @react-router/dev v0.0.0-experimental-fbc98d36c
  *
  * 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
@@ -884,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.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4cf5bd08c
+ * @react-router/dev v0.0.0-experimental-fbc98d36c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -52,6 +52,7 @@ var import_promises2 = require("fs/promises");
 var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var babel = __toESM(require("@babel/core"));
+var import_node_fetch_server2 = require("@remix-run/node-fetch-server");
 var import_react_router2 = require("react-router");
 var import_es_module_lexer = require("es-module-lexer");
 var import_pick3 = __toESM(require("lodash/pick"));
@@ -1255,81 +1256,14 @@ async function watch(rootDirectory, { mode, logger, rsc }) {
 }
 
 // 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");
-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;
-}
+var import_node_fetch_server = require("@remix-run/node-fetch-server");
 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 url2 = 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(url2.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/styles.ts
@@ -3481,7 +3415,7 @@ var reactRouterVitePlugin = () => {
                     req2,
                     await reactRouterDevLoadContext(req2)
                   );
-                  await toNodeRequest(res2, nodeRes);
+                  await (0, import_node_fetch_server2.sendResponse)(nodeRes, res2);
                 };
                 await nodeHandler(req, res);
               } catch (error) {
@@ -5289,6 +5223,7 @@ function reactRouterRSCVitePlugin() {
   let configLoader;
   let typegenWatcherPromise;
   let viteCommand;
+  let resolvedViteConfig;
   let routeIdByFile;
   let logger;
   const defaultEntries2 = getDefaultEntries();
@@ -5461,6 +5396,9 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           }
         };
       },
+      configResolved(viteConfig) {
+        resolvedViteConfig = viteConfig;
+      },
       async configureServer(viteDevServer) {
         configLoader.onChange(
           async ({
@@ -5494,6 +5432,24 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         await configLoader.close();
       }
     },
+    /* @__PURE__ */ (() => {
+      let logged = false;
+      function logExperimentalNotice() {
+        if (logged) return;
+        logged = true;
+        logger.info(
+          import_picocolors5.default.yellow(
+            `${viteCommand === "serve" ? "  " : ""}\u{1F9EA} Using React Router's RSC Framework Mode (experimental)`
+          )
+        );
+      }
+      return {
+        name: "react-router/rsc/log-experimental-notice",
+        sharedDuringBuild: true,
+        buildStart: logExperimentalNotice,
+        configureServer: logExperimentalNotice
+      };
+    })(),
     {
       name: "react-router/rsc/typegen",
       async config(viteUserConfig, { command, mode }) {
@@ -5694,6 +5650,28 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         return modules;
       }
     },
+    {
+      name: "react-router/rsc/virtual-react-router-serve-config",
+      resolveId(id) {
+        if (id === virtual2.reactRouterServeConfig.id) {
+          return virtual2.reactRouterServeConfig.resolvedId;
+        }
+      },
+      load(id) {
+        if (id === virtual2.reactRouterServeConfig.resolvedId) {
+          const rscOutDir = resolvedViteConfig.environments.rsc?.build?.outDir;
+          invariant(rscOutDir, "RSC build directory config not found");
+          const clientOutDir = resolvedViteConfig.environments.client?.build?.outDir;
+          invariant(clientOutDir, "Client build directory config not found");
+          const assetsBuildDirectory = Path5.relative(rscOutDir, clientOutDir);
+          const publicPath = resolvedViteConfig.base;
+          return `export default ${JSON.stringify({
+            assetsBuildDirectory,
+            publicPath
+          })};`;
+        }
+      }
+    },
     validatePluginOrder(),
     warnOnClientSourceMaps()
   ];
@@ -5703,7 +5681,8 @@ var virtual2 = {
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
   hmrRuntime: create("unstable_rsc/runtime"),
   basename: create("unstable_rsc/basename"),
-  rscEntry: create("unstable_rsc/rsc-entry")
+  rscEntry: create("unstable_rsc/rsc-entry"),
+  reactRouterServeConfig: create("unstable_rsc/react-router-serve-config")
 };
 function invalidateVirtualModules2(viteDevServer) {
   for (const vmod of Object.values(virtual2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-4cf5bd08c",
+  "version": "0.0.0-experimental-fbc98d36c",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -60,7 +60,6 @@
     }
   },
   "dependencies": {
-    "isbot": "^5.1.11",
     "@babel/core": "^7.27.7",
     "@babel/generator": "^7.27.5",
     "@babel/parser": "^7.27.7",
@@ -69,12 +68,14 @@
     "@babel/traverse": "^7.27.7",
     "@babel/types": "^7.27.7",
     "@npmcli/package-json": "^4.0.1",
+    "@remix-run/node-fetch-server": "^0.9.0",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
     "chokidar": "^4.0.0",
     "dedent": "^1.5.3",
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
+    "isbot": "^5.1.11",
     "jsesc": "3.0.2",
     "lodash": "^4.17.21",
     "pathe": "^1.1.2",
@@ -82,11 +83,10 @@
     "prettier": "^3.6.2",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
-    "set-cookie-parser": "^2.6.0",
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-4cf5bd08c"
+    "@react-router/node": "0.0.0-experimental-fbc98d36c"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -98,9 +98,8 @@
     "@types/lodash": "^4.14.182",
     "@types/node": "^20.0.0",
     "@types/npmcli__package-json": "^4.0.0",
-    "@types/set-cookie-parser": "^2.4.1",
     "@types/semver": "^7.7.0",
-    "@vitejs/plugin-rsc": "0.4.26",
+    "@vitejs/plugin-rsc": "0.4.30",
     "esbuild-register": "^3.6.0",
     "execa": "5.1.1",
     "express": "^4.19.2",
@@ -110,16 +109,16 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^0.0.0-experimental-4cf5bd08c",
-    "@react-router/serve": "0.0.0-experimental-4cf5bd08c"
+    "@react-router/serve": "0.0.0-experimental-fbc98d36c",
+    "react-router": "^0.0.0-experimental-fbc98d36c"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-4cf5bd08c",
-    "react-router": "^0.0.0-experimental-4cf5bd08c"
+    "@react-router/serve": "^0.0.0-experimental-fbc98d36c",
+    "react-router": "^0.0.0-experimental-fbc98d36c"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {