Merge branch 'main' into docs/windows-drive

nodejs · Jan 28, 2025 · 57da0f5 · 57da0f5
2 parents 44bfa16 + c118911
commit 57da0f5
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.31.0](https://github.com/nodejs/corepack/compare/v0.30.0...v0.31.0) (2025-01-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* drop support for Node.js 21.x ([#594](https://github.com/nodejs/corepack/issues/594))
+
+### Features
+
+* update package manager versions ([#595](https://github.com/nodejs/corepack/issues/595)) ([c7a9bde](https://github.com/nodejs/corepack/commit/c7a9bde16dcbbb7e6ef03fef740656cde7ade360))
+
+
+### Bug Fixes
+
+* only print message for `UsageError`s ([#602](https://github.com/nodejs/corepack/issues/602)) ([72a588c](https://github.com/nodejs/corepack/commit/72a588c2370c17e415b24fe389efdafb3c84e90b))
+* update npm registry keys ([#614](https://github.com/nodejs/corepack/issues/614)) ([8c90caa](https://github.com/nodejs/corepack/commit/8c90caab7f1c5c9b89f1de113bc1dfc441bf25d2))
+
+
+### Miscellaneous Chores
+
+* drop support for Node.js 21.x ([#594](https://github.com/nodejs/corepack/issues/594)) ([8bebc0c](https://github.com/nodejs/corepack/commit/8bebc0c0a5cbcdeec41673dcbaf581e6e1c1be11))
+
 ## [0.30.0](https://github.com/nodejs/corepack/compare/v0.29.4...v0.30.0) (2024-11-23)
 
 

diff --git a/README.md b/README.md
@@ -302,6 +302,8 @@ same major line. Should you need to upgrade to a new major, use an explicit
 
 ## Troubleshooting
 
+The environment variable `DEBUG` can be set to `corepack` to enable additional debug logging.
+
 ### Networking
 
 There are a wide variety of networking issues that can occur while running

diff --git a/config.json b/config.json
@@ -165,11 +165,18 @@
   "keys": {
     "npm": [
       {
-        "expires": null,
+        "expires": "2025-01-29T00:00:00.000Z",
         "keyid": "SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA",
         "keytype": "ecdsa-sha2-nistp256",
         "scheme": "ecdsa-sha2-nistp256",
         "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1Olb3zMAFFxXKHiIkQO5cJ3Yhl5i6UPp+IhuteBJbuHcA5UogKo0EWtlWwW6KSaKoTNEYL7JlCQiVnkhBktUgg=="
+      },
+      {
+        "expires": null,
+        "keyid": "SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U",
+        "keytype": "ecdsa-sha2-nistp256",
+        "scheme": "ecdsa-sha2-nistp256",
+        "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY6Ya7W++7aUPzvMTrezH6Ycx3c+HOKYCcNGybJZSCJq/fd7Qa8uuAKtdIkUQtQiEKERhAmE5lMMJhP8OkDOa2g=="
       }
     ]
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corepack",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "homepage": "https://github.com/nodejs/corepack#readme",
   "bugs": {
     "url": "https://github.com/nodejs/corepack/issues"

diff --git a/sources/main.ts b/sources/main.ts
@@ -1,4 +1,5 @@
 import {BaseContext, Builtins, Cli}    from 'clipanion';
+import type {UsageError}               from 'clipanion';
 
 import {version as corepackVersion}    from '../package.json';
 
@@ -79,9 +80,17 @@ export async function runMain(argv: Array<string>) {
       process.exitCode ??= code;
     }
   } else {
-    await engine.executePackageManagerRequest(request, {
-      cwd: process.cwd(),
-      args: restArgs,
-    });
+    try {
+      await engine.executePackageManagerRequest(request, {
+        cwd: process.cwd(),
+        args: restArgs,
+      });
+    } catch (error: UsageError | any) {
+      if (error?.name === `UsageError`) {
+        console.error(error.message);
+        process.exit(1);
+      }
+      throw error;
+    }
   }
 }
diff --git a/tests/setupTests.ts b/tests/setupTests.ts
@@ -6,7 +6,7 @@ const OLD_ENV = process.env;
 // in case the local machine already set these values.
 const processEnv = Object.fromEntries(
   Object.entries(process.env).filter(
-    ([key]) => key !== `FORCE_COLOR` && !key.startsWith(`COREPACK_`),
+    ([key]) => key !== `FORCE_COLOR` && key !== `DEBUG` && !key.startsWith(`COREPACK_`),
   ),
 );
 

diff --git a/yarn.lock b/yarn.lock
@@ -4325,8 +4325,8 @@ __metadata:
   linkType: hard
 
 "vite@npm:^5.0.0":
-  version: 5.4.6
-  resolution: "vite@npm:5.4.6"
+  version: 5.4.14
+  resolution: "vite@npm:5.4.14"
   dependencies:
     esbuild: "npm:^0.21.3"
     fsevents: "npm:~2.3.3"
@@ -4363,7 +4363,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/5f87be3a10e970eaf9ac52dfab39cf9fff583036685252fb64570b6d7bfa749f6d221fb78058f5ef4b5664c180d45a8e7a7ff68d7f3770e69e24c7c68b958bde
+  checksum: 10c0/8842933bd70ca6a98489a0bb9c8464bec373de00f9a97c8c7a4e64b24d15c88bfaa8c1acb38a68c3e5eb49072ffbccb146842c2d4edcdd036a9802964cffe3d1
   languageName: node
   linkType: hard