Skip to content

Commit 5d3f71a

Browse files
committed
Use pnpm catalog: for shared dependencies
Add a catalog to pnpm-workspace.yaml defining versions for 11 commonly repeated dependencies across the monorepo. Update all package.json files to use catalog: references instead of inline version strings. This also normalizes several version mismatches: - typescript: ^5.0.4 / ^5.1.6 -> ^5.1.6 - debug / @types/debug: bare '4' in https-proxy-agent -> ^4.3.4 / ^4.1.7 - ws / @types/ws: ^5.2.4 / ^6.0.4 in agent-base -> ^8.13.0 / ^8.5.4 - socksv5: npm 0.0.6 in pac-proxy-agent -> GitHub fork
1 parent 77da068 commit 5d3f71a

13 files changed

Lines changed: 170 additions & 156 deletions

File tree

packages/agent-base/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
"author": "Nathan Rajlich <[email protected]> (http://n8.io/)",
3434
"license": "MIT",
3535
"devDependencies": {
36-
"@types/debug": "^4.1.7",
37-
"@types/node": "^22.13.0",
36+
"@types/debug": "catalog:",
37+
"@types/node": "catalog:",
3838
"@types/semver": "^7.3.13",
39-
"@types/ws": "^6.0.4",
40-
"async-listen": "^3.0.0",
39+
"@types/ws": "catalog:",
40+
"async-listen": "catalog:",
4141
"tsconfig": "workspace:*",
42-
"typescript": "^5.0.4",
43-
"ws": "^5.2.4"
42+
"typescript": "catalog:",
43+
"ws": "catalog:"
4444
},
4545
"engines": {
4646
"node": ">= 14"

packages/data-uri-to-buffer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"author": "Nathan Rajlich <[email protected]> (http://n8.io/)",
4444
"license": "MIT",
4545
"devDependencies": {
46-
"@types/node": "^22.13.0",
46+
"@types/node": "catalog:",
4747
"tsconfig": "workspace:*",
48-
"typescript": "^5.0.4"
48+
"typescript": "catalog:"
4949
}
5050
}

packages/degenerator/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
"esprima": "^4.0.1"
3535
},
3636
"devDependencies": {
37-
"@tootallnate/quickjs-emscripten": "^0.23.0",
37+
"@tootallnate/quickjs-emscripten": "catalog:",
3838
"@types/escodegen": "^0.0.7",
3939
"@types/esprima": "^4.0.3",
40-
"@types/node": "^22.13.0",
40+
"@types/node": "catalog:",
4141
"tsconfig": "workspace:*",
42-
"typescript": "^5.1.6"
42+
"typescript": "catalog:"
4343
}
4444
}

