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
1 change: 1 addition & 0 deletions .oxfmtrc.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
"test/workspaces-browser/results.json",
"test/e2e/deps/error",
"test/e2e/deps/malformed-source-map",
"test/e2e/deps/optimizer/unparsable",
],
}
15 changes: 9 additions & 6 deletions packages/vitest/src/node/plugins/runnerTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function ModuleRunnerTransform(): VitePlugin {
configEnvironment: {
order: 'post',
handler(name, config) {
if (name === '__vitest_vm__' || name === '__vitest__') {
if (name === '__vitest__') {
return
}
// In browser mode the `client` environment (and any other environment
Expand All @@ -70,6 +70,14 @@ export function ModuleRunnerTransform(): VitePlugin {
return
}

const optimizerOptions =
name === '__vitest_vm__' ? undefined : testConfig?.deps?.optimizer?.[name]
config.optimizeDeps = resolveOptimizerConfig(optimizerOptions, config.optimizeDeps)

if (name === '__vitest_vm__') {
return
}

config.resolve ??= {}

// remove Vite's externalization logic because we have our own (unfortunately)
Expand All @@ -83,11 +91,6 @@ export function ModuleRunnerTransform(): VitePlugin {
// to externalize modules and always resolve static imports
// in both SSR and Client environments
config.resolve.noExternal = true

config.optimizeDeps = resolveOptimizerConfig(
testConfig?.deps?.optimizer?.[name],
config.optimizeDeps,
)
},
},
}
Expand Down
8 changes: 8 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions test/e2e/deps/optimizer/unparsable/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// This package has invalid JavaScript so the test fails if Vite's optimizer
// scans the dependency imported from index.html.
export default function broken(input: {| value: string |}) {
return input.value
}
6 changes: 6 additions & 0 deletions test/e2e/deps/optimizer/unparsable/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@vitest/test-dep-optimizer-unparsable",
"type": "module",
"private": true,
"main": "./index.js"
}
5 changes: 5 additions & 0 deletions test/e2e/fixtures/vm-optimizer/basic.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { expect, test } from 'vitest'

test('unrelated to the index.html graph', () => {
expect(1).toBe(1)
})
2 changes: 2 additions & 0 deletions test/e2e/fixtures/vm-optimizer/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!doctype html>
<html><body><script type="module" src="/main.js"></script></body></html>
1 change: 1 addition & 0 deletions test/e2e/fixtures/vm-optimizer/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import '@vitest/test-dep-optimizer-unparsable'
1 change: 1 addition & 0 deletions test/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@vitest/mocker": "workspace:*",
"@vitest/test-dep-optimizer-external": "file:./deps/optimizer/external",
"@vitest/test-dep-optimizer-optimized": "file:./deps/optimizer/optimized",
"@vitest/test-dep-optimizer-unparsable": "file:./deps/optimizer/unparsable",
"@vitest/utils": "workspace:*",
"ansivision": "catalog:",
"flatted": "catalog:",
Expand Down
21 changes: 21 additions & 0 deletions test/e2e/test/vm-optimizer.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { expect, test } from 'vitest'
import { runVitest } from '../../test-utils'

test.for(['forks', 'threads', 'vmThreads', 'vmForks'])(
'does not optimize dependencies discovered from index.html - %s',
async (pool) => {
const { stderr, testTree } = await runVitest({
root: './fixtures/vm-optimizer',
pool,
})

expect(stderr).toBe('')
expect(testTree()).toMatchInlineSnapshot(`
{
"basic.test.ts": {
"unrelated to the index.html graph": "passed",
},
}
`)
},
)
Loading