Skip to content

Commit 5ba9bc7

Browse files
committed
nodejs-20: backport corepack update to 0.31.0
This resolves the same error as in PR 9597 for nodejs 20.x, updating Corepack's pinned registry public keys. Patch 1 (update corepack to 0.30.0) is included in nodejs v20.18.3 proposal and should be removed in the next nodejs update. Patch 2 (update to 0.31.0) is not included in that proposal and should be removed after two new nodejs 20.x releases. Link: nodejs/node#56699 Link: nodejs/corepack#627 Link: https://github.com/nodejs/corepack/releases/tag/v0.31.0 Link: https://github.com/nodejs/corepack/releases/tag/v0.30.0 Link: nodejs/node@f7131cf Link: nodejs/node@63c1859 Link: nodejs/node#55977 Link: nodejs/node#56795 Link: #9597 Backport-of: f7131cf178231f578f1da2aa7ff52a427c953b98 Backport-of: 64ee8a025815553af30d9d273e2f2d07a5eb83ea Reviewed-by: xtex <[email protected]> Signed-off-by: xtex <[email protected]>
1 parent 1bffd1d commit 5ba9bc7

File tree

3 files changed

+400
-0
lines changed

3 files changed

+400
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
From 9c5f17e334dd598d165d9b74c2a35520bddb56ba Mon Sep 17 00:00:00 2001
2+
From: "Node.js GitHub Bot" <[email protected]>
3+
Date: Mon, 25 Nov 2024 20:02:35 -0500
4+
Subject: [PATCH 1/2] BACKPORT: deps: update corepack to 0.30.0
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
X-Developer-Signature: v=1; a=openpgp-sha256; l=8218; [email protected];
9+
h=from:subject; bh=2BpVeYfruzvIMsj7C/QBi6hCldFOFmFmYBO/WLyqIFE=;
10+
b=owGbwMvMwCW2U4Ij7wZL9ETG02pJDOnLTdMT77ar7jFdPOsDn0W9xgcF36hFfe2rptr+WKPt6
11+
LPphkNnRykLgxgXg6yYIkuRYYM3q046v+iyclmYOaxMIEMYuDgFYCLW6owMRx9mvrc7HSxU8qjm
12+
l96J5HVSnQ4BZ2Ubz66y33NUpDjkCCPD9aU8M734/eYt3fxUdtG2a0+ui/y+WlrmfkJ36protKU
13+
RjAA=
14+
X-Developer-Key: [email protected]; a=openpgp;
15+
fpr=7231804B052C670F15A6771DB918086ED8045B91
16+
17+
PR-URL: https://github.com/nodejs/node/pull/55977
18+
Reviewed-By: Michaël Zasso <[email protected]>
19+
Reviewed-By: Trivikram Kamat <[email protected]>
20+
Reviewed-By: Antoine du Hamel <[email protected]>
21+
---
22+
deps/corepack/CHANGELOG.md | 12 ++++++++++++
23+
deps/corepack/dist/corepack.js | 1 +
24+
deps/corepack/dist/lib/corepack.cjs | 20 +++++++++++++-------
25+
deps/corepack/dist/npm.js | 1 +
26+
deps/corepack/dist/npx.js | 1 +
27+
deps/corepack/dist/pnpm.js | 1 +
28+
deps/corepack/dist/pnpx.js | 1 +
29+
deps/corepack/dist/yarn.js | 1 +
30+
deps/corepack/dist/yarnpkg.js | 1 +
31+
deps/corepack/package.json | 2 +-
32+
10 files changed, 33 insertions(+), 8 deletions(-)
33+
34+
diff --git a/deps/corepack/CHANGELOG.md b/deps/corepack/CHANGELOG.md
35+
index 7de934c0d2c0..941d0b6b7e5e 100644
36+
--- a/deps/corepack/CHANGELOG.md
37+
+++ b/deps/corepack/CHANGELOG.md
38+
@@ -1,5 +1,17 @@
39+
# Changelog
40+
41+
+## [0.30.0](https://github.com/nodejs/corepack/compare/v0.29.4...v0.30.0) (2024-11-23)
42+
+
43+
+
44+
+### Features
45+
+
46+
+* update package manager versions ([#578](https://github.com/nodejs/corepack/issues/578)) ([a286c8f](https://github.com/nodejs/corepack/commit/a286c8f5537ea9ecf9b6ff53c7bc3e8da4e3c8bb))
47+
+
48+
+
49+
+### Performance Improvements
50+
+
51+
+* prefer `module.enableCompileCache` over `v8-compile-cache` ([#574](https://github.com/nodejs/corepack/issues/574)) ([cba6905](https://github.com/nodejs/corepack/commit/cba690575bd606faeee54bd512ccb8797d49055f))
52+
+
53+
## [0.29.4](https://github.com/nodejs/corepack/compare/v0.29.3...v0.29.4) (2024-09-07)
54+
55+
56+
diff --git a/deps/corepack/dist/corepack.js b/deps/corepack/dist/corepack.js
57+
index b1b22662466f..6179b11c083c 100755
58+
--- a/deps/corepack/dist/corepack.js
59+
+++ b/deps/corepack/dist/corepack.js
60+
@@ -1,3 +1,4 @@
61+
#!/usr/bin/env node
62+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='0';
63+
+require('module').enableCompileCache?.();
64+
require('./lib/corepack.cjs').runMain(process.argv.slice(2));
65+
\ No newline at end of file
66+
diff --git a/deps/corepack/dist/lib/corepack.cjs b/deps/corepack/dist/lib/corepack.cjs
67+
index 2978fc336232..e1919339dc38 100644
68+
--- a/deps/corepack/dist/lib/corepack.cjs
69+
+++ b/deps/corepack/dist/lib/corepack.cjs
70+
@@ -21260,7 +21260,7 @@ function String2(descriptor, ...args) {
71+
}
72+
73+
// package.json
74+
-var version = "0.29.4";
75+
+var version = "0.30.0";
76+
77+
// sources/Engine.ts
78+
var import_fs9 = __toESM(require("fs"));
79+
@@ -21274,7 +21274,7 @@ var import_valid3 = __toESM(require_valid2());
80+
var config_default = {
81+
definitions: {
82+
npm: {
83+
- default: "10.8.3+sha1.e6085b2864fcfd9b1aad7b602601b5a2fc116699",
84+
+ default: "10.9.1+sha1.ab141c1229765c11c8c59060fc9cf450a2207bd6",
85+
fetchLatestFrom: {
86+
type: "npm",
87+
package: "npm"
88+
@@ -21311,7 +21311,7 @@ var config_default = {
89+
}
90+
},
91+
pnpm: {
92+
- default: "9.9.0+sha1.3edbe440f4e570aa8f049adbd06b9483d55cc2d2",
93+
+ default: "9.14.2+sha1.5202b50ab92394b3c922d2e293f196e2df6d441b",
94+
fetchLatestFrom: {
95+
type: "npm",
96+
package: "pnpm"
97+
@@ -21375,7 +21375,7 @@ var config_default = {
98+
package: "yarn"
99+
},
100+
transparent: {
101+
- default: "4.4.1+sha224.fd21d9eb5fba020083811af1d4953acc21eeb9f6ff97efd1b3f9d4de",
102+
+ default: "4.5.2+sha224.c2e2e9ed3cdadd6ec250589b3393f71ae56d5ec297af11cec1eba3b4",
103+
commands: [
104+
[
105+
"yarn",
106+
@@ -21965,8 +21965,11 @@ async function runVersion(locator, installSpec, binName, args) {
107+
}
108+
if (!binPath)
109+
throw new Error(`Assertion failed: Unable to locate path for bin '${binName}'`);
110+
- if (locator.name !== `npm` || (0, import_lt.default)(locator.reference, `9.7.0`))
111+
- await Promise.resolve().then(() => __toESM(require_v8_compile_cache()));
112+
+ if (!import_module.default.enableCompileCache) {
113+
+ if (locator.name !== `npm` || (0, import_lt.default)(locator.reference, `9.7.0`)) {
114+
+ await Promise.resolve().then(() => __toESM(require_v8_compile_cache()));
115+
+ }
116+
+ }
117+
process.env.COREPACK_ROOT = import_path7.default.dirname(require.resolve("corepack/package.json"));
118+
process.argv = [
119+
process.execPath,
120+
@@ -21976,6 +21979,9 @@ async function runVersion(locator, installSpec, binName, args) {
121+
process.execArgv = [];
122+
process.mainModule = void 0;
123+
process.nextTick(import_module.default.runMain, binPath);
124+
+ if (import_module.default.flushCompileCache) {
125+
+ setImmediate(import_module.default.flushCompileCache);
126+
+ }
127+
}
128+
function shouldSkipIntegrityCheck() {
129+
return process.env.COREPACK_INTEGRITY_KEYS === `` || process.env.COREPACK_INTEGRITY_KEYS === `0`;
130+
@@ -22553,7 +22559,7 @@ var EnableCommand = class extends Command {
131+
[`enable`]
132+
];
133+
static usage = Command.Usage({
134+
- description: `Add the Corepack shims to the install directories`,
135+
+ description: `Add the Corepack shims to the install directory`,
136+
details: `
137+
When run, this command will check whether the shims for the specified package managers can be found with the correct values inside the install directory. If not, or if they don't exist, they will be created.
138+
139+
diff --git a/deps/corepack/dist/npm.js b/deps/corepack/dist/npm.js
140+
index 7d10ba5bdf36..75f68b058f2d 100755
141+
--- a/deps/corepack/dist/npm.js
142+
+++ b/deps/corepack/dist/npm.js
143+
@@ -1,3 +1,4 @@
144+
#!/usr/bin/env node
145+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
146+
+require('module').enableCompileCache?.();
147+
require('./lib/corepack.cjs').runMain(['npm', ...process.argv.slice(2)]);
148+
\ No newline at end of file
149+
diff --git a/deps/corepack/dist/npx.js b/deps/corepack/dist/npx.js
150+
index a8bd3e690143..b1138bb48e1a 100755
151+
--- a/deps/corepack/dist/npx.js
152+
+++ b/deps/corepack/dist/npx.js
153+
@@ -1,3 +1,4 @@
154+
#!/usr/bin/env node
155+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
156+
+require('module').enableCompileCache?.();
157+
require('./lib/corepack.cjs').runMain(['npx', ...process.argv.slice(2)]);
158+
\ No newline at end of file
159+
diff --git a/deps/corepack/dist/pnpm.js b/deps/corepack/dist/pnpm.js
160+
index a0a872634355..56ba50940503 100755
161+
--- a/deps/corepack/dist/pnpm.js
162+
+++ b/deps/corepack/dist/pnpm.js
163+
@@ -1,3 +1,4 @@
164+
#!/usr/bin/env node
165+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
166+
+require('module').enableCompileCache?.();
167+
require('./lib/corepack.cjs').runMain(['pnpm', ...process.argv.slice(2)]);
168+
\ No newline at end of file
169+
diff --git a/deps/corepack/dist/pnpx.js b/deps/corepack/dist/pnpx.js
170+
index 57ad4842631c..ee36be2e99c6 100755
171+
--- a/deps/corepack/dist/pnpx.js
172+
+++ b/deps/corepack/dist/pnpx.js
173+
@@ -1,3 +1,4 @@
174+
#!/usr/bin/env node
175+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
176+
+require('module').enableCompileCache?.();
177+
require('./lib/corepack.cjs').runMain(['pnpx', ...process.argv.slice(2)]);
178+
\ No newline at end of file
179+
diff --git a/deps/corepack/dist/yarn.js b/deps/corepack/dist/yarn.js
180+
index eaed8596eaba..ce628c82b6a7 100755
181+
--- a/deps/corepack/dist/yarn.js
182+
+++ b/deps/corepack/dist/yarn.js
183+
@@ -1,3 +1,4 @@
184+
#!/usr/bin/env node
185+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
186+
+require('module').enableCompileCache?.();
187+
require('./lib/corepack.cjs').runMain(['yarn', ...process.argv.slice(2)]);
188+
\ No newline at end of file
189+
diff --git a/deps/corepack/dist/yarnpkg.js b/deps/corepack/dist/yarnpkg.js
190+
index aada6032fa67..9541ed726aaa 100755
191+
--- a/deps/corepack/dist/yarnpkg.js
192+
+++ b/deps/corepack/dist/yarnpkg.js
193+
@@ -1,3 +1,4 @@
194+
#!/usr/bin/env node
195+
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
196+
+require('module').enableCompileCache?.();
197+
require('./lib/corepack.cjs').runMain(['yarnpkg', ...process.argv.slice(2)]);
198+
\ No newline at end of file
199+
diff --git a/deps/corepack/package.json b/deps/corepack/package.json
200+
index 571c359407e0..c9c6662e99e6 100644
201+
--- a/deps/corepack/package.json
202+
+++ b/deps/corepack/package.json
203+
@@ -1,6 +1,6 @@
204+
{
205+
"name": "corepack",
206+
- "version": "0.29.4",
207+
+ "version": "0.30.0",
208+
"homepage": "https://github.com/nodejs/corepack#readme",
209+
"bugs": {
210+
"url": "https://github.com/nodejs/corepack/issues"
211+
212+
base-commit: 53a57efd83a18efe7a84bf1b460acc789139939b
213+
--
214+
2.48.1
215+

0 commit comments

Comments
 (0)