From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Mon, 24 Jul 2023 17:33:12 +0000 (+0800)
Subject: fix: work around vitest `mergeConfig`/`defineConfig` type issues
X-Git-Tag: v3.7.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b948832388366c040d7dc7bad30a7daa513c11c3;p=thirdparty%2Fvuejs%2Fcreate-vue.git

fix: work around vitest `mergeConfig`/`defineConfig` type issues

Until https://github.com/vitest-dev/vitest/pull/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
---

diff --git a/template/config/vitest/vitest.config.js b/template/config/vitest/vitest.config.js
index 36c66434..42638b25 100644
--- a/template/config/vitest/vitest.config.js
+++ b/template/config/vitest/vitest.config.js
@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url'
-import { mergeConfig } from 'vite'
-import { configDefaults, defineConfig } from 'vitest/config'
+import { mergeConfig, defineConfig } from 'vite'
+import { configDefaults } from 'vitest/config'
 import viteConfig from './vite.config'
 
 export default mergeConfig(