Commit 10d8408

committed

chore: import both mergeConfig and defineConfig from vitest/config

With the typing fix in Vitest 0.34, it is again possible to use `defineConfig` and `mergeConfig` from the `vitest` package.

1 parent 653f953 commit 10d8408Copy full SHA for 10d8408

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import { fileURLToPath } from 'node:url'`
`2`		`-import { mergeConfig, defineConfig } from 'vite'`
`3`		`-import { configDefaults } from 'vitest/config'`
	`2`	`+import { mergeConfig, defineConfig, configDefaults } from 'vitest/config'`
`4`	`3`	`import viteConfig from './vite.config'`
`5`	`4`
`6`	`5`	`export default mergeConfig(`

Comments

(0)