Merge branch 'master' into detach-migration

RobinTail · RobinTail · commit a6ed3afdd7c0 · 2025-06-15T18:17:15.000+02:00
diff --git a/cjs-test/package.json b/cjs-test/package.json
@@ -6,6 +6,7 @@
     "test": "vitest run --globals"
   },
   "dependencies": {
-    "express-zod-api": "workspace:*"
+    "express-zod-api": "workspace:*",
+    "zod": "catalog:peer"
   }
 }
diff --git a/esm-test/package.json b/esm-test/package.json
@@ -7,6 +7,7 @@
     "test": "vitest run --globals"
   },
   "dependencies": {
-    "express-zod-api": "workspace:*"
+    "express-zod-api": "workspace:*",
+    "zod": "catalog:peer"
   }
 }
diff --git a/example/package.json b/example/package.json
@@ -13,10 +13,14 @@
   },
   "dependencies": {
     "express-zod-api": "workspace:*",
-    "swagger-ui-express": "^5.0.0"
+    "http-errors": "catalog:peer",
+    "swagger-ui-express": "^5.0.0",
+    "zod": "catalog:peer"
   },
   "devDependencies": {
+    "@types/http-errors": "catalog:peer",
     "@types/swagger-ui-express": "^4.1.8",
-    "undici": "^6.19.8"
+    "typescript": "catalog:peer",
+    "undici": "catalog:dev"
   }
 }
diff --git a/express-zod-api/package.json b/express-zod-api/package.json
@@ -55,16 +55,16 @@
     "ramda": "^0.30.1"
   },
   "peerDependencies": {
-    "@types/compression": "^1.7.5",
-    "@types/express": "^5.0.0",
-    "@types/express-fileupload": "^1.5.0",
-    "@types/http-errors": "^2.0.2",
-    "compression": "^1.8.0",
-    "express": "^5.1.0",
-    "express-fileupload": "^1.5.0",
-    "http-errors": "^2.0.0",
-    "typescript": "^5.1.3",
-    "zod": "^3.25.35"
+    "@types/compression": "catalog:peer",
+    "@types/express": "catalog:peer",
+    "@types/express-fileupload": "catalog:peer",
+    "@types/http-errors": "catalog:peer",
+    "compression": "catalog:peer",
+    "express": "catalog:peer",
+    "express-fileupload": "catalog:peer",
+    "http-errors": "catalog:peer",
+    "typescript": "catalog:peer",
+    "zod": "catalog:peer"
   },
   "peerDependenciesMeta": {
     "@types/compression": {
@@ -98,7 +98,7 @@
     "node-forge": "^1.3.1",
     "semver": "^7.7.2",
     "snakify-ts": "^2.3.0",
-    "undici": "^6.19.8"
+    "undici": "catalog:dev"
   },
   "keywords": [
     "nodejs",
diff --git a/issue952-test/package.json b/issue952-test/package.json
@@ -7,8 +7,10 @@
     "posttest": "rm *.d.ts"
   },
   "dependencies": {
+    "@types/express": "catalog:peer",
+    "@types/express-fileupload": "catalog:peer",
     "express-zod-api": "workspace:*",
-    "express": "^5.0.1",
-    "express-fileupload": "^1.5.1"
+    "typescript": "catalog:peer",
+    "zod": "catalog:peer"
   }
 }
diff --git a/package.json b/package.json
@@ -20,28 +20,18 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
     "@tsconfig/node20": "^20.1.5",
-    "@types/compression": "^1.8.1",
-    "@types/express": "^5.0.3",
-    "@types/express-fileupload": "^1.5.0",
-    "@types/http-errors": "^2.0.5",
     "@types/node": "^24.0.0",
     "@vitest/coverage-v8": "^3.2.3",
-    "compression": "^1.8.0",
     "eslint": "^9.28.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-allowed-dependencies": "^1.3.0",
     "eslint-plugin-prettier": "^5.4.1",
-    "express": "^5.1.0",
-    "express-fileupload": "^1.5.0",
-    "http-errors": "^2.0.0",
     "husky": "^9.0.5",
     "prettier": "3.5.3",
     "tsup": "^8.5.0",
     "tsx": "^4.19.4",
-    "typescript": "^5.8.3",
     "typescript-eslint": "^8.34.0",
-    "vitest": "^3.2.3",
-    "zod": "^3.25.61"
+    "vitest": "^3.2.3"
   },
   "resolutions": {
     "@scarf/scarf": "npm:empty-npm-package@1.0.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -16,3 +16,17 @@ publicHoistPattern:
   - "globals" # used by eslint.config.js
   - "@types/qs" # used by index.ts, fixes TS2742 for attachRouting
   - "@types/express-serve-static-core" # used by index.ts, fixes TS2742 for attachRouting
+catalogs:
+  peer:
+    "@types/compression": "^1.7.5"
+    "@types/express": "^5.0.0"
+    "@types/express-fileupload": "^1.5.0"
+    "@types/http-errors": "^2.0.2"
+    "compression": "^1.8.0"
+    "express": "^5.1.0"
+    "express-fileupload": "^1.5.0"
+    "http-errors": "^2.0.0"
+    "typescript": "^5.1.3"
+    "zod": "^3.25.35"
+  dev:
+    "undici": "^6.19.8"
diff --git a/tools/headers.ts b/tools/headers.ts

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`"test": "vitest run --globals"`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`		`- "express-zod-api": "workspace:*"`
	`9`	`+ "express-zod-api": "workspace:*",`
	`10`	`+ "zod": "catalog:peer"`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"test": "vitest run --globals"`
`8`	`8`	`},`
`9`	`9`	`"dependencies": {`
`10`		`- "express-zod-api": "workspace:*"`
	`10`	`+ "express-zod-api": "workspace:*",`
	`11`	`+ "zod": "catalog:peer"`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@`
`7`	`7`	`"posttest": "rm *.d.ts"`
`8`	`8`	`},`
`9`	`9`	`"dependencies": {`
	`10`	`+ "@types/express": "catalog:peer",`
	`11`	`+ "@types/express-fileupload": "catalog:peer",`
`10`	`12`	`"express-zod-api": "workspace:*",`
`11`		`- "express": "^5.0.1",`
`12`		`- "express-fileupload": "^1.5.1"`
	`13`	`+ "typescript": "catalog:peer",`
	`14`	`+ "zod": "catalog:peer"`
`13`	`15`	`}`
`14`	`16`	`}`