From 303421afa6efe330d3de2db279be18d19c9de7bc Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Mon, 24 Nov 2025 23:15:49 -0800
Subject: [PATCH 1/3] feat: routeRSCServerRequest replace fetchServer with
 serverResponse

---
 .changeset/plenty-kiwis-matter.md             |  6 ++++
 docs/api/rsc/RSCStaticRouter.md               | 15 +++++-----
 docs/api/rsc/routeRSCServerRequest.md         | 21 +++++++-------
 docs/how-to/react-server-components.md        | 12 ++++----
 .../helpers/rsc-parcel/src/prerender.tsx      |  4 +--
 integration/helpers/rsc-parcel/src/server.tsx |  4 +--
 .../helpers/rsc-vite/src/entry.rsc.tsx        |  2 +-
 .../helpers/rsc-vite/src/entry.ssr.tsx        |  4 +--
 .../config/default-rsc-entries/entry.rsc.tsx  |  2 +-
 .../config/default-rsc-entries/entry.ssr.tsx  |  4 +--
 packages/react-router/lib/rsc/server.ssr.tsx  | 28 ++++++++++++++-----
 playground/rsc-parcel/src/entry.ssr.tsx       |  2 +-
 playground/rsc-vite/src/entry.rsc.tsx         |  2 +-
 playground/rsc-vite/src/entry.ssr.tsx         |  4 +--
 14 files changed, 66 insertions(+), 44 deletions(-)
 create mode 100644 .changeset/plenty-kiwis-matter.md

