Skip to content

remove runInContext callbacks from stream-ops #90609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lubieowoce merged 1 commit into from
Feb 27, 2026
+87 −85
Merged

remove runInContext callbacks from stream-ops #90609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 77 additions & 65 deletions packages/next/src/server/app-render/app-render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,9 @@ async function generateDynamicFlightRenderResult(
options
)

const flightStream = renderToFlightStream(
const flightStream = workUnitAsyncStorage.run(
requestStore,
renderToFlightStream,
ctx.componentMod,
rscPayload,
clientModules,
Expand All @@ -732,8 +734,7 @@ async function generateDynamicFlightRenderResult(
temporaryReferences: options?.temporaryReferences,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
}
)

return new FlightRenderResult(
Expand Down Expand Up @@ -902,15 +903,16 @@ async function stagedRenderToReadableStreamWithoutCachesInDev(
return await runInSequentialTasks(
() => {
stageController.advanceStage(RenderStage.Static)
return renderToFlightStream(
return workUnitAsyncStorage.run(
requestStore,
renderToFlightStream,
ctx.componentMod,
rscPayload,
clientModules,
{
...options,
environmentName,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
}
)
},
() => {
Expand Down Expand Up @@ -2906,16 +2908,17 @@ async function renderToStream(
}

reactServerResult = new ReactServerResult(
renderToFlightStream(
workUnitAsyncStorage.run(
requestStore,
renderToFlightStream,
ctx.componentMod,
RSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
debugChannel: debugChannel?.serverSide,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
}
)
)
}
Expand Down Expand Up @@ -2966,12 +2969,14 @@ async function renderToStream(
tracingMetadata: tracingMetadata,
})

const { stream: htmlStream, allReady } = await resumeToFizzStream(
resumeAppElement,
postponed,
{ onError: htmlRendererErrorHandler, nonce },
(fn) => workUnitAsyncStorage.run(requestStore, fn)
)
const { stream: htmlStream, allReady } =
await workUnitAsyncStorage.run(
requestStore,
resumeToFizzStream,
resumeAppElement,
postponed,
{ onError: htmlRendererErrorHandler, nonce }
)

// End the render span only after React completed rendering (including anything inside Suspense boundaries)
allReady.finally(() => {
Expand Down Expand Up @@ -3031,10 +3036,11 @@ async function renderToStream(
formState,
}

const { stream: htmlStream, allReady } = await renderToFizzStream(
const { stream: htmlStream, allReady } = await workUnitAsyncStorage.run(
requestStore,
renderToFizzStream,
appElement,
fizzOptions,
(fn) => workUnitAsyncStorage.run(requestStore, fn)
fizzOptions
)

// End the render span only after React completed rendering (including anything inside Suspense boundaries)
Expand Down Expand Up @@ -3136,15 +3142,16 @@ async function renderToStream(
errorType
)

errorServerStream = renderToFlightStream(
errorServerStream = workUnitAsyncStorage.run(
requestStore,
renderToFlightStream,
ctx.componentMod,
errorRSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
}
)

if (reactServerResult === null) {
Expand All @@ -3163,7 +3170,9 @@ async function renderToStream(
supportsDynamicResponse !== true || !!shouldWaitOnAllReady

const { stream: errorHtmlStream, allReady: errorAllReady } =
await renderToFizzStream(
await workUnitAsyncStorage.run(
requestStore,
renderToFizzStream,
<ErrorApp
reactServerStream={errorServerStream}
ServerInsertedHTMLProvider={ServerInsertedHTMLProvider}
Expand All @@ -3176,8 +3185,7 @@ async function renderToStream(
bootstrapScriptContent,
bootstrapScripts: [errorBootstrapScript],
formState,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
}
)

// End the render span only after React completed rendering (including anything inside Suspense boundaries)
Expand Down Expand Up @@ -3310,20 +3318,23 @@ async function renderWithRestartOnCacheMissInDev(
initialStageController.advanceStage(RenderStage.EarlyStatic)
startTime = performance.now() + performance.timeOrigin

const streamPair = renderToFlightStream(
ComponentMod,
initialRscPayload,
clientModules,
{
onError,
environmentName,
startTime,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
signal: initialReactController.signal,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
).tee()
const streamPair = workUnitAsyncStorage
.run(
requestStore,
renderToFlightStream,
ComponentMod,
initialRscPayload,
clientModules,
{
onError,
environmentName,
startTime,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
signal: initialReactController.signal,
}
)
.tee()

// If we abort the render, we want to reject the stage-dependent promises as well.
// Note that we want to install this listener after the render is started
Expand Down Expand Up @@ -3457,19 +3468,22 @@ async function renderWithRestartOnCacheMissInDev(
finalStageController.advanceStage(RenderStage.EarlyStatic)
startTime = performance.now() + performance.timeOrigin

const streamPair = renderToFlightStream(
ComponentMod,
finalRscPayload,
clientModules,
{
onError,
environmentName,
startTime,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
},
(fn) => workUnitAsyncStorage.run(requestStore, fn)
).tee()
const streamPair = workUnitAsyncStorage
.run(
requestStore,
renderToFlightStream,
ComponentMod,
finalRscPayload,
clientModules,
{
onError,
environmentName,
startTime,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
}
)
.tee()

return {
stream: streamPair[0],
Expand Down Expand Up @@ -5782,7 +5796,9 @@ async function prerenderToStream(
)
)

const { stream: htmlStream } = await renderToFizzStream(
const { stream: htmlStream } = await workUnitAsyncStorage.run(
prerenderLegacyStore,
renderToFizzStream,
// eslint-disable-next-line @next/internal/no-ambiguous-jsx
<App
reactServerStream={reactServerResult.asUnclosingStream()}
Expand All @@ -5797,8 +5813,7 @@ async function prerenderToStream(
onError: htmlRendererErrorHandler,
nonce,
bootstrapScripts: [bootstrapScript],
},
(fn) => workUnitAsyncStorage.run(prerenderLegacyStore, fn)
}
)

if (shouldGenerateStaticFlightData(workStore)) {
Expand Down Expand Up @@ -5936,24 +5951,22 @@ async function prerenderToStream(
errorType
)

// Keep prerender-legacy async storage stable across node stream event
// callbacks and pipeable renderer hooks.
const runInLegacyContext = <T,>(fn: () => T): T =>
workUnitAsyncStorage.run(prerenderLegacyStore, fn)

const errorServerStream = renderToFlightStream(
const errorServerStream = workUnitAsyncStorage.run(
prerenderLegacyStore,
renderToFlightStream,
ComponentMod,
errorRSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
},
runInLegacyContext
}
)

try {
const { stream: errorHtmlStream } = await renderToFizzStream(
const { stream: errorHtmlStream } = await workUnitAsyncStorage.run(
prerenderLegacyStore,
renderToFizzStream,
// eslint-disable-next-line @next/internal/no-ambiguous-jsx
<ErrorApp
reactServerStream={errorServerStream}
Expand All @@ -5966,8 +5979,7 @@ async function prerenderToStream(
nonce,
bootstrapScripts: [errorBootstrapScript],
formState,
},
runInLegacyContext
}
)

if (shouldGenerateStaticFlightData(workStore)) {
Expand Down
30 changes: 10 additions & 20 deletions packages/next/src/server/app-render/stream-ops.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,9 @@ export function renderToFlightStream(
ComponentMod: FlightComponentMod,
payload: FlightPayload,
clientModules: FlightClientModules,
opts: FlightRenderOptions,
runInContext?: <T>(fn: () => T) => T
opts: FlightRenderOptions
): AnyStream {
const run: <T>(fn: () => T) => T = runInContext ?? ((fn) => fn())
return run(() =>
ComponentMod.renderToReadableStream(payload, clientModules, opts)
)
return ComponentMod.renderToReadableStream(payload, clientModules, opts)
}

export async function streamToString(stream: AnyStream): Promise<string> {
Expand All @@ -162,28 +158,22 @@ export async function streamToString(stream: AnyStream): Promise<string> {

export async function renderToFizzStream(
element: React.ReactElement,
streamOptions: any,
runInContext?: <T>(fn: () => T) => T
streamOptions: any
): Promise<FizzStreamResult> {
const run: <T>(fn: () => T) => T = runInContext ?? ((fn) => fn())
const stream = await run(() =>
renderToInitialFizzStream({
ReactDOMServer: { renderToReadableStream },
element,
streamOptions,
})
)
const stream = await renderToInitialFizzStream({
ReactDOMServer: { renderToReadableStream },
element,
streamOptions,
})
return { stream, allReady: stream.allReady, abort: undefined }
}

export async function resumeToFizzStream(
element: React.ReactElement,
postponedState: PostponedState,
streamOptions: any,
runInContext?: <T>(fn: () => T) => T
streamOptions: any
): Promise<FizzStreamResult> {
const run: <T>(fn: () => T) => T = runInContext ?? ((fn) => fn())
const stream = await run(() => resume(element, postponedState, streamOptions))
const stream = await resume(element, postponedState, streamOptions)
return { stream, allReady: stream.allReady, abort: undefined }
}

Expand Down
Loading