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

Revert "Revert "Node.js streams: Add forkpoint for prerenderToStream"" (#93376)

Reverts vercel/next.js#92845
parent 9a4e4e7f
...@@ -4127,7 +4127,8 @@ async function renderToStream( ...@@ -4127,7 +4127,8 @@ async function renderToStream(
requestStore, requestStore,
renderToNodeFizzStream, renderToNodeFizzStream,
appElement, appElement,
fizzOptions fizzOptions,
{ waitForAllReady: generateStaticHTML }
) )
// End the render span only after React completed rendering (including anything inside Suspense boundaries) // End the render span only after React completed rendering (including anything inside Suspense boundaries)
...@@ -4413,7 +4414,8 @@ async function renderToStream( ...@@ -4413,7 +4414,8 @@ async function renderToStream(
bootstrapScriptContent, bootstrapScriptContent,
bootstrapScripts: [errorBootstrapScript], bootstrapScripts: [errorBootstrapScript],
formState, formState,
} },
{ waitForAllReady: generateStaticHTML }
) )
errorAllReady.finally(() => { errorAllReady.finally(() => {
...@@ -7104,6 +7106,16 @@ async function prerenderToStream( ...@@ -7104,6 +7106,16 @@ async function prerenderToStream(
const { cachedNavigations } = renderOpts.experimental const { cachedNavigations } = renderOpts.experimental
const renderFlightStream = process.env.__NEXT_USE_NODE_STREAMS
? renderToNodeFlightStream
: renderToWebFlightStream
const renderFizzStream = process.env.__NEXT_USE_NODE_STREAMS
? renderToNodeFizzStream
: renderToWebFizzStream
const createInlinedDataStream = process.env.__NEXT_USE_NODE_STREAMS
? createNodeInlinedDataStream
: createWebInlinedDataStream
const allowEmptyStaticShell = const allowEmptyStaticShell =
(renderOpts.allowEmptyStaticShell ?? false) || (renderOpts.allowEmptyStaticShell ?? false) ||
(await isPageAllowedToBlock(tree)) (await isPageAllowedToBlock(tree))
...@@ -7952,13 +7964,13 @@ async function prerenderToStream( ...@@ -7952,13 +7964,13 @@ async function prerenderToStream(
// segments, since those are the only ones whose data is not complete. // segments, since those are the only ones whose data is not complete.
const emptyReactServerResult = const emptyReactServerResult =
await createReactServerPrerenderResultFromRender( await createReactServerPrerenderResultFromRender(
renderToWebFlightStream(ComponentMod, [], clientModules, { renderFlightStream(ComponentMod, [], clientModules, {
filterStackFrame, filterStackFrame,
onError: serverComponentsErrorHandler, onError: serverComponentsErrorHandler,
}) })
) )
finalStream = await continueStaticFallbackPrerender(htmlStream, { finalStream = await continueStaticFallbackPrerender(htmlStream, {
inlinedDataStream: createWebInlinedDataStream( inlinedDataStream: createInlinedDataStream(
emptyReactServerResult.consumeAsStream(), emptyReactServerResult.consumeAsStream(),
nonce, nonce,
formState formState
...@@ -7970,7 +7982,7 @@ async function prerenderToStream( ...@@ -7970,7 +7982,7 @@ async function prerenderToStream(
} else { } else {
// Normal static prerender case, no fallback param handling needed // Normal static prerender case, no fallback param handling needed
finalStream = await continueStaticPrerender(htmlStream, { finalStream = await continueStaticPrerender(htmlStream, {
inlinedDataStream: createWebInlinedDataStream( inlinedDataStream: createInlinedDataStream(
reactServerResult.consumeAsStream(), reactServerResult.consumeAsStream(),
nonce, nonce,
formState formState
...@@ -8029,7 +8041,7 @@ async function prerenderToStream( ...@@ -8029,7 +8041,7 @@ async function prerenderToStream(
await createReactServerPrerenderResultFromRender( await createReactServerPrerenderResultFromRender(
workUnitAsyncStorage.run( workUnitAsyncStorage.run(
reactServerPrerenderStore, reactServerPrerenderStore,
renderToWebFlightStream, renderFlightStream,
ComponentMod, ComponentMod,
RSCPayload, RSCPayload,
clientModules, clientModules,
...@@ -8224,7 +8236,7 @@ async function prerenderToStream( ...@@ -8224,7 +8236,7 @@ async function prerenderToStream(
digestErrorsMap: reactServerErrorsByDigest, digestErrorsMap: reactServerErrorsByDigest,
ssrErrors: allCapturedErrors, ssrErrors: allCapturedErrors,
stream: await continueStaticPrerender(htmlStream, { stream: await continueStaticPrerender(htmlStream, {
inlinedDataStream: createWebInlinedDataStream( inlinedDataStream: createInlinedDataStream(
reactServerResult.consumeAsStream(), reactServerResult.consumeAsStream(),
nonce, nonce,
formState formState
...@@ -8267,7 +8279,7 @@ async function prerenderToStream( ...@@ -8267,7 +8279,7 @@ async function prerenderToStream(
await createReactServerPrerenderResultFromRender( await createReactServerPrerenderResultFromRender(
workUnitAsyncStorage.run( workUnitAsyncStorage.run(
prerenderLegacyStore, prerenderLegacyStore,
renderToWebFlightStream, renderFlightStream,
ComponentMod, ComponentMod,
RSCPayload, RSCPayload,
clientModules, clientModules,
...@@ -8280,7 +8292,7 @@ async function prerenderToStream( ...@@ -8280,7 +8292,7 @@ async function prerenderToStream(
const { stream: htmlStream } = await workUnitAsyncStorage.run( const { stream: htmlStream } = await workUnitAsyncStorage.run(
prerenderLegacyStore, prerenderLegacyStore,
renderToWebFizzStream, renderFizzStream,
// eslint-disable-next-line @next/internal/no-ambiguous-jsx // eslint-disable-next-line @next/internal/no-ambiguous-jsx
<App <App
reactServerStream={reactServerResult.asUnclosingStream()} reactServerStream={reactServerResult.asUnclosingStream()}
...@@ -8295,7 +8307,8 @@ async function prerenderToStream( ...@@ -8295,7 +8307,8 @@ async function prerenderToStream(
onError: htmlRendererErrorHandler, onError: htmlRendererErrorHandler,
nonce, nonce,
bootstrapScripts: [bootstrapScript], bootstrapScripts: [bootstrapScript],
} },
{ waitForAllReady: true }
) )
if (shouldGenerateStaticFlightData(workStore)) { if (shouldGenerateStaticFlightData(workStore)) {
...@@ -8322,7 +8335,7 @@ async function prerenderToStream( ...@@ -8322,7 +8335,7 @@ async function prerenderToStream(
digestErrorsMap: reactServerErrorsByDigest, digestErrorsMap: reactServerErrorsByDigest,
ssrErrors: allCapturedErrors, ssrErrors: allCapturedErrors,
stream: await continueFizzStream(htmlStream, { stream: await continueFizzStream(htmlStream, {
inlinedDataStream: createWebInlinedDataStream( inlinedDataStream: createInlinedDataStream(
reactServerResult.consumeAsStream(), reactServerResult.consumeAsStream(),
nonce, nonce,
formState formState
...@@ -8467,7 +8480,7 @@ async function prerenderToStream( ...@@ -8467,7 +8480,7 @@ async function prerenderToStream(
const errorServerStreamRaw = workUnitAsyncStorage.run( const errorServerStreamRaw = workUnitAsyncStorage.run(
prerenderLegacyStore, prerenderLegacyStore,
renderToWebFlightStream, renderFlightStream,
ComponentMod, ComponentMod,
errorRSCPayload, errorRSCPayload,
clientModules, clientModules,
...@@ -8493,7 +8506,7 @@ async function prerenderToStream( ...@@ -8493,7 +8506,7 @@ async function prerenderToStream(
try { try {
const { stream: errorHtmlStream } = await workUnitAsyncStorage.run( const { stream: errorHtmlStream } = await workUnitAsyncStorage.run(
prerenderLegacyStore, prerenderLegacyStore,
renderToWebFizzStream, renderFizzStream,
// eslint-disable-next-line @next/internal/no-ambiguous-jsx // eslint-disable-next-line @next/internal/no-ambiguous-jsx
<ErrorApp <ErrorApp
reactServerStream={errorServerStream} reactServerStream={errorServerStream}
...@@ -8506,7 +8519,8 @@ async function prerenderToStream( ...@@ -8506,7 +8519,8 @@ async function prerenderToStream(
nonce, nonce,
bootstrapScripts: [errorBootstrapScript], bootstrapScripts: [errorBootstrapScript],
formState, formState,
} },
{ waitForAllReady: true }
) )
const resolvedFlightResult = errorFlightResultPromise const resolvedFlightResult = errorFlightResultPromise
...@@ -8535,7 +8549,7 @@ async function prerenderToStream( ...@@ -8535,7 +8549,7 @@ async function prerenderToStream(
digestErrorsMap: reactServerErrorsByDigest, digestErrorsMap: reactServerErrorsByDigest,
ssrErrors: allCapturedErrors, ssrErrors: allCapturedErrors,
stream: await continueFizzStream(errorHtmlStream, { stream: await continueFizzStream(errorHtmlStream, {
inlinedDataStream: createWebInlinedDataStream( inlinedDataStream: createInlinedDataStream(
flightStream, flightStream,
nonce, nonce,
formState formState
......
...@@ -597,11 +597,13 @@ export { renderToWebFizzStream } from './stream-ops.web' ...@@ -597,11 +597,13 @@ export { renderToWebFizzStream } from './stream-ops.web'
export async function renderToNodeFizzStream( export async function renderToNodeFizzStream(
element: React.ReactElement, element: React.ReactElement,
streamOptions: any streamOptions: any,
options?: { waitForAllReady?: boolean }
): Promise<FizzStreamResult> { ): Promise<FizzStreamResult> {
const pt = new PassThrough() const pt = new PassThrough()
const shellReady = new DetachedPromise<void>() const shellReady = new DetachedPromise<void>()
const allReady = new DetachedPromise<void>() const allReady = new DetachedPromise<void>()
const deferPipe = options?.waitForAllReady === true
const pipeable = getTracer().trace(AppRenderSpan.renderToReadableStream, () => const pipeable = getTracer().trace(AppRenderSpan.renderToReadableStream, () =>
renderToPipeableStream(element, { renderToPipeableStream(element, {
...@@ -609,7 +611,9 @@ export async function renderToNodeFizzStream( ...@@ -609,7 +611,9 @@ export async function renderToNodeFizzStream(
onHeaders: streamOptions?.onHeaders, onHeaders: streamOptions?.onHeaders,
onShellReady() { onShellReady() {
streamOptions?.onShellReady?.() streamOptions?.onShellReady?.()
pipeable.pipe(pt) if (!deferPipe) {
pipeable.pipe(pt)
}
shellReady.resolve() shellReady.resolve()
}, },
onShellError(error: unknown) { onShellError(error: unknown) {
...@@ -618,6 +622,9 @@ export async function renderToNodeFizzStream( ...@@ -618,6 +622,9 @@ export async function renderToNodeFizzStream(
}, },
onAllReady() { onAllReady() {
streamOptions?.onAllReady?.() streamOptions?.onAllReady?.()
if (deferPipe) {
pipeable.pipe(pt)
}
allReady.resolve() allReady.resolve()
}, },
onError: streamOptions?.onError, onError: streamOptions?.onError,
......
...@@ -253,7 +253,8 @@ export async function streamToString(stream: AnyStream): Promise<string> { ...@@ -253,7 +253,8 @@ export async function streamToString(stream: AnyStream): Promise<string> {
export async function renderToWebFizzStream( export async function renderToWebFizzStream(
element: React.ReactElement, element: React.ReactElement,
streamOptions: any streamOptions: any,
_options?: { waitForAllReady?: boolean }
): Promise<FizzStreamResult> { ): Promise<FizzStreamResult> {
const stream = await renderToInitialFizzStream({ const stream = await renderToInitialFizzStream({
ReactDOMServer: { renderToReadableStream }, ReactDOMServer: { renderToReadableStream },
...@@ -265,7 +266,8 @@ export async function renderToWebFizzStream( ...@@ -265,7 +266,8 @@ export async function renderToWebFizzStream(
export async function renderToNodeFizzStream( export async function renderToNodeFizzStream(
_element: React.ReactElement, _element: React.ReactElement,
_streamOptions: any _streamOptions: any,
_options?: { waitForAllReady?: boolean }
): Promise<FizzStreamResult> { ): Promise<FizzStreamResult> {
throw new Error('Not implemented') throw new Error('Not implemented')
} }
......
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