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

chore: set resolve.mainFields and resolve.conditions for SSR environment #6896

Merged
merged 4 commits into from
Nov 13, 2024
Merged

chore: set resolve.mainFields and resolve.conditions for SSR environment #6896

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ca9e04
chore: set `resolve.mainFields` and `resolve.conditions` for SSR envi…
sapphi-red Nov 12, 2024
bfa17d8
chore: add it to workspace plugin too
sapphi-red Nov 13, 2024
80f87af
chore: use ts-ignore
sapphi-red Nov 13, 2024
45c904b
chore: fix format
sapphi-red Nov 13, 2024
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
12 changes: 12 additions & 0 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 @@ -113,6 +113,18 @@
// https://github.com/vitejs/vite/pull/16453
emptyOutDir: false,
},
// eslint-disable-next-line ts/ban-ts-comment

Check failure on line 116 in packages/vitest/src/node/plugins/index.ts

View workflow job for this annotation

GitHub Actions / Lint: node-latest, ubuntu-latest 

Trailing spaces not allowed
sapphi-red marked this conversation as resolved.
Show resolved Hide resolved
// @ts-ignore Vite 6 compat
environments: {
sapphi-red marked this conversation as resolved.
Show resolved Hide resolved
ssr: {
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: [],
conditions: ['node'],
},
},
},
test: {
poolOptions: {
threads: {
Expand Down
12 changes: 12 additions & 0 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 @@ -96,6 +96,18 @@
),
},
},
// eslint-disable-next-line ts/ban-ts-comment

Check failure on line 99 in packages/vitest/src/node/plugins/workspace.ts

View workflow job for this annotation

GitHub Actions / Lint: node-latest, ubuntu-latest 

Trailing spaces not allowed
sapphi-red marked this conversation as resolved.
Show resolved Hide resolved
// @ts-ignore Vite 6 compat
environments: {
ssr: {
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: [],
conditions: ['node'],
},
},
},
test: {
name,
},
Expand Down
Loading