fix: merge back client too

vitejs · Dec 2, 2024 · e686c7d · e686c7d
1 parent 0aae189
commit e686c7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/vite/src/node/__tests__/config.spec.ts b/packages/vite/src/node/__tests__/config.spec.ts
@@ -398,6 +398,7 @@ test('ssr config compat', async () => {
   expect(config.resolve.conditions).toMatchInlineSnapshot(`
     [
       "client1",
+      "client2",
     ]
   `)
   expect(config.environments.client.resolve.conditions).toMatchInlineSnapshot(`

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -1149,6 +1149,11 @@ export async function resolveConfig(
     config.ssr?.target === 'webworker',
   )
 
+  // Backward compatibility: merge config.environments.client.resolve back into config.resolve
+  config.resolve ??= {}
+  config.resolve.conditions = config.environments.client.resolve?.conditions
+  config.resolve.mainFields = config.environments.client.resolve?.mainFields
+
   const resolvedDefaultResolve = resolveResolveOptions(config.resolve, logger)
 
   const resolvedEnvironments: Record<string, ResolvedEnvironmentOptions> = {}