From 10d84088282ed3bae203974ec3514da7f4dc1bce Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 18 Aug 2023 11:34:12 +0800 Subject: [PATCH] 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. --- template/config/vitest/vitest.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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( -- 2.39.5