Skip to content

Commit 9f519c5

Browse files
KKonstantinovKKonstantinov
committed
introduce named catalogs, slim down dependencies to minimum required for respective sdk
1 parent 3e0657f commit 9f519c5

File tree

15 files changed

+329
-417
lines changed

15 files changed

+329
-417
lines changed

‎common/eslint-config/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
".": "./eslint.config.mjs"
88
},
99
"dependencies": {
10-
"typescript": "catalog:"
10+
"typescript": "catalog:devTools"
1111
},
1212
"repository": {
1313
"type": "git",
@@ -22,15 +22,15 @@
2222
},
2323
"version": "2.0.0",
2424
"devDependencies": {
25-
"@eslint/js": "catalog:",
26-
"eslint": "catalog:",
27-
"eslint-config-prettier": "catalog:",
25+
"@eslint/js": "catalog:devTools",
26+
"eslint": "catalog:devTools",
27+
"eslint-config-prettier": "catalog:devTools",
2828
"eslint-import-resolver-typescript": "^4.4.4",
2929
"eslint-plugin-import": "^2.32.0",
30-
"eslint-plugin-n": "catalog:",
30+
"eslint-plugin-n": "catalog:devTools",
3131
"eslint-plugin-simple-import-sort": "^12.1.1",
32-
"prettier": "catalog:",
33-
"typescript": "catalog:",
34-
"typescript-eslint": "catalog:"
32+
"prettier": "catalog:devTools",
33+
"typescript": "catalog:devTools",
34+
"typescript-eslint": "catalog:devTools"
3535
}
3636
}

‎common/tsconfig/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"main": "tsconfig.json",
55
"type": "module",
66
"dependencies": {
7-
"typescript": "catalog:"
7+
"typescript": "catalog:devTools"
88
},
99
"repository": {
1010
"type": "git",

‎common/vitest-config/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
".": "./vitest.config.js"
88
},
99
"dependencies": {
10-
"typescript": "catalog:"
10+
"typescript": "catalog:devTools"
1111
},
1212
"repository": {
1313
"type": "git",
@@ -23,6 +23,6 @@
2323
"version": "2.0.0",
2424
"devDependencies": {
2525
"@modelcontextprotocol/tsconfig": "workspace:^",
26-
"vite-tsconfig-paths": "catalog:"
26+
"vite-tsconfig-paths": "catalog:devTools"
2727
}
2828
}

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,28 @@
3030
"test:all": "pnpm -r test"
3131
},
3232
"devDependencies": {
33-
"@cfworker/json-schema": "catalog:",
34-
"@eslint/js": "catalog:",
35-
"@types/content-type": "catalog:",
36-
"@types/cors": "catalog:",
37-
"@types/cross-spawn": "catalog:",
38-
"@types/eventsource": "catalog:",
39-
"@types/express": "catalog:",
40-
"@types/express-serve-static-core": "catalog:",
33+
"@cfworker/json-schema": "catalog:runtimeShared",
34+
"@eslint/js": "catalog:devTools",
35+
"@types/content-type": "catalog:devTools",
36+
"@types/cors": "catalog:devTools",
37+
"@types/cross-spawn": "catalog:devTools",
38+
"@types/eventsource": "catalog:devTools",
39+
"@types/express": "catalog:devTools",
40+
"@types/express-serve-static-core": "catalog:devTools",
4141
"@types/node": "^24.10.1",
42-
"@types/supertest": "catalog:",
43-
"@types/ws": "catalog:",
44-
"@typescript/native-preview": "catalog:",
45-
"eslint": "catalog:",
46-
"eslint-config-prettier": "catalog:",
47-
"eslint-plugin-n": "catalog:",
48-
"prettier": "catalog:",
49-
"supertest": "catalog:",
50-
"tsx": "catalog:",
51-
"typescript": "catalog:",
52-
"typescript-eslint": "catalog:",
53-
"vitest": "catalog:",
54-
"ws": "catalog:"
42+
"@types/supertest": "catalog:devTools",
43+
"@types/ws": "catalog:devTools",
44+
"@typescript/native-preview": "catalog:devTools",
45+
"eslint": "catalog:devTools",
46+
"eslint-config-prettier": "catalog:devTools",
47+
"eslint-plugin-n": "catalog:devTools",
48+
"prettier": "catalog:devTools",
49+
"supertest": "catalog:devTools",
50+
"tsx": "catalog:devTools",
51+
"typescript": "catalog:devTools",
52+
"typescript-eslint": "catalog:devTools",
53+
"vitest": "catalog:devTools",
54+
"ws": "catalog:devTools"
5555
},
5656
"resolutions": {
5757
"strip-ansi": "6.0.1"

‎packages/client/package.json‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,16 @@
5050
},
5151
"dependencies": {
5252
"@modelcontextprotocol/sdk-core": "workspace:^",
53-
"ajv": "catalog:",
54-
"ajv-formats": "catalog:",
55-
"content-type": "catalog:",
56-
"cors": "catalog:",
57-
"cross-spawn": "catalog:",
58-
"eventsource": "catalog:",
59-
"eventsource-parser": "catalog:",
60-
"jose": "catalog:",
61-
"json-schema-typed": "catalog:",
62-
"pkce-challenge": "catalog:",
63-
"raw-body": "catalog:",
64-
"zod": "catalog:",
65-
"zod-to-json-schema": "catalog:"
53+
"cross-spawn": "catalog:runtimeClientOnly",
54+
"eventsource": "catalog:runtimeClientOnly",
55+
"eventsource-parser": "catalog:runtimeClientOnly",
56+
"jose": "catalog:runtimeClientOnly",
57+
"pkce-challenge": "catalog:runtimeShared",
58+
"zod": "catalog:runtimeShared"
6659
},
6760
"peerDependencies": {
68-
"@cfworker/json-schema": "catalog:",
69-
"zod": "catalog:"
61+
"@cfworker/json-schema": "catalog:runtimeShared",
62+
"zod": "catalog:runtimeShared"
7063
},
7164
"peerDependenciesMeta": {
7265
"@cfworker/json-schema": {
@@ -80,20 +73,20 @@
8073
"@modelcontextprotocol/tsconfig": "workspace:^",
8174
"@modelcontextprotocol/vitest-config": "workspace:^",
8275
"@modelcontextprotocol/eslint-config": "workspace:^",
83-
"@cfworker/json-schema": "catalog:",
84-
"@eslint/js": "catalog:",
85-
"@types/content-type": "catalog:",
86-
"@types/cors": "catalog:",
87-
"@types/cross-spawn": "catalog:",
88-
"@types/eventsource": "catalog:",
89-
"@typescript/native-preview": "catalog:",
90-
"eslint": "catalog:",
91-
"eslint-config-prettier": "catalog:",
92-
"eslint-plugin-n": "catalog:",
93-
"prettier": "catalog:",
94-
"tsx": "catalog:",
95-
"typescript": "catalog:",
96-
"typescript-eslint": "catalog:",
97-
"vitest": "catalog:"
76+
"@cfworker/json-schema": "catalog:runtimeShared",
77+
"@eslint/js": "catalog:devTools",
78+
"@types/content-type": "catalog:devTools",
79+
"@types/cors": "catalog:devTools",
80+
"@types/cross-spawn": "catalog:devTools",
81+
"@types/eventsource": "catalog:devTools",
82+
"@typescript/native-preview": "catalog:devTools",
83+
"eslint": "catalog:devTools",
84+
"eslint-config-prettier": "catalog:devTools",
85+
"eslint-plugin-n": "catalog:devTools",
86+
"prettier": "catalog:devTools",
87+
"tsx": "catalog:devTools",
88+
"typescript": "catalog:devTools",
89+
"typescript-eslint": "catalog:devTools",
90+
"vitest": "catalog:devTools"
9891
}
9992
}

