chore: conflict

vitest-dev · Nov 14, 2024 · e6ee7ac · e6ee7ac
1 parent ed8a96e
commit e6ee7ac
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
@@ -94,18 +94,6 @@ export async function VitestPlugin(
             alias: testConfig.alias,
             conditions: ['node'],
           },
-          // eslint-disable-next-line ts/ban-ts-comment
-          // @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'],
-              },
-            },
-          },
           server: {
             ...testConfig.api,
             open,

diff --git a/packages/vitest/src/node/plugins/workspace.ts b/packages/vitest/src/node/plugins/workspace.ts
@@ -71,18 +71,6 @@ export function WorkspaceVitestPlugin(
             alias: testConfig.alias,
             conditions: ['node'],
           },
-          // eslint-disable-next-line ts/ban-ts-comment
-          // @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'],
-              },
-            },
-          },
           esbuild: viteConfig.esbuild === false
             ? false
             : {