From b38211469a9d6095fc7aff390774dd0bfe8346cd Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 12 Sep 2026 23:02:41 +0000 Subject: [PATCH 1/4] Cache the pnpm store between CI runs The lockfile is not committed so the usual lockfile hash key does not work. Instead the store is snapshotted whenever a package.json changes or a week passes, and every run restores the most recent snapshot through a prefix restore key. pnpm still resolves the latest versions within the ranges; the cache only saves the tarball downloads. A composite action holds the setup so the four jobs share it. Co-Authored-By: Claude Fable 5.1 --- .github/actions/pnpm-install/action.yml | 36 +++++++++++++++++++++++++ .github/workflows/node.js.yml | 21 +++++---------- 2 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 .github/actions/pnpm-install/action.yml diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml new file mode 100644 index 00000000..3f310773 --- /dev/null +++ b/.github/actions/pnpm-install/action.yml @@ -0,0 +1,36 @@ +name: Install dependencies +description: Set up pnpm and Node.js, restore the pnpm store from the cache and run pnpm install + +inputs: + node-version: + description: Node.js version passed to actions/setup-node + required: true + +runs: + using: composite + steps: + - uses: pnpm/action-setup@v6 + - uses: actions/setup-node@v7 + with: + node-version: ${{ inputs.node-version }} + + # The lockfile is not committed, so the usual lockfile hash key does not + # apply. Instead a new store snapshot is saved whenever a package.json + # changes or a week passes, and every run restores the most recent one. + - id: store + shell: bash + run: | + echo "path=$(pnpm store path --silent)" >> "$GITHUB_OUTPUT" + echo "week=$(date -u +%G-%V)" >> "$GITHUB_OUTPUT" + - uses: actions/cache@v6 + with: + path: ${{ steps.store.outputs.path }} + key: pnpm-store-${{ runner.os }}-${{ steps.store.outputs.week }}-${{ hashFiles('**/package.json', 'pnpm-workspace.yaml') }} + restore-keys: pnpm-store-${{ runner.os }}- + + - shell: bash + run: pnpm i --no-frozen-lockfile + # Drop packages the restored store had but this install did not use, so + # the snapshot does not grow with every version bump. + - shell: bash + run: pnpm store prune diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index f465f8f7..caa9a1a0 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -31,13 +31,10 @@ jobs: steps: - uses: actions/checkout@v7 - - uses: pnpm/action-setup@v6 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v7 + - name: Prepare and install + uses: ./.github/actions/pnpm-install with: node-version: ${{ matrix.node-version }} - - name: Prepare and install - run: pnpm i --no-frozen-lockfile - name: Use Factorio ${{ matrix.factorio-version }} run: wget -q -O factorio.tar.gz https://www.factorio.com/get-download/${{ matrix.factorio-version }}/headless/linux64 && tar -xf factorio.tar.gz && rm factorio.tar.gz - name: Run tests @@ -78,12 +75,10 @@ jobs: steps: - uses: actions/checkout@v7 - - uses: pnpm/action-setup@v6 - - uses: actions/setup-node@v7 + - name: Prepare and install + uses: ./.github/actions/pnpm-install with: node-version: ${{ env.NODE_VERSION }} - - name: Prepare and install - run: pnpm i --no-frozen-lockfile - name: Build run: pnpm run build - name: Test ${{ matrix.controller }} controller with ${{ matrix.host }} host @@ -98,11 +93,9 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v7 - - uses: pnpm/action-setup@v6 - - uses: actions/setup-node@v7 + - uses: ./.github/actions/pnpm-install with: node-version: ${{ env.NODE_VERSION }} - - run: pnpm i --no-frozen-lockfile - run: pnpm run lint build: @@ -110,11 +103,9 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v7 - - uses: pnpm/action-setup@v6 - - uses: actions/setup-node@v7 + - uses: ./.github/actions/pnpm-install with: node-version: ${{ env.NODE_VERSION }} - - run: pnpm i --no-frozen-lockfile - run: pnpm run build-mod # Upload build to artifacts - name: Upload build to artifacts From 992fc0fed7c3d219a5b526900b295688951d95b8 Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 12 Sep 2026 23:16:12 +0000 Subject: [PATCH 2/4] Cache build output and skip builds where unused The prepare scripts (tsc --build and webpack) are most of the install time in every job, so their output is cached between runs. tsc's tsbuildinfo tracks file hashes and webpack's filesystem cache keeps its node_modules modules, so a restored cache makes both incremental. The lint and build-mod jobs never read the compiled output: eslint is not type-aware here and build_mod.js is plain JavaScript. They now install with --ignore-scripts. Co-Authored-By: Claude Fable 5.1 --- .github/actions/pnpm-install/action.yml | 21 +++++++++++++++++++-- .github/workflows/node.js.yml | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml index 3f310773..b4225457 100644 --- a/.github/actions/pnpm-install/action.yml +++ b/.github/actions/pnpm-install/action.yml @@ -1,10 +1,13 @@ name: Install dependencies -description: Set up pnpm and Node.js, restore the pnpm store from the cache and run pnpm install +description: Set up pnpm and Node.js, restore caches and run pnpm install inputs: node-version: description: Node.js version passed to actions/setup-node required: true + ignore-scripts: + description: Skip the prepare scripts that build the workspace packages + default: "false" runs: using: composite @@ -28,8 +31,22 @@ runs: key: pnpm-store-${{ runner.os }}-${{ steps.store.outputs.week }}-${{ hashFiles('**/package.json', 'pnpm-workspace.yaml') }} restore-keys: pnpm-store-${{ runner.os }}- + # The prepare scripts run tsc --build and webpack, both incremental when + # their previous output is present. Every run saves its output and the + # next run starts from the most recent one. + - if: inputs.ignore-scripts != 'true' + uses: actions/cache@v6 + with: + path: | + packages/*/dist + plugins/*/dist + packages/*/node_modules/.cache + plugins/*/node_modules/.cache + key: build-${{ runner.os }}-${{ github.sha }} + restore-keys: build-${{ runner.os }}- + - shell: bash - run: pnpm i --no-frozen-lockfile + run: pnpm i --no-frozen-lockfile ${{ inputs.ignore-scripts == 'true' && '--ignore-scripts' || '' }} # Drop packages the restored store had but this install did not use, so # the snapshot does not grow with every version bump. - shell: bash diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index caa9a1a0..8b321f19 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -96,6 +96,7 @@ jobs: - uses: ./.github/actions/pnpm-install with: node-version: ${{ env.NODE_VERSION }} + ignore-scripts: true - run: pnpm run lint build: @@ -106,6 +107,7 @@ jobs: - uses: ./.github/actions/pnpm-install with: node-version: ${{ env.NODE_VERSION }} + ignore-scripts: true - run: pnpm run build-mod # Upload build to artifacts - name: Upload build to artifacts From f3daaf7b151202f754c82344e66d012c0a3933d5 Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 12 Sep 2026 23:24:13 +0000 Subject: [PATCH 3/4] Bump dependency versions Raise every caret range to the current latest within its major, in the root package.json, the pnpm-workspace.yaml catalog, the per-package package.json files and the create plugin template. Majors taken: eslint 10, @eslint/js 10, globals 17, nyc 18, @types/express 5, @types/node 24, finalhandler 2, pidusage 4, style-loader 4, css-loader 7, yargs 18 (all packages), chalk 6. Majors skipped: mocha 12 (integration suite fails under it, 59 tests, starting with a 30 s timeout in clusteriocontroller run; kept at ^11.8.0), inquirer (10+ is a rewrite on @inquirer/prompts where ui.Prompt.prototype.close no longer exists, so the win32 readline workaround in create.js would have to go and cannot be verified here), react/antd/react-router-dom/@types/react, typescript 7, @sinclair/typebox, webpack-merge (exact pin), webpack-dev-middleware, webpack-manifest-plugin, winston-daily-rotate-file. Code adaptations: the two /api/stream/:id handlers in routes.ts are typed Request<{ id: string }> because @types/express 5 types req.params values as string | string[]; eslint.config.mjs adds newIsCapExceptions: ["constructor"] because eslint 10.10 new-cap now reports `new this.constructor()`. Co-Authored-By: Claude Fable 5.1 --- eslint.config.mjs | 1 + package.json | 34 +++++++++--------- packages/controller/package.json | 18 +++++----- packages/controller/src/routes.ts | 12 ++++--- packages/create/package.json | 2 +- packages/create/templates/common/package.json | 14 ++++---- packages/ctl/package.json | 4 +-- packages/host/package.json | 14 ++++---- packages/lib/package.json | 8 ++--- packages/web_ui/package.json | 28 +++++++-------- pnpm-workspace.yaml | 36 +++++++++---------- 11 files changed, 88 insertions(+), 83 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 8fc661f1..e75d2f0c 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -148,6 +148,7 @@ export default defineConfig([{ "new-cap": ["error", { "capIsNewExceptions": ["StringEnum", "StringKey"], "capIsNewExceptionPattern": "^Type\\.", + "newIsCapExceptions": ["constructor"], }], "new-parens": "error", diff --git a/package.json b/package.json index 972d08c9..ec0013af 100644 --- a/package.json +++ b/package.json @@ -42,24 +42,24 @@ "@clusterio/host": "workspace:^", "@clusterio/lib": "workspace:^", "@clusterio/web_ui": "workspace:^", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "^9.32.0", - "@stylistic/eslint-plugin": "^5.2.2", - "@swc/core": "^1.13.3", + "@eslint/eslintrc": "^3.3.7", + "@eslint/js": "^10.0.1", + "@stylistic/eslint-plugin": "^5.10.0", + "@swc/core": "^1.16.2", "@types/node": "catalog:", - "@typescript-eslint/eslint-plugin": "^8.38.0", - "@typescript-eslint/parser": "^8.38.0", - "eslint": "^9.32.0", + "@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.1.0", - "form-data": "^4.0.4", - "globals": "^16.3.0", - "jsonwebtoken": "^9.0.2", - "jszip": "^3.10.1", - "mocha": "^11.7.1", - "nyc": "^17.1.0", - "typedoc": "^0.28.9", - "typescript": "^5.9.2", - "yargs": "^18.0.0" + "express": "^5.2.1", + "form-data": "^4.0.6", + "globals": "^17.12.0", + "jsonwebtoken": "^9.0.3", + "jszip": "^3.10.2", + "mocha": "^11.8.0", + "nyc": "^18.0.0", + "typedoc": "^0.28.20", + "typescript": "^5.9.3", + "yargs": "^18.1.0" } } diff --git a/packages/controller/package.json b/packages/controller/package.json index 0ff9fda0..d93601df 100644 --- a/packages/controller/package.json +++ b/packages/controller/package.json @@ -39,36 +39,36 @@ "@clusterio/lib": "workspace:^", "@sinclair/typebox": "catalog:", "busboy": "^1.6.0", - "compression": "^1.8.0", + "compression": "^1.8.2", "express": "catalog:", - "finalhandler": "^1.3.1", + "finalhandler": "^2.1.1", "jsonwebtoken": "catalog:", "jszip": "catalog:", - "semver": "^7.7.1", + "semver": "^7.8.5", "winston": "catalog:", "winston-daily-rotate-file": "catalog:", "ws": "catalog:", - "yargs": "^17.7.2" + "yargs": "^18.1.0" }, "devDependencies": { "@clusterio/web_ui": "workspace:^", "@swc/core": "catalog:", - "@types/busboy": "^1.5.0", - "@types/compression": "^1.7.2", + "@types/busboy": "^1.5.4", + "@types/compression": "^1.8.1", "@types/express": "catalog:", "@types/finalhandler": "catalog:", "@types/jsonwebtoken": "catalog:", "@types/node": "catalog:", - "@types/semver": "^7.5.0", + "@types/semver": "^7.8.0", "@types/ws": "catalog:", - "@types/yargs": "^17.0.33", + "@types/yargs": "^17.0.35", "react": "catalog:", "react-dom": "catalog:", "react-router-dom": "catalog:", "typescript": "catalog:", "webpack": "catalog:", "webpack-cli": "catalog:", - "webpack-dev-middleware": "^6.1.1", + "webpack-dev-middleware": "^6.1.3", "webpack-merge": "catalog:" } } diff --git a/packages/controller/src/routes.ts b/packages/controller/src/routes.ts index 94531b72..da32850b 100644 --- a/packages/controller/src/routes.ts +++ b/packages/controller/src/routes.ts @@ -349,7 +349,7 @@ export async function createProxyStream(app: Application): Promise return stream; } -async function putStream(req: Request, res: Response) { +async function putStream(req: Request<{ id: string }>, res: Response) { const stream = req.app.locals.streams.get(req.params.id); if (!stream || stream.source) { res.sendStatus(404); @@ -388,7 +388,7 @@ function startStream(res: Response, stream: ProxyStream) { clearTimeout(stream.timeout); } -async function getStream(req: Request, res: Response) { +async function getStream(req: Request<{ id: string }>, res: Response) { const stream = req.app.locals.streams.get(req.params.id); if (!stream || stream.flowing) { res.sendStatus(404); @@ -695,8 +695,12 @@ export function addRouteHandlers(app: Application) { validateHostToken, (req:Request, res:Response, next:any) => uploadExport(req, res).catch(next) ); - app.put("/api/stream/:id", (req:Request, res:Response, next:any) => putStream(req, res).catch(next)); - app.get("/api/stream/:id", (req:Request, res:Response, next:any) => getStream(req, res).catch(next)); + app.put("/api/stream/:id", + (req:Request<{ id: string }>, res:Response, next:any) => putStream(req, res).catch(next) + ); + app.get("/api/stream/:id", + (req:Request<{ id: string }>, res:Response, next:any) => getStream(req, res).catch(next) + ); app.post("/api/upload-save", validateUserToken, (req:Request, res:Response, next:any) => uploadSave(req, res).catch(next) diff --git a/packages/create/package.json b/packages/create/package.json index 601defa0..bf85f5b4 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -34,6 +34,6 @@ "dependencies": { "chalk": "catalog:", "inquirer": "^8.2.4", - "yargs": "^17.7.2" + "yargs": "^18.1.0" } } diff --git a/packages/create/templates/common/package.json b/packages/create/templates/common/package.json index dd7b657d..9776f0fc 100644 --- a/packages/create/templates/common/package.json +++ b/packages/create/templates/common/package.json @@ -55,21 +55,21 @@ "devDependencies": { //%// Typescript and type declarations //%if typescript - "typescript": "^5.5.3", - "@types/node": "^20.4.5", + "typescript": "^5.9.3", + "@types/node": "^24.13.4", //%endif //%if typescript & web - "@types/react": "^18.2.21", + "@types/react": "^18.3.31", //%endif //%// Everything else //%if web - "antd": "^5.13.0", + "antd": "^5.29.3", "react": "^18.2.0", "react-dom": "^18.2.0", //%endif //%if webpack - "webpack": "^5.88.2", - "webpack-cli": "^5.1.4", + "webpack": "^5.110.3", + "webpack-cli": "^7.2.3", "webpack-merge": "^5.9.0", //%endif //%if controller @@ -87,7 +87,7 @@ "@clusterio/lib": "^__clusterio_version__" }, "dependencies": { - "@sinclair/typebox": "^0.30.4" + "@sinclair/typebox": "^0.30.6" }, "publishConfig": { "access": "public" diff --git a/packages/ctl/package.json b/packages/ctl/package.json index 04f1373b..50980c7c 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": "^17.7.2" + "yargs": "^18.1.0" }, "devDependencies": { "@types/node": "catalog:", - "@types/yargs": "^17.0.33", + "@types/yargs": "^17.0.35", "typescript": "catalog:" } } diff --git a/packages/host/package.json b/packages/host/package.json index 542caa42..8593ccc0 100644 --- a/packages/host/package.json +++ b/packages/host/package.json @@ -39,22 +39,22 @@ "dependencies": { "@clusterio/lib": "workspace:^", "@sinclair/typebox": "catalog:", - "jimp": "^1.6.0", + "jimp": "^1.6.1", "jszip": "catalog:", - "pidusage": "^3.0.2", + "pidusage": "^4.0.1", "rcon-client": "^4.2.5", - "semver": "^7.7.1", + "semver": "^7.8.5", "set-blocking": "catalog:", "winston": "catalog:", "winston-daily-rotate-file": "catalog:", - "yargs": "^17.7.2" + "yargs": "^18.1.0" }, "devDependencies": { "@types/node": "catalog:", - "@types/pidusage": "^2.0.2", - "@types/semver": "^7.5.0", + "@types/pidusage": "^2.0.5", + "@types/semver": "^7.8.0", "@types/set-blocking": "catalog:", - "@types/yargs": "^17.0.33", + "@types/yargs": "^17.0.35", "typescript": "catalog:" } } diff --git a/packages/lib/package.json b/packages/lib/package.json index 8cc7bcb7..918a2371 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -45,7 +45,7 @@ "dependencies": { "@sinclair/typebox": "catalog:", - "ajv": "^8.17.1", + "ajv": "^8.20.0", "chalk": "catalog:", "fast-deep-equal": "^3.1.3", "jszip": "catalog:", @@ -54,14 +54,14 @@ "winston": "catalog:", "winston-transport": "catalog:", "ws": "catalog:", - "yargs": "^17.7.2" + "yargs": "^18.1.0" }, "devDependencies": { "@types/node": "catalog:", "@types/set-blocking": "catalog:", - "@types/triple-beam": "^1.3.2", + "@types/triple-beam": "^1.3.5", "@types/ws": "catalog:", - "@types/yargs": "^17.0.33", + "@types/yargs": "^17.0.35", "typescript": "catalog:" } } diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json index 9371bdc6..aea3a710 100644 --- a/packages/web_ui/package.json +++ b/packages/web_ui/package.json @@ -35,38 +35,38 @@ "dependencies": { "@ant-design/icons": "^5.6.1", "@clusterio/lib": "workspace:^", - "@sinclair/typebox": "^0.30.4", - "@swc/core": "^1.13.3", - "antd": "^5.24.2", - "assert": "^2.0.0", + "@sinclair/typebox": "^0.30.6", + "@swc/core": "^1.16.2", + "antd": "^5.29.3", + "assert": "^2.1.0", "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", - "css-loader": "^6.8.1", + "css-loader": "^7.1.5", "events": "^3.3.0", "file-loader": "^6.2.0", "null-loader": "^4.0.1", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", "process": "^0.11.10", - "rc-field-form": "^1.37.0", + "rc-field-form": "^1.44.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-markdown": "catalog:", - "react-router-dom": "^6.29.0", + "react-router-dom": "^6.30.6", "stream-browserify": "^3.0.0", - "style-loader": "^3.3.3", - "swc-loader": "^0.2.6", - "terser-webpack-plugin": "^5.3.11", - "typescript": "^5.7.3", + "style-loader": "^4.0.0", + "swc-loader": "^0.2.7", + "terser-webpack-plugin": "^5.6.1", + "typescript": "^5.9.3", "util": "^0.12.5", "webpack": "catalog:", "webpack-cli": "catalog:", "webpack-manifest-plugin": "^5.0.0" }, "devDependencies": { - "@types/node": "^20.17.19", - "@types/react": "^18.3.18", - "@types/react-dom": "^18.3.5" + "@types/node": "^24.13.4", + "@types/react": "^18.3.31", + "@types/react-dom": "^18.3.7" } } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 949418cc..6076acf0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,33 +6,33 @@ packages: - test/ catalog: - '@sinclair/typebox': ^0.30.4 - '@swc/core': ^1.13.3 - '@types/express': ^4.17.17 - '@types/finalhandler': ^1.2.0 - '@types/jsonwebtoken': ^9.0.9 - '@types/node': ^22.20.1 - '@types/react': ^18.3.18 - '@types/set-blocking': ^2.0.0 - '@types/ws': ^8.5.14 - antd: ^5.24.2 - chalk: ^4.1.2 - express: ^5.1.0 - jsonwebtoken: ^9.0.2 - jszip: ^3.10.1 + '@sinclair/typebox': ^0.30.6 + '@swc/core': ^1.16.2 + '@types/express': ^5.0.6 + '@types/finalhandler': ^1.2.4 + '@types/jsonwebtoken': ^9.0.10 + '@types/node': ^24.13.4 + '@types/react': ^18.3.31 + '@types/set-blocking': ^2.0.2 + '@types/ws': ^8.18.1 + antd: ^5.29.3 + chalk: ^6.0.0 + express: ^5.2.1 + jsonwebtoken: ^9.0.3 + jszip: ^3.10.2 react: ^18.2.0 react-dom: ^18.2.0 react-markdown: ^10.1.0 - react-router-dom: ^6.29.0 + react-router-dom: ^6.30.6 set-blocking: ^2.0.0 - typescript: ^5.7.3 + typescript: ^5.9.3 webpack: ^5.110.3 webpack-cli: ^7.2.3 webpack-merge: 5.9.0 - winston: ^3.17.0 + winston: ^3.19.0 winston-daily-rotate-file: ^4.7.1 winston-transport: ^4.9.0 - ws: ^8.18.1 + ws: ^8.21.3 catalogMode: strict 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 4/4] 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