Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions packages/vitest/src/node/plugins/runnerTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ export function ModuleRunnerTransform(): VitePlugin {
config.environments[name] ??= {}

const environment = config.environments[name]
// other environments consumed by the browser are not run by Vitest
if (browserEnabled && name !== 'client' && environment.consumer === 'client') {
continue
}
environment.dev ??= {}
// vm tests run using the native import mechanism
if (name === '__vitest_vm__') {
Expand All @@ -58,10 +62,11 @@ export function ModuleRunnerTransform(): VitePlugin {
if (name === '__vitest_vm__' || name === '__vitest__') {
return
}
// In browser mode the `client` environment is browser-managed: don't
// apply node-runner externalization / `optimizeDeps` to it (that would
// discard the browser `optimizeDeps.include`, e.g. `vitest > expect-type`).
if (name === 'client' && testConfig.browser?.enabled) {
// In browser mode the `client` environment (and any other environment
// consumed by the browser) is browser-managed: don't apply node-runner
// externalization / `optimizeDeps` to it (that would discard the browser
// `optimizeDeps.include`, e.g. `vitest > expect-type`).
if (testConfig.browser?.enabled && (name === 'client' || config.consumer === 'client')) {
return
}

Expand Down
29 changes: 29 additions & 0 deletions test/e2e/test/config/browser-configs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,35 @@ test('pre-bundles vite module runner through vitest in browser mode', async () =
expect(v.vite.config.optimizeDeps.exclude).not.toContain('vite/module-runner')
})

test('keeps the config of other browser-consumed environments in browser mode', async () => {
const v = await vitest({
browser: {
enabled: true,
provider: preview(),
instances: [{ browser: 'chromium' }],
},
$viteConfig: {
environments: {
page_runner: {
consumer: 'client',
dev: { moduleRunnerTransform: true, preTransformRequests: true },
optimizeDeps: { include: ['react'] },
},
},
},
})

const { page_runner, ssr } = v.vite.config.environments
expect(page_runner.dev.preTransformRequests).toBe(true)
expect(page_runner.keepProcessEnv).toBe(false)
expect(page_runner.resolve.noExternal).not.toBe(true)
expect(page_runner.optimizeDeps.noDiscovery).toBe(false)
expect(page_runner.optimizeDeps.include).toEqual(['react'])
// environments that Vitest runs on the server keep the node-runner config
expect(ssr.optimizeDeps.noDiscovery).toBe(true)
expect(ssr.resolve.noExternal).toBe(true)
})

test('disables pre-transform requests in node mode', async () => {
expect(await observePreTransformRequests()).toEqual({
client: false,
Expand Down
Loading