From ae7164737c87f6095d8063ed9db0d1eab09d0112 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Mon, 21 Feb 2022 22:33:33 +0800 Subject: [PATCH 1/2] fix: add config.d.ts && change defineConfig function type --- packages/vitest/config.d.ts | 1 + packages/vitest/src/config.ts | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/vitest/config.d.ts diff --git a/packages/vitest/config.d.ts b/packages/vitest/config.d.ts new file mode 100644 index 000000000000..0fe54cfd876a --- /dev/null +++ b/packages/vitest/config.d.ts @@ -0,0 +1 @@ +export * from "./dist/config"; diff --git a/packages/vitest/src/config.ts b/packages/vitest/src/config.ts index ca7f01e85ea9..19634f43b1be 100644 --- a/packages/vitest/src/config.ts +++ b/packages/vitest/src/config.ts @@ -1,6 +1,11 @@ import type { UserConfig } from 'vite' +import type { InlineConfig } from './types' + +interface UserConfig$1 extends UserConfig { + test?: InlineConfig +} export { configDefaults } from './defaults' -export function defineConfig(config: UserConfig) { +export function defineConfig(config: UserConfig$1) { return config } From 939fcc986152a811bed52df29c36c593784844c6 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 22 Feb 2022 13:11:12 +0800 Subject: [PATCH 2/2] chore: update --- packages/vitest/config.d.ts | 2 +- packages/vitest/package.json | 2 +- packages/vitest/src/config.ts | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/vitest/config.d.ts b/packages/vitest/config.d.ts index 0fe54cfd876a..2837ab8a73aa 100644 --- a/packages/vitest/config.d.ts +++ b/packages/vitest/config.d.ts @@ -1 +1 @@ -export * from "./dist/config"; +export * from './dist/config' diff --git a/packages/vitest/package.json b/packages/vitest/package.json index 7d14b933ecaa..680a32ec7034 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -39,7 +39,7 @@ "./config": { "import": "./dist/config.js", "require": "./dist/config.cjs", - "types": "./dist/config.d.ts" + "types": "./config.d.ts" } }, "main": "./dist/index.js", diff --git a/packages/vitest/src/config.ts b/packages/vitest/src/config.ts index 19634f43b1be..ddd587d8fcbc 100644 --- a/packages/vitest/src/config.ts +++ b/packages/vitest/src/config.ts @@ -1,11 +1,12 @@ -import type { UserConfig } from 'vite' +import type { UserConfig as ViteUserConfig } from 'vite' import type { InlineConfig } from './types' -interface UserConfig$1 extends UserConfig { +export interface UserConfig extends ViteUserConfig { test?: InlineConfig } export { configDefaults } from './defaults' -export function defineConfig(config: UserConfig$1) { + +export function defineConfig(config: UserConfig) { return config }