From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 18 Aug 2023 03:34:12 +0000 (+0800)
Subject: chore: import both `mergeConfig` and `defineConfig` from `vitest/config`
X-Git-Tag: v3.7.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d84088282ed3bae203974ec3514da7f4dc1bce;p=thirdparty%2Fvuejs%2Fcreate-vue.git

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.
---

diff --git a/template/config/vitest/vitest.config.js b/template/config/vitest/vitest.config.js
index 7b502be7..10067d57 100644
--- a/template/config/vitest/vitest.config.js
+++ b/template/config/vitest/vitest.config.js
@@ -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(