fix(vitest): inline chai types instead of using @types/chai (#4209)

package.json

@@ -82,6 +82,9 @@
       "ignoreMissing": [
         "@algolia/client-search"
       ]
+    },
+    "patchedDependencies": {
+      "@types/chai@4.3.6": "patches/@types__chai@4.3.6.patch"
     }
   },
   "simple-git-hooks": {

packages/expect/index.d.ts

@@ -0,0 +1,3 @@
+import './dist/chai'
+
+export * from './dist/index'

packages/expect/package.json

@@ -17,14 +17,14 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./index.d.ts",
       "import": "./dist/index.js"
     },
     "./*": "./*"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "types": "./index.d.ts",
   "files": [
     "dist"
   ],
@@ -39,7 +39,9 @@
     "chai": "^4.3.10"
   },
   "devDependencies": {
+    "@types/chai": "^4.3.6",
     "@vitest/runner": "workspace:*",
-    "picocolors": "^1.0.0"
+    "picocolors": "^1.0.0",
+    "rollup-plugin-copy": "^3.5.0"
   }
 }

packages/expect/rollup.config.js

@@ -2,6 +2,7 @@ import { builtinModules } from 'node:module'
 import esbuild from 'rollup-plugin-esbuild'
 import dts from 'rollup-plugin-dts'
 import { defineConfig } from 'rollup'
+import copy from 'rollup-plugin-copy'
 import pkg from './package.json' assert { type: 'json' }
 
 const external = [
@@ -16,6 +17,11 @@ const plugins = [
   esbuild({
     target: 'node14',
   }),
+  copy({
+    targets: [
+      { src: 'node_modules/@types/chai/index.d.ts', dest: 'dist', rename: 'chai.d.ts' },
+    ],
+  }),
 ]
 
 export default defineConfig([

packages/expect/src/types.ts

@@ -1,5 +1,3 @@
-import type { use as chaiUse } from 'chai'
-
 /**
  * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
  *
@@ -12,8 +10,7 @@ import type { Formatter } from 'picocolors/types'
 import type { Constructable } from '@vitest/utils'
 import type { diff, getMatcherUtils, stringify } from './jest-matcher-utils'
 
-export type FirstFunctionArgument<T> = T extends (arg: infer A) => unknown ? A : never
-export type ChaiPlugin = FirstFunctionArgument<typeof chaiUse>
+export type ChaiPlugin = Chai.ChaiPlugin
 
 export type Tester = (a: any, b: any) => boolean | undefined
 

packages/vitest/package.json

@@ -106,8 +106,8 @@
     "prepublishOnly": "pnpm build"
   },
   "peerDependencies": {
-    "@types/node": ">= 14",
     "@edge-runtime/vm": "*",
+    "@types/node": ">= 14",
     "@vitest/browser": "*",
     "@vitest/ui": "*",
     "happy-dom": "*",
@@ -146,8 +146,6 @@
     }
   },
   "dependencies": {
-    "@types/chai": "^4.3.5",
-    "@types/chai-subset": "^1.3.3",
     "@vitest/expect": "workspace:*",
     "@vitest/runner": "workspace:*",
     "@vitest/snapshot": "workspace:*",

packages/vitest/src/integrations/chai/chai-subset.d.ts

@@ -0,0 +1,4 @@
+declare module 'chai-subset' {
+  const chaiSubset: Chai.ChaiPlugin
+  export = chaiSubset
+}

packages/vitest/src/types/global.ts

@@ -5,6 +5,18 @@ import type { UserConsoleLog } from './general'
 import type { VitestEnvironment } from './config'
 import type { BenchmarkResult } from './benchmark'
 
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Chai {
+    interface Assertion {
+      containSubset(expected: any): Assertion
+    }
+    interface Assert {
+      containSubset(val: any, exp: any, msg?: string): void
+    }
+  }
+}
+
 declare module '@vitest/expect' {
   interface MatcherState {
     environment: VitestEnvironment

patches/@types__chai@4.3.6.patch

@@ -0,0 +1,14 @@
+diff --git a/index.d.ts b/index.d.ts
+index 9f5cb99cdc30c0ceee9c4bb2d866030cfe7b889e..7e231313ed85b703d70ec44778a96e7f3ff4f98e 100755
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -1963,6 +1963,6 @@ declare module "chai" {
+     export = chai;
+ }
+
+-interface Object {
+-    should: Chai.Assertion;
+-}
++// interface Object {
++//     should: Chai.Assertion;
++// }