Skip to content

Commit

Permalink
nodejs-20: backport corepack update to 0.31.0
Browse files Browse the repository at this point in the history 
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 <xtex@aosc.io>
Signed-off-by: xtex <xtex@aosc.io>
  • Loading branch information
@xtexx
xtexx committed Feb 8, 2025
1 parent 1bffd1d commit 5ba9bc7
Show file tree
Hide file tree
Showing 3 changed files with 400 additions and 0 deletions.
215 changes: 215 additions & 0 deletions lang-js/nodejs-20/autobuild/patches/0001-BACKPORT-deps-update-corepack-to-0.30.0.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
From 9c5f17e334dd598d165d9b74c2a35520bddb56ba Mon Sep 17 00:00:00 2001
From: "Node.js GitHub Bot" <github-bot@iojs.org>
Date: Mon, 25 Nov 2024 20:02:35 -0500
Subject: [PATCH 1/2] BACKPORT: deps: update corepack to 0.30.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Developer-Signature: v=1; a=openpgp-sha256; l=8218; i=xtexchooser@duck.com;
h=from:subject; bh=2BpVeYfruzvIMsj7C/QBi6hCldFOFmFmYBO/WLyqIFE=;
b=owGbwMvMwCW2U4Ij7wZL9ETG02pJDOnLTdMT77ar7jFdPOsDn0W9xgcF36hFfe2rptr+WKPt6
LPphkNnRykLgxgXg6yYIkuRYYM3q046v+iyclmYOaxMIEMYuDgFYCLW6owMRx9mvrc7HSxU8qjm
l96J5HVSnQ4BZ2Ubz66y33NUpDjkCCPD9aU8M734/eYt3fxUdtG2a0+ui/y+WlrmfkJ36protKU
RjAA=
X-Developer-Key: i=xtexchooser@duck.com; a=openpgp;
fpr=7231804B052C670F15A6771DB918086ED8045B91

PR-URL: https://github.com/nodejs/node/pull/55977
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
deps/corepack/CHANGELOG.md | 12 ++++++++++++
deps/corepack/dist/corepack.js | 1 +
deps/corepack/dist/lib/corepack.cjs | 20 +++++++++++++-------
deps/corepack/dist/npm.js | 1 +
deps/corepack/dist/npx.js | 1 +
deps/corepack/dist/pnpm.js | 1 +
deps/corepack/dist/pnpx.js | 1 +
deps/corepack/dist/yarn.js | 1 +
deps/corepack/dist/yarnpkg.js | 1 +
deps/corepack/package.json | 2 +-
10 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/deps/corepack/CHANGELOG.md b/deps/corepack/CHANGELOG.md
index 7de934c0d2c0..941d0b6b7e5e 100644
--- a/deps/corepack/CHANGELOG.md
+++ b/deps/corepack/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog

