Unverified Commit 6632b909 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Remove `deploymentId` from App Router `RenderOptsPartial` (#88866)

parent d4e64f52
...@@ -611,6 +611,7 @@ export async function handler( ...@@ -611,6 +611,7 @@ export async function handler(
page: normalizedSrcPage, page: normalizedSrcPage,
sharedContext: { sharedContext: {
buildId, buildId,
deploymentId,
}, },
serverComponentsHmrCache: getRequestMeta( serverComponentsHmrCache: getRequestMeta(
req, req,
...@@ -659,7 +660,6 @@ export async function handler( ...@@ -659,7 +660,6 @@ export async function handler(
trailingSlash: nextConfig.trailingSlash, trailingSlash: nextConfig.trailingSlash,
images: nextConfig.images, images: nextConfig.images,
previewProps: prerenderManifest.preview, previewProps: prerenderManifest.preview,
deploymentId: deploymentId,
enableTainting: nextConfig.experimental.taint, enableTainting: nextConfig.experimental.taint,
htmlLimitedBots: nextConfig.htmlLimitedBots, htmlLimitedBots: nextConfig.htmlLimitedBots,
reactMaxHeadersLength: nextConfig.reactMaxHeadersLength, reactMaxHeadersLength: nextConfig.reactMaxHeadersLength,
......
...@@ -106,6 +106,7 @@ async function requestHandler( ...@@ -106,6 +106,7 @@ async function requestHandler(
sharedContext: { sharedContext: {
buildId, buildId,
deploymentId,
}, },
fallbackRouteParams: null, fallbackRouteParams: null,
...@@ -141,7 +142,6 @@ async function requestHandler( ...@@ -141,7 +142,6 @@ async function requestHandler(
trailingSlash: nextConfig.trailingSlash, trailingSlash: nextConfig.trailingSlash,
images: nextConfig.images, images: nextConfig.images,
previewProps: prerenderManifest.preview, previewProps: prerenderManifest.preview,
deploymentId,
enableTainting: nextConfig.experimental.taint, enableTainting: nextConfig.experimental.taint,
htmlLimitedBots: nextConfig.htmlLimitedBots, htmlLimitedBots: nextConfig.htmlLimitedBots,
reactMaxHeadersLength: nextConfig.reactMaxHeadersLength, reactMaxHeadersLength: nextConfig.reactMaxHeadersLength,
......
...@@ -110,6 +110,7 @@ async function requestHandler( ...@@ -110,6 +110,7 @@ async function requestHandler(
params, params,
buildId, buildId,
nextConfig, nextConfig,
deploymentId,
isNextDataRequest, isNextDataRequest,
buildManifest, buildManifest,
prerenderManifest, prerenderManifest,
...@@ -127,7 +128,7 @@ async function requestHandler( ...@@ -127,7 +128,7 @@ async function requestHandler(
sharedContext: { sharedContext: {
buildId, buildId,
deploymentId: process.env.NEXT_DEPLOYMENT_ID, deploymentId,
customServer: undefined, customServer: undefined,
}, },
......
...@@ -500,7 +500,6 @@ async function exportAppImpl( ...@@ -500,7 +500,6 @@ async function exportAppImpl(
join(distDir, 'server', `${NEXT_FONT_MANIFEST}.json`) join(distDir, 'server', `${NEXT_FONT_MANIFEST}.json`)
), ),
images: nextConfig.images, images: nextConfig.images,
deploymentId: nextConfig.deploymentId,
htmlLimitedBots: nextConfig.htmlLimitedBots.source, htmlLimitedBots: nextConfig.htmlLimitedBots.source,
experimental: { experimental: {
clientTraceMetadata: nextConfig.experimental.clientTraceMetadata, clientTraceMetadata: nextConfig.experimental.clientTraceMetadata,
...@@ -713,6 +712,7 @@ async function exportAppImpl( ...@@ -713,6 +712,7 @@ async function exportAppImpl(
batches.map(async (batch) => batches.map(async (batch) =>
worker.exportPages({ worker.exportPages({
buildId, buildId,
deploymentId: nextConfig.deploymentId,
exportPaths: batch, exportPaths: batch,
parentSpanId: span.getId(), parentSpanId: span.getId(),
pagesDataDir, pagesDataDir,
......
...@@ -23,6 +23,7 @@ export type ExportPathEntry = ExportPathMap[keyof ExportPathMap] & { ...@@ -23,6 +23,7 @@ export type ExportPathEntry = ExportPathMap[keyof ExportPathMap] & {
export interface ExportPagesInput { export interface ExportPagesInput {
buildId: string buildId: string
deploymentId: string
exportPaths: ExportPathEntry[] exportPaths: ExportPathEntry[]
parentSpanId: number parentSpanId: number
dir: string dir: string
...@@ -41,6 +42,7 @@ export interface ExportPagesInput { ...@@ -41,6 +42,7 @@ export interface ExportPagesInput {
export interface ExportPageInput { export interface ExportPageInput {
buildId: string buildId: string
deploymentId: string
exportPath: ExportPathEntry exportPath: ExportPathEntry
distDir: string distDir: string
outDir: string outDir: string
......
...@@ -85,6 +85,7 @@ async function exportPageImpl( ...@@ -85,6 +85,7 @@ async function exportPageImpl(
renderOpts: commonRenderOpts, renderOpts: commonRenderOpts,
outDir: commonOutDir, outDir: commonOutDir,
buildId, buildId,
deploymentId,
renderResumeDataCache, renderResumeDataCache,
} = input } = input
...@@ -274,7 +275,7 @@ async function exportPageImpl( ...@@ -274,7 +275,7 @@ async function exportPageImpl(
// Handle App Pages // Handle App Pages
if (isAppDir) { if (isAppDir) {
const sharedContext: AppSharedContext = { buildId } const sharedContext: AppSharedContext = { buildId, deploymentId }
return exportAppPage( return exportAppPage(
req, req,
...@@ -294,7 +295,7 @@ async function exportPageImpl( ...@@ -294,7 +295,7 @@ async function exportPageImpl(
} else { } else {
const sharedContext: PagesSharedContext = { const sharedContext: PagesSharedContext = {
buildId, buildId,
deploymentId: commonRenderOpts.deploymentId, deploymentId,
customServer: undefined, customServer: undefined,
} }
...@@ -416,6 +417,7 @@ export async function exportPages( ...@@ -416,6 +417,7 @@ export async function exportPages(
enableExperimentalReact: needsExperimentalReact(nextConfig), enableExperimentalReact: needsExperimentalReact(nextConfig),
sriEnabled: Boolean(nextConfig.experimental.sri?.algorithm), sriEnabled: Boolean(nextConfig.experimental.sri?.algorithm),
buildId: input.buildId, buildId: input.buildId,
deploymentId: input.deploymentId,
renderResumeDataCache, renderResumeDataCache,
}), }),
hasDebuggerAttached hasDebuggerAttached
......
...@@ -234,6 +234,7 @@ export type GenerateFlight = typeof generateDynamicFlightRenderResult ...@@ -234,6 +234,7 @@ export type GenerateFlight = typeof generateDynamicFlightRenderResult
export type AppSharedContext = { export type AppSharedContext = {
buildId: string buildId: string
deploymentId: string
} }
export type AppRenderContext = { export type AppRenderContext = {
...@@ -2886,7 +2887,7 @@ async function renderToStream( ...@@ -2886,7 +2887,7 @@ async function renderToStream(
), ),
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}) })
} }
} }
...@@ -2964,7 +2965,7 @@ async function renderToStream( ...@@ -2964,7 +2965,7 @@ async function renderToStream(
isStaticGeneration: generateStaticHTML, isStaticGeneration: generateStaticHTML,
isBuildTimePrerendering: ctx.workStore.isBuildTimePrerendering === true, isBuildTimePrerendering: ctx.workStore.isBuildTimePrerendering === true,
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
validateRootLayout: dev, validateRootLayout: dev,
...@@ -3134,7 +3135,7 @@ async function renderToStream( ...@@ -3134,7 +3135,7 @@ async function renderToStream(
isBuildTimePrerendering: isBuildTimePrerendering:
ctx.workStore.isBuildTimePrerendering === true, ctx.workStore.isBuildTimePrerendering === true,
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
getServerInsertedHTML: makeGetServerInsertedHTML({ getServerInsertedHTML: makeGetServerInsertedHTML({
polyfills, polyfills,
renderServerInsertedHTML, renderServerInsertedHTML,
...@@ -4840,7 +4841,7 @@ async function prerenderToStream( ...@@ -4840,7 +4841,7 @@ async function prerenderToStream(
stream: await continueDynamicPrerender(prelude, { stream: await continueDynamicPrerender(prelude, {
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: consumeDynamicAccess( dynamicAccess: consumeDynamicAccess(
serverDynamicTracking, serverDynamicTracking,
...@@ -4938,7 +4939,7 @@ async function prerenderToStream( ...@@ -4938,7 +4939,7 @@ async function prerenderToStream(
isBuildTimePrerendering: isBuildTimePrerendering:
ctx.workStore.isBuildTimePrerendering === true, ctx.workStore.isBuildTimePrerendering === true,
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}) })
} else { } else {
// Normal static prerender case, no fallback param handling needed // Normal static prerender case, no fallback param handling needed
...@@ -4953,7 +4954,7 @@ async function prerenderToStream( ...@@ -4953,7 +4954,7 @@ async function prerenderToStream(
isBuildTimePrerendering: isBuildTimePrerendering:
ctx.workStore.isBuildTimePrerendering === true, ctx.workStore.isBuildTimePrerendering === true,
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}) })
} }
...@@ -5127,7 +5128,7 @@ async function prerenderToStream( ...@@ -5127,7 +5128,7 @@ async function prerenderToStream(
stream: await continueDynamicPrerender(prelude, { stream: await continueDynamicPrerender(prelude, {
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: dynamicTracking.dynamicAccesses, dynamicAccess: dynamicTracking.dynamicAccesses,
// TODO: Should this include the SSR pass? // TODO: Should this include the SSR pass?
...@@ -5149,7 +5150,7 @@ async function prerenderToStream( ...@@ -5149,7 +5150,7 @@ async function prerenderToStream(
stream: await continueDynamicPrerender(prelude, { stream: await continueDynamicPrerender(prelude, {
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: dynamicTracking.dynamicAccesses, dynamicAccess: dynamicTracking.dynamicAccesses,
// TODO: Should this include the SSR pass? // TODO: Should this include the SSR pass?
...@@ -5216,7 +5217,7 @@ async function prerenderToStream( ...@@ -5216,7 +5217,7 @@ async function prerenderToStream(
isBuildTimePrerendering: isBuildTimePrerendering:
ctx.workStore.isBuildTimePrerendering === true, ctx.workStore.isBuildTimePrerendering === true,
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: dynamicTracking.dynamicAccesses, dynamicAccess: dynamicTracking.dynamicAccesses,
// TODO: Should this include the SSR pass? // TODO: Should this include the SSR pass?
...@@ -5317,7 +5318,7 @@ async function prerenderToStream( ...@@ -5317,7 +5318,7 @@ async function prerenderToStream(
buildId: ctx.workStore.buildId, buildId: ctx.workStore.buildId,
getServerInsertedHTML, getServerInsertedHTML,
getServerInsertedMetadata, getServerInsertedMetadata,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
// TODO: Should this include the SSR pass? // TODO: Should this include the SSR pass?
collectedRevalidate: prerenderLegacyStore.revalidate, collectedRevalidate: prerenderLegacyStore.revalidate,
...@@ -5503,7 +5504,7 @@ async function prerenderToStream( ...@@ -5503,7 +5504,7 @@ async function prerenderToStream(
}), }),
getServerInsertedMetadata, getServerInsertedMetadata,
validateRootLayout: dev, validateRootLayout: dev,
deploymentId: ctx.renderOpts.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: null, dynamicAccess: null,
collectedRevalidate: collectedRevalidate:
......
...@@ -18,8 +18,8 @@ export function getAssetQueryString( ...@@ -18,8 +18,8 @@ export function getAssetQueryString(
qs += `?v=${ctx.requestTimestamp}` qs += `?v=${ctx.requestTimestamp}`
} }
if (ctx.renderOpts.deploymentId) { if (ctx.sharedContext.deploymentId) {
qs += `${shouldAddVersion ? '&' : '?'}dpl=${ctx.renderOpts.deploymentId}` qs += `${shouldAddVersion ? '&' : '?'}dpl=${ctx.sharedContext.deploymentId}`
} }
return qs return qs
} }
...@@ -126,7 +126,6 @@ export interface RenderOptsPartial { ...@@ -126,7 +126,6 @@ export interface RenderOptsPartial {
nextConfigOutput?: 'standalone' | 'export' nextConfigOutput?: 'standalone' | 'export'
onInstrumentationRequestError?: ServerOnInstrumentationRequestError onInstrumentationRequestError?: ServerOnInstrumentationRequestError
isDraftMode?: boolean isDraftMode?: boolean
deploymentId?: string
onUpdateCookies?: (cookies: string[]) => void onUpdateCookies?: (cookies: string[]) => void
loadConfig?: ( loadConfig?: (
phase: string, phase: string,
......
...@@ -94,6 +94,9 @@ export interface WorkStore { ...@@ -94,6 +94,9 @@ export interface WorkStore {
isUnstableNoStore?: boolean isUnstableNoStore?: boolean
isPrefetchRequest?: boolean isPrefetchRequest?: boolean
/**
* Prefer `sharedContext.buildId` instead. This only exists because it's needed in use-cache-wrapper
*/
buildId: string buildId: string
readonly reactLoadableManifest?: DeepReadonly< readonly reactLoadableManifest?: DeepReadonly<
......
...@@ -324,6 +324,7 @@ export default abstract class Server< ...@@ -324,6 +324,7 @@ export default abstract class Server<
protected readonly pagesManifest?: PagesManifest protected readonly pagesManifest?: PagesManifest
protected readonly appPathsManifest?: PagesManifest protected readonly appPathsManifest?: PagesManifest
protected readonly buildId: string protected readonly buildId: string
protected readonly deploymentId: string
protected readonly minimalMode: boolean protected readonly minimalMode: boolean
protected readonly renderOpts: BaseRenderOpts protected readonly renderOpts: BaseRenderOpts
protected readonly serverOptions: Readonly<ServerOptions> protected readonly serverOptions: Readonly<ServerOptions>
...@@ -454,20 +455,19 @@ export default abstract class Server< ...@@ -454,20 +455,19 @@ export default abstract class Server<
// values from causing issues as this can be user provided // values from causing issues as this can be user provided
this.nextConfig = conf as NextConfigRuntime this.nextConfig = conf as NextConfigRuntime
let deploymentId
if (this.nextConfig.experimental.runtimeServerDeploymentId) { if (this.nextConfig.experimental.runtimeServerDeploymentId) {
if (!process.env.NEXT_DEPLOYMENT_ID) { if (!process.env.NEXT_DEPLOYMENT_ID) {
throw new Error( throw new Error(
'process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled' 'process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled'
) )
} }
deploymentId = process.env.NEXT_DEPLOYMENT_ID this.deploymentId = process.env.NEXT_DEPLOYMENT_ID
} else { } else {
let id = this.nextConfig.experimental.useSkewCookie let id = this.nextConfig.experimental.useSkewCookie
? '' ? ''
: this.nextConfig.deploymentId || '' : this.nextConfig.deploymentId || ''
deploymentId = id this.deploymentId = id
process.env.NEXT_DEPLOYMENT_ID = id process.env.NEXT_DEPLOYMENT_ID = id
} }
...@@ -530,7 +530,6 @@ export default abstract class Server< ...@@ -530,7 +530,6 @@ export default abstract class Server<
dir: this.dir, dir: this.dir,
supportsDynamicResponse: true, supportsDynamicResponse: true,
trailingSlash: this.nextConfig.trailingSlash, trailingSlash: this.nextConfig.trailingSlash,
deploymentId: deploymentId,
poweredByHeader: this.nextConfig.poweredByHeader, poweredByHeader: this.nextConfig.poweredByHeader,
generateEtags, generateEtags,
previewProps: this.getPrerenderManifest().preview, previewProps: this.getPrerenderManifest().preview,
......
...@@ -356,7 +356,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -356,7 +356,7 @@ export default class NextNodeServer extends BaseServer<
// when using compile mode static env isn't inlined so we // when using compile mode static env isn't inlined so we
// need to populate in normal runtime env // need to populate in normal runtime env
if (this.renderOpts.isExperimentalCompile) { if (this.renderOpts.isExperimentalCompile) {
populateStaticEnv(this.nextConfig, this.renderOpts.deploymentId || '') populateStaticEnv(this.nextConfig, this.deploymentId || '')
} }
const shouldRemoveUncaughtErrorAndRejectionListeners = Boolean( const shouldRemoveUncaughtErrorAndRejectionListeners = Boolean(
...@@ -715,6 +715,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -715,6 +715,7 @@ export default class NextNodeServer extends BaseServer<
this.getServerComponentsHmrCache(), this.getServerComponentsHmrCache(),
{ {
buildId: this.buildId, buildId: this.buildId,
deploymentId: this.deploymentId,
} }
) )
} else { } else {
...@@ -729,7 +730,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -729,7 +730,7 @@ export default class NextNodeServer extends BaseServer<
renderOpts as LoadedRenderOpts<PagesModule>, renderOpts as LoadedRenderOpts<PagesModule>,
{ {
buildId: this.buildId, buildId: this.buildId,
deploymentId: this.renderOpts.deploymentId, deploymentId: this.deploymentId,
customServer: this.serverOptions.customServer || undefined, customServer: this.serverOptions.customServer || undefined,
}, },
{ {
......
...@@ -306,7 +306,7 @@ export type PagesSharedContext = { ...@@ -306,7 +306,7 @@ export type PagesSharedContext = {
/** /**
* The deployment ID if the user is deploying to a platform that provides one. * The deployment ID if the user is deploying to a platform that provides one.
*/ */
deploymentId: string | undefined deploymentId: string
/** /**
* True if the user is using a custom server. * True if the user is using a custom server.
......
...@@ -265,7 +265,7 @@ export const getHandler = ({ ...@@ -265,7 +265,7 @@ export const getHandler = ({
buildId, buildId,
customServer: customServer:
Boolean(routerServerContext?.isCustomServer) || undefined, Boolean(routerServerContext?.isCustomServer) || undefined,
deploymentId: getDeploymentId(), deploymentId: getDeploymentId() || '',
}, },
renderOpts: { renderOpts: {
params, params,
......
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