Skip to content

Commit b948832

Browse files
committed
fix: work around vitest mergeConfig/defineConfig type issues
Until vitest-dev/vitest#3804 is merged and released, we can work around the issue by using the exports from `vite`, they are identical anyway. In later versions, we should import both `mergeConfig` and `defineConfig` from `vitest`, though, to better align with their official documentation. Fixes #313 Fixes #317
1 parent f0e47a6 commit b948832

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: template/config/vitest/vitest.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fileURLToPath } from 'node:url'
2-
import { mergeConfig } from 'vite'
3-
import { configDefaults, defineConfig } from 'vitest/config'
2+
import { mergeConfig, defineConfig } from 'vite'
3+
import { configDefaults } from 'vitest/config'
44
import viteConfig from './vite.config'
55

66
export default mergeConfig(

0 commit comments

Comments
 (0)