From b948832388366c040d7dc7bad30a7daa513c11c3 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 25 Jul 2023 01:33:12 +0800 Subject: [PATCH] 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 --- template/config/vitest/vitest.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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( -- 2.39.5