Skip to content

Commit e56d0c7

Browse files
RobinTailRobinTail
authored
Reorganizing peers (#2747)
Addition to #2428 It turned out that required peer dependencies are installed automatically unless opted out: https://pnpm.io/next/settings#autoinstallpeers This might be a better solution since I want to absorb the validation workflow into the existing integration tests without hoisting Discovered while working on #2736 and might be needed to solve in advance <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Chores** - Updated dependencies across multiple packages to use a centralized peer dependency catalog. - Added a new peer dependency catalog to the workspace configuration, listing key runtime and type definition packages. - Adjusted package dependencies to reference the new peer catalog, removing direct versioned dependencies where applicable. - Added or updated peer dependencies for packages such as zod and http-errors in relevant projects. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent a667f92 commit e56d0c7

9 files changed

Lines changed: 123 additions & 92 deletions

File tree

‎cjs-test/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"test": "vitest run --globals"
77
},
88
"dependencies": {
9-
"express-zod-api": "workspace:*"
9+
"express-zod-api": "workspace:*",
10+
"zod": "catalog:peer"
1011
}
1112
}

‎esm-test/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"test": "vitest run --globals"
88
},
99
"dependencies": {
10-
"express-zod-api": "workspace:*"
10+
"express-zod-api": "workspace:*",
11+
"zod": "catalog:peer"
1112
}
1213
}

‎example/package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414
},
1515
"dependencies": {
1616
"express-zod-api": "workspace:*",
17-
"swagger-ui-express": "^5.0.0"
17+
"http-errors": "catalog:peer",
18+
"swagger-ui-express": "^5.0.0",
19+
"zod": "catalog:peer"
1820
},
1921
"devDependencies": {
22+
"@types/http-errors": "catalog:peer",
2023
"@types/swagger-ui-express": "^4.1.8",
21-
"undici": "^6.19.8"
24+
"typescript": "catalog:peer",
25+
"undici": "catalog:dev"
2226
}
2327
}

‎express-zod-api/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
"ramda": "^0.30.1"
6767
},
6868
"peerDependencies": {
69-
"@types/compression": "^1.7.5",
70-
"@types/express": "^5.0.0",
71-
"@types/express-fileupload": "^1.5.0",
72-
"@types/http-errors": "^2.0.2",
73-
"compression": "^1.8.0",
74-
"express": "^5.1.0",
75-
"express-fileupload": "^1.5.0",
76-
"http-errors": "^2.0.0",
77-
"typescript": "^5.1.3",
78-
"zod": "^3.25.35"
69+
"@types/compression": "catalog:peer",
70+
"@types/express": "catalog:peer",
71+
"@types/express-fileupload": "catalog:peer",
72+
"@types/http-errors": "catalog:peer",
73+
"compression": "catalog:peer",
74+
"express": "catalog:peer",
75+
"express-fileupload": "catalog:peer",
76+
"http-errors": "catalog:peer",
77+
"typescript": "catalog:peer",
78+
"zod": "catalog:peer"
7979
},
8080
"peerDependenciesMeta": {
8181
"@types/compression": {
@@ -111,7 +111,7 @@
111111
"semver": "^7.7.2",
112112
"snakify-ts": "^2.3.0",
113113
"tsup": "^8.5.0",
114-
"undici": "^6.19.8"
114+
"undici": "catalog:dev"
115115
},
116116
"keywords": [
117117
"nodejs",

‎issue952-test/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
"posttest": "rm *.d.ts"
88
},
99
"dependencies": {
10+
"@types/express": "catalog:peer",
11+
"@types/express-fileupload": "catalog:peer",
1012
"express-zod-api": "workspace:*",
11-
"express": "^5.0.1",
12-
"express-fileupload": "^1.5.1"
13+
"typescript": "catalog:peer",
14+
"zod": "catalog:peer"
1315
}
1416
}

‎package.json‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,18 @@
2020
},
2121
"devDependencies": {
2222
"@tsconfig/node20": "^20.1.5",
23-
"@types/compression": "^1.8.1",
24-
"@types/express": "^5.0.3",
25-
"@types/express-fileupload": "^1.5.0",
26-
"@types/http-errors": "^2.0.5",
2723
"@types/node": "^24.0.0",
2824
"@typescript-eslint/rule-tester": "^8.34.0",
2925
"@vitest/coverage-v8": "^3.2.3",
30-
"compression": "^1.8.0",
3126
"eslint": "^9.28.0",
3227
"eslint-config-prettier": "^10.1.5",
3328
"eslint-plugin-allowed-dependencies": "^1.3.0",
3429
"eslint-plugin-prettier": "^5.4.1",
35-
"express": "^5.1.0",
36-
"express-fileupload": "^1.5.0",
37-
"http-errors": "^2.0.0",
3830
"husky": "^9.0.5",
3931
"prettier": "3.5.3",
4032
"tsx": "^4.19.4",
41-
"typescript": "^5.8.3",
4233
"typescript-eslint": "^8.34.0",
43-
"vitest": "^3.2.3",
44-
"zod": "^3.25.61"
34+
"vitest": "^3.2.3"
4535
},
4636
"resolutions": {
4737
"@scarf/scarf": "npm:[email protected]"

‎pnpm-lock.yaml‎

Lines changed: 78 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,17 @@ publicHoistPattern:
1515
- "globals" # used by eslint.config.js
1616
- "@types/qs" # used by index.ts, fixes TS2742 for attachRouting
1717
- "@types/express-serve-static-core" # used by index.ts, fixes TS2742 for attachRouting
18+
catalogs:
19+
peer:
20+
"@types/compression": "^1.7.5"
21+
"@types/express": "^5.0.0"
22+
"@types/express-fileupload": "^1.5.0"
23+
"@types/http-errors": "^2.0.2"
24+
"compression": "^1.8.0"
25+
"express": "^5.1.0"
26+
"express-fileupload": "^1.5.0"
27+
"http-errors": "^2.0.0"
28+
"typescript": "^5.1.3"
29+
"zod": "^3.25.35"
30+
dev:
31+
"undici": "^6.19.8"

0 commit comments

Comments
 (0)