Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 16, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions packages/vitest/src/node/plugins/conditions.ts
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions packages/vitest/src/node/plugins/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand All @@ -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,
Expand Down Expand Up @@ -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'],
},
},
},
Expand Down
7 changes: 2 additions & 5 deletions packages/vitest/src/node/plugins/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'],
},
},
},
Expand Down
8 changes: 0 additions & 8 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion test/config/deps/test-dep-conditions/default.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/config/deps/test-dep-conditions/module.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/config/deps/test-dep-conditions/node.js
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions test/config/deps/test-dep-conditions/package.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/config/fixtures/conditions-subpackage/module.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/config/fixtures/default-conditions/default-conditions.test.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions test/config/fixtures/default-conditions/vitest.config.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*"
Expand Down
23 changes: 0 additions & 23 deletions test/config/test/default-conditions.test.ts
View file
Open in desktop

This file was deleted.

Loading