diff --git a/package.json b/package.json index 0704bdc7081142..8ef5b2d811cc05 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "test": "run-s test-unit test-serve test-build", "test-serve": "vitest run -c vitest.config.e2e.ts", "test-build": "cross-env VITE_TEST_BUILD=1 vitest run -c vitest.config.e2e.ts", - "test-build-legacy-cjs": "cross-env VITE_TEST_LEGACY_CJS_PLUGIN=1 pnpm test-build", + "test-build-without-plugin-commonjs": "cross-env VITE_TEST_WITHOUT_PLUGIN_COMMONJS=1 pnpm test-build", "test-unit": "vitest run", "test-docs": "pnpm run docs-build", "debug-serve": "cross-env VITE_DEBUG_SERVE=1 vitest run -c vitest.config.e2e.ts", diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 06cb3223077191..8112d7f624edff 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -563,7 +563,7 @@ export async function resolveConfig( const optimizeDeps = config.optimizeDeps || {} - if (process.env.VITE_TEST_DISABLING_CJS_PLUGIN) { + if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) { config.build ??= {} config.build.commonjsOptions = { include: [] } config.optimizeDeps ??= {} diff --git a/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/playground/optimize-deps/__tests__/optimize-deps.spec.ts index b0af6debca526e..a62b4525e057be 100644 --- a/playground/optimize-deps/__tests__/optimize-deps.spec.ts +++ b/playground/optimize-deps/__tests__/optimize-deps.spec.ts @@ -105,14 +105,11 @@ test('vue + vuex', async () => { // When we use the Rollup CommonJS plugin instead of esbuild prebundling, // the esbuild plugins won't apply to dependencies -test.skipIf(isBuild && process.env.VITE_TEST_LEGACY_CJS_PLUGIN)( - 'esbuild-plugin', - async () => { - expect(await page.textContent('.esbuild-plugin')).toMatch( - `Hello from an esbuild plugin` - ) - } -) +test('esbuild-plugin', async () => { + expect(await page.textContent('.esbuild-plugin')).toMatch( + `Hello from an esbuild plugin` + ) +}) test('import from hidden dir', async () => { expect(await page.textContent('.hidden-dir')).toBe('hello!')