Skip to content

Commit 9363872

Browse files
authored
chore: fix test optimizeDeps at build time flag (#9004)
1 parent 70af44a commit 9363872

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

packages/vite/src/node/config.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,15 @@ export async function resolveConfig(
427427
}
428428
}
429429

430+
if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
431+
config = mergeConfig(config, {
432+
optimizeDeps: { disabled: false },
433+
ssr: { optimizeDeps: { disabled: false } }
434+
})
435+
config.build ??= {}
436+
config.build.commonjsOptions = { include: [] }
437+
}
438+
430439
// resolve root
431440
const resolvedRoot = normalizePath(
432441
config.root ? path.resolve(config.root) : process.cwd()
@@ -563,16 +572,6 @@ export async function resolveConfig(
563572

564573
const optimizeDeps = config.optimizeDeps || {}
565574

566-
if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
567-
config.build ??= {}
568-
config.build.commonjsOptions = { include: [] }
569-
config.optimizeDeps ??= {}
570-
config.optimizeDeps.disabled = false
571-
config.ssr ??= {}
572-
config.ssr.optimizeDeps ??= {}
573-
config.ssr.optimizeDeps.disabled = false
574-
}
575-
576575
const BASE_URL = resolvedBase
577576

578577
const resolved: ResolvedConfig = {

0 commit comments

Comments
 (0)