fix: use ssr.resolve.conditions on Vite 6

vitest-dev · Jan 21, 2025 · 9ef7071 · 9ef7071
1 parent 62bb62e
commit 9ef7071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/vitest/src/node/pool.ts b/packages/vitest/src/node/pool.ts
@@ -93,10 +93,13 @@ export function createPool(ctx: Vitest): ProcessPool {
   // in addition to resolve.conditions Vite also adds production/development,
   // see: https://github.com/vitejs/vite/blob/af2aa09575229462635b7cbb6d248ca853057ba2/packages/vite/src/node/plugins/resolve.ts#L1056-L1080
   const viteMajor = Number(viteVersion.split('.')[0])
-  const potentialConditions = new Set([
-    ...viteMajor >= 6 ? [] : ['production', 'development'],
-    ...ctx.vite.config.resolve.conditions,
-  ])
+  const potentialConditions = new Set(viteMajor >= 6
+    ? (ctx.vite.config.ssr.resolve?.conditions ?? [])
+    : [
+        'production',
+        'development',
+        ...ctx.vite.config.resolve.conditions,
+      ])
   const conditions = [...potentialConditions]
     .filter((condition) => {
       if (condition === 'production') {

diff --git a/test/config/test/conditions-cli.test.ts b/test/config/test/conditions-cli.test.ts
@@ -53,6 +53,11 @@ test('correctly imports external dependencies with a custom condition', async ()
     resolve: {
       conditions: ['custom'],
     },
+    ssr: {
+      resolve: {
+        conditions: ['custom'],
+      },
+    },
     define: {
       TEST_CONDITION: '"custom"',
     },