Skip to content

Commit 866c992

Browse files
xtexxxtexx
committed
nodejs-22: backport corepack update to 0.31.0
This backports node update of corepack to 0.31.0, updating npmjs.org keys pinned by corepack. This should fix the following error: corepack install -g [email protected] Installing [email protected]... Internal Error: Cannot find matching keyid: {"signatures":[{"sig":"MEYCIQDkZyZZmBzkRcQowEEFiEcGp4/xV8GBLXxTEzz9QstrsAIhAPx6tvZixjTub6GPqJa82vcWFhUU39JCtoJvcoRK/K39","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"keys":[{"expires":null,"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","keytype":"ecdsa-sha2-nistp256","scheme":"ecdsa-sha2-nistp256","key":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1Olb3zMAFFxXKHiIkQO5cJ3Yhl5i6UPp+IhuteBJbuHcA5UogKo0EWtlWwW6KSaKoTNEYL7JlCQiVnkhBktUgg=="}]} Link: pnpm/pnpm#9014 Link: nodejs/corepack#612 Link: misskey-dev/misskey#15386 Link: https://github.com/nodejs/corepack/releases/tag/v0.31.0 Link: nodejs/node@63c1859 Link: nodejs/node#56795 Backport-of: 63c1859e019465cbb0b6b46ba0d481fb41d94a22 Reviewed-by: xtex <[email protected]> Signed-off-by: xtex <[email protected]>
1 parent 1bffd1d commit 866c992

File tree

2 files changed

+182
-0
lines changed

2 files changed

+182
-0
lines changed

‎lang-js/nodejs-22/autobuild/patches/0001-deps-update-corepack-to-0.31.0.patch