‎packages/core/package.json‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,15 @@
5454
"client": "tsx scripts/cli.ts client"
5555
},
5656
"dependencies": {
57-
"ajv": "catalog:",
58-
"ajv-formats": "catalog:",
59-
"content-type": "catalog:",
60-
"cors": "catalog:",
61-
"cross-spawn": "catalog:",
62-
"eventsource": "catalog:",
63-
"eventsource-parser": "catalog:",
64-
"express": "catalog:",
65-
"express-rate-limit": "catalog:",
66-
"jose": "catalog:",
67-
"json-schema-typed": "catalog:",
68-
"pkce-challenge": "catalog:",
69-
"raw-body": "catalog:",
70-
"zod": "catalog:",
71-
"zod-to-json-schema": "catalog:"
57+
"ajv": "catalog:runtimeShared",
58+
"ajv-formats": "catalog:runtimeShared",
59+
"json-schema-typed": "catalog:runtimeShared",
60+
"zod": "catalog:runtimeShared",
61+
"zod-to-json-schema": "catalog:runtimeShared"
7262
},
7363
"peerDependencies": {
74-
"@cfworker/json-schema": "catalog:",
75-
"zod": "catalog:"
64+
"@cfworker/json-schema": "catalog:runtimeShared",
65+
"zod": "catalog:runtimeShared"
7666
},
7767
"peerDependenciesMeta": {
7868
"@cfworker/json-schema": {
@@ -86,22 +76,22 @@
8676
"@modelcontextprotocol/tsconfig": "workspace:^",
8777
"@modelcontextprotocol/vitest-config": "workspace:^",
8878
"@modelcontextprotocol/eslint-config": "workspace:^",
89-
"@cfworker/json-schema": "catalog:",
90-
"@eslint/js": "catalog:",
91-
"@types/content-type": "catalog:",
92-
"@types/cors": "catalog:",
93-
"@types/cross-spawn": "catalog:",
94-
"@types/eventsource": "catalog:",
95-
"@types/express": "catalog:",
96-
"@types/express-serve-static-core": "catalog:",
97-
"@typescript/native-preview": "catalog:",
98-
"eslint": "catalog:",
99-
"eslint-config-prettier": "catalog:",
100-
"eslint-plugin-n": "catalog:",
101-
"prettier": "catalog:",
102-
"tsx": "catalog:",
103-
"typescript": "catalog:",
104-
"typescript-eslint": "catalog:",
105-
"vitest": "catalog:"
79+
"@cfworker/json-schema": "catalog:runtimeShared",
80+
"@eslint/js": "catalog:devTools",
81+
"@types/content-type": "catalog:devTools",
82+
"@types/cors": "catalog:devTools",
83+
"@types/cross-spawn": "catalog:devTools",
84+
"@types/eventsource": "catalog:devTools",
85+
"@types/express": "catalog:devTools",
86+
"@types/express-serve-static-core": "catalog:devTools",
87+
"@typescript/native-preview": "catalog:devTools",
88+
"eslint": "catalog:devTools",
89+
"eslint-config-prettier": "catalog:devTools",
90+
"eslint-plugin-n": "catalog:devTools",
91+
"prettier": "catalog:devTools",
92+
"tsx": "catalog:devTools",
93+
"typescript": "catalog:devTools",
94+
"typescript-eslint": "catalog:devTools",
95+
"vitest": "catalog:devTools"
10696
}
10797
}

