From e715f0d6afcc382c9c7aea02a87fab894c58f610 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 15 Sep 2026 11:53:48 +0200 Subject: [PATCH] Replace Yarn catalogs with explicit dependency ranges Dependabot does not yet support updating Yarn catalog definitions in .yarnrc.yml. Keep explicit version ranges in both workspace manifests so Dependabot can continue updating shared dependencies. Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .yarnrc.yml | 6 ------ package.json | 8 ++++---- subaction/matrix/package.json | 8 ++++---- yarn.lock | 16 ++++++++-------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index fff1670..3930be5 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -22,9 +22,3 @@ enableGlobalCache: false enableHardenedMode: true enableScripts: false npmMinimalAgeGate: 2d - -catalog: - "@actions/core": ^3.0.1 - "@docker/actions-toolkit": ^0.100.0 - esbuild: ^0.28.0 - generate-license-file: ^4.1.1 diff --git a/package.json b/package.json index e65f4dc..fd3525f 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "license": "Apache-2.0", "packageManager": "yarn@4.15.0", "dependencies": { - "@actions/core": "catalog:", - "@docker/actions-toolkit": "catalog:", + "@actions/core": "^3.0.1", + "@docker/actions-toolkit": "^0.100.0", "handlebars": "^4.7.9" }, "devDependencies": { @@ -38,11 +38,11 @@ "@typescript-eslint/parser": "^8.56.1", "@vitest/coverage-v8": "^4.0.18", "@vitest/eslint-plugin": "^1.6.9", - "esbuild": "catalog:", + "esbuild": "^0.28.0", "eslint": "^9.39.3", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.5", - "generate-license-file": "catalog:", + "generate-license-file": "^4.1.1", "globals": "^17.3.0", "prettier": "^3.8.1", "typescript": "^5.9.3", diff --git a/subaction/matrix/package.json b/subaction/matrix/package.json index 43abd8e..689e9c2 100644 --- a/subaction/matrix/package.json +++ b/subaction/matrix/package.json @@ -15,12 +15,12 @@ "author": "Docker Inc.", "license": "Apache-2.0", "dependencies": { - "@actions/core": "catalog:", + "@actions/core": "^3.0.1", "@actions/exec": "^3.0.0", - "@docker/actions-toolkit": "catalog:" + "@docker/actions-toolkit": "^0.100.0" }, "devDependencies": { - "esbuild": "catalog:", - "generate-license-file": "catalog:" + "esbuild": "^0.28.0", + "generate-license-file": "^4.1.1" } } diff --git a/yarn.lock b/yarn.lock index 1cfd575..ba3ddc0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2834,11 +2834,11 @@ __metadata: version: 0.0.0-use.local resolution: "docker-buildx-bake-matrix@workspace:subaction/matrix" dependencies: - "@actions/core": "catalog:" + "@actions/core": "npm:^3.0.1" "@actions/exec": "npm:^3.0.0" - "@docker/actions-toolkit": "catalog:" - esbuild: "catalog:" - generate-license-file: "catalog:" + "@docker/actions-toolkit": "npm:^0.100.0" + esbuild: "npm:^0.28.0" + generate-license-file: "npm:^4.1.1" languageName: unknown linkType: soft @@ -2846,19 +2846,19 @@ __metadata: version: 0.0.0-use.local resolution: "docker-buildx-bake@workspace:." dependencies: - "@actions/core": "catalog:" - "@docker/actions-toolkit": "catalog:" + "@actions/core": "npm:^3.0.1" + "@docker/actions-toolkit": "npm:^0.100.0" "@eslint/js": "npm:^9.39.3" "@types/node": "npm:^24.11.0" "@typescript-eslint/eslint-plugin": "npm:^8.56.1" "@typescript-eslint/parser": "npm:^8.56.1" "@vitest/coverage-v8": "npm:^4.0.18" "@vitest/eslint-plugin": "npm:^1.6.9" - esbuild: "catalog:" + esbuild: "npm:^0.28.0" eslint: "npm:^9.39.3" eslint-config-prettier: "npm:^10.1.8" eslint-plugin-prettier: "npm:^5.5.5" - generate-license-file: "catalog:" + generate-license-file: "npm:^4.1.1" globals: "npm:^17.3.0" handlebars: "npm:^4.7.9" prettier: "npm:^3.8.1"