Merge branch 'main' into test-install-dir

aduh95 · web-flow · commit 1e86d7f9d8ff · 2026-05-15T17:21:33.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: lts/*
         env:
@@ -27,7 +27,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(corepack yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
 
-      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
+      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae  # v5.0.5
         with:
           path: ${{steps.yarn-cache-dir-path.outputs.dir}}
           key: ${{runner.os}}-yarn-${{hashFiles('**/yarn.lock')}}
@@ -47,9 +47,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 20
           - 22
           - 24
+          - 26
         platform:
           - ubuntu-latest
           - macos-latest
@@ -66,10 +66,10 @@ jobs:
     runs-on: ${{matrix.platform}}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
       - name: "Use Node.js ${{matrix.node}}.x"
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: ${{matrix.node}}.x
         env:
@@ -80,7 +80,7 @@ jobs:
         run: echo "dir=$(corepack yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
         shell: bash # Needs explicit bash for Windows-support
 
-      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
+      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae  # v5.0.5
         with:
           path: ${{steps.yarn-cache-dir-path.outputs.dir}}
           key: ${{runner.os}}-yarn-${{hashFiles('**/yarn.lock')}}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,9 +35,9 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: lts/*
         env:
@@ -47,7 +47,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(corepack yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
 
-      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
+      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae  # v5.0.5
         with:
           path: ${{steps.yarn-cache-dir-path.outputs.dir}}
           key: ${{runner.os}}-yarn-${{hashFiles('**/yarn.lock')}}
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
       - name: Install Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: lts/*
         env:
@@ -49,7 +49,7 @@ jobs:
             },
           }" > config.json
 
-      - uses: gr2m/create-or-update-pull-request-action@77596e3166f328b24613f7082ab30bf2d93079d5 # v1.9.2
+      - uses: gr2m/create-or-update-pull-request-action@b65137ca591da0b9f43bad7b24df13050ea45d1b # v1.10.1
         # Creates a PR or update the Action's existing PR, or
         # no-op if the base branch is already up-to-date.
         env:
diff --git a/.github/workflows/update-nock-files.yml b/.github/workflows/update-nock-files.yml
@@ -54,7 +54,7 @@ jobs:
           ACTUAL: ${{ fromJson(steps.pr_info.outputs.DATA).head_sha }}
           EXPECTED: ${{ inputs.head_sha }}
 
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           ref: ${{ fromJson(steps.pr_info.outputs.DATA).head_sha }}
           fetch-depth: ${{ !inputs.merge_base && 1 || 0 }}
@@ -74,7 +74,7 @@ jobs:
           BASE_BRANCH: ${{ fromJson(steps.pr_info.outputs.DATA).base_ref }}
 
       - name: Install Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: lts/*
         env:
@@ -84,7 +84,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(corepack yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
 
-      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
+      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae  # v5.0.5
         with:
           path: ${{steps.yarn-cache-dir-path.outputs.dir}}
           key: ${{runner.os}}-yarn-${{hashFiles('**/yarn.lock')}}
@@ -126,7 +126,7 @@ jobs:
           REMOTE_REF: ${{ fromJson(steps.pr_info.outputs.DATA).head_ref }}
 
       - name: Upload `tests/nocks.db` in case of failure
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         if: ${{ failure() && steps.contains-changes.outputs.result == 'yes' }}
         with:
           name: nock