+## [0.30.0](https://github.com/nodejs/corepack/compare/v0.29.4...v0.30.0) (2024-11-23)
+
+
+### Features
+
+* update package manager versions ([#578](https://github.com/nodejs/corepack/issues/578)) ([a286c8f](https://github.com/nodejs/corepack/commit/a286c8f5537ea9ecf9b6ff53c7bc3e8da4e3c8bb))
+
+
+### Performance Improvements
+
+* prefer `module.enableCompileCache` over `v8-compile-cache` ([#574](https://github.com/nodejs/corepack/issues/574)) ([cba6905](https://github.com/nodejs/corepack/commit/cba690575bd606faeee54bd512ccb8797d49055f))
+
## [0.29.4](https://github.com/nodejs/corepack/compare/v0.29.3...v0.29.4) (2024-09-07)


diff --git a/deps/corepack/dist/corepack.js b/deps/corepack/dist/corepack.js
index b1b22662466f..6179b11c083c 100755
--- a/deps/corepack/dist/corepack.js
+++ b/deps/corepack/dist/corepack.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='0';
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(process.argv.slice(2));
\ No newline at end of file
diff --git a/deps/corepack/dist/lib/corepack.cjs b/deps/corepack/dist/lib/corepack.cjs
index 2978fc336232..e1919339dc38 100644
--- a/deps/corepack/dist/lib/corepack.cjs
+++ b/deps/corepack/dist/lib/corepack.cjs
@@ -21260,7 +21260,7 @@ function String2(descriptor, ...args) {
}

// package.json
-var version = "0.29.4";
+var version = "0.30.0";

// sources/Engine.ts
var import_fs9 = __toESM(require("fs"));
@@ -21274,7 +21274,7 @@ var import_valid3 = __toESM(require_valid2());
var config_default = {
definitions: {
npm: {
- default: "10.8.3+sha1.e6085b2864fcfd9b1aad7b602601b5a2fc116699",
+ default: "10.9.1+sha1.ab141c1229765c11c8c59060fc9cf450a2207bd6",
fetchLatestFrom: {
type: "npm",
package: "npm"
@@ -21311,7 +21311,7 @@ var config_default = {
}
},
pnpm: {
- default: "9.9.0+sha1.3edbe440f4e570aa8f049adbd06b9483d55cc2d2",
+ default: "9.14.2+sha1.5202b50ab92394b3c922d2e293f196e2df6d441b",
fetchLatestFrom: {
type: "npm",
package: "pnpm"
@@ -21375,7 +21375,7 @@ var config_default = {
package: "yarn"
},
transparent: {
- default: "4.4.1+sha224.fd21d9eb5fba020083811af1d4953acc21eeb9f6ff97efd1b3f9d4de",
+ default: "4.5.2+sha224.c2e2e9ed3cdadd6ec250589b3393f71ae56d5ec297af11cec1eba3b4",
commands: [
[
"yarn",
@@ -21965,8 +21965,11 @@ async function runVersion(locator, installSpec, binName, args) {
}
if (!binPath)
throw new Error(`Assertion failed: Unable to locate path for bin '${binName}'`);
- if (locator.name !== `npm` || (0, import_lt.default)(locator.reference, `9.7.0`))
- await Promise.resolve().then(() => __toESM(require_v8_compile_cache()));
+ if (!import_module.default.enableCompileCache) {
+ if (locator.name !== `npm` || (0, import_lt.default)(locator.reference, `9.7.0`)) {
+ await Promise.resolve().then(() => __toESM(require_v8_compile_cache()));
+ }
+ }
process.env.COREPACK_ROOT = import_path7.default.dirname(require.resolve("corepack/package.json"));
process.argv = [
process.execPath,
@@ -21976,6 +21979,9 @@ async function runVersion(locator, installSpec, binName, args) {
process.execArgv = [];
process.mainModule = void 0;
process.nextTick(import_module.default.runMain, binPath);
+ if (import_module.default.flushCompileCache) {
+ setImmediate(import_module.default.flushCompileCache);
+ }
}
function shouldSkipIntegrityCheck() {
return process.env.COREPACK_INTEGRITY_KEYS === `` || process.env.COREPACK_INTEGRITY_KEYS === `0`;
@@ -22553,7 +22559,7 @@ var EnableCommand = class extends Command {
[`enable`]
];
static usage = Command.Usage({
- description: `Add the Corepack shims to the install directories`,
+ description: `Add the Corepack shims to the install directory`,
details: `
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.

diff --git a/deps/corepack/dist/npm.js b/deps/corepack/dist/npm.js
index 7d10ba5bdf36..75f68b058f2d 100755
--- a/deps/corepack/dist/npm.js
+++ b/deps/corepack/dist/npm.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['npm', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/dist/npx.js b/deps/corepack/dist/npx.js
index a8bd3e690143..b1138bb48e1a 100755
--- a/deps/corepack/dist/npx.js
+++ b/deps/corepack/dist/npx.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['npx', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/dist/pnpm.js b/deps/corepack/dist/pnpm.js
index a0a872634355..56ba50940503 100755
--- a/deps/corepack/dist/pnpm.js
+++ b/deps/corepack/dist/pnpm.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['pnpm', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/dist/pnpx.js b/deps/corepack/dist/pnpx.js
index 57ad4842631c..ee36be2e99c6 100755
--- a/deps/corepack/dist/pnpx.js
+++ b/deps/corepack/dist/pnpx.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['pnpx', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/dist/yarn.js b/deps/corepack/dist/yarn.js
index eaed8596eaba..ce628c82b6a7 100755
--- a/deps/corepack/dist/yarn.js
+++ b/deps/corepack/dist/yarn.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['yarn', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/dist/yarnpkg.js b/deps/corepack/dist/yarnpkg.js
index aada6032fa67..9541ed726aaa 100755
--- a/deps/corepack/dist/yarnpkg.js
+++ b/deps/corepack/dist/yarnpkg.js
@@ -1,3 +1,4 @@
#!/usr/bin/env node
process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT??='1'
+require('module').enableCompileCache?.();
require('./lib/corepack.cjs').runMain(['yarnpkg', ...process.argv.slice(2)]);
\ No newline at end of file
diff --git a/deps/corepack/package.json b/deps/corepack/package.json
index 571c359407e0..c9c6662e99e6 100644
--- a/deps/corepack/package.json
+++ b/deps/corepack/package.json
@@ -1,6 +1,6 @@
{
"name": "corepack",
- "version": "0.29.4",
+ "version": "0.30.0",
"homepage": "https://github.com/nodejs/corepack#readme",
"bugs": {
"url": "https://github.com/nodejs/corepack/issues"

base-commit: 53a57efd83a18efe7a84bf1b460acc789139939b
--
2.48.1

Loading

0 comments on commit 5ba9bc7

Please sign in to comment.