Unverified Commit 486f6744 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Refactor prerenderManifest passing (#89765)

In all of these cases, the only reason the prerender manifest was passed
around was for the previewProps.
So do that directly instead.
parent b4724c15
...@@ -219,7 +219,7 @@ export async function handler( ...@@ -219,7 +219,7 @@ export async function handler(
const context: AppRouteRouteHandlerContext = { const context: AppRouteRouteHandlerContext = {
params, params,
prerenderManifest, previewProps: prerenderManifest.preview,
renderOpts: { renderOpts: {
experimental: { experimental: {
authInterrupts: Boolean(nextConfig.experimental.authInterrupts), authInterrupts: Boolean(nextConfig.experimental.authInterrupts),
......
...@@ -66,16 +66,10 @@ export async function exportAppRoute( ...@@ -66,16 +66,10 @@ export async function exportAppRoute(
// the route and the context for the request. // the route and the context for the request.
const context: AppRouteRouteHandlerContext = { const context: AppRouteRouteHandlerContext = {
params, params,
prerenderManifest: { previewProps: {
version: 4, previewModeEncryptionKey: '',
routes: {}, previewModeId: '',
dynamicRoutes: {}, previewModeSigningKey: '',
preview: {
previewModeEncryptionKey: '',
previewModeId: '',
previewModeSigningKey: '',
},
notFoundRoutes: [],
}, },
renderOpts: { renderOpts: {
cacheComponents, cacheComponents,
......
...@@ -372,7 +372,7 @@ export async function createHotReloaderTurbopack( ...@@ -372,7 +372,7 @@ export async function createHotReloaderTurbopack(
}), }),
buildId, buildId,
encryptionKey, encryptionKey,
previewProps: opts.fsChecker.prerenderManifest.preview, previewProps: opts.fsChecker.previewProps,
browserslistQuery: supportedBrowsers.join(', '), browserslistQuery: supportedBrowsers.join(', '),
noMangling: false, noMangling: false,
writeRoutesHashesManifest: false, writeRoutesHashesManifest: false,
......
...@@ -9,6 +9,7 @@ import type { MiddlewareManifest } from '../../../build/webpack/plugins/middlewa ...@@ -9,6 +9,7 @@ import type { MiddlewareManifest } from '../../../build/webpack/plugins/middlewa
import type { UnwrapPromise } from '../../../lib/coalesced-function' import type { UnwrapPromise } from '../../../lib/coalesced-function'
import type { PatchMatcher } from '../../../shared/lib/router/utils/path-match' import type { PatchMatcher } from '../../../shared/lib/router/utils/path-match'
import type { MiddlewareRouteMatch } from '../../../shared/lib/router/utils/middleware-route-matcher' import type { MiddlewareRouteMatch } from '../../../shared/lib/router/utils/middleware-route-matcher'
import type { __ApiPreviewProps } from '../../api-utils'
import path from 'path' import path from 'path'
import fs from 'fs/promises' import fs from 'fs/promises'
...@@ -163,7 +164,7 @@ export async function setupFsCheck(opts: { ...@@ -163,7 +164,7 @@ export async function setupFsCheck(opts: {
headers: [], headers: [],
} }
let buildId = 'development' let buildId = 'development'
let prerenderManifest: PrerenderManifest let previewProps: __ApiPreviewProps
if (!opts.dev) { if (!opts.dev) {
const buildIdPath = path.join(opts.dir, opts.config.distDir, BUILD_ID_FILE) const buildIdPath = path.join(opts.dir, opts.config.distDir, BUILD_ID_FILE)
...@@ -234,9 +235,11 @@ export async function setupFsCheck(opts: { ...@@ -234,9 +235,11 @@ export async function setupFsCheck(opts: {
await fs.readFile(routesManifestPath, 'utf8') await fs.readFile(routesManifestPath, 'utf8')
) as RoutesManifest ) as RoutesManifest
prerenderManifest = JSON.parse( previewProps = (
await fs.readFile(prerenderManifestPath, 'utf8') JSON.parse(
) as PrerenderManifest await fs.readFile(prerenderManifestPath, 'utf8')
) as PrerenderManifest
).preview
const middlewareManifest = JSON.parse( const middlewareManifest = JSON.parse(
await fs.readFile(middlewareManifestPath, 'utf8').catch(() => '{}') await fs.readFile(middlewareManifestPath, 'utf8').catch(() => '{}')
...@@ -344,22 +347,16 @@ export async function setupFsCheck(opts: { ...@@ -344,22 +347,16 @@ export async function setupFsCheck(opts: {
// dev handling // dev handling
customRoutes = await loadCustomRoutes(opts.config) customRoutes = await loadCustomRoutes(opts.config)
prerenderManifest = { previewProps = {
version: 4, previewModeId: (require('crypto') as typeof import('crypto'))
routes: {}, .randomBytes(16)
dynamicRoutes: {}, .toString('hex'),
notFoundRoutes: [], previewModeSigningKey: (require('crypto') as typeof import('crypto'))
preview: { .randomBytes(32)
previewModeId: (require('crypto') as typeof import('crypto')) .toString('hex'),
.randomBytes(16) previewModeEncryptionKey: (require('crypto') as typeof import('crypto'))
.toString('hex'), .randomBytes(32)
previewModeSigningKey: (require('crypto') as typeof import('crypto')) .toString('hex'),
.randomBytes(32)
.toString('hex'),
previewModeEncryptionKey: (require('crypto') as typeof import('crypto'))
.randomBytes(32)
.toString('hex'),
},
} }
} }
...@@ -460,7 +457,7 @@ export async function setupFsCheck(opts: { ...@@ -460,7 +457,7 @@ export async function setupFsCheck(opts: {
devVirtualFsItems: new Set<string>(), devVirtualFsItems: new Set<string>(),
prerenderManifest, previewProps,
middlewareMatcher: middlewareMatcher as MiddlewareRouteMatch | undefined, middlewareMatcher: middlewareMatcher as MiddlewareRouteMatch | undefined,
ensureCallback(fn: typeof ensureFn) { ensureCallback(fn: typeof ensureFn) {
......
...@@ -263,7 +263,7 @@ async function startWatcher( ...@@ -263,7 +263,7 @@ async function startWatcher(
}), }),
telemetry: opts.telemetry, telemetry: opts.telemetry,
rewrites: opts.fsChecker.rewrites, rewrites: opts.fsChecker.rewrites,
previewProps: opts.fsChecker.prerenderManifest.preview, previewProps: opts.fsChecker.previewProps,
resetFetch, resetFetch,
lockfile, lockfile,
onDevServerCleanup: opts.onDevServerCleanup, onDevServerCleanup: opts.onDevServerCleanup,
...@@ -324,7 +324,17 @@ async function startWatcher( ...@@ -324,7 +324,17 @@ async function startWatcher(
const prerenderManifestPath = path.join(distDir, PRERENDER_MANIFEST) const prerenderManifestPath = path.join(distDir, PRERENDER_MANIFEST)
await fs.promises.writeFile( await fs.promises.writeFile(
prerenderManifestPath, prerenderManifestPath,
JSON.stringify(opts.fsChecker.prerenderManifest, null, 2) JSON.stringify(
{
version: 4,
routes: {},
dynamicRoutes: {},
notFoundRoutes: [],
preview: opts.fsChecker.previewProps,
},
null,
2
)
) )
if (opts.nextConfig.experimental.nextScriptWorkers) { if (opts.nextConfig.experimental.nextScriptWorkers) {
......
...@@ -2,10 +2,10 @@ import type { NextConfig } from '../../config-shared' ...@@ -2,10 +2,10 @@ import type { NextConfig } from '../../config-shared'
import type { AppRouteRouteDefinition } from '../../route-definitions/app-route-route-definition' import type { AppRouteRouteDefinition } from '../../route-definitions/app-route-route-definition'
import type { AppSegmentConfig } from '../../../build/segment-config/app/app-segment-config' import type { AppSegmentConfig } from '../../../build/segment-config/app/app-segment-config'
import type { NextRequest } from '../../web/spec-extension/request' import type { NextRequest } from '../../web/spec-extension/request'
import type { PrerenderManifest } from '../../../build'
import type { NextURL } from '../../web/next-url' import type { NextURL } from '../../web/next-url'
import type { DeepReadonly } from '../../../shared/lib/deep-readonly' import type { DeepReadonly } from '../../../shared/lib/deep-readonly'
import type { WorkUnitStore } from '../../app-render/work-unit-async-storage.external' import type { WorkUnitStore } from '../../app-render/work-unit-async-storage.external'
import type { __ApiPreviewProps } from '../../api-utils'
import { import {
RouteModule, RouteModule,
...@@ -114,7 +114,7 @@ export interface AppRouteRouteHandlerContext extends RouteModuleHandleContext { ...@@ -114,7 +114,7 @@ export interface AppRouteRouteHandlerContext extends RouteModuleHandleContext {
renderOpts: WorkStoreContext['renderOpts'] & renderOpts: WorkStoreContext['renderOpts'] &
Pick<RenderOptsPartial, 'onInstrumentationRequestError'> & Pick<RenderOptsPartial, 'onInstrumentationRequestError'> &
CollectedCacheInfo CollectedCacheInfo
prerenderManifest: DeepReadonly<PrerenderManifest> previewProps: DeepReadonly<__ApiPreviewProps>
sharedContext: AppRouteSharedContext sharedContext: AppRouteSharedContext
} }
...@@ -726,7 +726,7 @@ export class AppRouteRouteModule extends RouteModule< ...@@ -726,7 +726,7 @@ export class AppRouteRouteModule extends RouteModule<
req.nextUrl, req.nextUrl,
implicitTags, implicitTags,
undefined, undefined,
context.prerenderManifest.preview context.previewProps
) )
const workStore = createWorkStore(staticGenerationContext) const workStore = createWorkStore(staticGenerationContext)
......
...@@ -99,13 +99,7 @@ export class EdgeRouteModuleWrapper { ...@@ -99,13 +99,7 @@ export class EdgeRouteModuleWrapper {
// match (if any). // match (if any).
const context: AppRouteRouteHandlerContext = { const context: AppRouteRouteHandlerContext = {
params, params,
prerenderManifest: { previewProps,
version: 4,
routes: {},
dynamicRoutes: {},
preview: previewProps,
notFoundRoutes: [],
},
renderOpts: { renderOpts: {
supportsDynamicResponse: true, supportsDynamicResponse: true,
waitUntil, 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