Unverified Commit 3c2fc61b authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix validateTurboNextConfig running for next start (#86886)

This fixes `validateTurboNextConfig` running during `next start` which
was caught due to the wrong `phase` being provided to `workflows` config
wrapper.

We shouldn't run extra validation during `next start` as this needs to
boot as fast as possible and would have already been validated during
`next build` or `next dev`.
parent 3bb0bcbf
...@@ -8,6 +8,7 @@ import { getSupportedBrowsers } from '../utils' ...@@ -8,6 +8,7 @@ import { getSupportedBrowsers } from '../utils'
import { normalizePath } from '../../lib/normalize-path' import { normalizePath } from '../../lib/normalize-path'
import type { NextConfigComplete } from '../../server/config-shared' import type { NextConfigComplete } from '../../server/config-shared'
import type { __ApiPreviewProps } from '../../server/api-utils' import type { __ApiPreviewProps } from '../../server/api-utils'
import { PHASE_PRODUCTION_BUILD } from '../../api/constants'
export type AnalyzeContext = { export type AnalyzeContext = {
config: NextConfigComplete config: NextConfigComplete
...@@ -25,7 +26,7 @@ export async function turbopackAnalyze( ...@@ -25,7 +26,7 @@ export async function turbopackAnalyze(
}> { }> {
await validateTurboNextConfig({ await validateTurboNextConfig({
dir: analyzeContext.dir, dir: analyzeContext.dir,
isDev: false, configPhase: PHASE_PRODUCTION_BUILD,
}) })
const { config, dir, distDir, noMangling } = analyzeContext const { config, dir, distDir, noMangling } = analyzeContext
......
...@@ -28,7 +28,7 @@ export async function turbopackBuild(): Promise<{ ...@@ -28,7 +28,7 @@ export async function turbopackBuild(): Promise<{
}> { }> {
await validateTurboNextConfig({ await validateTurboNextConfig({
dir: NextBuildContext.dir!, dir: NextBuildContext.dir!,
isDev: false, configPhase: PHASE_PRODUCTION_BUILD,
}) })
const config = NextBuildContext.config! const config = NextBuildContext.config!
......
import type { NextConfigComplete } from '../server/config-shared' import type { NextConfigComplete } from '../server/config-shared'
import loadConfig from '../server/config' import loadConfig from '../server/config'
import * as Log from '../build/output/log' import * as Log from '../build/output/log'
import {
PHASE_DEVELOPMENT_SERVER,
PHASE_PRODUCTION_BUILD,
} from '../shared/lib/constants'
const unsupportedTurbopackNextConfigOptions = [ const unsupportedTurbopackNextConfigOptions = [
// Left to be implemented (priority) // Left to be implemented (priority)
...@@ -45,10 +41,10 @@ const unsupportedTurbopackNextConfigOptions = [ ...@@ -45,10 +41,10 @@ const unsupportedTurbopackNextConfigOptions = [
/** */ /** */
export async function validateTurboNextConfig({ export async function validateTurboNextConfig({
dir, dir,
isDev, configPhase,
}: { }: {
dir: string dir: string
isDev?: boolean configPhase: Parameters<typeof loadConfig>[0]
}) { }) {
const { defaultConfig } = const { defaultConfig } =
require('../server/config-shared') as typeof import('../server/config-shared') require('../server/config-shared') as typeof import('../server/config-shared')
...@@ -65,16 +61,15 @@ export async function validateTurboNextConfig({ ...@@ -65,16 +61,15 @@ export async function validateTurboNextConfig({
const unsupportedConfig: string[] = [] const unsupportedConfig: string[] = []
let rawNextConfig: NextConfigComplete = {} as NextConfigComplete let rawNextConfig: NextConfigComplete = {} as NextConfigComplete
const phase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD
try { try {
rawNextConfig = interopDefault( rawNextConfig = interopDefault(
await loadConfig(phase, dir, { await loadConfig(configPhase, dir, {
rawConfig: true, rawConfig: true,
}) })
) )
if (typeof rawNextConfig === 'function') { if (typeof rawNextConfig === 'function') {
rawNextConfig = (rawNextConfig as any)(phase, { rawNextConfig = (rawNextConfig as any)(configPhase, {
defaultConfig, defaultConfig,
}) })
} }
......
...@@ -25,7 +25,10 @@ import setupDebug from 'next/dist/compiled/debug' ...@@ -25,7 +25,10 @@ import setupDebug from 'next/dist/compiled/debug'
import { RESTART_EXIT_CODE } from './utils' import { RESTART_EXIT_CODE } from './utils'
import { formatHostname } from './format-hostname' import { formatHostname } from './format-hostname'
import { initialize } from './router-server' import { initialize } from './router-server'
import { CONFIG_FILES } from '../../shared/lib/constants' import {
CONFIG_FILES,
PHASE_DEVELOPMENT_SERVER,
} from '../../shared/lib/constants'
import { getStartServerInfo, logStartInfo } from './app-info-log' import { getStartServerInfo, logStartInfo } from './app-info-log'
import { validateTurboNextConfig } from '../../lib/turbopack-warning' import { validateTurboNextConfig } from '../../lib/turbopack-warning'
import { type Span, trace, flushAllTraces } from '../../trace' import { type Span, trace, flushAllTraces } from '../../trace'
...@@ -473,10 +476,10 @@ export async function startServer( ...@@ -473,10 +476,10 @@ export async function startServer(
Log.event(`Ready in ${formatDurationText}`) Log.event(`Ready in ${formatDurationText}`)
if (process.env.TURBOPACK) { if (process.env.TURBOPACK && isDev) {
await validateTurboNextConfig({ await validateTurboNextConfig({
dir: serverOptions.dir, dir: serverOptions.dir,
isDev: serverOptions.isDev, configPhase: PHASE_DEVELOPMENT_SERVER,
}) })
} }
} catch (err) { } catch (err) {
......
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