Leverage temporary references on the server

vercel · May 22, 2024 · b6fdeeb · b6fdeeb
1 parent d4552a2
commit b6fdeeb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/...compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js b/...compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js
@@ -5331,8 +5331,8 @@ function renderToPipeableStream(model, webpackMap, options) {
   };
 }
 
-function decodeReplyFromBusboy(busboyStream, webpackMap) {
-  var response = createResponse(webpackMap, '');
+function decodeReplyFromBusboy(busboyStream, webpackMap, options) {
+  var response = createResponse(webpackMap, '', options ? options.temporaryReferences : undefined);
   var pendingFiles = 0;
   var queuedFields = [];
   busboyStream.on('field', function (name, value) {

diff --git a/packages/next/src/server/app-render/action-handler.ts b/packages/next/src/server/app-render/action-handler.ts
@@ -379,6 +379,7 @@ export async function handleAction({
   requestStore,
   serverActions,
   ctx,
+  temporaryReferences,
 }: {
   req: BaseNextRequest
   res: BaseNextResponse
@@ -389,6 +390,7 @@ export async function handleAction({
   requestStore: RequestStore
   serverActions?: ServerActionsConfig
   ctx: AppRenderContext
+  temporaryReferences: unknown
 }): Promise<
   | undefined
   | {
@@ -578,7 +580,9 @@ export async function handleAction({
           // TODO-APP: Add streaming support
           const formData = await req.request.formData()
           if (isFetchAction) {
-            bound = await decodeReply(formData, serverModuleMap)
+            bound = await decodeReply(formData, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           } else {
             const action = await decodeAction(formData, serverModuleMap)
             if (typeof action === 'function') {
@@ -617,9 +621,13 @@ export async function handleAction({
 
           if (isURLEncodedAction) {
             const formData = formDataFromSearchQueryString(actionData)
-            bound = await decodeReply(formData, serverModuleMap)
+            bound = await decodeReply(formData, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           } else {
-            bound = await decodeReply(actionData, serverModuleMap)
+            bound = await decodeReply(actionData, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           }
         }
       } else if (
@@ -681,7 +689,9 @@ export async function handleAction({
 
             body.pipe(busboy)
 
-            bound = await decodeReplyFromBusboy(busboy, serverModuleMap)
+            bound = await decodeReplyFromBusboy(busboy, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           } else {
             // React doesn't yet publish a busboy version of decodeAction
             // so we polyfill the parsing of FormData.
@@ -737,9 +747,13 @@ export async function handleAction({
 
           if (isURLEncodedAction) {
             const formData = formDataFromSearchQueryString(actionData)
-            bound = await decodeReply(formData, serverModuleMap)
+            bound = await decodeReply(formData, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           } else {
-            bound = await decodeReply(actionData, serverModuleMap)
+            bound = await decodeReply(actionData, serverModuleMap, {
+              temporaryReferences: temporaryReferences,
+            })
           }
         }
       } else {

diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -906,6 +906,8 @@ async function renderToHTMLOrFlightImpl(
 
   getTracer().getRootSpanAttributes()?.set('next.route', pagePath)
 
+  const temporaryReferences = ComponentMod.createTemporaryReferenceSet()
+
   const renderToStream = getTracer().wrap(
     AppRenderSpan.getBodyResult,
     {
@@ -959,6 +961,7 @@ async function renderToHTMLOrFlightImpl(
         {
           onError: serverComponentsErrorHandler,
           nonce,
+          temporaryReferences: temporaryReferences,
         }
       )
 
@@ -1291,6 +1294,7 @@ async function renderToHTMLOrFlightImpl(
           {
             onError: serverComponentsErrorHandler,
             nonce,
+            temporaryReferences: temporaryReferences,
           }
         )
 
@@ -1364,6 +1368,7 @@ async function renderToHTMLOrFlightImpl(
     requestStore,
     serverActions,
     ctx,
+    temporaryReferences,
   })
 
   let formState: null | any = null

diff --git a/packages/next/src/server/app-render/entry-base.ts b/packages/next/src/server/app-render/entry-base.ts
@@ -4,6 +4,7 @@ export {
   decodeReply,
   decodeAction,
   decodeFormState,
+  createTemporaryReferenceSet,
 } from 'react-server-dom-webpack/server.edge'
 
 import AppRouter from '../../client/components/app-router'