+181
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
From 63c1859e019465cbb0b6b46ba0d481fb41d94a22 Mon Sep 17 00:00:00 2001
2+
From: "Node.js GitHub Bot" <[email protected]>
3+
Date: Tue, 28 Jan 2025 05:58:55 -0500
4+
Subject: [PATCH] deps: update corepack to 0.31.0
5+
X-Developer-Signature: v=1; a=openpgp-sha256; l=6207; [email protected];
6+
h=from:subject; bh=KiQjLdRtHV6vkfj0L1VKKRwWQp66sGcgJtgHK8MpnL8=;
7+
b=owGbwMvMwCW2U4Ij7wZL9ETG02pJDOnLVd0dOqxawoLZ15vne4cuWMPa+5nnarLVfw+FijVzQ
8+
k5ZFv3qKGVhEONikBVTZCkybPBm1UnnF11WLgszh5UJZAgDF6cATGQhJyPDorZqo4LNmdfMjDt7
9+
zrzeflJqvmFpzLveAj32wD1SkfOjGRm+pNxk0rZjva0w+838u6sqOvmyD01L+RTDlDzRc0aY9R5
10+
uAA==
11+
X-Developer-Key: [email protected]; a=openpgp;
12+
fpr=7231804B052C670F15A6771DB918086ED8045B91
13+
14+
PR-URL: https://github.com/nodejs/node/pull/56795
15+
Reviewed-By: Antoine du Hamel <[email protected]>
16+
Reviewed-By: Chengzhong Wu <[email protected]>
17+
---
18+
deps/corepack/CHANGELOG.md | 22 +++++++++++++++++++
19+
deps/corepack/README.md | 2 ++
20+
deps/corepack/dist/lib/corepack.cjs | 33 +++++++++++++++++++++--------
21+
deps/corepack/package.json | 6 +++---
22+
4 files changed, 51 insertions(+), 12 deletions(-)
23+
24+
diff --git a/deps/corepack/CHANGELOG.md b/deps/corepack/CHANGELOG.md
25+
index 941d0b6b7e5e25..88363683a9d5f6 100644
26+
--- a/deps/corepack/CHANGELOG.md
27+
+++ b/deps/corepack/CHANGELOG.md
28+
@@ -1,5 +1,27 @@
29+
# Changelog
30+
31+
+## [0.31.0](https://github.com/nodejs/corepack/compare/v0.30.0...v0.31.0) (2025-01-27)
32+
+
33+
+
34+
+### ⚠ BREAKING CHANGES
35+
+
36+
+* drop support for Node.js 21.x ([#594](https://github.com/nodejs/corepack/issues/594))
37+
+
38+
+### Features
39+
+
40+
+* update package manager versions ([#595](https://github.com/nodejs/corepack/issues/595)) ([c7a9bde](https://github.com/nodejs/corepack/commit/c7a9bde16dcbbb7e6ef03fef740656cde7ade360))
41+
+
42+
+
43+
+### Bug Fixes
44+
+
45+
+* only print message for `UsageError`s ([#602](https://github.com/nodejs/corepack/issues/602)) ([72a588c](https://github.com/nodejs/corepack/commit/72a588c2370c17e415b24fe389efdafb3c84e90b))
46+
+* update npm registry keys ([#614](https://github.com/nodejs/corepack/issues/614)) ([8c90caa](https://github.com/nodejs/corepack/commit/8c90caab7f1c5c9b89f1de113bc1dfc441bf25d2))
47+
+
48+
+
49+
+### Miscellaneous Chores
50+
+
51+
+* drop support for Node.js 21.x ([#594](https://github.com/nodejs/corepack/issues/594)) ([8bebc0c](https://github.com/nodejs/corepack/commit/8bebc0c0a5cbcdeec41673dcbaf581e6e1c1be11))
52+
+
53+
## [0.30.0](https://github.com/nodejs/corepack/compare/v0.29.4...v0.30.0) (2024-11-23)
54+
55+
56+
diff --git a/deps/corepack/README.md b/deps/corepack/README.md
57+
index d94614affc5353..66bfbc3fb6aae3 100644
58+
--- a/deps/corepack/README.md
59+
+++ b/deps/corepack/README.md
60+
@@ -302,6 +302,8 @@ same major line. Should you need to upgrade to a new major, use an explicit
61+
62+
## Troubleshooting
63+
64+
+The environment variable `DEBUG` can be set to `corepack` to enable additional debug logging.
65+
+
66+
### Networking
67+
68+
There are a wide variety of networking issues that can occur while running
69+
diff --git a/deps/corepack/dist/lib/corepack.cjs b/deps/corepack/dist/lib/corepack.cjs
70+
index e1919339dc38bd..7a92f3334f7687 100644
71+
--- a/deps/corepack/dist/lib/corepack.cjs
72+
+++ b/deps/corepack/dist/lib/corepack.cjs
73+
@@ -21260,7 +21260,7 @@ function String2(descriptor, ...args) {
74+
}
75+
76+
// package.json
77+
-var version = "0.30.0";
78+
+var version = "0.31.0";
79+
80+
// sources/Engine.ts
81+
var import_fs9 = __toESM(require("fs"));
82+
@@ -21274,7 +21274,7 @@ var import_valid3 = __toESM(require_valid2());
83+
var config_default = {
84+
definitions: {
85+
npm: {
86+
- default: "10.9.1+sha1.ab141c1229765c11c8c59060fc9cf450a2207bd6",
87+
+ default: "11.0.0+sha1.7bba7c80740ef1f5b2c5d4cecc55e94912faa5e6",
88+
fetchLatestFrom: {
89+
type: "npm",
90+
package: "npm"
91+
@@ -21311,7 +21311,7 @@ var config_default = {
92+
}
93+
},
94+
pnpm: {
95+
- default: "9.14.2+sha1.5202b50ab92394b3c922d2e293f196e2df6d441b",
96+
+ default: "9.15.4+sha1.ffa0b5c573381e8035b354028ccff97c8e452047",
97+
fetchLatestFrom: {
98+
type: "npm",
99+
package: "pnpm"
100+
@@ -21375,7 +21375,7 @@ var config_default = {
101+
package: "yarn"
102+
},
103+
transparent: {
104+
- default: "4.5.2+sha224.c2e2e9ed3cdadd6ec250589b3393f71ae56d5ec297af11cec1eba3b4",
105+
+ default: "4.6.0+sha224.acd0786f07ffc6c933940eb65fc1d627131ddf5455bddcc295dc90fd",
106+
commands: [
107+
[
108+
"yarn",
109+
@@ -21438,11 +21438,18 @@ var config_default = {
110+
keys: {
111+
npm: [
112+
{
113+
- expires: null,
114+
+ expires: "2025-01-29T00:00:00.000Z",
115+
keyid: "SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA",
116+
keytype: "ecdsa-sha2-nistp256",
117+
scheme: "ecdsa-sha2-nistp256",
118+
key: "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1Olb3zMAFFxXKHiIkQO5cJ3Yhl5i6UPp+IhuteBJbuHcA5UogKo0EWtlWwW6KSaKoTNEYL7JlCQiVnkhBktUgg=="
119+
+ },
120+
+ {
121+
+ expires: null,
122+
+ keyid: "SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U",
123+
+ keytype: "ecdsa-sha2-nistp256",
124+
+ scheme: "ecdsa-sha2-nistp256",
125+
+ key: "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY6Ya7W++7aUPzvMTrezH6Ycx3c+HOKYCcNGybJZSCJq/fd7Qa8uuAKtdIkUQtQiEKERhAmE5lMMJhP8OkDOa2g=="
126+
}
127+
]
128+
}
129+
@@ -23099,10 +23106,18 @@ async function runMain(argv) {
130+
process.exitCode ??= code2;
131+
}
132+
} else {
133+
- await engine.executePackageManagerRequest(request, {
134+
- cwd: process.cwd(),
135+
- args: restArgs
136+
- });
137+
+ try {
138+
+ await engine.executePackageManagerRequest(request, {
139+
+ cwd: process.cwd(),
140+
+ args: restArgs
141+
+ });
142+
+ } catch (error) {
143+
+ if (error?.name === `UsageError`) {
144+
+ console.error(error.message);
145+
+ process.exit(1);
146+
+ }
147+
+ throw error;
148+
+ }
149+
}
150+
}
151+
// Annotate the CommonJS export names for ESM import in node:
152+
diff --git a/deps/corepack/package.json b/deps/corepack/package.json
153+
index c9c6662e99e6c9..91b95f31d77b54 100644
154+
--- a/deps/corepack/package.json
155+
+++ b/deps/corepack/package.json
156+
@@ -1,6 +1,6 @@
157+
{
158+
"name": "corepack",
159+
- "version": "0.30.0",
160+
+ "version": "0.31.0",
161+
"homepage": "https://github.com/nodejs/corepack#readme",
162+
"bugs": {
163+
"url": "https://github.com/nodejs/corepack/issues"
164+
@@ -10,7 +10,7 @@
165+
"url": "https://github.com/nodejs/corepack.git"
166+
},
167+
"engines": {
168+
- "node": "^18.17.1 || >=20.10.0"
169+
+ "node": "^18.17.1 || ^20.10.0 || >=22.11.0"
170+
},
171+
"exports": {
172+
"./package.json": "./package.json"
173+
@@ -26,7 +26,7 @@
174+
"@yarnpkg/eslint-config": "^2.0.0",
175+
"@yarnpkg/fslib": "^3.0.0-rc.48",
176+
"@zkochan/cmd-shim": "^6.0.0",
177+
- "better-sqlite3": "^10.0.0",
178+
+ "better-sqlite3": "^11.7.2",
179+
"clipanion": "patch:clipanion@npm%3A3.2.1#~/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch",
180+
"debug": "^4.1.1",
181+
"esbuild": "^0.21.0",

‎lang-js/nodejs-22/spec

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
VER=22.13.1
2+
REL=1
23
SRCS="tbl::https://nodejs.org/dist/v$VER/node-v$VER.tar.xz"
34
CHKSUMS="sha256::cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2"
45
CHKUPDATE="anitya::id=374342"

0 commit comments

Comments
 (0)