chore: refactor vitest usage, ts config, shuffle dependencies

common/tsconfig/tsconfig.json

@@ -26,6 +26,6 @@
         "paths": {
             "pkce-challenge": ["./node_modules/pkce-challenge/dist/index.node"]
         },
-        "types": ["node", "vitest/globals"]
+        "types": ["node"]
     }
 }

common/vitest-config/package.json

@@ -1,14 +1,16 @@
 {
     "name": "@modelcontextprotocol/vitest-config",
     "private": true,
-    "main": "vitest.config.mjs",
     "type": "module",
     "exports": {
-        ".": "./vitest.config.js"
+        ".": "./vitest.config.ts"
     },
     "dependencies": {
         "typescript": "catalog:devTools"
     },
+    "peerDependencies": {
+        "vitest": "catalog:devTools"
+    },
     "repository": {
         "type": "git",
         "url": "https://github.com/modelcontextprotocol/typescript-sdk.git"

common/vitest-config/vitest.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from 'vitest/config';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+    test: {
+        globals: true,
+        environment: 'node',
+        include: ['test/**/*.test.ts']
+    },
+    plugins: [tsconfigPaths()]
+});

examples/client/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

examples/client/package.json

@@ -43,6 +43,7 @@
         "@modelcontextprotocol/tsconfig": "workspace:^",
         "@modelcontextprotocol/eslint-config": "workspace:^",
         "@modelcontextprotocol/vitest-config": "workspace:^",
-        "tsdown": "catalog:devTools"
+        "tsdown": "catalog:devTools",
+        "vitest": "catalog:devTools"
     }
 }

examples/server/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

examples/server/package.json

@@ -52,6 +52,7 @@
         "@modelcontextprotocol/vitest-config": "workspace:^",
         "@types/cors": "catalog:devTools",
         "@types/express": "catalog:devTools",
-        "tsdown": "catalog:devTools"
+        "tsdown": "catalog:devTools",
+        "vitest": "catalog:devTools"
     }
 }

examples/shared/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

package.json

@@ -72,7 +72,6 @@
         "typedoc": "catalog:devTools",
         "typescript": "catalog:devTools",
         "typescript-eslint": "catalog:devTools",
-        "vitest": "catalog:devTools",
         "ws": "catalog:devTools",
         "zod": "catalog:runtimeShared"
     },

packages/client/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

packages/client/vitest.config.js → packages/client/vitest.config.ts

@@ -3,6 +3,6 @@ import { mergeConfig } from 'vitest/config';
 
 export default mergeConfig(baseConfig, {
     test: {
-        setupFiles: ['./vitest.setup.js']
+        setupFiles: ['./vitest.setup.ts']
     }
 });

packages/core/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

packages/middleware/express/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

packages/middleware/hono/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

packages/middleware/node/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

packages/server/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

test/conformance/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

test/conformance/package.json

@@ -49,6 +49,7 @@
         "@modelcontextprotocol/test-helpers": "workspace:^",
         "cors": "catalog:runtimeServerOnly",
         "express": "catalog:runtimeServerOnly",
+        "vitest": "catalog:devTools",
         "zod": "catalog:runtimeShared"
     }
 }

test/helpers/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />

test/integration/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vitest/globals" />