diff --git a/deps/corepack/CHANGELOG.md b/deps/corepack/CHANGELOG.md index a452caefc95459..57f5e31d11d75a 100644 --- a/deps/corepack/CHANGELOG.md +++ b/deps/corepack/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.18.1](https://github.com/nodejs/corepack/compare/v0.18.0...v0.18.1) (2023-06-13) + + +### Features + +* update package manager versions ([#272](https://github.com/nodejs/corepack/issues/272)) ([5345774](https://github.com/nodejs/corepack/commit/53457747a26a5de3debbd0d9282b338186bbd7c3)) + + +### Bug Fixes + +* disable `v8-compile-cache` when using `npm@>=9.7.0` ([#276](https://github.com/nodejs/corepack/issues/276)) ([2f3678c](https://github.com/nodejs/corepack/commit/2f3678cd7915978f4e2ce7a32cbe5db58e9d0b8d)) +* don't override `process.exitCode` ([#268](https://github.com/nodejs/corepack/issues/268)) ([17d1f3d](https://github.com/nodejs/corepack/commit/17d1f3dd41ef6127228d427fd5cca373d6c97f0f)) + ## [0.18.0](https://github.com/nodejs/corepack/compare/v0.17.2...v0.18.0) (2023-05-19) diff --git a/deps/corepack/README.md b/deps/corepack/README.md index 84dc59c2383cb0..683f539ec00019 100644 --- a/deps/corepack/README.md +++ b/deps/corepack/README.md @@ -249,7 +249,8 @@ network interaction. There are a wide variety of networking issues that can occur while running `corepack` commands. Things to check: - Make sure your network connection is active. -- Make sure the host for your request can be resolved by your DNS; try using `curl [URL]` from your shell. +- Make sure the host for your request can be resolved by your DNS; try using + `curl [URL]` (ipv4) and `curl -6 [URL]` (ipv6) from your shell. - Check your proxy settings (see [Environment Variables](#environment-variables)). ## Contributing diff --git a/deps/corepack/dist/lib/corepack.cjs b/deps/corepack/dist/lib/corepack.cjs index 7a302d1ce1397a..01d63dc61c4751 100644 --- a/deps/corepack/dist/lib/corepack.cjs +++ b/deps/corepack/dist/lib/corepack.cjs @@ -38675,7 +38675,7 @@ function String2(descriptor, ...args) { } // package.json -var version = "0.18.0"; +var version = "0.18.1"; // sources/Engine.ts var import_fs3 = __toESM(require("fs")); @@ -38718,7 +38718,7 @@ var config_default = { } }, pnpm: { - default: "8.5.1+sha1.97019f5a8ec2416123506419ab36dd558e4c72eb", + default: "8.6.1+sha1.435b3c83c7de5c455ad80fd63ee7ecf3b67b949b", fetchLatestFrom: { type: "npm", package: "pnpm" @@ -38770,7 +38770,7 @@ var config_default = { package: "yarn" }, transparent: { - default: "3.5.1+sha224.13b84a541cae0695210d8c99f1dbd0e89ef09d93e166a59a8f8eb7ec", + default: "3.6.0+sha224.19e47520fa56c6146388fdeb438d9dcf6630c3f277a2e1180995c3bb", commands: [ [ "yarn", @@ -39088,7 +39088,7 @@ async function installVersion(installTarget, locator, { spec }) { log(`Install finished`); return installFolder; } -async function runVersion(installSpec, binName, args) { +async function runVersion(locator, installSpec, binName, args) { let binPath = null; if (Array.isArray(installSpec.spec.bin)) { if (installSpec.spec.bin.some((bin) => bin === binName)) { @@ -39108,7 +39108,8 @@ async function runVersion(installSpec, binName, args) { } if (!binPath) throw new Error(`Assertion failed: Unable to locate path for bin '${binName}'`); - await Promise.resolve().then(() => __toESM(require_v8_compile_cache())); + if (locator.name !== `npm` || import_semver.default.lt(locator.reference, `9.7.0`)) + await Promise.resolve().then(() => __toESM(require_v8_compile_cache())); process.env.COREPACK_ROOT = import_path3.default.dirname(require.resolve("corepack/package.json")); process.argv = [ process.execPath, @@ -39760,9 +39761,9 @@ async function executePackageManagerRequest({ packageManager, binaryName, binary if (resolved === null) throw new UsageError(`Failed to successfully resolve '${descriptor.range}' to a valid ${descriptor.name} release`); const installSpec = await context.engine.ensurePackageManager(resolved); - return await runVersion(installSpec, binaryName, args); + return await runVersion(resolved, installSpec, binaryName, args); } -async function main(argv) { +async function runMain(argv) { const context = { ...Cli.defaultContext, cwd: process.cwd(), @@ -39770,9 +39771,8 @@ async function main(argv) { }; const [firstArg, ...restArgs] = argv; const request = getPackageManagerRequestFromCli(firstArg, context); - let cli; if (!request) { - cli = new Cli({ + const cli = new Cli({ binaryLabel: `Corepack`, binaryName: `corepack`, binaryVersion: version @@ -39783,14 +39783,14 @@ async function main(argv) { cli.register(DisableCommand); cli.register(HydrateCommand); cli.register(PrepareCommand); - return await cli.run(argv, context); + await cli.runExit(argv, context); } else { - const cli2 = new Cli({ + const cli = new Cli({ binaryLabel: `'${request.binaryName}', via Corepack`, binaryName: request.binaryName, binaryVersion: `corepack/${version}` }); - cli2.register(class BinaryCommand extends Command { + cli.register(class BinaryCommand extends Command { constructor() { super(...arguments); this.proxy = options_exports.Proxy(); @@ -39799,17 +39799,12 @@ async function main(argv) { return executePackageManagerRequest(request, this.proxy, this.context); } }); - return await cli2.run(restArgs, context); + const code = await cli.run(restArgs, context); + if (code !== 0) { + process.exitCode ??= code; + } } } -function runMain(argv) { - main(argv).then((exitCode) => { - process.exitCode = exitCode; - }, (err) => { - console.error(err.stack); - process.exitCode = 1; - }); -} // Annotate the CommonJS export names for ESM import in node: 0 && (module.exports = { runMain diff --git a/deps/corepack/package.json b/deps/corepack/package.json index 59c9ddd5234bc4..8e30aa46ea318a 100644 --- a/deps/corepack/package.json +++ b/deps/corepack/package.json @@ -1,6 +1,6 @@ { "name": "corepack", - "version": "0.18.0", + "version": "0.18.1", "homepage": "https://github.com/nodejs/corepack#readme", "bugs": { "url": "https://github.com/nodejs/corepack/issues"