Unverified Commit 7de651e8 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

Remove obsolete static generation plumbing (#96563)

## Summary

- Removes the unused `RenderOptsPartial.isStaticGeneration` option and
its debug-render write. `WorkStore` derives this value independently.
- Removes `shouldGenerateStaticFlightData` and its redundant guards.
These checks only occur inside `prerenderToStream`, which is exclusively
entered when `isStaticGeneration` is true.

<!-- NEXT_JS_LLM -->
parent 8231b031
...@@ -921,7 +921,6 @@ export function createAppPageEntrypoint({ ...@@ -921,7 +921,6 @@ export function createAppPageEntrypoint({
? { ? {
isBuildTimePrerendering: true, isBuildTimePrerendering: true,
supportsDynamicResponse: false, supportsDynamicResponse: false,
isStaticGeneration: true,
isDebugDynamicAccesses: isDebugDynamicAccesses, isDebugDynamicAccesses: isDebugDynamicAccesses,
} }
: {}), : {}),
......
...@@ -8144,18 +8144,6 @@ type PrerenderToStreamResult = { ...@@ -8144,18 +8144,6 @@ type PrerenderToStreamResult = {
renderResumeDataCache?: RenderResumeDataCache renderResumeDataCache?: RenderResumeDataCache
} }
/**
* Determines whether we should generate static flight data.
*/
// TODO: This helper used to exclude fallback route params. It now only checks
// static generation inside prerenderToStream and can be removed. LOE: low.
function shouldGenerateStaticFlightData(workStore: WorkStore): boolean {
const { isStaticGeneration } = workStore
if (!isStaticGeneration) return false
return true
}
async function continueStaticPrerenderWithInlinedData( async function continueStaticPrerenderWithInlinedData(
htmlStream: AnyStream, htmlStream: AnyStream,
reactServerResult: ReactServerPrerenderResult, reactServerResult: ReactServerPrerenderResult,
...@@ -8836,12 +8824,10 @@ async function prerenderToStream( ...@@ -8836,12 +8824,10 @@ async function prerenderToStream(
finalServerPayload.s = staleTimeIterable finalServerPayload.s = staleTimeIterable
} }
if (shouldGenerateStaticFlightData(workStore)) { // Embed the runtime data access tracking in the payload so
// Embed the runtime data access tracking in the payload so // collectSegmentData can replay it per stage. Only needed when the
// collectSegmentData can replay it per stage. Only needed when the // Flight data will be decomposed into segment prefetches below.
// Flight data will be decomposed into segment prefetches below. finalServerPayload.u = runtimeDataAccessed.promise
finalServerPayload.u = runtimeDataAccessed.promise
}
const serverDynamicTracking = createDynamicTrackingState( const serverDynamicTracking = createDynamicTrackingState(
isDebugDynamicAccesses isDebugDynamicAccesses
...@@ -9056,30 +9042,28 @@ async function prerenderToStream( ...@@ -9056,30 +9042,28 @@ async function prerenderToStream(
reactServerPrerenderResultIsDynamic = resultIsPartial reactServerPrerenderResultIsDynamic = resultIsPartial
reactServerPrerenderStore = finalServerPrerenderStore reactServerPrerenderStore = finalServerPrerenderStore
if (shouldGenerateStaticFlightData(workStore)) { metadata.flightData = Buffer.concat(
metadata.flightData = Buffer.concat( cachedNavigations
cachedNavigations ? prependIsPartialByteToChunks(
? prependIsPartialByteToChunks( reactServerResult.asChunks(),
reactServerResult.asChunks(), resultIsPartial
resultIsPartial )
) : reactServerResult.asChunks()
: reactServerResult.asChunks() )
)
// collectSegmentData needs the raw flight data without the marker byte. // collectSegmentData needs the raw flight data without the marker byte.
const flightData = cachedNavigations const flightData = cachedNavigations
? metadata.flightData.subarray(1) ? metadata.flightData.subarray(1)
: metadata.flightData : metadata.flightData
await collectSegmentData( await collectSegmentData(
flightData, flightData,
finalServerPrerenderStore, finalServerPrerenderStore,
ComponentMod, ComponentMod,
renderOpts, renderOpts,
ctx.pagePath, ctx.pagePath,
metadata metadata
) )
}
const clientDynamicTracking = createDynamicTrackingState( const clientDynamicTracking = createDynamicTrackingState(
isDebugDynamicAccesses isDebugDynamicAccesses
...@@ -9407,17 +9391,15 @@ async function prerenderToStream( ...@@ -9407,17 +9391,15 @@ async function prerenderToStream(
// parts of the React Server render that might not be used in the SSR render. // parts of the React Server render that might not be used in the SSR render.
const flightData = await streamToBuffer(reactServerResult.asStream()) const flightData = await streamToBuffer(reactServerResult.asStream())
if (shouldGenerateStaticFlightData(workStore)) { metadata.flightData = flightData
metadata.flightData = flightData await collectSegmentData(
await collectSegmentData( flightData,
flightData, ssrPrerenderStore,
ssrPrerenderStore, ComponentMod,
ComponentMod, renderOpts,
renderOpts, ctx.pagePath,
ctx.pagePath, metadata
metadata )
)
}
const { prelude, preludeIsEmpty } = const { prelude, preludeIsEmpty } =
await processPreludeOp(unprocessedPrelude) await processPreludeOp(unprocessedPrelude)
...@@ -9619,18 +9601,16 @@ async function prerenderToStream( ...@@ -9619,18 +9601,16 @@ async function prerenderToStream(
{ waitForAllReady: true } { waitForAllReady: true }
) )
if (shouldGenerateStaticFlightData(workStore)) { const flightData = await streamToBuffer(reactServerResult.asStream())
const flightData = await streamToBuffer(reactServerResult.asStream()) metadata.flightData = flightData
metadata.flightData = flightData await collectSegmentData(
await collectSegmentData( flightData,
flightData, prerenderLegacyStore,
prerenderLegacyStore, ComponentMod,
ComponentMod, renderOpts,
renderOpts, ctx.pagePath,
ctx.pagePath, metadata
metadata )
)
}
const getServerInsertedHTML = makeGetServerInsertedHTML({ const getServerInsertedHTML = makeGetServerInsertedHTML({
polyfills, polyfills,
...@@ -10165,20 +10145,18 @@ async function prerenderToStream( ...@@ -10165,20 +10145,18 @@ async function prerenderToStream(
{ waitForAllReady: true } { waitForAllReady: true }
) )
if (shouldGenerateStaticFlightData(workStore)) { const flightData = await streamToBuffer(
const flightData = await streamToBuffer( reactServerPrerenderResult.asStream()
reactServerPrerenderResult.asStream() )
) metadata.flightData = flightData
metadata.flightData = flightData await collectSegmentData(
await collectSegmentData( flightData,
flightData, prerenderLegacyStore,
prerenderLegacyStore, ComponentMod,
ComponentMod, renderOpts,
renderOpts, ctx.pagePath,
ctx.pagePath, metadata
metadata )
)
}
return { return {
digestErrorsMap: reactServerErrorsByDigest, digestErrorsMap: reactServerErrorsByDigest,
......
...@@ -214,8 +214,6 @@ export interface RenderOptsPartial { ...@@ -214,8 +214,6 @@ export interface RenderOptsPartial {
*/ */
prefetchHints?: Record<string, PrefetchHints> prefetchHints?: Record<string, PrefetchHints>
isStaticGeneration?: boolean
/** /**
* When true, the page is prerendered as a fallback shell, while allowing any * When true, the page is prerendered as a fallback shell, while allowing any
* dynamic accesses to result in an empty shell. This is the case when there * dynamic accesses to result in an empty shell. This is the case when there
......
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