Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up RenderOptsPartial #23614

Merged
merged 6 commits into from Apr 2, 2021
Merged

Clean up RenderOptsPartial #23614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe5095e
Remove autoExport from RenderOpts
devknoll Mar 31, 2021
5b6b2c1
Merge branch 'canary' into remove-unused-opts
devknoll Apr 1, 2021
9efffa3
Remove ampMode from RenderOpts
devknoll Apr 1, 2021
2b02856
Stop passing inAmpMode and hybridAmp
devknoll Apr 1, 2021
9653a7a
Unset nextExport when falsy
devknoll Apr 1, 2021
9eea76b
Merge branch 'canary' into remove-unused-opts
devknoll Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 25 additions & 10 deletions packages/next/export/worker.ts
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ import { requireFontManifest } from '../next-server/server/require'
import { FontManifest } from '../next-server/server/font-utils'
import { normalizeLocalePath } from '../next-server/lib/i18n/normalize-locale-path'
import { trace } from '../telemetry/trace'
import { isInAmpMode } from '../next-server/lib/amp'

const envConfig = require('../next-server/lib/runtime-config')

Expand Down Expand Up @@ -67,8 +68,6 @@ interface RenderOpts {
ampPath?: string
ampValidatorPath?: string
ampSkipValidation?: boolean
hybridAmp?: boolean
inAmpMode?: boolean
optimizeFonts?: boolean
optimizeImages?: boolean
optimizeCss?: any
Expand Down Expand Up @@ -215,6 +214,8 @@ export default async function exportPage({
let html
let curRenderOpts: RenderOpts = {}
let renderMethod = renderToHTML
let inAmpMode = false,
hybridAmp = false

const renderedDuringBuild = (getStaticProps: any) => {
return !buildExport && getStaticProps && !isDynamicRoute(path)
Expand All @@ -229,11 +230,18 @@ export default async function exportPage({
...query,
},
})
const { Component: mod, getServerSideProps } = await loadComponents(
distDir,
page,
serverless
)
const {
Component: mod,
getServerSideProps,
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) {
throw new Error(
Expand Down Expand Up @@ -292,6 +300,13 @@ export default async function exportPage({
}
} else {
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) {
throw new Error(
Expand Down Expand Up @@ -371,11 +386,11 @@ export default async function exportPage({
}
}

if (curRenderOpts.inAmpMode && !curRenderOpts.ampSkipValidation) {
if (inAmpMode && !curRenderOpts.ampSkipValidation) {
if (!results.ssgNotFound) {
await validateAmp(html, path, curRenderOpts.ampValidatorPath)
}
} else if (curRenderOpts.hybridAmp) {
} else if (hybridAmp) {
// we need to render the AMP version
let ampHtmlFilename = `${ampPath}${sep}index.html`
if (!subFolders) {
Expand Down Expand Up @@ -433,7 +448,7 @@ export default async function exportPage({
'utf8'
)

if (curRenderOpts.hybridAmp) {
if (hybridAmp) {
await promises.writeFile(
dataFile.replace(/\.json$/, '.amp.json'),
JSON.stringify((curRenderOpts as any).pageData),
Expand Down
16 changes: 5 additions & 11 deletions packages/next/next-server/server/render.tsx
View file
Open in desktop
Expand Up @@ -165,13 +165,9 @@ export type RenderOptsPartial = {
runtimeConfig?: { [key: string]: any }
assetPrefix?: string
err?: Error | null
autoExport?: boolean
nextExport?: boolean
dev?: boolean
ampMode?: any
ampPath?: string
inAmpMode?: boolean
hybridAmp?: boolean
ErrorDebug?: React.ComponentType<{ error: Error }>
ampValidator?: (html: string, pathname: string) => Promise<void>
ampSkipValidation?: boolean
Expand Down Expand Up @@ -261,6 +257,7 @@ function renderDocument(
devOnlyCacheBusterQueryString: string
scriptLoader: any
isPreview?: boolean
autoExport?: boolean
}
): string {
return (
Expand Down Expand Up @@ -533,7 +530,6 @@ export async function renderToHTML(
req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : ''
}`
req.url = pathname
renderOpts.nextExport = true
}

if (pathname === '/404' && (hasPageGetInitialProps || getServerSideProps)) {
Expand All @@ -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

Expand Down Expand Up @@ -1038,11 +1032,9 @@ export async function renderToHTML(
const dynamicImportsIds = [...dynamicImportIdsSet]
const hybridAmp = ampState.hybrid

// update renderOpts so export knows current state
renderOpts.inAmpMode = inAmpMode
renderOpts.hybridAmp = hybridAmp

const docComponentsRendered: DocumentProps['docComponentsRendered'] = {}
const nextExport =
!isSSG && (renderOpts.nextExport || (dev && (isAutoExport || isFallback)))

let html = renderDocument(Document, {
...renderOpts,
Expand Down Expand Up @@ -1078,6 +1070,8 @@ export async function renderToHTML(
devOnlyCacheBusterQueryString,
scriptLoader,
isPreview: isPreview === true ? true : undefined,
autoExport: isAutoExport === true ? true : undefined,
nextExport: nextExport === true ? true : undefined,
})

if (process.env.NODE_ENV !== 'production') {
Expand Down