Unverified Commit e079cce4 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Update static check vars and fix types (#10260)

Co-authored-by: 's avatarJoe Haddad <timer150@gmail.com>
parent 8579888c
...@@ -53,6 +53,7 @@ import { generateBuildId } from './generate-build-id' ...@@ -53,6 +53,7 @@ import { generateBuildId } from './generate-build-id'
import { isWriteable } from './is-writeable' import { isWriteable } from './is-writeable'
import createSpinner from './spinner' import createSpinner from './spinner'
import { import {
isPageStatic,
collectPages, collectPages,
getPageSizeInKb, getPageSizeInKb,
hasCustomAppGetInitialProps, hasCustomAppGetInitialProps,
...@@ -416,7 +417,8 @@ export default async function build(dir: string, conf = null): Promise<void> { ...@@ -416,7 +417,8 @@ export default async function build(dir: string, conf = null): Promise<void> {
const staticCheckWorkers = new Worker(staticCheckWorker, { const staticCheckWorkers = new Worker(staticCheckWorker, {
numWorkers: config.experimental.cpus, numWorkers: config.experimental.cpus,
enableWorkerThreads: config.experimental.workerThreads, enableWorkerThreads: config.experimental.workerThreads,
}) }) as Worker & { isPageStatic: typeof isPageStatic }
staticCheckWorkers.getStdout().pipe(process.stdout) staticCheckWorkers.getStdout().pipe(process.stdout)
staticCheckWorkers.getStderr().pipe(process.stderr) staticCheckWorkers.getStderr().pipe(process.stderr)
...@@ -481,7 +483,7 @@ export default async function build(dir: string, conf = null): Promise<void> { ...@@ -481,7 +483,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
if (nonReservedPage) { if (nonReservedPage) {
try { try {
let result: any = await (staticCheckWorkers as any).isPageStatic( let result = await staticCheckWorkers.isPageStatic(
page, page,
serverBundle, serverBundle,
runtimeEnvConfig runtimeEnvConfig
...@@ -492,7 +494,7 @@ export default async function build(dir: string, conf = null): Promise<void> { ...@@ -492,7 +494,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
hybridAmpPages.add(page) hybridAmpPages.add(page)
} }
if (result.prerender) { if (result.hasStaticProps) {
ssgPages.add(page) ssgPages.add(page)
isSsg = true isSsg = true
...@@ -500,7 +502,7 @@ export default async function build(dir: string, conf = null): Promise<void> { ...@@ -500,7 +502,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
additionalSsgPaths.set(page, result.prerenderRoutes) additionalSsgPaths.set(page, result.prerenderRoutes)
ssgPageRoutes = result.prerenderRoutes ssgPageRoutes = result.prerenderRoutes
} }
} else if (result.static && customAppGetInitialProps === false) { } else if (result.isStatic && customAppGetInitialProps === false) {
staticPages.add(page) staticPages.add(page)
isStatic = true isStatic = true
} }
......
...@@ -479,9 +479,9 @@ export async function isPageStatic( ...@@ -479,9 +479,9 @@ export async function isPageStatic(
serverBundle: string, serverBundle: string,
runtimeEnvConfig: any runtimeEnvConfig: any
): Promise<{ ): Promise<{
static?: boolean isStatic?: boolean
prerender?: boolean
isHybridAmp?: boolean isHybridAmp?: boolean
hasStaticProps?: boolean
prerenderRoutes?: string[] | undefined prerenderRoutes?: string[] | undefined
}> { }> {
try { try {
...@@ -593,10 +593,10 @@ export async function isPageStatic( ...@@ -593,10 +593,10 @@ export async function isPageStatic(
const config = mod.config || {} const config = mod.config || {}
return { return {
static: !hasStaticProps && !hasGetInitialProps, isStatic: !hasStaticProps && !hasGetInitialProps,
isHybridAmp: config.amp === 'hybrid', isHybridAmp: config.amp === 'hybrid',
prerenderRoutes: prerenderPaths, prerenderRoutes: prerenderPaths,
prerender: hasStaticProps, hasStaticProps,
} }
} catch (err) { } catch (err) {
if (err.code === 'MODULE_NOT_FOUND') return {} if (err.code === 'MODULE_NOT_FOUND') return {}
......
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