Commit 3abfd56a authored by Jiachi Liu's avatar Jiachi Liu Committed by Janka Uryga

Drop edge prerender manifest (#67787)

Follow up for #67779 , we don't have to generate the edge preview
manifest since it's mainly for rendering the preview props and now
preview props can be accessed through process env by a util
`getEdgePreviewProps()`
parent abbc66c6
...@@ -341,32 +341,6 @@ async function writePrerenderManifest( ...@@ -341,32 +341,6 @@ async function writePrerenderManifest(
manifest: DeepReadonly<PrerenderManifest> manifest: DeepReadonly<PrerenderManifest>
): Promise<void> { ): Promise<void> {
await writeManifest(path.join(distDir, PRERENDER_MANIFEST), manifest) await writeManifest(path.join(distDir, PRERENDER_MANIFEST), manifest)
await writeEdgePartialPrerenderManifest(distDir, manifest)
}
async function writeEdgePartialPrerenderManifest(
distDir: string,
manifest: DeepReadonly<Partial<PrerenderManifest>>
): Promise<void> {
// We need to write a partial prerender manifest to make preview mode settings available in edge middleware.
// Use env vars in JS bundle and inject the actual vars to edge manifest.
const edgePartialPrerenderManifest: DeepReadonly<Partial<PrerenderManifest>> =
{
routes: {},
dynamicRoutes: {},
notFoundRoutes: [],
version: manifest.version,
// Preview props are inlined in the code with dynamic env vars,
// During edge runtime build:
// - local: env vars will be injected through edge-runtime as runtime env vars
// - deployment: env vars will be replaced by edge build pipeline as inline values
}
await writeFileUtf8(
path.join(distDir, PRERENDER_MANIFEST.replace(/\.json$/, '.js')),
`self.__PRERENDER_MANIFEST=${JSON.stringify(
JSON.stringify(edgePartialPrerenderManifest)
)}`
)
} }
async function writeClientSsgManifest( async function writeClientSsgManifest(
...@@ -1243,8 +1217,6 @@ export default async function build( ...@@ -1243,8 +1217,6 @@ export default async function build(
.traceChild('write-routes-manifest') .traceChild('write-routes-manifest')
.traceAsyncFn(() => writeManifest(routesManifestPath, routesManifest)) .traceAsyncFn(() => writeManifest(routesManifestPath, routesManifest))
await writeEdgePartialPrerenderManifest(distDir, {})
const outputFileTracingRoot = const outputFileTracingRoot =
config.experimental.outputFileTracingRoot || dir config.experimental.outputFileTracingRoot || dir
...@@ -1287,7 +1259,6 @@ export default async function build( ...@@ -1287,7 +1259,6 @@ export default async function build(
path.relative(distDir, pagesManifestPath), path.relative(distDir, pagesManifestPath),
BUILD_MANIFEST, BUILD_MANIFEST,
PRERENDER_MANIFEST, PRERENDER_MANIFEST,
PRERENDER_MANIFEST.replace(/\.json$/, '.js'),
path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST), path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST),
path.join(SERVER_DIRECTORY, MIDDLEWARE_BUILD_MANIFEST + '.js'), path.join(SERVER_DIRECTORY, MIDDLEWARE_BUILD_MANIFEST + '.js'),
path.join( path.join(
......
...@@ -37,7 +37,6 @@ declare const nextConfig: NextConfigComplete ...@@ -37,7 +37,6 @@ declare const nextConfig: NextConfigComplete
const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined) const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined)
const buildManifest: BuildManifest = self.__BUILD_MANIFEST as any const buildManifest: BuildManifest = self.__BUILD_MANIFEST as any
const prerenderManifest = maybeJSONParse(self.__PRERENDER_MANIFEST)
const reactLoadableManifest = maybeJSONParse(self.__REACT_LOADABLE_MANIFEST) const reactLoadableManifest = maybeJSONParse(self.__REACT_LOADABLE_MANIFEST)
const rscManifest = self.__RSC_MANIFEST?.['VAR_PAGE'] const rscManifest = self.__RSC_MANIFEST?.['VAR_PAGE']
const rscServerManifest = maybeJSONParse(self.__RSC_SERVER_MANIFEST) const rscServerManifest = maybeJSONParse(self.__RSC_SERVER_MANIFEST)
...@@ -70,7 +69,6 @@ const render = getRender({ ...@@ -70,7 +69,6 @@ const render = getRender({
error500Mod, error500Mod,
Document, Document,
buildManifest, buildManifest,
prerenderManifest,
renderToHTML, renderToHTML,
reactLoadableManifest, reactLoadableManifest,
clientReferenceManifest: isServerComponent ? rscManifest : null, clientReferenceManifest: isServerComponent ? rscManifest : null,
......
...@@ -82,7 +82,6 @@ const error500Mod = userland500Page ...@@ -82,7 +82,6 @@ const error500Mod = userland500Page
const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined) const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined)
const buildManifest: BuildManifest = self.__BUILD_MANIFEST as any const buildManifest: BuildManifest = self.__BUILD_MANIFEST as any
const prerenderManifest = maybeJSONParse(self.__PRERENDER_MANIFEST)
const reactLoadableManifest = maybeJSONParse(self.__REACT_LOADABLE_MANIFEST) const reactLoadableManifest = maybeJSONParse(self.__REACT_LOADABLE_MANIFEST)
const subresourceIntegrityManifest = sriEnabled const subresourceIntegrityManifest = sriEnabled
? maybeJSONParse(self.__SUBRESOURCE_INTEGRITY_MANIFEST) ? maybeJSONParse(self.__SUBRESOURCE_INTEGRITY_MANIFEST)
...@@ -99,7 +98,6 @@ const render = getRender({ ...@@ -99,7 +98,6 @@ const render = getRender({
error500Mod, error500Mod,
Document, Document,
buildManifest, buildManifest,
prerenderManifest,
renderToHTML, renderToHTML,
reactLoadableManifest, reactLoadableManifest,
subresourceIntegrityManifest, subresourceIntegrityManifest,
......
...@@ -13,14 +13,12 @@ import { ...@@ -13,14 +13,12 @@ import {
WebNextResponse, WebNextResponse,
} from '../../../../server/base-http/web' } from '../../../../server/base-http/web'
import { SERVER_RUNTIME } from '../../../../lib/constants' import { SERVER_RUNTIME } from '../../../../lib/constants'
import type { ManifestRewriteRoute, PrerenderManifest } from '../../..' import type { ManifestRewriteRoute } from '../../..'
import { normalizeAppPath } from '../../../../shared/lib/router/utils/app-paths' import { normalizeAppPath } from '../../../../shared/lib/router/utils/app-paths'
import type { SizeLimit } from '../../../../../types' import type { SizeLimit } from '../../../../../types'
import { internal_getCurrentFunctionWaitUntil } from '../../../../server/web/internal-edge-wait-until' import { internal_getCurrentFunctionWaitUntil } from '../../../../server/web/internal-edge-wait-until'
import type { PAGE_TYPES } from '../../../../lib/page-types' import type { PAGE_TYPES } from '../../../../lib/page-types'
import type { NextRequestHint } from '../../../../server/web/adapter' import type { NextRequestHint } from '../../../../server/web/adapter'
import type { DeepReadonly } from '../../../../shared/lib/deep-readonly'
import { getEdgePreviewProps } from '../../../../server/web/get-edge-preview-props'
export function getRender({ export function getRender({
dev, dev,
...@@ -32,7 +30,6 @@ export function getRender({ ...@@ -32,7 +30,6 @@ export function getRender({
pagesType, pagesType,
Document, Document,
buildManifest, buildManifest,
prerenderManifest,
reactLoadableManifest, reactLoadableManifest,
interceptionRouteRewrites, interceptionRouteRewrites,
renderToHTML, renderToHTML,
...@@ -55,7 +52,6 @@ export function getRender({ ...@@ -55,7 +52,6 @@ export function getRender({
renderToHTML?: any renderToHTML?: any
Document: DocumentType Document: DocumentType
buildManifest: BuildManifest buildManifest: BuildManifest
prerenderManifest: DeepReadonly<PrerenderManifest>
reactLoadableManifest: ReactLoadableManifest reactLoadableManifest: ReactLoadableManifest
subresourceIntegrityManifest?: Record<string, string> subresourceIntegrityManifest?: Record<string, string>
interceptionRouteRewrites?: ManifestRewriteRoute[] interceptionRouteRewrites?: ManifestRewriteRoute[]
...@@ -89,12 +85,6 @@ export function getRender({ ...@@ -89,12 +85,6 @@ export function getRender({
page, page,
pathname: isAppPath ? normalizeAppPath(page) : page, pathname: isAppPath ? normalizeAppPath(page) : page,
pagesType, pagesType,
prerenderManifest: prerenderManifest
? {
...prerenderManifest,
preview: getEdgePreviewProps(),
}
: undefined,
interceptionRouteRewrites, interceptionRouteRewrites,
extendRenderOpts: { extendRenderOpts: {
buildId, buildId,
......
...@@ -20,7 +20,6 @@ import { ...@@ -20,7 +20,6 @@ import {
SUBRESOURCE_INTEGRITY_MANIFEST, SUBRESOURCE_INTEGRITY_MANIFEST,
NEXT_FONT_MANIFEST, NEXT_FONT_MANIFEST,
SERVER_REFERENCE_MANIFEST, SERVER_REFERENCE_MANIFEST,
PRERENDER_MANIFEST,
INTERCEPTION_ROUTE_REWRITE_MANIFEST, INTERCEPTION_ROUTE_REWRITE_MANIFEST,
} from '../../../shared/lib/constants' } from '../../../shared/lib/constants'
import type { MiddlewareConfig } from '../../analysis/get-page-static-info' import type { MiddlewareConfig } from '../../analysis/get-page-static-info'
...@@ -135,10 +134,6 @@ function getEntryFiles( ...@@ -135,10 +134,6 @@ function getEntryFiles(
files.push(`server/edge-${INSTRUMENTATION_HOOK_FILENAME}.js`) files.push(`server/edge-${INSTRUMENTATION_HOOK_FILENAME}.js`)
} }
if (process.env.NODE_ENV === 'production') {
files.push(PRERENDER_MANIFEST.replace('json', 'js'))
}
files.push( files.push(
...entryFiles ...entryFiles
.filter((file) => !file.endsWith('.hot-update.js')) .filter((file) => !file.endsWith('.hot-update.js'))
......
...@@ -17,7 +17,6 @@ declare global { ...@@ -17,7 +17,6 @@ declare global {
__BUILD_MANIFEST_CB?: Function __BUILD_MANIFEST_CB?: Function
__MIDDLEWARE_MATCHERS?: MiddlewareMatcher[] __MIDDLEWARE_MATCHERS?: MiddlewareMatcher[]
__MIDDLEWARE_MANIFEST_CB?: Function __MIDDLEWARE_MANIFEST_CB?: Function
__PRERENDER_MANIFEST?: string
__REACT_LOADABLE_MANIFEST?: any __REACT_LOADABLE_MANIFEST?: any
__RSC_MANIFEST?: any __RSC_MANIFEST?: any
__RSC_SERVER_MANIFEST?: any __RSC_SERVER_MANIFEST?: any
......
...@@ -3,7 +3,6 @@ import type RenderResult from './render-result' ...@@ -3,7 +3,6 @@ import type RenderResult from './render-result'
import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta' import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta'
import type { Params } from '../shared/lib/router/utils/route-matcher' import type { Params } from '../shared/lib/router/utils/route-matcher'
import type { LoadComponentsReturnType } from './load-components' import type { LoadComponentsReturnType } from './load-components'
import type { PrerenderManifest } from '../build'
import type { import type {
LoadedRenderOpts, LoadedRenderOpts,
MiddlewareRoutingItem, MiddlewareRoutingItem,
...@@ -33,7 +32,6 @@ import type { PAGE_TYPES } from '../lib/page-types' ...@@ -33,7 +32,6 @@ import type { PAGE_TYPES } from '../lib/page-types'
import type { Rewrite } from '../lib/load-custom-routes' import type { Rewrite } from '../lib/load-custom-routes'
import { buildCustomRoute } from '../lib/build-custom-route' import { buildCustomRoute } from '../lib/build-custom-route'
import { UNDERSCORE_NOT_FOUND_ROUTE } from '../api/constants' import { UNDERSCORE_NOT_FOUND_ROUTE } from '../api/constants'
import type { DeepReadonly } from '../shared/lib/deep-readonly'
import { getEdgePreviewProps } from './web/get-edge-preview-props' import { getEdgePreviewProps } from './web/get-edge-preview-props'
interface WebServerOptions extends Options { interface WebServerOptions extends Options {
...@@ -50,7 +48,6 @@ interface WebServerOptions extends Options { ...@@ -50,7 +48,6 @@ interface WebServerOptions extends Options {
| typeof import('./app-render/app-render').renderToHTMLOrFlight | typeof import('./app-render/app-render').renderToHTMLOrFlight
| undefined | undefined
incrementalCacheHandler?: any incrementalCacheHandler?: any
prerenderManifest: DeepReadonly<PrerenderManifest> | undefined
interceptionRouteRewrites?: Rewrite[] interceptionRouteRewrites?: Rewrite[]
} }
} }
...@@ -134,17 +131,13 @@ export default class NextWebServer extends BaseServer<WebServerOptions> { ...@@ -134,17 +131,13 @@ export default class NextWebServer extends BaseServer<WebServerOptions> {
} }
protected getPrerenderManifest() { protected getPrerenderManifest() {
const { prerenderManifest } = this.serverOptions.webServerConfig return {
if (this.renderOpts?.dev || !prerenderManifest) { version: -1 as any, // letting us know this doesn't conform to spec
return { routes: {},
version: -1 as any, // letting us know this doesn't conform to spec dynamicRoutes: {},
routes: {}, notFoundRoutes: [],
dynamicRoutes: {}, preview: getEdgePreviewProps(),
notFoundRoutes: [],
preview: getEdgePreviewProps(),
}
} }
return prerenderManifest
} }
protected getNextFontManifest() { protected getNextFontManifest() {
......
...@@ -56,12 +56,6 @@ describe('app dir - basic', () => { ...@@ -56,12 +56,6 @@ describe('app dir - basic', () => {
) )
}) })
it('should not have entire prerender-manifest for edge', async () => {
expect(await next.readFile('.next/prerender-manifest.js')).not.toContain(
'initialRevalidate'
)
})
if (!process.env.NEXT_EXPERIMENTAL_COMPILE) { if (!process.env.NEXT_EXPERIMENTAL_COMPILE) {
it('should have correct size in build output', async () => { it('should have correct size in build output', async () => {
expect(next.cliOutput).toMatch( expect(next.cliOutput).toMatch(
......
...@@ -115,7 +115,6 @@ describe('Middleware Runtime trailing slash', () => { ...@@ -115,7 +115,6 @@ describe('Middleware Runtime trailing slash', () => {
delete middlewareWithoutEnvs.env delete middlewareWithoutEnvs.env
expect(middlewareWithoutEnvs).toEqual({ expect(middlewareWithoutEnvs).toEqual({
files: expect.arrayContaining([ files: expect.arrayContaining([
'prerender-manifest.js',
'server/edge-runtime-webpack.js', 'server/edge-runtime-webpack.js',
'server/middleware.js', 'server/middleware.js',
]), ]),
......
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