Unverified Commit b42b5c6a authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Node.js streams: Add forkpoint for generateDynamicFlightRenderResult (#92474)

## What?

Building on top of the changes in #92252. This PR implements similar
fork points for generateDynamicFlightRenderResult
parent ed650742
...@@ -846,42 +846,77 @@ async function generateDynamicFlightRenderResult( ...@@ -846,42 +846,77 @@ async function generateDynamicFlightRenderResult(
onFlightDataRenderError onFlightDataRenderError
) )
const debugChannel = setReactDebugChannel && createWebDebugChannel() if (process.env.__NEXT_USE_NODE_STREAMS) {
const debugChannel = setReactDebugChannel && createNodeDebugChannel()
if (debugChannel) { if (debugChannel) {
setReactDebugChannel(debugChannel.clientSide, htmlRequestId, requestId) setReactDebugChannel(debugChannel.clientSide, htmlRequestId, requestId)
} }
const { clientModules } = getClientReferenceManifest() const { clientModules } = getClientReferenceManifest()
// For app dir, use the bundled version of Flight server renderer (renderToReadableStream) const rscPayload = await workUnitAsyncStorage.run(
// which contains the subset React. requestStore,
const rscPayload = await workUnitAsyncStorage.run( generateDynamicRSCPayload,
requestStore, ctx,
generateDynamicRSCPayload, options
ctx, )
options
)
const flightStream = workUnitAsyncStorage.run( const flightStream = workUnitAsyncStorage.run(
requestStore, requestStore,
renderToWebFlightStream, renderToNodeFlightStream,
ctx.componentMod, ctx.componentMod,
rscPayload, rscPayload,
clientModules, clientModules,
{ {
onError, onError,
temporaryReferences: options?.temporaryReferences, temporaryReferences: options?.temporaryReferences,
filterStackFrame, filterStackFrame,
debugChannel: debugChannel?.serverSide, debugChannel: debugChannel?.serverSide,
}
)
return new FlightRenderResult(
flightStream,
{ fetchMetrics: workStore.fetchMetrics },
options?.waitUntil
)
} else {
const debugChannel = setReactDebugChannel && createWebDebugChannel()
if (debugChannel) {
setReactDebugChannel(debugChannel.clientSide, htmlRequestId, requestId)
} }
)
return new FlightRenderResult( const { clientModules } = getClientReferenceManifest()
flightStream,
{ fetchMetrics: workStore.fetchMetrics }, const rscPayload = await workUnitAsyncStorage.run(
options?.waitUntil requestStore,
) generateDynamicRSCPayload,
ctx,
options
)
const flightStream = workUnitAsyncStorage.run(
requestStore,
renderToWebFlightStream,
ctx.componentMod,
rscPayload,
clientModules,
{
onError,
temporaryReferences: options?.temporaryReferences,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
}
)
return new FlightRenderResult(
flightStream,
{ fetchMetrics: workStore.fetchMetrics },
options?.waitUntil
)
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment