Skip to content

Commit c7a1b0e

Browse files
committed
fix: prevent bundling of ZodError type
1 parent f70caa2 commit c7a1b0e

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

packages/next/src/server/config-shared.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { SubresourceIntegrityAlgorithm } from '../build/webpack/plugins/subresou
1010
import { WEB_VITALS } from '../shared/lib/utils'
1111
import type { NextParsedUrlQuery } from './request-meta'
1212
import { SizeLimit } from '../../types'
13-
import type { ZodError } from 'zod'
1413

1514
export type NextConfigComplete = Required<NextConfig> & {
1615
images: Required<ImageConfigComplete>
@@ -781,18 +780,3 @@ export async function normalizeConfig(phase: string, config: any) {
781780
// Support `new Promise` and `async () =>` as return values of the config export
782781
return await config
783782
}
784-
785-
export function validateConfig(userConfig: NextConfig): ZodError | null {
786-
if (process.env.NEXT_MINIMAL) {
787-
return null
788-
}
789-
790-
const { configSchema } =
791-
require('./config-schema') as typeof import('./config-schema')
792-
const state = configSchema.safeParse(userConfig)
793-
if (state.success) {
794-
return null
795-
}
796-
797-
return state.error
798-
}

packages/next/src/server/config.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
normalizeConfig,
1010
ExperimentalConfig,
1111
NextConfigComplete,
12-
validateConfig,
1312
NextConfig,
1413
TurboLoaderItem,
1514
} from './config-shared'
@@ -955,13 +954,15 @@ export default async function loadConfig(
955954
userConfigModule.default || userConfigModule
956955
)
957956

958-
const validateError = validateConfig(userConfig)
957+
const { configSchema } =
958+
require('./config-schema') as typeof import('./config-schema')
959+
const state = configSchema.safeParse(userConfig)
959960

960-
if (validateError) {
961+
if (!state.success) {
961962
// error message header
962963
const messages = [`Invalid ${configFileName} options detected: `]
963964

964-
const [errorMessages, shouldExit] = normalizeZodErrors(validateError)
965+
const [errorMessages, shouldExit] = normalizeZodErrors(state.error)
965966
// ident list item
966967
for (const error of errorMessages) {
967968
messages.push(` ${error}`)

0 commit comments

Comments
 (0)