Try to hook up generateFlight

vercel · May 22, 2024 · 059e3da · 059e3da
1 parent 2fca6bc
commit 059e3da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
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: import('react-dom/server.edge').TemporaryReferencesSet
 }): Promise<
   | undefined
   | {
@@ -398,9 +400,6 @@ export async function handleAction({
       type: 'done'
       result: RenderResult | undefined
       formState?: any
-      temporaryReferences:
-        | import('react-dom/server.edge').TemporaryReferencesSet
-        | undefined
     }
 > {
   const contentType = req.headers['content-type']
@@ -516,7 +515,6 @@ export async function handleAction({
             // if the page was not revalidated, we can skip the rendering the flight tree
             skipFlight: !staticGenerationStore.pathWasRevalidated,
           }),
-          temporaryReferences: undefined,
         }
       }
 
@@ -558,14 +556,10 @@ export async function handleAction({
           ctx.renderOpts.basePath,
           staticGenerationStore
         ),
-        temporaryReferences: undefined,
       }
     }
   }
 
-  let temporaryReferences:
-    | import('react-dom/server.edge').TemporaryReferencesSet
-    | undefined
   try {
     await actionAsyncStorage.run({ isAction: true }, async () => {
       if (
@@ -575,16 +569,10 @@ export async function handleAction({
         isWebNextRequest(req)
       ) {
         // Use react-server-dom-webpack/server.edge
-        const {
-          createTemporaryReferenceSet,
-          decodeReply,
-          decodeAction,
-          decodeFormState,
-        } = ComponentMod
+        const { decodeReply, decodeAction, decodeFormState } = ComponentMod
         if (!req.body) {
           throw new Error('invariant: Missing request body.')
         }
-        temporaryReferences = createTemporaryReferenceSet()
 
         // TODO: add body limit
 
@@ -650,13 +638,11 @@ export async function handleAction({
       ) {
         // Use react-server-dom-webpack/server.node which supports streaming
         const {
-          createTemporaryReferenceSet,
           decodeReply,
           decodeReplyFromBusboy,
           decodeAction,
           decodeFormState,
         } = require(`./react-server.node`)
-        temporaryReferences = createTemporaryReferenceSet()
 
         const { Transform } =
           require('node:stream') as typeof import('node:stream')
@@ -827,7 +813,6 @@ export async function handleAction({
       type: 'done',
       result: actionResult,
       formState,
-      temporaryReferences,
     }
   } catch (err) {
     if (isRedirectError(err)) {
@@ -854,7 +839,6 @@ export async function handleAction({
             ctx.renderOpts.basePath,
             staticGenerationStore
           ),
-          temporaryReferences: undefined,
         }
       }
 
@@ -900,7 +884,6 @@ export async function handleAction({
             actionResult: promise,
             asNotFound: true,
           }),
-          temporaryReferences,
         }
       }
       return {
@@ -935,7 +918,6 @@ export async function handleAction({
           skipFlight:
             !staticGenerationStore.pathWasRevalidated || actionWasForwarded,
         }),
-        temporaryReferences,
       }
     }
 

diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -150,6 +150,7 @@ export type AppRenderContext = AppRenderBaseContext & {
   isNotFoundPath: boolean
   nonce: string | undefined
   res: BaseNextResponse
+  temporaryReferences: import('react-dom/server.edge').TemporaryReferencesSet
 }
 
 function createNotFoundLoaderTree(loaderTree: LoaderTree): LoaderTree {
@@ -367,7 +368,7 @@ async function generateFlight(
     {
       onError: ctx.flightDataRendererErrorHandler,
       nonce: ctx.nonce,
-      temporaryReferences: undefined,
+      temporaryReferences: ctx.temporaryReferences,
     }
   )
 
@@ -863,6 +864,8 @@ async function renderToHTMLOrFlightImpl(
     nonce = getScriptNonceFromHeader(csp)
   }
 
+  const temporaryReferences = ComponentMod.createTemporaryReferenceSet()
+
   const ctx: AppRenderContext = {
     ...baseCtx,
     getDynamicParamFromSegment,
@@ -883,6 +886,7 @@ async function renderToHTMLOrFlightImpl(
     isNotFoundPath,
     nonce,
     res,
+    temporaryReferences,
   }
 
   if (isRSCRequest && !isStaticGeneration) {
@@ -922,7 +926,6 @@ async function renderToHTMLOrFlightImpl(
       asNotFound,
       tree,
       formState,
-      temporaryReferences,
     }: RenderToStreamOptions): Promise<RenderToStreamResult> => {
       const tracingMetadata = getTracedMetadata(
         getTracer().getTracePropagationData(),
@@ -1372,6 +1375,7 @@ async function renderToHTMLOrFlightImpl(
     requestStore,
     serverActions,
     ctx,
+    temporaryReferences,
   })
 
   let formState: null | any = null
@@ -1382,7 +1386,7 @@ async function renderToHTMLOrFlightImpl(
         asNotFound: true,
         tree: notFoundLoaderTree,
         formState,
-        temporaryReferences: undefined,
+        temporaryReferences,
       })
 
       return new RenderResult(response.stream, { metadata })
@@ -1404,10 +1408,7 @@ async function renderToHTMLOrFlightImpl(
     asNotFound: isNotFoundPath,
     tree: loaderTree,
     formState,
-    temporaryReferences:
-      actionRequestResult !== undefined
-        ? actionRequestResult.temporaryReferences
-        : undefined,
+    temporaryReferences,
   })
 
   // If we have pending revalidates, wait until they are all resolved.