diff --git a/.changeset/plenty-kiwis-matter.md b/.changeset/plenty-kiwis-matter.md
new file mode 100644
index 0000000000..66afd64413
--- /dev/null
+++ b/.changeset/plenty-kiwis-matter.md
@@ -0,0 +1,6 @@
+---
+"@react-router/dev": minor
+"react-router": minor
+---
+
+routeRSCServerRequest replace fetchServer with serverResponse
diff --git a/docs/api/rsc/RSCStaticRouter.md b/docs/api/rsc/RSCStaticRouter.md
index 5f56c30cdc..db7b8dfbdb 100644
--- a/docs/api/rsc/RSCStaticRouter.md
+++ b/docs/api/rsc/RSCStaticRouter.md
@@ -6,7 +6,7 @@ unstable: true
 # unstable_RSCStaticRouter
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -43,7 +43,7 @@ import {
 
 routeRSCServerRequest({
   request,
-  fetchServer,
+  serverResponse,
   createFromReadableStream,
   async renderHTML(getPayload) {
     const payload = getPayload();
@@ -53,7 +53,7 @@ routeRSCServerRequest({
       {
         bootstrapScriptContent,
         formState: await payload.formState,
-      }
+      },
     );
   },
 });
@@ -62,7 +62,9 @@ routeRSCServerRequest({
 ## Signature
 
 ```tsx
-function RSCStaticRouter({ getPayload }: RSCStaticRouterProps)
+function RSCStaticRouter({
+  getPayload,
+}: RSCStaticRouterProps);
 ```
 
 ## Props
@@ -71,4 +73,3 @@ function RSCStaticRouter({ getPayload }: RSCStaticRouterProps)
 
 A function that starts decoding of the [`unstable_RSCPayload`](https://api.reactrouter.com/v7/types/react_router.unstable_RSCPayload.html). Usually passed
 through from [`unstable_routeRSCServerRequest`](../rsc/routeRSCServerRequest)'s `renderHTML`.
-
diff --git a/docs/api/rsc/routeRSCServerRequest.md b/docs/api/rsc/routeRSCServerRequest.md
index 390ae380ce..78e17d3a7d 100644
--- a/docs/api/rsc/routeRSCServerRequest.md
+++ b/docs/api/rsc/routeRSCServerRequest.md
@@ -6,7 +6,7 @@ unstable: true
 # unstable_routeRSCServerRequest
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -45,7 +45,7 @@ import {
 
 routeRSCServerRequest({
   request,
-  fetchServer,
+  serverResponse,
   createFromReadableStream,
   async renderHTML(getPayload) {
     const payload = getPayload();
@@ -55,7 +55,7 @@ routeRSCServerRequest({
       {
         bootstrapScriptContent,
         formState: await payload.formState,
-      }
+      },
     );
   },
 });
@@ -66,19 +66,21 @@ routeRSCServerRequest({
 ```tsx
 async function routeRSCServerRequest({
   request,
-  fetchServer,
+  serverResponse,
   createFromReadableStream,
   renderHTML,
   hydrate = true,
 }: {
   request: Request;
-  fetchServer: (request: Request) => Promise<Response>;
+  serverResponse: Response;
   createFromReadableStream: SSRCreateFromReadableStreamFunction;
   renderHTML: (
     getPayload: () => DecodedPayload,
-  ) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>;
+  ) =>
+    | ReadableStream<Uint8Array>
+    | Promise<ReadableStream<Uint8Array>>;
   hydrate?: boolean;
-}): Promise<Response>
+}): Promise<Response>;
 ```
 
 ## Params
@@ -109,4 +111,3 @@ The request to route.
 A [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
 that either contains the [RSC](https://react.dev/reference/rsc/server-components)
 payload for data requests, or renders the HTML for document requests.
-
diff --git a/docs/how-to/react-server-components.md b/docs/how-to/react-server-components.md
index b705f44fda..0e71788f21 100644
--- a/docs/how-to/react-server-components.md
+++ b/docs/how-to/react-server-components.md
@@ -634,14 +634,14 @@ import { createFromReadableStream } from "react-server-dom-parcel/client.edge";
 
 export async function generateHTML(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
   bootstrapScriptContent: string | undefined,
 ): Promise<Response> {
   return await routeRSCServerRequest({
     // The incoming request.
     request,
-    // How to call the React Server.
-    fetchServer,
+    // The React Server response.
+    serverResponse,
     // Provide the React Server touchpoints.
     createFromReadableStream,
     // Render the router to HTML.
@@ -864,13 +864,13 @@ import {
 
 export async function generateHTML(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ): Promise<Response> {
   return await routeRSCServerRequest({
     // The incoming request.
     request,
-    // How to call the React Server.
-    fetchServer,
+    // The React Server response
+    serverResponse,
     // Provide the React Server touchpoints.
     createFromReadableStream,
     // Render the router to HTML.
diff --git a/integration/helpers/rsc-parcel/src/prerender.tsx b/integration/helpers/rsc-parcel/src/prerender.tsx
index 3d962b3fec..c0819d1e34 100644
--- a/integration/helpers/rsc-parcel/src/prerender.tsx
+++ b/integration/helpers/rsc-parcel/src/prerender.tsx
@@ -9,14 +9,14 @@ import { createFromReadableStream } from "react-server-dom-parcel/client.edge";
 
 export async function prerender(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
   bootstrapScriptContent: string | undefined,
 ): Promise<Response> {
   return await routeRSCServerRequest({
     // The incoming request.
     request,
     // How to fetch from the React Server.
-    fetchServer,
+    serverResponse,
     // Provide the React Server touchpoints.
     createFromReadableStream,
     // Render the router to HTML.
diff --git a/integration/helpers/rsc-parcel/src/server.tsx b/integration/helpers/rsc-parcel/src/server.tsx
index a5684ffd7f..589b890e82 100644
--- a/integration/helpers/rsc-parcel/src/server.tsx
+++ b/integration/helpers/rsc-parcel/src/server.tsx
@@ -63,10 +63,10 @@ app.get("/.well-known/appspecific/com.chrome.devtools.json", (_, res) => {
 
 // Hookup our application.
 app.use(
-  createRequestListener((request) =>
+  createRequestListener(async (request) =>
     prerender(
       request,
-      fetchServer,
+      await fetchServer(request),
       (assets as unknown as { bootstrapScript?: string }).bootstrapScript,
     ),
   ),
diff --git a/integration/helpers/rsc-vite/src/entry.rsc.tsx b/integration/helpers/rsc-vite/src/entry.rsc.tsx
index e61290062f..d71ba2e0b9 100644
--- a/integration/helpers/rsc-vite/src/entry.rsc.tsx
+++ b/integration/helpers/rsc-vite/src/entry.rsc.tsx
@@ -37,5 +37,5 @@ export default async function handler(request: Request) {
     // eslint-disable-next-line @typescript-eslint/consistent-type-imports
     typeof import("./entry.ssr")
   >("ssr", "index");
-  return ssr.default(request, fetchServer);
+  return ssr.default(request, await fetchServer(request));
 }
diff --git a/integration/helpers/rsc-vite/src/entry.ssr.tsx b/integration/helpers/rsc-vite/src/entry.ssr.tsx
index 6f47c70f85..5a2cf52529 100644
--- a/integration/helpers/rsc-vite/src/entry.ssr.tsx
+++ b/integration/helpers/rsc-vite/src/entry.ssr.tsx
@@ -8,13 +8,13 @@ import {
 
 export default async function handler(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
   return routeRSCServerRequest({
     request,
-    fetchServer,
+    serverResponse,
     createFromReadableStream,
     async renderHTML(getPayload) {
       const payload = getPayload();
diff --git a/packages/react-router-dev/config/default-rsc-entries/entry.rsc.tsx b/packages/react-router-dev/config/default-rsc-entries/entry.rsc.tsx
index ad86f492f6..21262b2682 100644
--- a/packages/react-router-dev/config/default-rsc-entries/entry.rsc.tsx
+++ b/packages/react-router-dev/config/default-rsc-entries/entry.rsc.tsx
@@ -37,7 +37,7 @@ 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);
+  return ssr.default(request, await fetchServer(request));
 }
 
 if (import.meta.hot) {
diff --git a/packages/react-router-dev/config/default-rsc-entries/entry.ssr.tsx b/packages/react-router-dev/config/default-rsc-entries/entry.ssr.tsx
index 5b15a77f71..25cc769323 100644
--- a/packages/react-router-dev/config/default-rsc-entries/entry.ssr.tsx
+++ b/packages/react-router-dev/config/default-rsc-entries/entry.ssr.tsx
@@ -8,14 +8,14 @@ import {
 
 export default async function handler(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
 
   return routeRSCServerRequest({
     request,
-    fetchServer,
+    serverResponse,
     createFromReadableStream,
     async renderHTML(getPayload) {
       const payload = getPayload();
diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx
index 7662d29947..50c62ab03b 100644
--- a/packages/react-router/lib/rsc/server.ssr.tsx
+++ b/packages/react-router/lib/rsc/server.ssr.tsx
@@ -49,7 +49,7 @@ export type SSRCreateFromReadableStreamFunction = (
  *
  * routeRSCServerRequest({
  *   request,
- *   fetchServer,
+ *   serverResponse,
  *   createFromReadableStream,
  *   async renderHTML(getPayload) {
  *     const payload = getPayload();
@@ -71,9 +71,11 @@ export type SSRCreateFromReadableStreamFunction = (
  * @param opts Options
  * @param opts.createFromReadableStream Your `react-server-dom-xyz/client`'s
  * `createFromReadableStream` function, used to decode payloads from the server.
- * @param opts.fetchServer A function that forwards a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
- * to the [RSC](https://react.dev/reference/rsc/server-components) handler
- * and returns a `Promise<Response>` containing a serialized {@link unstable_RSCPayload}.
+ * @param opts.serverResponse A Response or partial response generated by the [RSC](https://react.dev/reference/rsc/server-components) handler containing a serialized {@link unstable_RSCPayload}.
+ * @param opts.serverResponse.body A BodyInit.
+ * @param opts.serverResponse.headers A HeadersInit.
+ * @param opts.serverResponse.status A status code.
+ * @param opts.serverResponse.statusText A status message.
  * @param opts.hydrate Whether to hydrate the server response with the RSC payload.
  * Defaults to `true`.
  * @param opts.renderHTML A function that renders the {@link unstable_RSCPayload} to
@@ -85,13 +87,18 @@ export type SSRCreateFromReadableStreamFunction = (
  */
 export async function routeRSCServerRequest({
   request,
-  fetchServer,
+  serverResponse: _serverResponse,
   createFromReadableStream,
   renderHTML,
   hydrate = true,
 }: {
   request: Request;
-  fetchServer: (request: Request) => Promise<Response>;
+  serverResponse: {
+    body?: BodyInit | null;
+    headers?: HeadersInit;
+    status?: number;
+    statusText?: string;
+  };
   createFromReadableStream: SSRCreateFromReadableStreamFunction;
   renderHTML: (
     getPayload: () => DecodedPayload,
@@ -105,7 +112,14 @@ export async function routeRSCServerRequest({
     isManifestRequest(url) ||
     request.headers.has("rsc-action-id");
 
-  const serverResponse = await fetchServer(request);
+  const serverResponse =
+    _serverResponse instanceof Response
+      ? _serverResponse
+      : new Response(_serverResponse.body, {
+          headers: _serverResponse.headers,
+          status: _serverResponse.status,
+          statusText: _serverResponse.statusText,
+        });
 
   if (
     respondWithRSCPayload ||
diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx
index 1f29d629d3..29e8503537 100644
--- a/playground/rsc-parcel/src/entry.ssr.tsx
+++ b/playground/rsc-parcel/src/entry.ssr.tsx
@@ -19,7 +19,7 @@ app.use(
   createRequestListener(async (request) => {
     return routeRSCServerRequest({
       request,
-      fetchServer,
+      serverResponse: await fetchServer(request),
       createFromReadableStream,
       async renderHTML(getPayload) {
         const payload = getPayload();
diff --git a/playground/rsc-vite/src/entry.rsc.tsx b/playground/rsc-vite/src/entry.rsc.tsx
index c70f18a406..2c9c2c4395 100644
--- a/playground/rsc-vite/src/entry.rsc.tsx
+++ b/playground/rsc-vite/src/entry.rsc.tsx
@@ -33,7 +33,7 @@ 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);
+  return ssr.default(request, await fetchServer(request));
 }
 
 if (import.meta.hot) {
diff --git a/playground/rsc-vite/src/entry.ssr.tsx b/playground/rsc-vite/src/entry.ssr.tsx
index 6f47c70f85..5a2cf52529 100644
--- a/playground/rsc-vite/src/entry.ssr.tsx
+++ b/playground/rsc-vite/src/entry.ssr.tsx
@@ -8,13 +8,13 @@ import {
 
 export default async function handler(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
   return routeRSCServerRequest({
     request,
-    fetchServer,
+    serverResponse,
     createFromReadableStream,
     async renderHTML(getPayload) {
       const payload = getPayload();

From 0e3e68acc9910ced893729b5e13ec1c9e0e01ba7 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Tue, 2 Dec 2025 09:49:28 -0800
Subject: [PATCH 2/3] revert docs

---
 packages/react-router/lib/rsc/server.ssr.tsx | 22 ++------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx
index 50c62ab03b..dcb4b1dadb 100644
--- a/packages/react-router/lib/rsc/server.ssr.tsx
+++ b/packages/react-router/lib/rsc/server.ssr.tsx
@@ -72,10 +72,6 @@ export type SSRCreateFromReadableStreamFunction = (
  * @param opts.createFromReadableStream Your `react-server-dom-xyz/client`'s
  * `createFromReadableStream` function, used to decode payloads from the server.
  * @param opts.serverResponse A Response or partial response generated by the [RSC](https://react.dev/reference/rsc/server-components) handler containing a serialized {@link unstable_RSCPayload}.
- * @param opts.serverResponse.body A BodyInit.
- * @param opts.serverResponse.headers A HeadersInit.
- * @param opts.serverResponse.status A status code.
- * @param opts.serverResponse.statusText A status message.
  * @param opts.hydrate Whether to hydrate the server response with the RSC payload.
  * Defaults to `true`.
  * @param opts.renderHTML A function that renders the {@link unstable_RSCPayload} to
@@ -87,18 +83,13 @@ export type SSRCreateFromReadableStreamFunction = (
  */
 export async function routeRSCServerRequest({
   request,
-  serverResponse: _serverResponse,
+  serverResponse,
   createFromReadableStream,
   renderHTML,
   hydrate = true,
 }: {
   request: Request;
-  serverResponse: {
-    body?: BodyInit | null;
-    headers?: HeadersInit;
-    status?: number;
-    statusText?: string;
-  };
+  serverResponse: Response;
   createFromReadableStream: SSRCreateFromReadableStreamFunction;
   renderHTML: (
     getPayload: () => DecodedPayload,
@@ -112,15 +103,6 @@ export async function routeRSCServerRequest({
     isManifestRequest(url) ||
     request.headers.has("rsc-action-id");
 
-  const serverResponse =
-    _serverResponse instanceof Response
-      ? _serverResponse
-      : new Response(_serverResponse.body, {
-          headers: _serverResponse.headers,
-          status: _serverResponse.status,
-          statusText: _serverResponse.statusText,
-        });
-
   if (
     respondWithRSCPayload ||
     serverResponse.headers.get("React-Router-Resource") === "true"

From e6e55856d06fce3685a50c67dce83aeece729efe Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Tue, 2 Dec 2025 10:56:07 -0800
Subject: [PATCH 3/3] docs update

---
 docs/api/rsc/routeRSCServerRequest.md        | 5 ++---
 docs/how-to/react-server-components.md       | 4 ++--
 packages/react-router/lib/rsc/server.ssr.tsx | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/api/rsc/routeRSCServerRequest.md b/docs/api/rsc/routeRSCServerRequest.md
index 78e17d3a7d..cbed2c4220 100644
--- a/docs/api/rsc/routeRSCServerRequest.md
+++ b/docs/api/rsc/routeRSCServerRequest.md
@@ -89,10 +89,9 @@ async function routeRSCServerRequest({
 
 Your `react-server-dom-xyz/client`'s `createFromReadableStream` function, used to decode payloads from the server.
 
-### opts.fetchServer
+### opts.serverResponse
 
-A function that forwards a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) to the [RSC](https://react.dev/reference/rsc/server-components) handler
-and returns a `Promise<Response>` containing a serialized [`unstable_RSCPayload`](https://api.reactrouter.com/v7/types/react_router.unstable_RSCPayload.html).
+A Response from the [RSC](https://react.dev/reference/rsc/server-components) handler containing a serialized [`unstable_RSCPayload`](https://api.reactrouter.com/v7/types/react_router.unstable_RSCPayload.html).
 
 ### opts.hydrate
 
diff --git a/docs/how-to/react-server-components.md b/docs/how-to/react-server-components.md
index 0e71788f21..2a13787386 100644
--- a/docs/how-to/react-server-components.md
+++ b/docs/how-to/react-server-components.md
@@ -722,7 +722,7 @@ app.use(
   createRequestListener((request) =>
     generateHTML(
       request,
-      fetchServer,
+      await fetchServer(request),
       (routes as unknown as { bootstrapScript?: string })
         .bootstrapScript,
     ),
@@ -942,7 +942,7 @@ export default async function handler(request: Request) {
     typeof import("./entry.ssr")
   >("ssr", "index");
 
-  return ssr.generateHTML(request, fetchServer);
+  return ssr.generateHTML(request, await fetchServer(request));
 }
 ```
 
diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx
index dcb4b1dadb..d86de8cdda 100644
--- a/packages/react-router/lib/rsc/server.ssr.tsx
+++ b/packages/react-router/lib/rsc/server.ssr.tsx
@@ -321,7 +321,7 @@ export interface RSCStaticRouterProps {
  *
  * routeRSCServerRequest({
  *   request,
- *   fetchServer,
+ *   serverResponse,
  *   createFromReadableStream,
  *   async renderHTML(getPayload) {
  *     const payload = getPayload();