simplify entrypoints and update docs (existing method for formState still works)

Author: jacob-ebey

docs/api/rsc/RSCStaticRouter.md

@@ -46,13 +46,13 @@ routeRSCServerRequest({
   fetchServer,
   createFromReadableStream,
   async renderHTML(getPayload) {
-    const payload = await getPayload();
+    const payload = getPayload();
 
     return await renderHTMLToReadableStream(
       <RSCStaticRouter getPayload={getPayload} />,
       {
         bootstrapScriptContent,
-        formState: await getFormState(payload),
+        formState: await payload.formState,
       }
     );
   },

docs/api/rsc/routeRSCServerRequest.md

@@ -48,13 +48,13 @@ routeRSCServerRequest({
   fetchServer,
   createFromReadableStream,
   async renderHTML(getPayload) {
-    const payload = await getPayload();
+    const payload = getPayload();
 
     return await renderHTMLToReadableStream(
       <RSCStaticRouter getPayload={getPayload} />,
       {
         bootstrapScriptContent,
-        formState: await getFormState(payload),
+        formState: await payload.formState,
       }
     );
   },

docs/how-to/react-server-components.md

@@ -402,17 +402,13 @@ export async function generateHTML(
     createFromReadableStream,
     // Render the router to HTML.
     async renderHTML(getPayload) {
-      const payload = await getPayload();
-      const formState =
-        payload.type === "render"
-          ? await payload.formState
-          : undefined;
+      const payload = getPayload();
 
       return await renderHTMLToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,
         {
           bootstrapScriptContent,
-          formState,
+          formState: await payload.formState,
         },
       );
     },
@@ -635,11 +631,7 @@ export async function generateHTML(
     createFromReadableStream,
     // Render the router to HTML.
     async renderHTML(getPayload) {
-      const payload = await getPayload();
-      const formState =
-        payload.type === "render"
-          ? await payload.formState
-          : undefined;
+      const payload = getPayload();
 
       const bootstrapScriptContent =
         await import.meta.viteRsc.loadBootstrapScriptContent(
@@ -650,7 +642,7 @@ export async function generateHTML(
         <RSCStaticRouter getPayload={getPayload} />,
         {
           bootstrapScriptContent,
-          formState,
+          formState: payload.formState,
         },
       );
     },

integration/helpers/rsc-parcel/src/prerender.tsx

@@ -21,15 +21,13 @@ export async function prerender(
     createFromReadableStream,
     // Render the router to HTML.
     async renderHTML(getPayload) {
-      const payload = await getPayload();
-      const formState =
-        payload.type === "render" ? await payload.formState : undefined;
-
+      const payload = getPayload();
+      
       return await renderHTMLToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,
         {
           bootstrapScriptContent,
-          formState,
+          formState: await payload.formState,
         },
       );
     },

integration/helpers/rsc-vite/src/entry.ssr.tsx

@@ -17,16 +17,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,
         },
       );
     },

packages/react-router-dev/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,
         },
       );
     },

packages/react-router/lib/rsc/server.ssr.tsx

@@ -52,13 +52,13 @@ export type SSRCreateFromReadableStreamFunction = (
  *   fetchServer,
  *   createFromReadableStream,
  *   async renderHTML(getPayload) {
- *     const payload = await getPayload();
+ *     const payload = getPayload();
  *
  *     return await renderHTMLToReadableStream(
  *       <RSCStaticRouter getPayload={getPayload} />,
  *       {
  *         bootstrapScriptContent,
- *         formState: await getFormState(payload),
+ *         formState: await payload.formState,
  *       }
  *     );
  *   },
@@ -328,13 +328,13 @@ export interface RSCStaticRouterProps {
  *   fetchServer,
  *   createFromReadableStream,
  *   async renderHTML(getPayload) {
- *     const payload = await getPayload();
+ *     const payload = getPayload();
  *
  *     return await renderHTMLToReadableStream(
  *       <RSCStaticRouter getPayload={getPayload} />,
  *       {
  *         bootstrapScriptContent,
- *         formState: await getFormState(payload),
+ *         formState: await payload.formState,
  *       }
  *     );
  *   },

playground/rsc-parcel/src/entry.ssr.tsx

@@ -22,17 +22,15 @@ app.use(
       fetchServer,
       createFromReadableStream,
       async renderHTML(getPayload) {
-        const payload = await getPayload();
-        const formState =
-          payload.type === "render" ? await payload.formState : undefined;
+        const payload = getPayload();
 
         return await renderHTMLToReadableStream(
           <RSCStaticRouter getPayload={getPayload} />,
           {
             bootstrapScriptContent: (
               fetchServer as unknown as { bootstrapScript: string }
             ).bootstrapScript,
-            formState,
+            formState: await payload.formState,
           },
         );
       },

playground/rsc-vite/src/entry.ssr.tsx

@@ -17,16 +17,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,
         },
       );
     },