packages/get-uri/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@
4040
"author": "Nathan Rajlich <[email protected]> (http://n8.io/)",
4141
"license": "MIT",
4242
"devDependencies": {
43-
"@types/debug": "^4.1.7",
43+
"@types/debug": "catalog:",
4444
"@types/ftpd": "^0.2.35",
45-
"@types/node": "^22.13.0",
46-
"async-listen": "^3.0.0",
45+
"@types/node": "catalog:",
46+
"async-listen": "catalog:",
4747
"ftpd": "^0.2.14",
4848
"st": "^3.0.0",
4949
"tsconfig": "workspace:*",
50-
"typescript": "^5.0.4"
50+
"typescript": "catalog:"
5151
},
5252
"dependencies": {
5353
"basic-ftp": "^5.0.2",
5454
"data-uri-to-buffer": "workspace:*",
55-
"debug": "^4.3.4"
55+
"debug": "catalog:"
5656
},
5757
"engines": {
5858
"node": ">= 14"

packages/http-proxy-agent/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
"license": "MIT",
3434
"dependencies": {
3535
"agent-base": "workspace:*",
36-
"debug": "^4.3.4"
36+
"debug": "catalog:"
3737
},
3838
"devDependencies": {
39-
"@types/debug": "^4.1.7",
40-
"@types/node": "^22.13.0",
41-
"async-listen": "^3.0.0",
39+
"@types/debug": "catalog:",
40+
"@types/node": "catalog:",
41+
"async-listen": "catalog:",
4242
"proxy": "workspace:*",
4343
"tsconfig": "workspace:*",
44-
"typescript": "^5.0.4"
44+
"typescript": "catalog:"
4545
},
4646
"engines": {
4747
"node": ">= 14"

packages/https-proxy-agent/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
"license": "MIT",
3535
"dependencies": {
3636
"agent-base": "workspace:*",
37-
"debug": "4"
37+
"debug": "catalog:"
3838
},
3939
"devDependencies": {
40-
"@types/async-retry": "^1.4.5",
41-
"@types/debug": "4",
42-
"@types/node": "^22.13.0",
43-
"async-listen": "^3.0.0",
44-
"async-retry": "^1.3.3",
40+
"@types/async-retry": "catalog:",
41+
"@types/debug": "catalog:",
42+
"@types/node": "catalog:",
43+
"async-listen": "catalog:",
44+
"async-retry": "catalog:",
4545
"proxy": "workspace:*",
4646
"tsconfig": "workspace:*",
47-
"typescript": "^5.0.4"
47+
"typescript": "catalog:"
4848
},
4949
"engines": {
5050
"node": ">= 14"

packages/pac-proxy-agent/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@
3636
"author": "Nathan Rajlich <[email protected]> (http://n8.io/)",
3737
"license": "MIT",
3838
"dependencies": {
39-
"@tootallnate/quickjs-emscripten": "^0.23.0",
39+
"@tootallnate/quickjs-emscripten": "catalog:",
4040
"agent-base": "workspace:*",
41-
"debug": "^4.3.4",
41+
"debug": "catalog:",
4242
"get-uri": "workspace:*",
4343
"http-proxy-agent": "workspace:*",
4444
"https-proxy-agent": "workspace:*",
4545
"pac-resolver": "workspace:*",
4646
"socks-proxy-agent": "workspace:*"
4747
},
4848
"devDependencies": {
49-
"@types/debug": "^4.1.7",
50-
"@types/node": "^22.13.0",
51-
"async-listen": "^3.0.0",
49+
"@types/debug": "catalog:",
50+
"@types/node": "catalog:",
51+
"async-listen": "catalog:",
5252
"proxy": "workspace:*",
53-
"socksv5": "0.0.6",
53+
"socksv5": "catalog:",
5454
"tsconfig": "workspace:*",
55-
"typescript": "^5.0.4"
55+
"typescript": "catalog:"
5656
},
5757
"engines": {
5858
"node": ">= 14"

packages/pac-resolver/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"netmask": "^2.0.2"
1818
},
1919
"devDependencies": {
20-
"@tootallnate/quickjs-emscripten": "^0.23.0",
20+
"@tootallnate/quickjs-emscripten": "catalog:",
2121
"@types/netmask": "^1.0.30",
22-
"@types/node": "^22.13.0",
22+
"@types/node": "catalog:",
2323
"tsconfig": "workspace:*",
24-
"typescript": "^5.1.6"
24+
"typescript": "catalog:"
2525
},
2626
"scripts": {
2727
"build": "tsc",

packages/proxy-agent/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"license": "MIT",
3939
"dependencies": {
4040
"agent-base": "workspace:*",
41-
"debug": "^4.3.4",
41+
"debug": "catalog:",
4242
"http-proxy-agent": "workspace:*",
4343
"https-proxy-agent": "workspace:*",
4444
"lru-cache": "^7.14.1",
@@ -48,15 +48,15 @@
4848
},
4949
"devDependencies": {
5050
"@types/agent-base": "^4.2.0",
51-
"@types/debug": "^4.1.7",
52-
"@types/node": "^22.13.0",
51+
"@types/debug": "catalog:",
52+
"@types/node": "catalog:",
5353
"@types/proxy-from-env": "^1.0.1",
54-
"@types/ws": "^8.5.4",
55-
"async-listen": "^3.0.0",
54+
"@types/ws": "catalog:",
55+
"async-listen": "catalog:",
5656
"proxy": "workspace:*",
57-
"socksv5": "github:TooTallNate/socksv5#fix/dstSock-close-event",
57+
"socksv5": "catalog:",
5858
"tsconfig": "workspace:*",
59-
"typescript": "^5.0.4",
60-
"ws": "^8.13.0"
59+
"typescript": "catalog:",
60+
"ws": "catalog:"
6161
}
6262
}

packages/proxy/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"dependencies": {
4343
"args": "^5.0.3",
4444
"basic-auth-parser": "0.0.2-1",
45-
"debug": "^4.3.4"
45+
"debug": "catalog:"
4646
},
4747
"devDependencies": {
4848
"@types/args": "^5.0.0",
49-
"@types/debug": "^4.1.7",
50-
"@types/node": "^22.13.0",
51-
"async-listen": "^3.0.0",
49+
"@types/debug": "catalog:",
50+
"@types/node": "catalog:",
51+
"async-listen": "catalog:",
5252
"tsconfig": "workspace:*",
53-
"typescript": "^5.0.4"
53+
"typescript": "catalog:"
5454
},
5555
"engines": {
5656
"node": ">= 14"

0 commit comments

Comments
 (0)