diff --git a/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch b/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch
@@ -1,10 +1,13 @@
-diff --git a/lib/platform/package.json b/lib/platform/package.json
-index 5ea9d43740d1bdb509612376c0e9ce91d20f8b20..08d4f7327dee5e605107a343d73b2254ed08ddb9 100644
---- a/lib/platform/package.json
-+++ b/lib/platform/package.json
-@@ -1,4 +1,4 @@
- {
--    "main": "./node",
-+    "main": "./node.js",
-     "browser": "./browser"
- }
+diff --git a/package.json b/package.json
+index cbf943bcc31a864f2771e457d327e5106eba9afe..84cb1ce28a4eea4dba60bb4fa6c33a08474b2d3f 100644
+--- a/package.json
++++ b/package.json
+@@ -13,7 +13,7 @@
+     "command"
+   ],
+   "version": "3.2.1",
+-  "main": "lib/advanced/index",
++  "main": "lib/advanced/index.js",
+   "license": "MIT",
+   "sideEffects": false,
+   "repository": {
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.34.7](https://github.com/nodejs/corepack/compare/v0.34.6...v0.34.7) (2026-04-17)
+
+
+### Bug Fixes
+
+* update package manager versions ([#790](https://github.com/nodejs/corepack/issues/790)) ([e8961d6](https://github.com/nodejs/corepack/commit/e8961d6bdc14b8141fbda008febdd3649022862c))
+
 ## [0.34.6](https://github.com/nodejs/corepack/compare/v0.34.5...v0.34.6) (2026-01-23)
 
 
diff --git a/README.md b/README.md
@@ -328,8 +328,6 @@ same major line. Should you need to upgrade to a new major, use an explicit
   Only keys that start with `COREPACK_` and are not in the exception list
   (`COREPACK_ENABLE_DOWNLOAD_PROMPT` and `COREPACK_ENV_FILE` are ignored)
   will be taken into account.
-  For Node.js 18.x users, this setting has no effect as that version doesn't
-  support parsing of `.env` files.
 
 - `COREPACK_HOME` can be set in order to define where Corepack should install
   the package managers. By default it is set to `%LOCALAPPDATA%\node\corepack`
@@ -352,7 +350,7 @@ same major line. Should you need to upgrade to a new major, use an explicit
   empty password, explicitly set `COREPACK_NPM_PASSWORD` to an empty string.
 
 - `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` are supported through
-  [`proxy-from-env`](https://github.com/Rob--W/proxy-from-env).
+  [`NODE_USE_ENV_PROXY=1`](https://nodejs.org/api/cli.html#node_use_env_proxy1).
 
 - `COREPACK_INTEGRITY_KEYS` can be set to an empty string or `0` to
   instruct Corepack to skip integrity checks, or to a JSON string containing
diff --git a/config.json b/config.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "npm": {
-      "default": "11.8.0+sha1.d1bc924deb3b4d412055b1755098a70bf8a4713b",
+      "default": "11.14.1+sha1.4a6839650da0005f323fec6abd39d77ee24f842f",
       "fetchLatestFrom": {
         "type": "npm",
         "package": "npm"
@@ -38,7 +38,7 @@
       }
     },
     "pnpm": {
-      "default": "10.28.1+sha1.20817ab95fb7f61154ba5ff3bcb61f27defb6142",
+      "default": "11.1.2+sha1.ed39d701687311ce9345771c62376f9fe7286694",
       "fetchLatestFrom": {
         "type": "npm",
         "package": "pnpm"
@@ -119,7 +119,7 @@
         "package": "yarn"
       },
       "transparent": {
-        "default": "4.12.0+sha224.877304a94a6946ab1d58a358df5ff8af2f7c9d86ea506f05f5c9df05",
+        "default": "4.14.1+sha224.88b7a7244bbd9040380c417f7eb556d85c67640b651f113cb4c72113",
         "commands": [
           [
             "yarn",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corepack",
-  "version": "0.34.6",
+  "version": "0.34.7",
   "homepage": "https://github.com/nodejs/corepack#readme",
   "bugs": {
     "url": "https://github.com/nodejs/corepack/issues"
@@ -10,44 +10,43 @@
     "url": "https://github.com/nodejs/corepack.git"
   },
   "engines": {
-    "node": "^20.10.0 || ^22.11.0 || >=24.0.0"
+    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
   },
   "exports": {
     "./package.json": "./package.json"
   },
   "license": "MIT",
-  "packageManager": "yarn@4.11.0+sha224.209a3e277c6bbc03df6e4206fbfcb0c1621c27ecf0688f79a0c619f0",
+  "packageManager": "yarn@4.14.1+sha224.88b7a7244bbd9040380c417f7eb556d85c67640b651f113cb4c72113",
   "devDependencies": {
     "@types/debug": "^4.1.5",
-    "@types/node": "^20.4.6",
+    "@types/node": "^22.0.0",
     "@types/proxy-from-env": "^1",
     "@types/semver": "^7.1.0",
     "@types/which": "^3.0.0",
     "@yarnpkg/eslint-config": "^3.0.0",
     "@yarnpkg/fslib": "^3.0.0-rc.48",
     "@zkochan/cmd-shim": "^6.0.0",
-    "better-sqlite3": "^11.7.2",
     "clipanion": "patch:clipanion@npm%3A3.2.1#~/.yarn/patches/clipanion-npm-3.2.1-fc9187f56c.patch",
     "debug": "^4.1.1",
-    "esbuild": "^0.25.0",
+    "esbuild": "^0.28.0",
     "eslint": "^9.22.0",
-    "proxy-from-env": "^1.1.0",
     "semver": "^7.6.3",
     "supports-color": "^10.0.0",
-    "tar": "^7.5.4",
+    "tar": "^7.5.11",
     "tsx": "^4.16.2",
     "typescript": "^5.7.3",
-    "undici": "^6.21.2",
     "v8-compile-cache": "^2.3.0",
-    "vitest": "^3.0.5",
-    "which": "^5.0.0"
+    "vitest": "^4.0.5",
+    "which": "^7.0.0"
   },
-  "resolutions": {
-    "undici-types": "6.x"
+  "dependenciesMeta": {
+    "esbuild": {
+      "built": true
+    }
   },
   "scripts": {
     "build": "run clean && run build:bundle && tsx ./mkshims.ts",
-    "build:bundle": "esbuild ./sources/_lib.ts --bundle --platform=node --target=node18.17.0 --external:corepack --outfile='./dist/lib/corepack.cjs' --resolve-extensions='.ts,.mjs,.js'",
+    "build:bundle": "esbuild ./sources/_lib.ts --bundle --platform=node --target=node22.22.2 --external:corepack --outfile='./dist/lib/corepack.cjs' --resolve-extensions='.ts,.mjs,.js'",
     "clean": "run rimraf dist shims",
     "corepack": "tsx ./sources/_cli.ts",
     "lint": "eslint .",
diff --git a/sources/corepackUtils.ts b/sources/corepackUtils.ts
@@ -409,7 +409,6 @@ export async function runVersion(locator: Locator, installSpec: InstallSpec & {s
   if (!binPath)
     throw new Error(`Assertion failed: Unable to locate path for bin '${binName}'`);
 
-  // @ts-expect-error - Missing types
   if (!Module.enableCompileCache) {
     // Node.js segfaults when using npm@>=9.7.0 and v8-compile-cache
     // $ docker run -it node:20.3.0-slim corepack npm@9.7.1 --version
@@ -443,9 +442,7 @@ export async function runVersion(locator: Locator, installSpec: InstallSpec & {s
   // the stack trace of the package manager.
   process.nextTick(Module.runMain, binPath);
 
-  // @ts-expect-error - No types
   if (Module.flushCompileCache) {
-    // @ts-expect-error - No types
     setImmediate(Module.flushCompileCache);
   }
 }
diff --git a/sources/httpUtils.ts b/sources/httpUtils.ts
@@ -10,8 +10,6 @@ async function fetch(input: string | URL, init?: RequestInit) {
   if (process.env.COREPACK_ENABLE_NETWORK === `0`)
     throw new UsageError(`Network access disabled by the environment; can't reach ${input}`);
 
-  const agent = await getProxyAgent(input);
-
   if (typeof input === `string`)
     input = new URL(input);
 
@@ -42,7 +40,6 @@ async function fetch(input: string | URL, init?: RequestInit) {
   try {
     response = await globalThis.fetch(input, {
       ...init,
-      dispatcher: agent,
       headers,
     });
   } catch (error) {
@@ -91,31 +88,3 @@ export async function fetchUrlStream(input: string | URL, init?: RequestInit) {
   const stream = Readable.fromWeb(webStream);
   return stream;
 }
-
-let ProxyAgent: typeof import('undici').ProxyAgent;
-
-async function getProxyAgent(input: string | URL) {
-  const {getProxyForUrl} = await import(`proxy-from-env`);
-
-  // @ts-expect-error - The internal implementation is compatible with a WHATWG URL instance
-  const proxy = getProxyForUrl(input);
-
-  if (!proxy) return undefined;
-
-  if (ProxyAgent == null) {
-    // Doing a deep import here since undici isn't tree-shakeable
-    const [api, Dispatcher, _ProxyAgent] = await Promise.all([
-      // @ts-expect-error internal module is untyped
-      import(`undici/lib/api/index.js`),
-      // @ts-expect-error internal module is untyped
-      import(`undici/lib/dispatcher/dispatcher.js`),
-      // @ts-expect-error internal module is untyped
-      import(`undici/lib/dispatcher/proxy-agent.js`),
-    ]);
-
-    Object.assign(Dispatcher.default.prototype, api.default);
-    ProxyAgent = _ProxyAgent.default;
-  }
-
-  return new ProxyAgent(proxy);
-}
diff --git a/tests/_registryServer.mjs b/tests/_registryServer.mjs
@@ -186,10 +186,8 @@ if (process.env.AUTH_TYPE === `PROXY`) {
       clientSocket.pipe(serverSocket);
     });
   });
-  proxy.listen(0, `localhost`);
+  proxy.listen(new URL(process.env.HTTP_PROXY).port, `localhost`);
   await once(proxy, `listening`);
-  const {address, port} = proxy.address();
-  process.env.ALL_PROXY = `http://${address.includes(`:`) ? `[${address}]` : address}:${port}`;
 
   proxy.unref();
 }
diff --git a/tests/main.test.ts b/tests/main.test.ts
diff --git a/tests/nocks.db b/tests/nocks.db
diff --git a/tests/recordRequests.js b/tests/recordRequests.js
diff --git a/vitest.config.mts b/vitest.config.mts
diff --git a/yarn.lock b/yarn.lock
