Skip to content

Commit fa66d6e

Browse files
committed
chore: conflict
1 parent ed8a96e commit fa66d6e

File tree

1 file changed

+0
-12
lines changed
  • packages/vitest/src/node/plugins

1 file changed

+0
-12
lines changed

packages/vitest/src/node/plugins/index.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@ export async function VitestPlugin(
125125
// https://github.com/vitejs/vite/pull/16453
126126
emptyOutDir: false,
127127
},
128-
// eslint-disable-next-line ts/ban-ts-comment
129-
// @ts-ignore Vite 6 compat
130-
environments: {
131-
ssr: {
132-
resolve: {
133-
// by default Vite resolves `module` field, which not always a native ESM module
134-
// setting this option can bypass that and fallback to cjs version
135-
mainFields: [],
136-
conditions: ['node'],
137-
},
138-
},
139-
},
140128
test: {
141129
poolOptions: {
142130
threads: {

0 commit comments

Comments
 (0)