pnpm 10.34.4 → 10.34.5

package/dist/pnpm.cjs

@@ -2973,7 +2973,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault2(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "10.34.4" : "0.0.0"
+      version: true ? "10.34.5" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -18363,7 +18363,7 @@ var require_getOptionsFromRootManifest = __commonJS({
       }
       return settings;
     }
-    var REQUEST_DESTINATION_SCALAR_KEYS = /* @__PURE__ */ new Set(["registry"]);
+    var REQUEST_DESTINATION_SCALAR_KEYS = /* @__PURE__ */ new Set(["registry", "httpProxy", "httpsProxy", "noProxy", "proxy", "noproxy"]);
     function replaceEnvInSettings(settings) {
       const newSettings = {};
       for (const [key, value] of Object.entries(settings)) {
@@ -61552,6 +61552,10 @@ var require_nodeReleaseKeys = __commonJS({
       {
         fingerprint: "5BE8A3F6C8A5C01D106C0AD820B1A390B168D356",
         armoredKey: "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmDMEaGA63BYJKwYBBAHaRw8BAQdAo/yU+MutacFmmn0CEX495goNrBxR24235XLM\ncvHYjfq0L0FudG9pbmUgZHUgSGFtZWwgPGR1aGFtZWxhbnRvaW5lMTk5NUBnbWFp\nbC5jb20+iI4EExYKADYWIQRb6KP2yKXAHRBsCtggsaOQsWjTVgUCaGA63AIbAwQL\nCQgHBBUKCQgFFgIDAQACHgUCF4AACgkQILGjkLFo01afgwEA/sLHqsj7ml2vyDoT\nKDPE8n9a80ZOh14OfnlOe0cCZA8BAMEOOk7QFI69DIlV1nMiqcFCqQFoSzBU2LkI\nR17p/j4NtDNBbnRvaW5lIGR1IEhhbWVsIDxhbnRvaW5lLmR1aGFtZWxAcGxhdGZv\ncm1hdGljLmRldj6IjgQTFgoANhYhBFvoo/bIpcAdEGwK2CCxo5CxaNNWBQJpsCMx\nAhsDBAsJCAcEFQoJCAUWAgMBAAIeAQIXgAAKCRAgsaOQsWjTVr/sAPwIBsG8g6ND\nzoNRTX1wPKBvfZg1NP7tYCyM5sxQfrpuLAEA05AhG4xBILfhL/f0pqR5jXfxg6gz\nT6WfeVeS6zeHZwe4OARoYDrcEgorBgEEAZdVAQUBAQdAQVmtih8AO3ryBQMR/22x\nWHVKLjAbCiH2cMxNH+iy1RQDAQgHiHgEGBYKACAWIQRb6KP2yKXAHRBsCtggsaOQ\nsWjTVgUCaGA63AIbDAAKCRAgsaOQsWjTVu8oAP9Bc+QY+9FikX3YvMgWAqiDlVOy\no0y6UIZGBMSQlF80wAD/d34LqtVIVe9oe5NO3xA75+6Ew8tGeAjUq/ovagr5dAU=\n=JsVv\n-----END PGP PUBLIC KEY BLOCK-----\n"
+      },
+      {
+        fingerprint: "655F3B5C1FB3FA8D1A0CA6BDE4A7D232B936D2FD",
+        armoredKey: "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmDMEakIjcxYJKwYBBAHaRw8BAQdAYRFWvBCAd9dDjKTePuAvvzAWxhvojAXco0m4\n2AMh/MC0H1N0ZXdhcnQgWCBBZGRpc29uIDxzeGFAaWJtLmNvbT6ImQQTFgoAQRYh\nBGVfO1wfs/qNGgymveSn0jK5NtL9BQJqQiNzAhsDBQkDwmcABQsJCAcCAiICBhUK\nCQgLAgQWAgMBAh4HAheAAAoJEOSn0jK5NtL9FOEBAMpIjknm4fnEQvTmIlzy0kDu\nVplF4HR78+lBef2i4590AP9i82wtP4pH1/vynoSBMkCauFIPmF1c9MYLFF0f53zq\nArg4BGpCI3MSCisGAQQBl1UBBQEBB0AVa1WJ4P8ir/M7NaCGrX7PDs0QU9qzpzme\na5TZ44b/YgMBCAeIfgQYFgoAJhYhBGVfO1wfs/qNGgymveSn0jK5NtL9BQJqQiNz\nAhsMBQkDwmcAAAoJEOSn0jK5NtL9EzYA/Arr4hbKLaU6OUjAVbH7HGLEl0HSvxE8\n5lEgWfuNbqOtAQCF9UT0wQEfiIj2R358Ce62zV43w2yaD8Xu0M/S+hz8AQ==\n=DcLq\n-----END PGP PUBLIC KEY BLOCK-----\n"
       }
     ];
   }
@@ -139132,6 +139136,7 @@ var require_lib120 = __commonJS({
           deps: _calcDepGraphHash(/* @__PURE__ */ new Set(), depPath)
         };
         const hexDigest = (0, crypto_object_hasher_1.hashObjectWithoutSorting)(state, { encoding: "hex" });
+        assertNoPathTraversal(version2);
         const prefix = name.startsWith("@") ? "" : "@/";
         yield {
           hash: `${prefix}${name}/${version2}/${hexDigest}`,
@@ -139139,6 +139144,13 @@ var require_lib120 = __commonJS({
         };
       }
     }
+    function assertNoPathTraversal(version2) {
+      if (version2.split(/[/\\]/).includes("..")) {
+        const error = new Error(`Refusing to build a virtual-store path with the traversal version segment ${JSON.stringify(version2)}`);
+        error.code = "ERR_PNPM_INVALID_DEPENDENCY_NAME";
+        throw error;
+      }
+    }
     function lockfileToDepGraph(lockfile) {
       const graph = {};
       if (lockfile.packages != null) {
@@ -159893,8 +159905,124 @@ var require_lib157 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@yarnpkg+pnp@4.0.8/node_modules/@yarnpkg/pnp/lib/index.js
+// ../fs/symlink-dependency/lib/safeJoinModulesDir.js
+var require_safeJoinModulesDir = __commonJS({
+  "../fs/symlink-dependency/lib/safeJoinModulesDir.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.safeJoinModulesDir = safeJoinModulesDir;
+    var path_1 = __importDefault2(require("path"));
+    var validate_npm_package_name_1 = __importDefault2(require_lib97());
+    function safeJoinModulesDir(modulesDir, alias) {
+      if (!(0, validate_npm_package_name_1.default)(alias).validForOldPackages) {
+        throw invalidDependencyNameError(modulesDir, alias);
+      }
+      const link = path_1.default.join(modulesDir, alias);
+      const resolvedDir = path_1.default.resolve(modulesDir);
+      const resolvedLink = path_1.default.resolve(link);
+      if (resolvedLink === resolvedDir || !resolvedLink.startsWith(resolvedDir + path_1.default.sep)) {
+        throw invalidDependencyNameError(modulesDir, alias, resolvedLink);
+      }
+      return link;
+    }
+    function invalidDependencyNameError(modulesDir, alias, resolvedLink) {
+      const detail = resolvedLink ? ` (it resolves to ${resolvedLink})` : "";
+      const error = new Error(`Refusing to place a dependency under ${modulesDir} with the invalid alias ${JSON.stringify(alias)}${detail}`);
+      error.code = "ERR_PNPM_INVALID_DEPENDENCY_NAME";
+      return error;
+    }
+  }
+});
+
+// ../fs/symlink-dependency/lib/symlinkDirectRootDependency.js
+var require_symlinkDirectRootDependency = __commonJS({
+  "../fs/symlink-dependency/lib/symlinkDirectRootDependency.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.symlinkDirectRootDependency = symlinkDirectRootDependency;
+    var fs_1 = require("fs");
+    var util_1 = __importDefault2(require("util"));
+    var core_loggers_1 = require_lib8();
+    var symlink_dir_1 = __importDefault2(require_dist18());
+    var safeJoinModulesDir_js_1 = require_safeJoinModulesDir();
+    var DEP_TYPE_BY_DEPS_FIELD_NAME = {
+      dependencies: "prod",
+      devDependencies: "dev",
+      optionalDependencies: "optional"
+    };
+    async function symlinkDirectRootDependency(dependencyLocation, destModulesDir, importAs, opts) {
+      let destModulesDirReal;
+      try {
+        destModulesDirReal = await fs_1.promises.realpath(destModulesDir);
+      } catch (err) {
+        if (util_1.default.types.isNativeError(err) && "code" in err && err.code === "ENOENT") {
+          await fs_1.promises.mkdir(destModulesDir, { recursive: true });
+          destModulesDirReal = await fs_1.promises.realpath(destModulesDir);
+        } else {
+          throw err;
+        }
+      }
+      const dest = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDirReal, importAs);
+      const { reused } = await (0, symlink_dir_1.default)(dependencyLocation, dest);
+      if (reused)
+        return;
+      core_loggers_1.rootLogger.debug({
+        added: {
+          dependencyType: opts.fromDependenciesField && DEP_TYPE_BY_DEPS_FIELD_NAME[opts.fromDependenciesField],
+          linkedFrom: dependencyLocation,
+          name: importAs,
+          realName: opts.linkedPackage.name,
+          version: opts.linkedPackage.version
+        },
+        prefix: opts.prefix
+      });
+    }
+  }
+});
+
+// ../fs/symlink-dependency/lib/index.js
 var require_lib158 = __commonJS({
+  "../fs/symlink-dependency/lib/index.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.symlinkDirectRootDependency = exports2.safeJoinModulesDir = void 0;
+    exports2.symlinkDependency = symlinkDependency;
+    exports2.symlinkDependencySync = symlinkDependencySync;
+    var core_loggers_1 = require_lib8();
+    var symlink_dir_1 = __importDefault2(require_dist18());
+    var safeJoinModulesDir_js_1 = require_safeJoinModulesDir();
+    var safeJoinModulesDir_js_2 = require_safeJoinModulesDir();
+    Object.defineProperty(exports2, "safeJoinModulesDir", { enumerable: true, get: function() {
+      return safeJoinModulesDir_js_2.safeJoinModulesDir;
+    } });
+    var symlinkDirectRootDependency_js_1 = require_symlinkDirectRootDependency();
+    Object.defineProperty(exports2, "symlinkDirectRootDependency", { enumerable: true, get: function() {
+      return symlinkDirectRootDependency_js_1.symlinkDirectRootDependency;
+    } });
+    async function symlinkDependency(dependencyRealLocation, destModulesDir, importAs) {
+      const link = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDir, importAs);
+      core_loggers_1.linkLogger.debug({ target: dependencyRealLocation, link });
+      return (0, symlink_dir_1.default)(dependencyRealLocation, link);
+    }
+    function symlinkDependencySync(dependencyRealLocation, destModulesDir, importAs) {
+      const link = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDir, importAs);
+      core_loggers_1.linkLogger.debug({ target: dependencyRealLocation, link });
+      return symlink_dir_1.default.sync(dependencyRealLocation, link);
+    }
+  }
+});
+
+// ../node_modules/.pnpm/@yarnpkg+pnp@4.0.8/node_modules/@yarnpkg/pnp/lib/index.js
+var require_lib159 = __commonJS({
   "../node_modules/.pnpm/@yarnpkg+pnp@4.0.8/node_modules/@yarnpkg/pnp/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -163365,7 +163493,7 @@ ${candidates.map((candidate) => `Not found: ${getPathForDisplay(candidate)}
 });
 
 // ../lockfile/lockfile-to-pnp/lib/index.js
