rename decode to createFromReadableStream in routeRSCServerRequest

Author: markdalgleish

docs/start/rsc/installation.md

@@ -160,7 +160,7 @@ export async function prerender(
     // How to fetch from the React Server.
     fetchServer,
     // Provide the React Server touchpoints.
-    decode: createFromReadableStream,
+    createFromReadableStream,
     // Render the router to HTML.
     async renderHTML(getPayload) {
       return await renderHTMLToReadableStream(

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

@@ -18,7 +18,7 @@ export async function prerender(
     // How to fetch from the React Server.
     fetchServer,
     // Provide the React Server touchpoints.
-    decode: createFromReadableStream,
+    createFromReadableStream,
     // Render the router to HTML.
     async renderHTML(getPayload) {
       const payload = await getPayload();

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

@@ -14,7 +14,7 @@ export default async function handler(
   return routeRSCServerRequest({
     request,
     fetchServer,
-    decode: (body) => createFromReadableStream(body),
+    createFromReadableStream,
     renderHTML(getPayload) {
       return ReactDomServer.renderToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,

packages/react-router/index-react-server.ts

@@ -2,6 +2,7 @@
 export { matchRSCServerRequest as unstable_matchRSCServerRequest } from "./lib/rsc/server.rsc";
 
 export type {
+  CreateFromReadableStreamFunction as unstable_CreateFromReadableStreamFunction,
   DecodeActionFunction as unstable_DecodeActionFunction,
   DecodeFormStateFunction as unstable_DecodeFormStateFunction,
   DecodeReplyFunction as unstable_DecodeReplyFunction,

packages/react-router/index.ts

@@ -283,10 +283,7 @@ export type { Register } from "./lib/types/register";
 export { href } from "./lib/href";
 
 // RSC
-export type {
-  CreateFromReadableStreamFunction as unstable_CreateFromReadableStreamFunction,
-  EncodeReplyFunction as unstable_EncodeReplyFunction,
-} from "./lib/rsc/browser";
+export type { EncodeReplyFunction as unstable_EncodeReplyFunction } from "./lib/rsc/browser";
 export {
   createCallServer as unstable_createCallServer,
   RSCHydratedRouter as unstable_RSCHydratedRouter,
@@ -303,6 +300,7 @@ import type { matchRSCServerRequest } from "./lib/rsc/server.rsc";
 export declare const unstable_matchRSCServerRequest: typeof matchRSCServerRequest;
 
 export type {
+  CreateFromReadableStreamFunction as unstable_CreateFromReadableStreamFunction,
   DecodeActionFunction as unstable_DecodeActionFunction,
   DecodeFormStateFunction as unstable_DecodeFormStateFunction,
   DecodeReplyFunction as unstable_DecodeReplyFunction,

packages/react-router/lib/rsc/browser.tsx

@@ -16,6 +16,7 @@ import type {
   ServerPayload,
   RenderedRoute,
   ServerRenderPayload,
+  CreateFromReadableStreamFunction,
 } from "./server.rsc";
 import type {
   DataStrategyFunction,
@@ -40,10 +41,6 @@ import {
 } from "../dom/ssr/routes";
 import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries";
 
-export type CreateFromReadableStreamFunction = (
-  body: ReadableStream<Uint8Array>
-) => Promise<unknown>;
-
 export type EncodeReplyFunction = (args: unknown[]) => Promise<BodyInit>;
 
 declare global {

packages/react-router/lib/rsc/server.rsc.ts

@@ -35,6 +35,10 @@ import { SINGLE_FETCH_REDIRECT_STATUS } from "../dom/ssr/single-fetch";
 import type { RouteMatch, RouteObject } from "../context";
 import invariant from "../server-runtime/invariant";
 
+export type CreateFromReadableStreamFunction = (
+  body: ReadableStream<Uint8Array>
+) => Promise<unknown>;
+
 type ServerContext = {
   redirect?: Response;
 };

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

@@ -5,18 +5,21 @@ import type { FrameworkContextObject } from "../dom/ssr/entry";
 import { createStaticRouter, StaticRouterProvider } from "../dom/server";
 import { injectRSCPayload } from "./html-stream/server";
 import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries";
-import type { ServerPayload } from "./server.rsc";
+import type {
+  ServerPayload,
+  CreateFromReadableStreamFunction,
+} from "./server.rsc";
 
 export async function routeRSCServerRequest({
   request,
   fetchServer,
-  decode,
+  createFromReadableStream,
   renderHTML,
   hydrate = true,
 }: {
   request: Request;
   fetchServer: (request: Request) => Promise<Response>;
-  decode: (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>;
+  createFromReadableStream: CreateFromReadableStreamFunction;
   renderHTML: (
     getPayload: () => Promise<ServerPayload>
   ) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>;
@@ -51,7 +54,7 @@ export async function routeRSCServerRequest({
   let payloadPromise: Promise<ServerPayload>;
   const getPayload = async () => {
     if (payloadPromise) return payloadPromise;
-    payloadPromise = decode(body);
+    payloadPromise = createFromReadableStream(body) as Promise<ServerPayload>;
     return payloadPromise;
   };
 

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

@@ -20,7 +20,7 @@ app.use(
     return routeRSCServerRequest({
       request,
       fetchServer,
-      decode: createFromReadableStream,
+      createFromReadableStream,
       async renderHTML(getPayload) {
         return await renderHTMLToReadableStream(
           <RSCStaticRouter getPayload={getPayload} />,

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

@@ -14,7 +14,7 @@ export default async function handler(
   return routeRSCServerRequest({
     request,
     fetchServer,
-    decode: (body) => createFromReadableStream(body),
+    createFromReadableStream,
     renderHTML(getPayload) {
       return ReactDomServer.renderToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,