addressing ci issues

ruimartin · ruimartin · commit 3673db9cb8f6 · 2025-08-26T10:35:09.000+02:00
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/tslib-npm-2.8.1-66590b21b8-3e2e043d5c.zip b/.yarn/cache/tslib-npm-2.8.1-66590b21b8-3e2e043d5c.zip
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -54,6 +54,3 @@ supportedArchitectures:
 telemetryUserId: yarnpkg/berry
 
 yarnPath: scripts/run-yarn.js
-
-catalog:
-  tslib: "^2.4.0"
diff --git a/packages/plugin-catalog/package.json b/packages/plugin-catalog/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^",
-    "tslib": "catalog:"
+    "tslib": "^2.4.0"
   },
   "peerDependencies": {
     "@yarnpkg/core": "workspace:^",
diff --git a/packages/plugin-catalog/tests/publishing.test.ts b/packages/plugin-catalog/tests/publishing.test.ts
@@ -105,7 +105,7 @@ describe(`Catalog publishing behavior`, () => {
       ...publishedDeps.peerDependencies,
     };
 
-    for (const [depName, depRange] of Object.entries(allDeps)) {
+    for (const [, depRange] of Object.entries(allDeps)) {
       expect(typeof depRange).toBe(`string`);
       expect((depRange as string).startsWith(`catalog:`)).toBe(false);
     }
diff --git a/yarn.lock b/yarn.lock
@@ -6131,7 +6131,7 @@ __metadata:
     "@yarnpkg/core": "workspace:^"
     "@yarnpkg/fslib": "workspace:^"
     "@yarnpkg/plugin-pack": "workspace:^"
-    tslib: "catalog:"
+    tslib: "npm:^2.4.0"
   peerDependencies:
     "@yarnpkg/core": "workspace:^"
     "@yarnpkg/plugin-pack": "workspace:^"
@@ -20835,20 +20835,13 @@ pem@dexus/pem:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.3, tslib@npm:^2.6.0":
+"tslib@npm:^2.0.3, tslib@npm:^2.4.0, tslib@npm:^2.6.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.4.0":
-  version: 2.8.1
-  resolution: "tslib@npm:2.8.1"
-  checksum: 10/3e2e043d5c2316461cb54e5c7fe02c30ef6dccb3384717ca22ae5c6b5bc95232a6241df19c622d9c73b809bea33b187f6dbc73030963e29950c2141bc32a79f7
-  languageName: node
-  linkType: hard
-
 "tuf-js@npm:^3.0.1":
   version: 3.0.1
   resolution: "tuf-js@npm:3.0.1"

Original file line number	Diff line number	Diff line change
@@ -105,7 +105,7 @@ describe(`Catalog publishing behavior`, () => {
`105`	`105`	`...publishedDeps.peerDependencies,`
`106`	`106`	`};`
`107`	`107`
`108`		`- for (const [depName, depRange] of Object.entries(allDeps)) {`
	`108`	`+ for (const [, depRange] of Object.entries(allDeps)) {`
`109`	`109`	expect(typeof depRange).toBe(`string`);
`110`	`110`	expect((depRange as string).startsWith(`catalog:`)).toBe(false);
`111`	`111`	`}`