From c597a63b34c0b6820d0467acbd3f91881ac8bc4b Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Mon, 30 Dec 2024 17:21:31 +0900
Subject: [PATCH 1/3] fix: fix missing chai types

---
 packages/vitest/src/integrations/chai/config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/vitest/src/integrations/chai/config.ts b/packages/vitest/src/integrations/chai/config.ts
index c101a1df2c74..fe3ffe294c3d 100644
--- a/packages/vitest/src/integrations/chai/config.ts
+++ b/packages/vitest/src/integrations/chai/config.ts
@@ -1,3 +1,5 @@
+// ensure `@vitest/expect` provides `chai` types
+import type {} from '@vitest/expect'
 import * as chai from 'chai'
 
 export function setupChaiConfig(config: ChaiConfig) {

From 4b807b9a50d7ad6276d1eca507ba71cb090b2c2f Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Mon, 30 Dec 2024 17:29:04 +0900
Subject: [PATCH 2/3] test: add test

---
 pnpm-lock.yaml                 |  6 ++++++
 test/dts-config/package.json   | 11 +++++++++++
 test/dts-config/tsconfig.json  | 11 +++++++++++
 test/dts-config/vite.config.ts |  3 +++
 4 files changed, 31 insertions(+)
 create mode 100644 test/dts-config/package.json
 create mode 100644 test/dts-config/tsconfig.json
 create mode 100644 test/dts-config/vite.config.ts

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d6e1d2b8bde..24deed4ca076 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1274,6 +1274,12 @@ importers:
         specifier: latest
         version: 9.4.5
 
+  test/dts-config:
+    devDependencies:
+      vitest:
+        specifier: workspace:*
+        version: link:../../packages/vitest
+
   test/dts-fixture:
     devDependencies:
       vitest:
diff --git a/test/dts-config/package.json b/test/dts-config/package.json
new file mode 100644
index 000000000000..b2e5baf2142f
--- /dev/null
+++ b/test/dts-config/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@vitest/test-dts-config",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "test": "tsc -b"
+  },
+  "devDependencies": {
+    "vitest": "workspace:*"
+  }
+}
diff --git a/test/dts-config/tsconfig.json b/test/dts-config/tsconfig.json
new file mode 100644
index 000000000000..7d66e7d2d2e0
--- /dev/null
+++ b/test/dts-config/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "types": [],
+    "strict": true,
+    "noEmit": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/test/dts-config/vite.config.ts b/test/dts-config/vite.config.ts
new file mode 100644
index 000000000000..abed6b2116e1
--- /dev/null
+++ b/test/dts-config/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({})

From 82ee70b91fc233b4c05980a4c1dbaac41f0fec67 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Mon, 30 Dec 2024 17:34:34 +0900
Subject: [PATCH 3/3] fix: tweak

---
 packages/vitest/config.d.ts                     | 2 ++
 packages/vitest/src/integrations/chai/config.ts | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vitest/config.d.ts b/packages/vitest/config.d.ts
index a11119b4fcbf..36afa874abb3 100644
--- a/packages/vitest/config.d.ts
+++ b/packages/vitest/config.d.ts
@@ -1 +1,3 @@
+// ensure `@vitest/expect` provides `chai` types
+import type {} from '@vitest/expect'
 export * from './dist/config.js'
diff --git a/packages/vitest/src/integrations/chai/config.ts b/packages/vitest/src/integrations/chai/config.ts
index fe3ffe294c3d..c101a1df2c74 100644
--- a/packages/vitest/src/integrations/chai/config.ts
+++ b/packages/vitest/src/integrations/chai/config.ts
@@ -1,5 +1,3 @@
-// ensure `@vitest/expect` provides `chai` types
-import type {} from '@vitest/expect'
 import * as chai from 'chai'
 
 export function setupChaiConfig(config: ChaiConfig) {