Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: optimize dependencies in setup files #2935

Merged
merged 2 commits into from
Feb 28, 2023
Merged

fix: optimize dependencies in setup files #2935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1617f03
fix: optimize dependencies in setup files
sheremet-va Feb 28, 2023
6ac2e81
chore: cleanup
sheremet-va Feb 28, 2023
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
6 changes: 6 additions & 0 deletions packages/vitest/src/node/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ export class Vitest {
return deepMerge<ResolvedConfig>({
...this.config,
reporters: [],
deps: {
...this.config.deps,
experimentalOptimizer: {
enabled: this.config.deps?.experimentalOptimizer?.enabled ?? false,
},
},
snapshotOptions: {
...this.config.snapshotOptions,
resolveSnapshotPath: undefined,
Expand Down
19 changes: 16 additions & 3 deletions packages/vitest/src/node/plugins/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { builtinModules } from 'node:module'
import type { UserConfig as ViteConfig, Plugin as VitePlugin } from 'vite'
import { relative } from 'pathe'
import { normalize, relative, resolve } from 'pathe'
import { toArray } from '@vitest/utils'
import { resolveModule } from 'local-pkg'
import { configDefaults } from '../../defaults'
import type { ResolvedConfig, UserConfig } from '../../types'
import { deepMerge, notNullish, removeUndefinedValues } from '../../utils'
Expand Down Expand Up @@ -150,14 +153,24 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t
}
}
else {
const entries = await ctx.globAllTestFiles(preOptions as ResolvedConfig, preOptions.dir || getRoot())
const root = config.root || process.cwd()
const entries = await ctx.globAllTestFiles(preOptions as ResolvedConfig, preOptions.dir || root)
if (preOptions?.setupFiles) {
const setupFiles = toArray(preOptions.setupFiles).map((file: string) =>
normalize(
resolveModule(file, { paths: [root] })
?? resolve(root, file),
),
)
entries.push(...setupFiles)
}
optimizeConfig.cacheDir = preOptions.cache?.dir ?? 'node_modules/.vitest'
optimizeConfig.optimizeDeps = {
...viteConfig.optimizeDeps,
...optimizer,
disabled: false,
entries: [...(optimizer.entries || viteConfig.optimizeDeps?.entries || []), ...entries],
exclude: ['vitest', ...(optimizer.exclude || viteConfig.optimizeDeps?.exclude || [])],
exclude: ['vitest', ...builtinModules, ...(optimizer.exclude || viteConfig.optimizeDeps?.exclude || [])],
include: (optimizer.include || viteConfig.optimizeDeps?.include || []).filter((n: string) => n !== 'vitest'),
}
// Vite throws an error that it cannot rename "deps_temp", but optimization still works
Expand Down