‎packages/examples/client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"dependencies": {
3333
"@modelcontextprotocol/sdk-client": "workspace:^",
34-
"ajv": "catalog:",
35-
"zod": "catalog:"
34+
"ajv": "catalog:runtimeShared",
35+
"zod": "catalog:runtimeShared"
3636
},
3737
"devDependencies": {
3838
"@modelcontextprotocol/sdk-examples-shared": "workspace:^",

‎packages/examples/server/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
"dependencies": {
3333
"@modelcontextprotocol/sdk-server": "workspace:^",
3434
"@modelcontextprotocol/sdk-examples-shared": "workspace:^",
35-
"zod": "catalog:",
36-
"express": "catalog:",
37-
"cors": "catalog:"
35+
"zod": "catalog:runtimeShared",
36+
"express": "catalog:runtimeServerOnly",
37+
"cors": "catalog:runtimeServerOnly"
3838
},
3939
"devDependencies": {
4040
"@modelcontextprotocol/tsconfig": "workspace:^",
4141
"@modelcontextprotocol/eslint-config": "workspace:^",
4242
"@modelcontextprotocol/vitest-config": "workspace:^",
43-
"@types/express": "catalog:",
44-
"@types/cors": "catalog:"
43+
"@types/express": "catalog:devTools",
44+
"@types/cors": "catalog:devTools"
4545
}
4646
}

‎packages/examples/shared/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
},
3434
"dependencies": {
3535
"@modelcontextprotocol/sdk-server": "workspace:^",
36-
"express": "catalog:"
36+
"express": "catalog:runtimeServerOnly"
3737
},
3838
"devDependencies": {
3939
"@modelcontextprotocol/tsconfig": "workspace:^",
4040
"@modelcontextprotocol/eslint-config": "workspace:^",
4141
"@modelcontextprotocol/vitest-config": "workspace:^",
42-
"@types/express": "catalog:"
42+
"@types/express": "catalog:devTools"
4343
}
4444
}

‎packages/examples/shared/test/demoInMemoryOAuthProvider.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { Response } from 'express';
2-
import { DemoInMemoryAuthProvider, DemoInMemoryClientsStore } from '../src/demoInMemoryOAuthProvider.js';
3-
import type { AuthorizationParams } from '@modelcontextprotocol/sdk-server';
41
import type { OAuthClientInformationFull } from '@modelcontextprotocol/sdk-core';
5-
import { InvalidRequestError } from '@modelcontextprotocol/sdk-core';
2+
import type { AuthorizationParams } from '@modelcontextprotocol/sdk-server';
3+
import { InvalidRequestError } from '@modelcontextprotocol/sdk-server';
4+
import type { Response } from 'express';
65

76
import { createExpressResponseMock } from '../../../integration/test/helpers/http.js';
7+
import { DemoInMemoryAuthProvider, DemoInMemoryClientsStore } from '../src/demoInMemoryOAuthProvider.js';
88

99
describe('DemoInMemoryAuthProvider', () => {
1010
let provider: DemoInMemoryAuthProvider;

0 commit comments

Comments
 (0)