Skip to content

Commit 294a84e

Browse files
committed
fix: backcompat merging
1 parent 62921e6 commit 294a84e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

packages/vite/src/node/config.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -860,11 +860,11 @@ export async function resolveConfig(
860860
// TODO: should entries and force be in EnvironmentOptions?
861861
const { entries, force, ...deprecatedClientOptimizeDepsConfig } =
862862
config.optimizeDeps ?? {}
863-
let configEnvironmentsClient = config.environments!.client!
863+
const configEnvironmentsClient = config.environments!.client!
864864
configEnvironmentsClient.dev ??= {}
865865
configEnvironmentsClient.dev.optimizeDeps = mergeConfig(
866-
configEnvironmentsClient.dev.optimizeDeps ?? {},
867866
deprecatedClientOptimizeDepsConfig,
867+
configEnvironmentsClient.dev.optimizeDeps ?? {},
868868
)
869869

870870
const deprecatedSsrOptimizeDepsConfig = config.ssr?.optimizeDeps ?? {}
@@ -885,8 +885,8 @@ export async function resolveConfig(
885885
if (configEnvironmentsSsr) {
886886
configEnvironmentsSsr.dev ??= {}
887887
configEnvironmentsSsr.dev.optimizeDeps = mergeConfig(
888-
configEnvironmentsSsr.dev.optimizeDeps ?? {},
889888
deprecatedSsrOptimizeDepsConfig,
889+
configEnvironmentsSsr.dev.optimizeDeps ?? {},
890890
)
891891
// TODO: should we merge here?
892892
configEnvironmentsSsr.resolve ??= {}
@@ -946,10 +946,10 @@ export async function resolveConfig(
946946
)
947947

948948
// Backward compatibility: merge environments.client.dev.optimizeDeps back into optimizeDeps
949-
configEnvironmentsClient = resolvedEnvironments.client
949+
const resolvedConfigEnvironmentsClient = resolvedEnvironments.client
950950
const patchedOptimizeDeps = mergeConfig(
951-
configEnvironmentsClient.dev?.optimizeDeps ?? {},
952951
config.optimizeDeps ?? {},
952+
resolvedConfigEnvironmentsClient.dev?.optimizeDeps ?? {},
953953
)
954954
const backwardCompatibleOptimizeDeps = {
955955
holdUntilCrawlEnd: true,

0 commit comments

Comments
 (0)