Unverified Commit af3315b1 authored by Gerald Monaco's avatar Gerald Monaco Committed by GitHub

Clean up RenderOptsPartial (#23614)

* Remove autoExport from RenderOpts

* Remove ampMode from RenderOpts

* Stop passing inAmpMode and hybridAmp

* Unset nextExport when falsy
parent 95b98396
...@@ -17,6 +17,7 @@ import { requireFontManifest } from '../next-server/server/require' ...@@ -17,6 +17,7 @@ import { requireFontManifest } from '../next-server/server/require'
import { FontManifest } from '../next-server/server/font-utils' import { FontManifest } from '../next-server/server/font-utils'
import { normalizeLocalePath } from '../next-server/lib/i18n/normalize-locale-path' import { normalizeLocalePath } from '../next-server/lib/i18n/normalize-locale-path'
import { trace } from '../telemetry/trace' import { trace } from '../telemetry/trace'
import { isInAmpMode } from '../next-server/lib/amp'
const envConfig = require('../next-server/lib/runtime-config') const envConfig = require('../next-server/lib/runtime-config')
...@@ -67,8 +68,6 @@ interface RenderOpts { ...@@ -67,8 +68,6 @@ interface RenderOpts {
ampPath?: string ampPath?: string
ampValidatorPath?: string ampValidatorPath?: string
ampSkipValidation?: boolean ampSkipValidation?: boolean
hybridAmp?: boolean
inAmpMode?: boolean
optimizeFonts?: boolean optimizeFonts?: boolean
optimizeImages?: boolean optimizeImages?: boolean
optimizeCss?: any optimizeCss?: any
...@@ -215,6 +214,8 @@ export default async function exportPage({ ...@@ -215,6 +214,8 @@ export default async function exportPage({
let html let html
let curRenderOpts: RenderOpts = {} let curRenderOpts: RenderOpts = {}
let renderMethod = renderToHTML let renderMethod = renderToHTML
let inAmpMode = false,
hybridAmp = false
const renderedDuringBuild = (getStaticProps: any) => { const renderedDuringBuild = (getStaticProps: any) => {
return !buildExport && getStaticProps && !isDynamicRoute(path) return !buildExport && getStaticProps && !isDynamicRoute(path)
...@@ -229,11 +230,18 @@ export default async function exportPage({ ...@@ -229,11 +230,18 @@ export default async function exportPage({
...query, ...query,
}, },
}) })
const { Component: mod, getServerSideProps } = await loadComponents( const {
distDir, Component: mod,
page, getServerSideProps,
serverless pageConfig,
) } = await loadComponents(distDir, page, serverless)
const ampState = {
ampFirst: pageConfig?.amp === true,
hasQuery: Boolean(query.amp),
hybrid: pageConfig?.amp === 'hybrid',
}
inAmpMode = isInAmpMode(ampState)
hybridAmp = ampState.hybrid
if (getServerSideProps) { if (getServerSideProps) {
throw new Error( throw new Error(
...@@ -292,6 +300,13 @@ export default async function exportPage({ ...@@ -292,6 +300,13 @@ export default async function exportPage({
} }
} else { } else {
const components = await loadComponents(distDir, page, serverless) const components = await loadComponents(distDir, page, serverless)
const ampState = {
ampFirst: components.pageConfig?.amp === true,
hasQuery: Boolean(query.amp),
hybrid: components.pageConfig?.amp === 'hybrid',
}
inAmpMode = isInAmpMode(ampState)
hybridAmp = ampState.hybrid
if (components.getServerSideProps) { if (components.getServerSideProps) {
throw new Error( throw new Error(
...@@ -371,11 +386,11 @@ export default async function exportPage({ ...@@ -371,11 +386,11 @@ export default async function exportPage({
} }
} }
if (curRenderOpts.inAmpMode && !curRenderOpts.ampSkipValidation) { if (inAmpMode && !curRenderOpts.ampSkipValidation) {
if (!results.ssgNotFound) { if (!results.ssgNotFound) {
await validateAmp(html, path, curRenderOpts.ampValidatorPath) await validateAmp(html, path, curRenderOpts.ampValidatorPath)
} }
} else if (curRenderOpts.hybridAmp) { } else if (hybridAmp) {
// we need to render the AMP version // we need to render the AMP version
let ampHtmlFilename = `${ampPath}${sep}index.html` let ampHtmlFilename = `${ampPath}${sep}index.html`
if (!subFolders) { if (!subFolders) {
...@@ -433,7 +448,7 @@ export default async function exportPage({ ...@@ -433,7 +448,7 @@ export default async function exportPage({
'utf8' 'utf8'
) )
if (curRenderOpts.hybridAmp) { if (hybridAmp) {
await promises.writeFile( await promises.writeFile(
dataFile.replace(/\.json$/, '.amp.json'), dataFile.replace(/\.json$/, '.amp.json'),
JSON.stringify((curRenderOpts as any).pageData), JSON.stringify((curRenderOpts as any).pageData),
......
...@@ -165,13 +165,9 @@ export type RenderOptsPartial = { ...@@ -165,13 +165,9 @@ export type RenderOptsPartial = {
runtimeConfig?: { [key: string]: any } runtimeConfig?: { [key: string]: any }
assetPrefix?: string assetPrefix?: string
err?: Error | null err?: Error | null
autoExport?: boolean
nextExport?: boolean nextExport?: boolean
dev?: boolean dev?: boolean
ampMode?: any
ampPath?: string ampPath?: string
inAmpMode?: boolean
hybridAmp?: boolean
ErrorDebug?: React.ComponentType<{ error: Error }> ErrorDebug?: React.ComponentType<{ error: Error }>
ampValidator?: (html: string, pathname: string) => Promise<void> ampValidator?: (html: string, pathname: string) => Promise<void>
ampSkipValidation?: boolean ampSkipValidation?: boolean
...@@ -261,6 +257,7 @@ function renderDocument( ...@@ -261,6 +257,7 @@ function renderDocument(
devOnlyCacheBusterQueryString: string devOnlyCacheBusterQueryString: string
scriptLoader: any scriptLoader: any
isPreview?: boolean isPreview?: boolean
autoExport?: boolean
} }
): string { ): string {
return ( return (
...@@ -533,7 +530,6 @@ export async function renderToHTML( ...@@ -533,7 +530,6 @@ export async function renderToHTML(
req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : '' req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : ''
}` }`
req.url = pathname req.url = pathname
renderOpts.nextExport = true
} }
if (pathname === '/404' && (hasPageGetInitialProps || getServerSideProps)) { if (pathname === '/404' && (hasPageGetInitialProps || getServerSideProps)) {
...@@ -550,8 +546,6 @@ export async function renderToHTML( ...@@ -550,8 +546,6 @@ export async function renderToHTML(
) )
} }
} }
if (isAutoExport) renderOpts.autoExport = true
if (isSSG) renderOpts.nextExport = false
await Loadable.preloadAll() // Make sure all dynamic imports are loaded await Loadable.preloadAll() // Make sure all dynamic imports are loaded
...@@ -1038,11 +1032,9 @@ export async function renderToHTML( ...@@ -1038,11 +1032,9 @@ export async function renderToHTML(
const dynamicImportsIds = [...dynamicImportIdsSet] const dynamicImportsIds = [...dynamicImportIdsSet]
const hybridAmp = ampState.hybrid const hybridAmp = ampState.hybrid
// update renderOpts so export knows current state
renderOpts.inAmpMode = inAmpMode
renderOpts.hybridAmp = hybridAmp
const docComponentsRendered: DocumentProps['docComponentsRendered'] = {} const docComponentsRendered: DocumentProps['docComponentsRendered'] = {}
const nextExport =
!isSSG && (renderOpts.nextExport || (dev && (isAutoExport || isFallback)))
let html = renderDocument(Document, { let html = renderDocument(Document, {
...renderOpts, ...renderOpts,
...@@ -1078,6 +1070,8 @@ export async function renderToHTML( ...@@ -1078,6 +1070,8 @@ export async function renderToHTML(
devOnlyCacheBusterQueryString, devOnlyCacheBusterQueryString,
scriptLoader, scriptLoader,
isPreview: isPreview === true ? true : undefined, isPreview: isPreview === true ? true : undefined,
autoExport: isAutoExport === true ? true : undefined,
nextExport: nextExport === true ? true : undefined,
}) })
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
......
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