Skip to content

Commit 755ecdf

Browse files
authored
Revert "fix: re-apply default conditions if using vite 6 or later (#7071)" (#7271)
1 parent 74fe67c commit 755ecdf

File tree

13 files changed

+4
-83
lines changed

13 files changed

+4
-83
lines changed

Diff for: packages/vitest/src/node/plugins/conditions.ts

-16
This file was deleted.

Diff for: packages/vitest/src/node/plugins/index.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { generateScopedClassName } from '../../integrations/css/css-modules'
1212
import { resolveApiServerConfig } from '../config/resolveConfig'
1313
import { Vitest } from '../core'
1414
import { createViteLogger, silenceImportViteIgnoreWarning } from '../viteLogger'
15-
import { getDefaultServerConditions } from './conditions'
1615
import { CoverageTransform } from './coverageTransform'
1716
import { CSSEnablerPlugin } from './cssEnabler'
1817
import { MocksPlugins } from './mocks'
@@ -74,8 +73,6 @@ export async function VitestPlugin(
7473
open = testConfig.uiBase ?? '/__vitest__/'
7574
}
7675

77-
const conditions = getDefaultServerConditions()
78-
7976
const config: ViteConfig = {
8077
root: viteConfig.test?.root || options.root,
8178
esbuild:
@@ -93,7 +90,7 @@ export async function VitestPlugin(
9390
// setting this option can bypass that and fallback to cjs version
9491
mainFields: [],
9592
alias: testConfig.alias,
96-
conditions,
93+
conditions: ['node'],
9794
},
9895
server: {
9996
...testConfig.api,
@@ -122,7 +119,7 @@ export async function VitestPlugin(
122119
// by default Vite resolves `module` field, which not always a native ESM module
123120
// setting this option can bypass that and fallback to cjs version
124121
mainFields: [],
125-
conditions,
122+
conditions: ['node'],
126123
},
127124
},
128125
},

Diff for: packages/vitest/src/node/plugins/workspace.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { basename, dirname, relative, resolve } from 'pathe'
77
import { configDefaults } from '../../defaults'
88
import { generateScopedClassName } from '../../integrations/css/css-modules'
99
import { createViteLogger, silenceImportViteIgnoreWarning } from '../viteLogger'
10-
import { getDefaultServerConditions } from './conditions'
1110
import { CoverageTransform } from './coverageTransform'
1211
import { CSSEnablerPlugin } from './cssEnabler'
1312
import { MocksPlugins } from './mocks'
@@ -63,16 +62,14 @@ export function WorkspaceVitestPlugin(
6362
}
6463
}
6564

66-
const conditions = getDefaultServerConditions()
67-
6865
const config: ViteConfig = {
6966
root,
7067
resolve: {
7168
// by default Vite resolves `module` field, which not always a native ESM module
7269
// setting this option can bypass that and fallback to cjs version
7370
mainFields: [],
7471
alias: testConfig.alias,
75-
conditions,
72+
conditions: ['node'],
7673
},
7774
esbuild: viteConfig.esbuild === false
7875
? false
@@ -107,7 +104,7 @@ export function WorkspaceVitestPlugin(
107104
// by default Vite resolves `module` field, which not always a native ESM module
108105
// setting this option can bypass that and fallback to cjs version
109106
mainFields: [],
110-
conditions,
107+
conditions: ['node'],
111108
},
112109
},
113110
},

Diff for: pnpm-lock.yaml

-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: test/config/deps/test-dep-conditions/default.js

-1
This file was deleted.

Diff for: test/config/deps/test-dep-conditions/module.js

-1
This file was deleted.

Diff for: test/config/deps/test-dep-conditions/node.js

-1
This file was deleted.

Diff for: test/config/deps/test-dep-conditions/package.json

-12
This file was deleted.

Diff for: test/config/fixtures/conditions-subpackage/module.js

-1
This file was deleted.

Diff for: test/config/fixtures/default-conditions/default-conditions.test.js

-6
This file was deleted.

Diff for: test/config/fixtures/default-conditions/vitest.config.ts

-3
This file was deleted.

Diff for: test/config/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"test": "vitest --typecheck.enabled"
77
},
88
"devDependencies": {
9-
"@vitest/test-dep-conditions": "file:./deps/test-dep-conditions",
109
"tinyexec": "^0.3.2",
1110
"vite": "latest",
1211
"vitest": "workspace:*"

Diff for: test/config/test/default-conditions.test.ts

-23
This file was deleted.

0 commit comments

Comments
 (0)