Revert "fix: re-apply default conditions if using vite 6 or later (#7071

)" (#7271)
vitest-dev · Jan 16, 2025 · 755ecdf · 755ecdf
1 parent 74fe67c
commit 755ecdf
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 83 deletions.
diff --git a/packages/vitest/src/node/plugins/conditions.ts b/packages/vitest/src/node/plugins/conditions.ts
diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
@@ -12,7 +12,6 @@ import { generateScopedClassName } from '../../integrations/css/css-modules'
 import { resolveApiServerConfig } from '../config/resolveConfig'
 import { Vitest } from '../core'
 import { createViteLogger, silenceImportViteIgnoreWarning } from '../viteLogger'
-import { getDefaultServerConditions } from './conditions'
 import { CoverageTransform } from './coverageTransform'
 import { CSSEnablerPlugin } from './cssEnabler'
 import { MocksPlugins } from './mocks'
@@ -74,8 +73,6 @@ export async function VitestPlugin(
           open = testConfig.uiBase ?? '/__vitest__/'
         }
 
-        const conditions = getDefaultServerConditions()
-
         const config: ViteConfig = {
           root: viteConfig.test?.root || options.root,
           esbuild:
@@ -93,7 +90,7 @@ export async function VitestPlugin(
             // setting this option can bypass that and fallback to cjs version
             mainFields: [],
             alias: testConfig.alias,
-            conditions,
+            conditions: ['node'],
           },
           server: {
             ...testConfig.api,
@@ -122,7 +119,7 @@ export async function VitestPlugin(
                 // by default Vite resolves `module` field, which not always a native ESM module
                 // setting this option can bypass that and fallback to cjs version
                 mainFields: [],
-                conditions,
+                conditions: ['node'],
               },
             },
           },

diff --git a/packages/vitest/src/node/plugins/workspace.ts b/packages/vitest/src/node/plugins/workspace.ts
@@ -7,7 +7,6 @@ import { basename, dirname, relative, resolve } from 'pathe'
 import { configDefaults } from '../../defaults'
 import { generateScopedClassName } from '../../integrations/css/css-modules'
 import { createViteLogger, silenceImportViteIgnoreWarning } from '../viteLogger'
-import { getDefaultServerConditions } from './conditions'
 import { CoverageTransform } from './coverageTransform'
 import { CSSEnablerPlugin } from './cssEnabler'
 import { MocksPlugins } from './mocks'
@@ -63,16 +62,14 @@ export function WorkspaceVitestPlugin(
           }
         }
 
-        const conditions = getDefaultServerConditions()
-
         const config: ViteConfig = {
           root,
           resolve: {
             // by default Vite resolves `module` field, which not always a native ESM module
             // setting this option can bypass that and fallback to cjs version
             mainFields: [],
             alias: testConfig.alias,
-            conditions,
+            conditions: ['node'],
           },
           esbuild: viteConfig.esbuild === false
             ? false
@@ -107,7 +104,7 @@ export function WorkspaceVitestPlugin(
                 // by default Vite resolves `module` field, which not always a native ESM module
                 // setting this option can bypass that and fallback to cjs version
                 mainFields: [],
-                conditions,
+                conditions: ['node'],
               },
             },
           },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/config/deps/test-dep-conditions/default.js b/test/config/deps/test-dep-conditions/default.js
diff --git a/test/config/deps/test-dep-conditions/module.js b/test/config/deps/test-dep-conditions/module.js
diff --git a/test/config/deps/test-dep-conditions/node.js b/test/config/deps/test-dep-conditions/node.js
diff --git a/test/config/deps/test-dep-conditions/package.json b/test/config/deps/test-dep-conditions/package.json
diff --git a/test/config/fixtures/conditions-subpackage/module.js b/test/config/fixtures/conditions-subpackage/module.js
diff --git a/test/config/fixtures/default-conditions/default-conditions.test.js b/test/config/fixtures/default-conditions/default-conditions.test.js
diff --git a/test/config/fixtures/default-conditions/vitest.config.ts b/test/config/fixtures/default-conditions/vitest.config.ts
diff --git a/test/config/package.json b/test/config/package.json
@@ -6,7 +6,6 @@
     "test": "vitest --typecheck.enabled"
   },
   "devDependencies": {
-    "@vitest/test-dep-conditions": "file:./deps/test-dep-conditions",
     "tinyexec": "^0.3.2",
     "vite": "latest",
     "vitest": "workspace:*"

diff --git a/test/config/test/default-conditions.test.ts b/test/config/test/default-conditions.test.ts