-var require_lib159 = __commonJS({
+var require_lib160 = __commonJS({
   "../lockfile/lockfile-to-pnp/lib/index.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
@@ -163377,8 +163505,9 @@ var require_lib159 = __commonJS({
     var fs_1 = require("fs");
     var path_1 = __importDefault2(require("path"));
     var lockfile_utils_1 = require_lib122();
+    var symlink_dependency_1 = require_lib158();
     var dependency_path_1 = require_lib87();
-    var pnp_1 = require_lib158();
+    var pnp_1 = require_lib159();
     var normalize_path_1 = __importDefault2(require_normalize_path());
     async function writePnpFile(lockfile, opts) {
       const packageRegistry = lockfileToPackageRegistry(lockfile, opts);
@@ -163435,7 +163564,8 @@ var require_lib159 = __commonJS({
           packageStore = /* @__PURE__ */ new Map();
           packageRegistry.set(name, packageStore);
         }
-        let packageLocation = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, path_1.default.join(opts.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(relDepPath, opts.virtualStoreDirMaxLength), "node_modules", name)));
+        const pkgModulesDir = path_1.default.join(opts.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(relDepPath, opts.virtualStoreDirMaxLength), "node_modules");
+        let packageLocation = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, (0, symlink_dependency_1.safeJoinModulesDir)(pkgModulesDir, name)));
         if (!packageLocation.startsWith("../")) {
           packageLocation = `./${packageLocation}`;
         }
@@ -163748,7 +163878,7 @@ var require_prune2 = __commonJS({
 });
 
 // ../pkg-manager/modules-cleaner/lib/index.js
-var require_lib160 = __commonJS({
+var require_lib161 = __commonJS({
   "../pkg-manager/modules-cleaner/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -163760,122 +163890,6 @@ var require_lib160 = __commonJS({
   }
 });
 
-// ../fs/symlink-dependency/lib/safeJoinModulesDir.js
-var require_safeJoinModulesDir = __commonJS({
-  "../fs/symlink-dependency/lib/safeJoinModulesDir.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.safeJoinModulesDir = safeJoinModulesDir;
-    var path_1 = __importDefault2(require("path"));
-    var validate_npm_package_name_1 = __importDefault2(require_lib97());
-    function safeJoinModulesDir(modulesDir, alias) {
-      if (!(0, validate_npm_package_name_1.default)(alias).validForOldPackages) {
-        throw invalidDependencyNameError(modulesDir, alias);
-      }
-      const link = path_1.default.join(modulesDir, alias);
-      const resolvedDir = path_1.default.resolve(modulesDir);
-      const resolvedLink = path_1.default.resolve(link);
-      if (resolvedLink === resolvedDir || !resolvedLink.startsWith(resolvedDir + path_1.default.sep)) {
-        throw invalidDependencyNameError(modulesDir, alias, resolvedLink);
-      }
-      return link;
-    }
-    function invalidDependencyNameError(modulesDir, alias, resolvedLink) {
-      const detail = resolvedLink ? ` (it resolves to ${resolvedLink})` : "";
-      const error = new Error(`Refusing to place a dependency under ${modulesDir} with the invalid alias ${JSON.stringify(alias)}${detail}`);
-      error.code = "ERR_PNPM_INVALID_DEPENDENCY_NAME";
-      return error;
-    }
-  }
-});
-
-// ../fs/symlink-dependency/lib/symlinkDirectRootDependency.js
-var require_symlinkDirectRootDependency = __commonJS({
-  "../fs/symlink-dependency/lib/symlinkDirectRootDependency.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.symlinkDirectRootDependency = symlinkDirectRootDependency;
-    var fs_1 = require("fs");
-    var util_1 = __importDefault2(require("util"));
-    var core_loggers_1 = require_lib8();
-    var symlink_dir_1 = __importDefault2(require_dist18());
-    var safeJoinModulesDir_js_1 = require_safeJoinModulesDir();
-    var DEP_TYPE_BY_DEPS_FIELD_NAME = {
-      dependencies: "prod",
-      devDependencies: "dev",
-      optionalDependencies: "optional"
-    };
-    async function symlinkDirectRootDependency(dependencyLocation, destModulesDir, importAs, opts) {
-      let destModulesDirReal;
-      try {
-        destModulesDirReal = await fs_1.promises.realpath(destModulesDir);
-      } catch (err) {
-        if (util_1.default.types.isNativeError(err) && "code" in err && err.code === "ENOENT") {
-          await fs_1.promises.mkdir(destModulesDir, { recursive: true });
-          destModulesDirReal = await fs_1.promises.realpath(destModulesDir);
-        } else {
-          throw err;
-        }
-      }
-      const dest = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDirReal, importAs);
-      const { reused } = await (0, symlink_dir_1.default)(dependencyLocation, dest);
-      if (reused)
-        return;
-      core_loggers_1.rootLogger.debug({
-        added: {
-          dependencyType: opts.fromDependenciesField && DEP_TYPE_BY_DEPS_FIELD_NAME[opts.fromDependenciesField],
-          linkedFrom: dependencyLocation,
-          name: importAs,
-          realName: opts.linkedPackage.name,
-          version: opts.linkedPackage.version
-        },
-        prefix: opts.prefix
-      });
-    }
-  }
-});
-
-// ../fs/symlink-dependency/lib/index.js
-var require_lib161 = __commonJS({
-  "../fs/symlink-dependency/lib/index.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.symlinkDirectRootDependency = exports2.safeJoinModulesDir = void 0;
-    exports2.symlinkDependency = symlinkDependency;
-    exports2.symlinkDependencySync = symlinkDependencySync;
-    var core_loggers_1 = require_lib8();
-    var symlink_dir_1 = __importDefault2(require_dist18());
-    var safeJoinModulesDir_js_1 = require_safeJoinModulesDir();
-    var safeJoinModulesDir_js_2 = require_safeJoinModulesDir();
-    Object.defineProperty(exports2, "safeJoinModulesDir", { enumerable: true, get: function() {
-      return safeJoinModulesDir_js_2.safeJoinModulesDir;
-    } });
-    var symlinkDirectRootDependency_js_1 = require_symlinkDirectRootDependency();
-    Object.defineProperty(exports2, "symlinkDirectRootDependency", { enumerable: true, get: function() {
-      return symlinkDirectRootDependency_js_1.symlinkDirectRootDependency;
-    } });
-    async function symlinkDependency(dependencyRealLocation, destModulesDir, importAs) {
-      const link = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDir, importAs);
-      core_loggers_1.linkLogger.debug({ target: dependencyRealLocation, link });
-      return (0, symlink_dir_1.default)(dependencyRealLocation, link);
-    }
-    function symlinkDependencySync(dependencyRealLocation, destModulesDir, importAs) {
-      const link = (0, safeJoinModulesDir_js_1.safeJoinModulesDir)(destModulesDir, importAs);
-      core_loggers_1.linkLogger.debug({ target: dependencyRealLocation, link });
-      return symlink_dir_1.default.sync(dependencyRealLocation, link);
-    }
-  }
-});
-
 // ../pkg-manager/headless/lib/linkHoistedModules.js
 var require_linkHoistedModules = __commonJS({
   "../pkg-manager/headless/lib/linkHoistedModules.js"(exports2) {
@@ -164298,6 +164312,7 @@ var require_lockfileToDepGraph = __commonJS({
     var logger_1 = require_lib();
     var package_is_installable_1 = require_lib86();
     var patching_config_1 = require_lib162();
+    var symlink_dependency_1 = require_lib158();
     var dp = __importStar3(require_lib87());
     var path_exists_1 = __importDefault2(require_path_exists2());
     var equals_1 = __importDefault2(require_equals2());
@@ -164383,7 +164398,7 @@ var require_lockfileToDepGraph = __commonJS({
           const depIsPresent = !isDirectoryDep && currentPackages[depPath] && (0, equals_1.default)(currentPackages[depPath].dependencies, pkgSnapshot.dependencies);
           const depIntegrityIsUnchanged = isIntegrityEqual(pkgSnapshot.resolution, currentPackages[depPath]?.resolution);
           const modules = path_1.default.join(opts.virtualStoreDir, dirNameInVirtualStore, "node_modules");
-          const dir = path_1.default.join(modules, pkgName);
+          const dir = (0, symlink_dependency_1.safeJoinModulesDir)(modules, pkgName);
           locationByDepPath[depPath] = dir;
           if (isDirectoryDep) {
             injectionTargetsByDepPath.set(depPath, [dir]);
@@ -165405,7 +165420,7 @@ var require_lockfileToHoistedDepGraph = __commonJS({
     var package_is_installable_1 = require_lib86();
     var patching_config_1 = require_lib162();
     var read_package_json_1 = require_lib62();
-    var symlink_dependency_1 = require_lib161();
+    var symlink_dependency_1 = require_lib158();
     var real_hoist_1 = require_lib164();
     var dp = __importStar3(require_lib87());
     async function lockfileToHoistedDepGraph(lockfile, currentLockfile, opts) {
@@ -165647,7 +165662,7 @@ var require_linkDirectDeps = __commonJS({
     var fs_1 = __importDefault2(require("fs"));
     var path_1 = __importDefault2(require("path"));
     var core_loggers_1 = require_lib8();
-    var symlink_dependency_1 = require_lib161();
+    var symlink_dependency_1 = require_lib158();
     var omit_1 = __importDefault2(require_omit());
     var read_modules_dir_1 = require_lib69();
     var rimraf_1 = __importDefault2(require_rimraf());
@@ -165822,15 +165837,15 @@ var require_lib166 = __commonJS({
     var lifecycle_1 = require_lib72();
     var link_bins_1 = require_lib70();
     var lockfile_fs_1 = require_lib124();
-    var lockfile_to_pnp_1 = require_lib159();
+    var lockfile_to_pnp_1 = require_lib160();
     var lockfile_utils_1 = require_lib122();
     var extendProjectsWithTargetDirs_js_1 = require_extendProjectsWithTargetDirs();
     var logger_1 = require_lib();
-    var modules_cleaner_1 = require_lib160();
+    var modules_cleaner_1 = require_lib161();
     var modules_yaml_1 = require_lib117();
     var read_package_json_1 = require_lib62();
     var read_project_manifest_1 = require_lib17();
-    var symlink_dependency_1 = require_lib161();
+    var symlink_dependency_1 = require_lib158();
     var types_1 = require_lib10();
     var dp = __importStar3(require_lib87());
     var worker_1 = require_lib74();
@@ -170098,6 +170113,7 @@ var require_resolvePeers = __commonJS({
     var semver_12 = __importDefault2(require_semver2());
     var semverUtils = __importStar3(require_semverUtils());
     var dependency_path_1 = require_lib87();
+    var symlink_dependency_1 = require_lib158();
     var partition_1 = __importDefault2(require_partition4());
     var pick_1 = __importDefault2(require_pick());
     var mergePeers_js_1 = require_mergePeers();
@@ -170481,7 +170497,7 @@ var require_resolvePeers = __commonJS({
         const peerDependencies = { ...resolvedPackage.peerDependencies };
         if (!ctx.depGraph[depPath] || ctx.depGraph[depPath].depth > node.depth) {
           const modules = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.virtualStoreDirMaxLength), "node_modules");
-          const dir = path_1.default.join(modules, resolvedPackage.name);
+          const dir = (0, symlink_dependency_1.safeJoinModulesDir)(modules, resolvedPackage.name);
           const transitivePeerDependencies = /* @__PURE__ */ new Set();
           for (const unknownPeer of allResolvedPeers.keys()) {
             if (!peerDependencies[unknownPeer]) {
@@ -171407,6 +171423,7 @@ var require_lib169 = __commonJS({
     var manifest_utils_1 = require_lib11();
     var patching_config_1 = require_lib162();
     var read_package_json_1 = require_lib62();
+    var symlink_dependency_1 = require_lib158();
     var types_1 = require_lib10();
     var difference_1 = __importDefault2(require_difference());
     var zipWith_1 = __importDefault2(require_zipWith2());
@@ -171706,7 +171723,7 @@ var require_lib169 = __commonJS({
         const node = graph[depPath];
         Object.assign(node, {
           modules,
-          dir: path_1.default.join(modules, node.name)
+          dir: (0, symlink_dependency_1.safeJoinModulesDir)(modules, node.name)
         });
       }
       return graph;
@@ -173241,8 +173258,8 @@ var require_link3 = __commonJS({
     var pkg_manager_direct_dep_linker_1 = require_lib165();
     var hoist_1 = require_lib157();
     var logger_1 = require_lib();
-    var modules_cleaner_1 = require_lib160();
-    var symlink_dependency_1 = require_lib161();
+    var modules_cleaner_1 = require_lib161();
+    var symlink_dependency_1 = require_lib158();
     var worker_1 = require_lib74();
     var p_limit_12 = __importDefault2(require_p_limit());
     var path_exists_1 = __importDefault2(require_path_exists2());
@@ -174047,7 +174064,7 @@ var require_install = __commonJS({
     var lifecycle_1 = require_lib72();
     var link_bins_1 = require_lib70();
     var lockfile_fs_1 = require_lib124();
-    var lockfile_to_pnp_1 = require_lib159();
+    var lockfile_to_pnp_1 = require_lib160();
     var lockfile_verification_1 = require_lib147();
     var lockfile_preferred_versions_1 = require_lib167();
     var logger_1 = require_lib();
@@ -191908,6 +191925,7 @@ var require_verifyPnpmEngineIdentity = __commonJS({
     var lockfile_fs_1 = require_lib124();
     var network_auth_header_1 = require_lib77();
     var pick_registry_for_package_1 = require_lib44();
+    var semver_12 = __importDefault2(require_semver2());
     var npmSigningKeys_js_1 = require_npmSigningKeys();
     function getNpmSigningKeys() {
       return npmSigningKeys_js_1.NPM_SIGNING_KEYS.map((k) => ({ ...k }));
@@ -191938,8 +191956,8 @@ var require_verifyPnpmEngineIdentity = __commonJS({
     }
     function collectEnginePackagesToVerify(lockfile, stageDir, targetPkgName, version2, registries) {
       const toVerify = [engineComponentToVerify(lockfile, registries, targetPkgName, version2)];
-      if (targetPkgName === "@pnpm/exe") {
-        const optionalDeps = lockfile.packages?.[`@pnpm/exe@${version2}`]?.optionalDependencies ?? {};
+      if (targetPkgName === "@pnpm/exe" || semver_12.default.major(version2) >= 12) {
+        const optionalDeps = lockfile.packages?.[`${targetPkgName}@${version2}`]?.optionalDependencies ?? {};
         for (const [name, platformVersion] of Object.entries(optionalDeps)) {
           if (!fs_1.default.existsSync(path_1.default.join(stageDir, "node_modules", name)))
             continue;
@@ -192075,6 +192093,10 @@ var require_installPnpmToTools = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.installPnpmToTools = installPnpmToTools;
+    exports2.pnpmPackageNameToInstall = pnpmPackageNameToInstall;
+    exports2.linkExePlatformBinary = linkExePlatformBinary;
+    exports2.exePlatformPkgDirNames = exePlatformPkgDirNames;
+    exports2.safeWrapperBinNames = safeWrapperBinNames;
     var fs_1 = __importDefault2(require("fs"));
     var path_1 = __importDefault2(require("path"));
     var cli_meta_1 = require_lib4();
@@ -192088,8 +192110,8 @@ var require_installPnpmToTools = __commonJS({
     var verifyPnpmEngineIdentity_js_1 = require_verifyPnpmEngineIdentity();
     async function installPnpmToTools(pnpmVersion, opts) {
       const currentPkgName = (0, cli_meta_1.getCurrentPackageName)();
-      const targetPkgName = currentPkgName === "@pnpm/exe" && process.platform === "darwin" && process.arch === "x64" && semver_12.default.major(pnpmVersion) >= 11 ? "pnpm" : currentPkgName;
-      if (targetPkgName !== currentPkgName) {
+      const targetPkgName = pnpmPackageNameToInstall(pnpmVersion, currentPkgName);
+      if (targetPkgName !== currentPkgName && semver_12.default.major(pnpmVersion) < 12) {
         (0, logger_1.globalWarn)(`Switching from @pnpm/exe to the "pnpm" npm package because @pnpm/exe v${pnpmVersion} no longer ships a binary for Intel macOS (darwin-x64). The new "pnpm" install requires Node.js to be available on PATH. See https://github.com/pnpm/pnpm/issues/11423.`);
       }
       const dir = (0, tools_path_1.getToolDirPath)({
@@ -192143,10 +192165,10 @@ var require_installPnpmToTools = __commonJS({
             pnpm_config_pm_on_fail: "ignore"
           }
         });
-        if (targetPkgName === "@pnpm/exe") {
-          linkExePlatformBinary(stage);
-        }
         await (0, verifyPnpmEngineIdentity_js_1.verifyPnpmEngineIdentity)(stage, targetPkgName, pnpmVersion, opts);
+        if (targetPkgName === "@pnpm/exe" || semver_12.default.major(pnpmVersion) >= 12) {
+          linkExePlatformBinary(stage, targetPkgName);
+        }
         symlink_dir_1.default.sync(stage, dir);
       } catch (err) {
         try {
@@ -192161,16 +192183,85 @@ var require_installPnpmToTools = __commonJS({
         binDir
       };
     }
-    function linkExePlatformBinary(stageDir) {
-      const platform = process.platform === "win32" ? "win" : process.platform === "darwin" ? "macos" : process.platform;
-      const arch = platform === "win" && process.arch === "ia32" ? "x86" : process.arch;
-      const executable = platform === "win" ? "pnpm.exe" : "pnpm";
-      const platformPkgDir = path_1.default.join(stageDir, "node_modules", "@pnpm", `${platform}-${arch}`);
-      const src = path_1.default.join(platformPkgDir, executable);
-      if (!fs_1.default.existsSync(src))
+    function pnpmPackageNameToInstall(pnpmVersion, currentPkgName) {
+      const major = semver_12.default.major(pnpmVersion);
+      if (major >= 12)
+        return "pnpm";
+      if (currentPkgName === "@pnpm/exe" && process.platform === "darwin" && process.arch === "x64" && major >= 11) {
+        return "pnpm";
+      }
+      return currentPkgName;
+    }
+    function linkExePlatformBinary(stageDir, wrapperPkgName) {
+      const wrapperDir = path_1.default.join(stageDir, "node_modules", ...wrapperPkgName.split("/"));
+      if (!fs_1.default.existsSync(wrapperDir))
         return;
-      const exePkgDir = path_1.default.join(stageDir, "node_modules", "@pnpm", "exe");
-      const dest = path_1.default.join(exePkgDir, executable);
+      const scopeDir = path_1.default.join(stageDir, "node_modules", "@pnpm");
+      const isWin = process.platform === "win32";
+      const executable = isWin ? "pnpm.exe" : "pnpm";
+      let src;
+      for (const dirName of exePlatformPkgDirNames(process.platform, process.arch)) {
+        const candidate = path_1.default.join(scopeDir, dirName, executable);
+        if (fs_1.default.existsSync(candidate)) {
+          src = candidate;
+          break;
+        }
+      }
+      if (src == null)
+        return;
+      if (!isWin) {
+        forceLink(src, path_1.default.join(wrapperDir, "pnpm"));
+        return;
+      }
+      const wrapperPkgJsonPath = path_1.default.join(wrapperDir, "package.json");
+      const wrapperPkg = JSON.parse(fs_1.default.readFileSync(wrapperPkgJsonPath, "utf8"));
+      const bin = typeof wrapperPkg.bin === "object" && wrapperPkg.bin != null ? wrapperPkg.bin : { pnpm: "pnpm" };
+      for (const name of safeWrapperBinNames(wrapperDir, bin)) {
+        forceLink(src, path_1.default.join(wrapperDir, `${name}.exe`));
+        forceLink(src, path_1.default.join(wrapperDir, name));
+        bin[name] = `${name}.exe`;
+      }
+      wrapperPkg.bin = bin;
+      const tempPkgJsonPath = `${wrapperPkgJsonPath}.pnpm-tmp`;
+      try {
+        fs_1.default.writeFileSync(tempPkgJsonPath, JSON.stringify(wrapperPkg, null, 2));
+        fs_1.default.renameSync(tempPkgJsonPath, wrapperPkgJsonPath);
+      } catch (err) {
+        try {
+          fs_1.default.rmSync(tempPkgJsonPath, { force: true });
+        } catch {
+        }
+        throw err;
+      }
+    }
+    function exePlatformPkgDirNames(platform, arch) {
+      switch (platform) {
+        case "win32": {
+          const legacyArch = arch === "ia32" ? "x86" : arch;
+          return [`win-${legacyArch}`, `exe.win32-${arch}`];
+        }
+        case "darwin":
+          return [`macos-${arch}`, `exe.darwin-${arch}`];
+        case "linux":
+          return [
+            `linux-${arch}`,
+            // legacy glibc
+            `linuxstatic-${arch}`,
+            // legacy musl
+            `exe.linux-${arch}`,
+            // v12 glibc
+            `exe.linux-${arch}-musl`
+            // v12 musl
+          ];
+        default:
+          return [`${platform}-${arch}`, `exe.${platform}-${arch}`];
+      }
+    }
+    function safeWrapperBinNames(wrapperDir, bin) {
+      const resolvedWrapperDir = path_1.default.resolve(wrapperDir);
+      return Object.keys(bin).filter((name) => path_1.default.dirname(path_1.default.resolve(wrapperDir, name)) === resolvedWrapperDir);
+    }
+    function forceLink(src, dest) {
       try {
         fs_1.default.unlinkSync(dest);
       } catch (err) {
@@ -192180,13 +192271,6 @@ var require_installPnpmToTools = __commonJS({
       }
       fs_1.default.linkSync(src, dest);
       fs_1.default.chmodSync(dest, 493);
-      if (platform === "win") {
-        const exePkgJsonPath = path_1.default.join(exePkgDir, "package.json");
-        const exePkg = JSON.parse(fs_1.default.readFileSync(exePkgJsonPath, "utf8"));
-        fs_1.default.writeFileSync(path_1.default.join(exePkgDir, "pnpm"), "This file intentionally left blank");
-        exePkg.bin.pnpm = "pnpm.exe";
-        fs_1.default.writeFileSync(exePkgJsonPath, JSON.stringify(exePkg, null, 2));
-      }
     }
   }
 });
@@ -192335,13 +192419,25 @@ var require_lib181 = __commonJS({
       return result2;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.selfUpdate = exports2.verifyPnpmEngineIdentity = exports2.getNpmSigningKeys = exports2.installPnpmToTools = void 0;
+    exports2.selfUpdate = exports2.verifyPnpmEngineIdentity = exports2.getNpmSigningKeys = exports2.safeWrapperBinNames = exports2.exePlatformPkgDirNames = exports2.linkExePlatformBinary = exports2.pnpmPackageNameToInstall = exports2.installPnpmToTools = void 0;
     var selfUpdate = __importStar3(require_selfUpdate());
     exports2.selfUpdate = selfUpdate;
     var installPnpmToTools_js_1 = require_installPnpmToTools();
     Object.defineProperty(exports2, "installPnpmToTools", { enumerable: true, get: function() {
       return installPnpmToTools_js_1.installPnpmToTools;
     } });
+    Object.defineProperty(exports2, "pnpmPackageNameToInstall", { enumerable: true, get: function() {
+      return installPnpmToTools_js_1.pnpmPackageNameToInstall;
+    } });
+    Object.defineProperty(exports2, "linkExePlatformBinary", { enumerable: true, get: function() {
+      return installPnpmToTools_js_1.linkExePlatformBinary;
+    } });
+    Object.defineProperty(exports2, "exePlatformPkgDirNames", { enumerable: true, get: function() {
+      return installPnpmToTools_js_1.exePlatformPkgDirNames;
+    } });
+    Object.defineProperty(exports2, "safeWrapperBinNames", { enumerable: true, get: function() {
+      return installPnpmToTools_js_1.safeWrapperBinNames;
+    } });
     var verifyPnpmEngineIdentity_js_1 = require_verifyPnpmEngineIdentity();
     Object.defineProperty(exports2, "getNpmSigningKeys", { enumerable: true, get: function() {
       return verifyPnpmEngineIdentity_js_1.getNpmSigningKeys;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pnpm",
-  "version": "10.34.4",
+  "version": "10.34.5",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",