Skip to content

Commit

Permalink
chore: import both mergeConfig and defineConfig from vitest/config
Browse files Browse the repository at this point in the history
With the typing fix in Vitest 0.34, it is again possible to use
`defineConfig` and `mergeConfig` from the `vitest` package.
  • Loading branch information
haoqunjiang committed Aug 18, 2023
1 parent 653f953 commit 10d8408
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions template/config/vitest/vitest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { fileURLToPath } from 'node:url'
import { mergeConfig, defineConfig } from 'vite'
import { configDefaults } from 'vitest/config'
import { mergeConfig, defineConfig, configDefaults } from 'vitest/config'
import viteConfig from './vite.config'

export default mergeConfig(
Expand Down

0 comments on commit 10d8408

Please sign in to comment.