From fd05ea0e9cc03a54c11ea4f4a3d75c05f94538fb Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 12 Sep 2026 23:36:25 +0000 Subject: [PATCH] Move shared dependencies into the workspace catalog yargs, @types/yargs, semver and @types/semver are used by several packages at the same version. Also point the remaining direct references to @swc/core and react-router-dom at their existing catalog entries. Co-Authored-By: Claude Fable 5.1 --- package.json | 12 ++++++------ packages/controller/package.json | 8 ++++---- packages/create/package.json | 2 +- packages/ctl/package.json | 4 ++-- packages/host/package.json | 8 ++++---- packages/lib/package.json | 4 ++-- packages/web_ui/package.json | 18 +++++++++--------- pnpm-workspace.yaml | 4 ++++ 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index ec0013af..e1175993 100644 --- a/package.json +++ b/package.json @@ -45,21 +45,21 @@ "@eslint/eslintrc": "^3.3.7", "@eslint/js": "^10.0.1", "@stylistic/eslint-plugin": "^5.10.0", - "@swc/core": "^1.16.2", + "@swc/core": "catalog:", "@types/node": "catalog:", "@typescript-eslint/eslint-plugin": "^8.70.0", "@typescript-eslint/parser": "^8.70.0", "eslint": "^10.10.0", "eslint-plugin-node": "^11.1.0", - "express": "^5.2.1", + "express": "catalog:", "form-data": "^4.0.6", "globals": "^17.12.0", - "jsonwebtoken": "^9.0.3", - "jszip": "^3.10.2", + "jsonwebtoken": "catalog:", + "jszip": "catalog:", "mocha": "^11.8.0", "nyc": "^18.0.0", "typedoc": "^0.28.20", - "typescript": "^5.9.3", - "yargs": "^18.1.0" + "typescript": "catalog:", + "yargs": "catalog:" } } diff --git a/packages/controller/package.json b/packages/controller/package.json index d93601df..041ce483 100644 --- a/packages/controller/package.json +++ b/packages/controller/package.json @@ -44,11 +44,11 @@ "finalhandler": "^2.1.1", "jsonwebtoken": "catalog:", "jszip": "catalog:", - "semver": "^7.8.5", + "semver": "catalog:", "winston": "catalog:", "winston-daily-rotate-file": "catalog:", "ws": "catalog:", - "yargs": "^18.1.0" + "yargs": "catalog:" }, "devDependencies": { "@clusterio/web_ui": "workspace:^", @@ -59,9 +59,9 @@ "@types/finalhandler": "catalog:", "@types/jsonwebtoken": "catalog:", "@types/node": "catalog:", - "@types/semver": "^7.8.0", + "@types/semver": "catalog:", "@types/ws": "catalog:", - "@types/yargs": "^17.0.35", + "@types/yargs": "catalog:", "react": "catalog:", "react-dom": "catalog:", "react-router-dom": "catalog:", diff --git a/packages/create/package.json b/packages/create/package.json index bf85f5b4..85a50e44 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -34,6 +34,6 @@ "dependencies": { "chalk": "catalog:", "inquirer": "^8.2.4", - "yargs": "^18.1.0" + "yargs": "catalog:" } } diff --git a/packages/ctl/package.json b/packages/ctl/package.json index 50980c7c..0d73a9a4 100644 --- a/packages/ctl/package.json +++ b/packages/ctl/package.json @@ -39,11 +39,11 @@ "@clusterio/lib": "workspace:^", "as-table": "^1.0.55", "winston": "catalog:", - "yargs": "^18.1.0" + "yargs": "catalog:" }, "devDependencies": { "@types/node": "catalog:", - "@types/yargs": "^17.0.35", + "@types/yargs": "catalog:", "typescript": "catalog:" } } diff --git a/packages/host/package.json b/packages/host/package.json index 8593ccc0..70dc3a3f 100644 --- a/packages/host/package.json +++ b/packages/host/package.json @@ -43,18 +43,18 @@ "jszip": "catalog:", "pidusage": "^4.0.1", "rcon-client": "^4.2.5", - "semver": "^7.8.5", + "semver": "catalog:", "set-blocking": "catalog:", "winston": "catalog:", "winston-daily-rotate-file": "catalog:", - "yargs": "^18.1.0" + "yargs": "catalog:" }, "devDependencies": { "@types/node": "catalog:", "@types/pidusage": "^2.0.5", - "@types/semver": "^7.8.0", + "@types/semver": "catalog:", "@types/set-blocking": "catalog:", - "@types/yargs": "^17.0.35", + "@types/yargs": "catalog:", "typescript": "catalog:" } } diff --git a/packages/lib/package.json b/packages/lib/package.json index 918a2371..e23c4b8c 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -54,14 +54,14 @@ "winston": "catalog:", "winston-transport": "catalog:", "ws": "catalog:", - "yargs": "^18.1.0" + "yargs": "catalog:" }, "devDependencies": { "@types/node": "catalog:", "@types/set-blocking": "catalog:", "@types/triple-beam": "^1.3.5", "@types/ws": "catalog:", - "@types/yargs": "^17.0.35", + "@types/yargs": "catalog:", "typescript": "catalog:" } } diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json index aea3a710..93c2aad8 100644 --- a/packages/web_ui/package.json +++ b/packages/web_ui/package.json @@ -35,9 +35,9 @@ "dependencies": { "@ant-design/icons": "^5.6.1", "@clusterio/lib": "workspace:^", - "@sinclair/typebox": "^0.30.6", - "@swc/core": "^1.16.2", - "antd": "^5.29.3", + "@sinclair/typebox": "catalog:", + "@swc/core": "catalog:", + "antd": "catalog:", "assert": "^2.1.0", "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", @@ -50,23 +50,23 @@ "path-browserify": "^1.0.1", "process": "^0.11.10", "rc-field-form": "^1.44.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "catalog:", + "react-dom": "catalog:", "react-markdown": "catalog:", - "react-router-dom": "^6.30.6", + "react-router-dom": "catalog:", "stream-browserify": "^3.0.0", "style-loader": "^4.0.0", "swc-loader": "^0.2.7", "terser-webpack-plugin": "^5.6.1", - "typescript": "^5.9.3", + "typescript": "catalog:", "util": "^0.12.5", "webpack": "catalog:", "webpack-cli": "catalog:", "webpack-manifest-plugin": "^5.0.0" }, "devDependencies": { - "@types/node": "^24.13.4", - "@types/react": "^18.3.31", + "@types/node": "catalog:", + "@types/react": "catalog:", "@types/react-dom": "^18.3.7" } } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6076acf0..c08a71cd 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -13,8 +13,10 @@ catalog: '@types/jsonwebtoken': ^9.0.10 '@types/node': ^24.13.4 '@types/react': ^18.3.31 + '@types/semver': ^7.8.0 '@types/set-blocking': ^2.0.2 '@types/ws': ^8.18.1 + '@types/yargs': ^17.0.35 antd: ^5.29.3 chalk: ^6.0.0 express: ^5.2.1 @@ -24,6 +26,7 @@ catalog: react-dom: ^18.2.0 react-markdown: ^10.1.0 react-router-dom: ^6.30.6 + semver: ^7.8.5 set-blocking: ^2.0.0 typescript: ^5.9.3 webpack: ^5.110.3 @@ -33,6 +36,7 @@ catalog: winston-daily-rotate-file: ^4.7.1 winston-transport: ^4.9.0 ws: ^8.21.3 + yargs: ^18.1.0 catalogMode: strict