pnpm 9.7.1 → 9.9.0

package/dist/node_modules/.modules.yaml

@@ -17,8 +17,8 @@ hoistedLocations:
     - node_modules/aggregate-error
   ansi-regex@5.0.1:
     - node_modules/string-width-cjs/node_modules/ansi-regex
-    - node_modules/strip-ansi-cjs/node_modules/ansi-regex
     - node_modules/wrap-ansi-cjs/node_modules/ansi-regex
+    - node_modules/strip-ansi-cjs/node_modules/ansi-regex
   ansi-regex@6.0.1:
     - node_modules/ansi-regex
   ansi-styles@4.3.0:
@@ -113,10 +113,10 @@ hoistedLocations:
   minipass-sized@1.0.3:
     - node_modules/minipass-sized
   minipass@3.3.6:
-    - node_modules/fs-minipass/node_modules/minipass
     - node_modules/minizlib/node_modules/minipass
-    - node_modules/minipass-flush/node_modules/minipass
+    - node_modules/fs-minipass/node_modules/minipass
     - node_modules/minipass-pipeline/node_modules/minipass
+    - node_modules/minipass-flush/node_modules/minipass
     - node_modules/minipass-sized/node_modules/minipass
   minipass@5.0.0:
     - node_modules/tar/node_modules/minipass
@@ -202,9 +202,9 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@9.7.0
+packageManager: pnpm@9.8.0
 pendingBuilds: []
-prunedAt: Wed, 14 Aug 2024 14:56:12 GMT
+prunedAt: Mon, 26 Aug 2024 15:35:33 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -7640,11 +7640,12 @@ var require_lib5 = __commonJS({
     exports2.packageManager = void 0;
     exports2.detectIfCurrentPkgIsExecutable = detectIfCurrentPkgIsExecutable;
     exports2.isExecutedByCorepack = isExecutedByCorepack;
+    exports2.getCurrentPackageName = getCurrentPackageName;
     var path_1 = __importDefault2(require("path"));
     var load_json_file_1 = __importDefault2(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "9.7.1" : "0.0.0"
+      version: true ? "9.9.0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -7672,6 +7673,28 @@ var require_lib5 = __commonJS({
     function isExecutedByCorepack(env = process.env) {
       return env.COREPACK_ROOT != null;
     }
+    function getCurrentPackageName(proc = process) {
+      return detectIfCurrentPkgIsExecutable(proc) ? getExePackageName(proc) : "pnpm";
+    }
+    function getExePackageName(proc) {
+      return `@pnpm/${normalizePlatformName(proc)}-${normalizeArchName(proc)}`;
+    }
+    function normalizePlatformName(proc) {
+      switch (proc.platform) {
+        case "win32":
+          return "win";
+        case "darwin":
+          return "macos";
+        default:
+          return proc.platform;
+      }
+    }
+    function normalizeArchName(proc) {
+      if (proc.platform === "win32" && proc.arch === "ia32") {
+        return "x86";
+      }
+      return proc.arch;
+    }
   }
 });
 
@@ -41984,13 +42007,13 @@ Follow ${chalk_1.default.magenta("@pnpmjs")} for updates: https://x.com/pnpmjs`,
       }));
     }
     function renderUpdateMessage(opts) {
-      if (opts.currentPkgIsExecutable && opts.env.PNPM_HOME) {
-        return "Run a script from: https://pnpm.io/installation";
-      }
       const updateCommand = renderUpdateCommand(opts);
       return `Run "${chalk_1.default.magenta(updateCommand)}" to update.`;
     }
     function renderUpdateCommand(opts) {
+      if (opts.env.PNPM_HOME) {
+        return "pnpm self-update";
+      }
       if ((0, cli_meta_1.isExecutedByCorepack)(opts.env)) {
         return `corepack install -g pnpm@${opts.latestVersion}`;
       }
@@ -42783,6 +42806,7 @@ var require_checkPlatform = __commonJS({
       if (typeof list === "string") {
         list = [list];
       }
+      list = list.filter((value2) => typeof value2 === "string");
       if (list.length === 1 && list[0] === "any") {
         return true;
       }
@@ -103001,9 +103025,9 @@ var require_groupBy2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/symlink-dir@6.0.1/node_modules/symlink-dir/dist/index.js
+// ../node_modules/.pnpm/symlink-dir@6.0.2/node_modules/symlink-dir/dist/index.js
 var require_dist14 = __commonJS({
-  "../node_modules/.pnpm/symlink-dir@6.0.1/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/symlink-dir@6.0.2/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
     "use strict";
     var betterPathResolve = require_better_path_resolve();
     var fs_1 = require("fs");
@@ -103027,6 +103051,7 @@ var require_dist14 = __commonJS({
       return forceSymlink(target, path2, opts);
     }
     async function forceSymlink(target, path2, opts) {
+      let initialErr;
       try {
         await fs_1.promises.symlink(target, path2, symlinkType);
         return { reused: false };
@@ -103043,9 +103068,7 @@ var require_dist14 = __commonJS({
             return { reused: false };
           case "EEXIST":
           case "EISDIR":
-            if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
-              throw err;
-            }
+            initialErr = err;
             break;
           default:
             throw err;
@@ -103055,6 +103078,9 @@ var require_dist14 = __commonJS({
       try {
         linkString = await fs_1.promises.readlink(path2);
       } catch (err) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+          throw initialErr;
+        }
         const parentDir = pathLib.dirname(path2);
         let warn;
         if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
@@ -103073,6 +103099,9 @@ var require_dist14 = __commonJS({
       if (target === linkString) {
         return { reused: true };
       }
+      if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+        throw initialErr;
+      }
       await fs_1.promises.unlink(path2);
       return await forceSymlink(target, path2, opts);
     }
@@ -103089,10 +103118,12 @@ var require_dist14 = __commonJS({
       symlinkDir2.sync = sync;
     })(symlinkDir || (symlinkDir = {}));
     function forceSymlinkSync(target, path2, opts) {
+      let initialErr;
       try {
         (0, fs_1.symlinkSync)(target, path2, symlinkType);
         return { reused: false };
       } catch (err) {
+        initialErr = err;
         switch (err.code) {
           case "ENOENT":
             try {
@@ -103105,9 +103136,6 @@ var require_dist14 = __commonJS({
             return { reused: false };
           case "EEXIST":
           case "EISDIR":
-            if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
-              throw err;
-            }
             break;
           default:
             throw err;
@@ -103117,6 +103145,9 @@ var require_dist14 = __commonJS({
       try {
         linkString = (0, fs_1.readlinkSync)(path2);
       } catch (err) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+          throw initialErr;
+        }
         const parentDir = pathLib.dirname(path2);
         let warn;
         if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
@@ -103135,6 +103166,9 @@ var require_dist14 = __commonJS({
       if (target === linkString) {
         return { reused: true };
       }
+      if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+        throw initialErr;
+      }
       (0, fs_1.unlinkSync)(path2);
       return forceSymlinkSync(target, path2, opts);
     }
@@ -190246,12 +190280,13 @@ var require_resolvePeers = __commonJS({
           }
         }
         const newParentPkgs = toPkgByName(parentPkgNodes);
+        const _parentPkgsMatch = parentPkgsMatch.bind(null, ctx.dependenciesTree);
         for (const [newParentPkgName, newParentPkg] of Object.entries(newParentPkgs)) {
           if (parentPkgs[newParentPkgName]) {
-            if (parentPkgs[newParentPkgName].version !== newParentPkg.version) {
+            if (!_parentPkgsMatch(parentPkgs[newParentPkgName], newParentPkg)) {
               newParentPkg.occurrence = parentPkgs[newParentPkgName].occurrence + 1;
+              parentPkgs[newParentPkgName] = newParentPkg;
             }
-            parentPkgs[newParentPkgName] = newParentPkg;
           } else {
             parentPkgs[newParentPkgName] = newParentPkg;
           }
@@ -190412,6 +190447,18 @@ var require_resolvePeers = __commonJS({
         }
       }
     }
+    function parentPkgsMatch(dependenciesTree, currentParentPkg, newParentPkg) {
+      if (currentParentPkg.version !== newParentPkg.version || currentParentPkg.alias !== newParentPkg.alias) {
+        return false;
+      }
+      const currentParentResolvedPkg = currentParentPkg.nodeId && dependenciesTree.get(currentParentPkg.nodeId)?.resolvedPackage;
+      if (currentParentResolvedPkg == null)
+        return true;
+      const newParentResolvedPkg = newParentPkg.nodeId && dependenciesTree.get(newParentPkg.nodeId)?.resolvedPackage;
+      if (newParentResolvedPkg == null)
+        return true;
+      return currentParentResolvedPkg.name === newParentResolvedPkg.name;
+    }
     function findHit(ctx, parentPkgs, pkgIdWithPatchHash) {
       const cacheItems = ctx.peersCache.get(pkgIdWithPatchHash);
       if (!cacheItems)
@@ -195406,12 +195453,16 @@ var require_recursive2 = __commonJS({
     }
     function getAllProjects(manifestsByPath, allProjectsGraph, sort) {
       const chunks = sort !== false ? (0, sort_packages_1.sortPackages)(allProjectsGraph) : [Object.keys(allProjectsGraph).sort()];
-      return chunks.map((prefixes, buildIndex) => prefixes.map((rootDir) => ({
-        buildIndex,
-        manifest: manifestsByPath[rootDir].manifest,
-        rootDir,
-        rootDirRealPath: allProjectsGraph[rootDir].package.rootDirRealPath
-      }))).flat();
+      return chunks.map((prefixes, buildIndex) => prefixes.map((rootDir) => {
+        const { rootDirRealPath, modulesDir } = allProjectsGraph[rootDir].package;
+        return {
+          buildIndex,
+          manifest: manifestsByPath[rootDir].manifest,
+          rootDir,
+          rootDirRealPath,
+          modulesDir
+        };
+      })).flat();
     }
     function getManifestsByPath(projects) {
       return projects.reduce((manifestsByPath, { rootDir, manifest, writeProjectManifest }) => {
@@ -216889,6 +216940,10 @@ var require_deploy = __commonJS({
       await fs_1.default.promises.mkdir(deployDir, { recursive: true });
       const includeOnlyPackageFiles = !opts.deployAllFiles;
       await copyProject(deployedDir, deployDir, { includeOnlyPackageFiles });
+      const deployedProject = opts.allProjects?.find(({ rootDir }) => rootDir === deployedDir);
+      if (deployedProject) {
+        deployedProject.modulesDir = path_1.default.relative(deployedDir, path_1.default.join(deployDir, "node_modules"));
+      }
       await plugin_commands_installation_1.install.handler({
         ...opts,
         confirmModulesPurge: false,
@@ -216910,7 +216965,7 @@ var require_deploy = __commonJS({
         preferFrozenLockfile: false,
         saveLockfile: false,
         virtualStoreDir: path_1.default.join(deployDir, "node_modules/.pnpm"),
-        modulesDir: path_1.default.relative(deployedDir, path_1.default.join(deployDir, "node_modules")),
+        modulesDir: path_1.default.relative(opts.workspaceDir, path_1.default.join(deployDir, "node_modules")),
         rawLocalConfig: {
           ...opts.rawLocalConfig,
           // This is a workaround to prevent frozen install in CI envs.
@@ -216970,6 +217025,263 @@ var require_lib164 = __commonJS({
   }
 });
 
+// ../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/logger.js
+var require_logger3 = __commonJS({
+  "../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/logger.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.globalInfo = exports2.globalWarn = exports2.logger = void 0;
+    var bole_1 = __importDefault2(require_bole());
+    bole_1.default.setFastTime();
+    exports2.logger = (0, bole_1.default)("pnpm");
+    var globalLogger = (0, bole_1.default)("pnpm:global");
+    function globalWarn(message2) {
+      globalLogger.warn(message2);
+    }
+    exports2.globalWarn = globalWarn;
+    function globalInfo(message2) {
+      globalLogger.info(message2);
+    }
+    exports2.globalInfo = globalInfo;
+  }
+});
+
+// ../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/streamParser.js
+var require_streamParser2 = __commonJS({
+  "../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/streamParser.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.createStreamParser = exports2.streamParser = void 0;
+    var bole_1 = __importDefault2(require_bole());
+    var ndjson_1 = __importDefault2(require_ndjson());
+    exports2.streamParser = createStreamParser();
+    function createStreamParser() {
+      const sp = ndjson_1.default.parse();
+      bole_1.default.output([
+        {
+          level: "debug",
+          stream: sp
+        }
+      ]);
+      return sp;
+    }
+    exports2.createStreamParser = createStreamParser;
+  }
+});
+
+// ../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/writeToConsole.js
+var require_writeToConsole2 = __commonJS({
+  "../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/writeToConsole.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.writeToConsole = void 0;
+    var bole_1 = __importDefault2(require_bole());
+    function writeToConsole() {
+      bole_1.default.output([
+        {
+          level: "debug",
+          stream: process.stdout
+        }
+      ]);
+    }
+    exports2.writeToConsole = writeToConsole;
+  }
+});
+
+// ../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/index.js
+var require_lib165 = __commonJS({
+  "../node_modules/.pnpm/@pnpm+logger@5.2.0/node_modules/@pnpm/logger/lib/index.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.writeToConsole = exports2.streamParser = exports2.createStreamParser = exports2.globalWarn = exports2.globalInfo = exports2.logger = void 0;
+    var logger_1 = require_logger3();
+    Object.defineProperty(exports2, "logger", { enumerable: true, get: function() {
+      return logger_1.logger;
+    } });
+    Object.defineProperty(exports2, "globalInfo", { enumerable: true, get: function() {
+      return logger_1.globalInfo;
+    } });
+    Object.defineProperty(exports2, "globalWarn", { enumerable: true, get: function() {
+      return logger_1.globalWarn;
+    } });
+    var streamParser_1 = require_streamParser2();
+    Object.defineProperty(exports2, "createStreamParser", { enumerable: true, get: function() {
+      return streamParser_1.createStreamParser;
+    } });
+    Object.defineProperty(exports2, "streamParser", { enumerable: true, get: function() {
+      return streamParser_1.streamParser;
+    } });
+    var writeToConsole_1 = require_writeToConsole2();
+    Object.defineProperty(exports2, "writeToConsole", { enumerable: true, get: function() {
+      return writeToConsole_1.writeToConsole;
+    } });
+  }
+});
+
+// ../tools/path/lib/index.js
+var require_lib166 = __commonJS({
+  "../tools/path/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.getToolDirPath = getToolDirPath;
+    var path_1 = __importDefault2(require("path"));
+    function getToolDirPath(opts) {
+      return path_1.default.join(opts.pnpmHomeDir, ".tools", opts.tool.name.replaceAll("/", "+"), opts.tool.version);
+    }
+  }
+});
+
+// ../tools/plugin-commands-self-updater/lib/selfUpdate.js
+var require_selfUpdate = __commonJS({
+  "../tools/plugin-commands-self-updater/lib/selfUpdate.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.commandNames = void 0;
+    exports2.rcOptionsTypes = rcOptionsTypes;
+    exports2.cliOptionsTypes = cliOptionsTypes;
+    exports2.help = help;
+    exports2.handler = handler;
+    var fs_1 = __importDefault2(require("fs"));
+    var path_1 = __importDefault2(require("path"));
+    var cli_utils_1 = require_lib35();
+    var cli_meta_1 = require_lib5();
+    var client_1 = require_lib90();
+    var pick_registry_for_package_1 = require_lib91();
+    var config_1 = require_lib23();
+    var error_1 = require_lib7();
+    var logger_1 = require_lib165();
+    var plugin_commands_installation_1 = require_lib163();
+    var read_project_manifest_1 = require_lib17();
+    var tools_path_1 = require_lib166();
+    var link_bins_1 = require_lib72();
+    var pick_1 = __importDefault2(require_pick());
+    var render_help_1 = __importDefault2(require_lib46());
+    function rcOptionsTypes() {
+      return (0, pick_1.default)([], config_1.types);
+    }
+    function cliOptionsTypes() {
+      return {
+        ...rcOptionsTypes()
+      };
+    }
+    exports2.commandNames = ["self-update"];
+    function help() {
+      return (0, render_help_1.default)({
+        description: "Updates pnpm to the latest version",
+        descriptionLists: [],
+        url: (0, cli_utils_1.docsUrl)("self-update"),
+        usages: []
+      });
+    }
+    async function handler(opts) {
+      if ((0, cli_meta_1.isExecutedByCorepack)()) {
+        throw new error_1.PnpmError("CANT_SELF_UPDATE_IN_COREPACK", "You should update pnpm with corepack");
+      }
+      const { resolve } = (0, client_1.createResolver)({ ...opts, authConfig: opts.rawConfig });
+      const pkgName = "pnpm";
+      const resolution = await resolve({ alias: pkgName, pref: "latest" }, {
+        lockfileDir: opts.lockfileDir ?? opts.dir,
+        preferredVersions: {},
+        projectDir: opts.dir,
+        registry: (0, pick_registry_for_package_1.pickRegistryForPackage)(opts.registries, pkgName, "latest")
+      });
+      if (!resolution?.manifest) {
+        throw new error_1.PnpmError("CANNOT_RESOLVE_PNPM", "Cannot find latest version of pnpm");
+      }
+      if (resolution.manifest.version === cli_meta_1.packageManager.version) {
+        return `The currently active ${cli_meta_1.packageManager.name} v${cli_meta_1.packageManager.version} is already "latest" and doesn't need an update`;
+      }
+      if (opts.wantedPackageManager?.name === cli_meta_1.packageManager.name && opts.managePackageManagerVersions) {
+        const { manifest, writeProjectManifest } = await (0, read_project_manifest_1.readProjectManifest)(opts.rootProjectManifestDir);
+        manifest.packageManager = `pnpm@${resolution.manifest.version}`;
+        await writeProjectManifest(manifest);
+        return `The current project has been updated to use pnpm v${resolution.manifest.version}`;
+      }
+      const currentPkgName = (0, cli_meta_1.getCurrentPackageName)();
+      const dir = (0, tools_path_1.getToolDirPath)({
+        pnpmHomeDir: opts.pnpmHomeDir,
+        tool: {
+          name: currentPkgName,
+          version: resolution.manifest.version
+        }
+      });
+      if (fs_1.default.existsSync(dir)) {
+        await (0, link_bins_1.linkBins)(path_1.default.join(dir, opts.modulesDir ?? "node_modules"), opts.pnpmHomeDir, {
+          warn: logger_1.globalWarn
+        });
+        return `The latest version, v${resolution.manifest.version}, is already present on the system. It was activated by linking it from ${dir}.`;
+      }
+      fs_1.default.mkdirSync(dir, { recursive: true });
+      fs_1.default.writeFileSync(path_1.default.join(dir, "package.json"), "{}");
+      await plugin_commands_installation_1.add.handler({
+        ...opts,
+        dir,
+        lockfileDir: dir,
+        bin: opts.pnpmHomeDir
+      }, [`${currentPkgName}@${resolution.manifest.version}`]);
+      return void 0;
+    }
+  }
+});
+
+// ../tools/plugin-commands-self-updater/lib/index.js
+var require_lib167 = __commonJS({
+  "../tools/plugin-commands-self-updater/lib/index.js"(exports2) {
+    "use strict";
+    var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault3 = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar3 = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result2 = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding3(result2, mod, k);
+      }
+      __setModuleDefault3(result2, mod);
+      return result2;
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.selfUpdate = void 0;
+    var selfUpdate = __importStar3(require_selfUpdate());
+    exports2.selfUpdate = selfUpdate;
+  }
+});
+
 // ../reviewing/plugin-commands-listing/lib/recursive.js
 var require_recursive3 = __commonJS({
   "../reviewing/plugin-commands-listing/lib/recursive.js"(exports2) {
@@ -217345,7 +217657,7 @@ For example: pnpm why babel-* eslint-*`,
 });
 
 // ../reviewing/plugin-commands-listing/lib/index.js
-var require_lib165 = __commonJS({
+var require_lib168 = __commonJS({
   "../reviewing/plugin-commands-listing/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -217804,7 +218116,7 @@ var require_licenses = __commonJS({
 });
 
 // ../reviewing/license-scanner/lib/index.js
-var require_lib166 = __commonJS({
+var require_lib169 = __commonJS({
   "../reviewing/license-scanner/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -217967,7 +218279,7 @@ var require_licensesList = __commonJS({
     var store_path_1 = require_lib81();
     var constants_1 = require_lib6();
     var lockfile_fs_1 = require_lib99();
-    var license_scanner_1 = require_lib166();
+    var license_scanner_1 = require_lib169();
     var outputRenderer_1 = require_outputRenderer();
     async function licensesList(opts) {
       const lockfile = await (0, lockfile_fs_1.readWantedLockfile)(opts.lockfileDir ?? opts.dir, {
@@ -218109,7 +218421,7 @@ var require_licenses2 = __commonJS({
 });
 
 // ../reviewing/plugin-commands-licenses/lib/index.js
-var require_lib167 = __commonJS({
+var require_lib170 = __commonJS({
   "../reviewing/plugin-commands-licenses/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -218655,7 +218967,7 @@ ${details}`;
 });
 
 // ../reviewing/plugin-commands-outdated/lib/index.js
-var require_lib168 = __commonJS({
+var require_lib171 = __commonJS({
   "../reviewing/plugin-commands-outdated/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -218746,7 +219058,7 @@ var require_overridePublishConfig = __commonJS({
 });
 
 // ../pkg-manifest/exportable-manifest/lib/index.js
-var require_lib169 = __commonJS({
+var require_lib172 = __commonJS({
   "../pkg-manifest/exportable-manifest/lib/index.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
@@ -220451,7 +220763,7 @@ var require_pack3 = __commonJS({
     var error_1 = require_lib7();
     var config_1 = require_lib23();
     var cli_utils_1 = require_lib35();
-    var exportable_manifest_1 = require_lib169();
+    var exportable_manifest_1 = require_lib172();
     var fs_packlist_1 = require_lib74();
     var package_bins_1 = require_lib47();
     var fast_glob_1 = __importDefault2(require_out4());
@@ -220619,7 +220931,7 @@ var require_pack3 = __commonJS({
 });
 
 // ../releasing/plugin-commands-publishing/lib/index.js
-var require_lib170 = __commonJS({
+var require_lib173 = __commonJS({
   "../releasing/plugin-commands-publishing/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -221048,7 +221360,6 @@ var require_stateFile = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.readEditDirState = readEditDirState;
     exports2.writeEditDirState = writeEditDirState;
-    exports2.deleteEditDirState = deleteEditDirState;
     var fs_1 = __importDefault2(require("fs"));
     var path_1 = __importDefault2(require("path"));
     var util_1 = __importDefault2(require("util"));
@@ -221069,12 +221380,6 @@ var require_stateFile = __commonJS({
         };
       });
     }
-    function deleteEditDirState(opts) {
-      modifyStateFile(opts.modulesDir, (state) => {
-        const key = createEditDirKey(opts);
-        delete state[key];
-      });
-    }
     function modifyStateFile(modulesDir, modifyState) {
       const filePath = getStateFilePath(modulesDir);
       let state = readStateFile(modulesDir);
@@ -221184,7 +221489,7 @@ var require_patch2 = __commonJS({
       await (0, writePackage_1.writePackage)(patchedDep, editDir, opts);
       (0, stateFile_1.writeEditDirState)({
         editDir,
-        modulesDir: opts.modulesDir ?? "node_modules",
+        modulesDir: path_1.default.join(opts.dir, opts.modulesDir ?? "node_modules"),
         patchedPkg: params[0],
         applyToAll: patchedDep.applyToAll
       });
@@ -221297,7 +221602,7 @@ var require_patchCommit = __commonJS({
       const editDir = path_1.default.resolve(opts.dir, userDir);
       const stateValue = (0, stateFile_1.readEditDirState)({
         editDir,
-        modulesDir: opts.modulesDir ?? "node_modules"
+        modulesDir: path_1.default.join(opts.dir, opts.modulesDir ?? "node_modules")
       });
       if (!stateValue) {
         throw new error_1.PnpmError("INVALID_PATCH_DIR", `${userDir} is not a valid patch directory`, {
@@ -221320,10 +221625,6 @@ var require_patchCommit = __commonJS({
       }
       const srcDir = tempy_1.default.directory();
       await (0, writePackage_1.writePackage)((0, parse_wanted_dependency_1.parseWantedDependency)(gitTarballUrl ? `${patchedPkgManifest.name}@${gitTarballUrl}` : nameAndVersion), srcDir, opts);
-      (0, stateFile_1.deleteEditDirState)({
-        editDir,
-        modulesDir: opts.modulesDir ?? "node_modules"
-      });
       const patchedPkgDir = await preparePkgFilesForDiff(userDir);
       const patchContent = await diffFolders(srcDir, patchedPkgDir);
       if (patchedPkgDir !== userDir) {
@@ -221526,7 +221827,7 @@ var require_patchRemove = __commonJS({
 });
 
 // ../patching/plugin-commands-patching/lib/index.js
-var require_lib171 = __commonJS({
+var require_lib174 = __commonJS({
   "../patching/plugin-commands-patching/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -221573,7 +221874,7 @@ var require_lib171 = __commonJS({
 });
 
 // ../env/path/lib/index.js
-var require_lib172 = __commonJS({
+var require_lib175 = __commonJS({
   "../env/path/lib/index.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
@@ -221605,7 +221906,7 @@ var require_makeEnv = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.makeEnv = makeEnv;
     var error_1 = require_lib7();
-    var env_path_1 = require_lib172();
+    var env_path_1 = require_lib175();
     var path_1 = __importDefault2(require("path"));
     function makeEnv(opts) {
       for (const prependPath of opts.prependPaths) {
@@ -223225,7 +223526,7 @@ var require_exec = __commonJS({
     var sort_packages_1 = require_lib128();
     var execa_1 = __importDefault2(require_lib18());
     var p_limit_12 = __importDefault2(require_p_limit());
-    var env_path_1 = require_lib172();
+    var env_path_1 = require_lib175();
     var pick_1 = __importDefault2(require_pick());
     var render_help_1 = __importDefault2(require_lib46());
     var existsInDir_1 = require_existsInDir();
@@ -223641,7 +223942,7 @@ var require_test2 = __commonJS({
 });
 
 // ../exec/plugin-commands-script-runners/lib/index.js
-var require_lib173 = __commonJS({
+var require_lib176 = __commonJS({
   "../exec/plugin-commands-script-runners/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -224310,7 +224611,7 @@ var require_server = __commonJS({
 });
 
 // ../store/plugin-commands-server/lib/index.js
-var require_lib174 = __commonJS({
+var require_lib177 = __commonJS({
   "../store/plugin-commands-server/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -228168,7 +228469,7 @@ var require_string_prototype2 = __commonJS({
 });
 
 // ../node_modules/.pnpm/safe-execa@0.1.1/node_modules/safe-execa/lib/index.js
-var require_lib175 = __commonJS({
+var require_lib178 = __commonJS({
   "../node_modules/.pnpm/safe-execa@0.1.1/node_modules/safe-execa/lib/index.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
@@ -228221,7 +228522,7 @@ var require_path_extender_windows = __commonJS({
     var error_1 = require_lib53();
     var string_prototype_matchall_1 = __importDefault2(require_string_prototype2());
     var path_1 = require("path");
-    var safe_execa_1 = __importDefault2(require_lib175());
+    var safe_execa_1 = __importDefault2(require_lib178());
     var BadEnvVariableError = class extends error_1.PnpmError {
       constructor({ envName, wantedValue, currentValue }) {
         super("BAD_ENV_FOUND", `Currently '${envName}' is set to '${wantedValue}'`);
@@ -228526,7 +228827,7 @@ source ${report.configFile.path}
 });
 
 // ../packages/plugin-commands-setup/lib/index.js
-var require_lib176 = __commonJS({
+var require_lib179 = __commonJS({
   "../packages/plugin-commands-setup/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -229497,7 +229798,7 @@ var require_store = __commonJS({
 });
 
 // ../store/plugin-commands-store/lib/index.js
-var require_lib177 = __commonJS({
+var require_lib180 = __commonJS({
   "../store/plugin-commands-store/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -229752,7 +230053,7 @@ var require_findHash = __commonJS({
 });
 
 // ../store/plugin-commands-store-inspecting/lib/index.js
-var require_lib178 = __commonJS({
+var require_lib181 = __commonJS({
   "../store/plugin-commands-store-inspecting/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -229928,7 +230229,7 @@ ${JSON.stringify(packageJson, null, 2)}`;
 });
 
 // ../packages/plugin-commands-init/lib/index.js
-var require_lib179 = __commonJS({
+var require_lib182 = __commonJS({
   "../packages/plugin-commands-init/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -230014,7 +230315,7 @@ var require_shorthands = __commonJS({
 });
 
 // ../cli/parse-cli-args/lib/index.js
-var require_lib180 = __commonJS({
+var require_lib183 = __commonJS({
   "../cli/parse-cli-args/lib/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -230219,7 +230520,7 @@ var require_parseCliArgs = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseCliArgs = parseCliArgs;
-    var parse_cli_args_1 = require_lib180();
+    var parse_cli_args_1 = require_lib183();
     var cmd_1 = require_cmd();
     var shorthands_1 = require_shorthands();
     var RENAMED_OPTIONS = {
@@ -230495,7 +230796,7 @@ var require_installTest = __commonJS({
     exports2.handler = handler;
     var cli_utils_1 = require_lib35();
     var plugin_commands_installation_1 = require_lib163();
-    var plugin_commands_script_runners_1 = require_lib173();
+    var plugin_commands_script_runners_1 = require_lib176();
     var render_help_1 = __importDefault2(require_lib46());
     exports2.cliOptionsTypes = plugin_commands_installation_1.install.cliOptionsTypes;
     exports2.rcOptionsTypes = plugin_commands_installation_1.install.rcOptionsTypes;
@@ -230744,18 +231045,19 @@ var require_cmd = __commonJS({
     var plugin_commands_env_1 = require_lib82();
     var plugin_commands_deploy_1 = require_lib164();
     var plugin_commands_installation_1 = require_lib163();
-    var plugin_commands_listing_1 = require_lib165();
-    var plugin_commands_licenses_1 = require_lib167();
-    var plugin_commands_outdated_1 = require_lib168();
-    var plugin_commands_publishing_1 = require_lib170();
-    var plugin_commands_patching_1 = require_lib171();
+    var tools_plugin_commands_self_updater_1 = require_lib167();
+    var plugin_commands_listing_1 = require_lib168();
+    var plugin_commands_licenses_1 = require_lib170();
+    var plugin_commands_outdated_1 = require_lib171();
+    var plugin_commands_publishing_1 = require_lib173();
+    var plugin_commands_patching_1 = require_lib174();
     var plugin_commands_rebuild_1 = require_lib129();
-    var plugin_commands_script_runners_1 = require_lib173();
-    var plugin_commands_server_1 = require_lib174();
-    var plugin_commands_setup_1 = require_lib176();
-    var plugin_commands_store_1 = require_lib177();
-    var plugin_commands_store_inspecting_1 = require_lib178();
-    var plugin_commands_init_1 = require_lib179();
+    var plugin_commands_script_runners_1 = require_lib176();
+    var plugin_commands_server_1 = require_lib177();
+    var plugin_commands_setup_1 = require_lib179();
+    var plugin_commands_store_1 = require_lib180();
+    var plugin_commands_store_inspecting_1 = require_lib181();
+    var plugin_commands_init_1 = require_lib182();
     var pick_1 = __importDefault2(require_pick());
     var shorthands_1 = require_shorthands();
     var parseCliArgs_1 = require_parseCliArgs();
@@ -230802,6 +231104,7 @@ var require_cmd = __commonJS({
       plugin_commands_installation_1.fetch,
       plugin_commands_completion_1.generateCompletion,
       plugin_commands_installation_1.importCommand,
+      tools_plugin_commands_self_updater_1.selfUpdate,
       plugin_commands_init_1.init,
       plugin_commands_installation_1.install,
       installTest,
@@ -231009,7 +231312,8 @@ var require_switchCliVersion = __commonJS({
     var path_1 = __importDefault2(require("path"));
     var logger_1 = require_lib();
     var cli_meta_1 = require_lib5();
-    var env_path_1 = require_lib172();
+    var env_path_1 = require_lib175();
+    var tools_path_1 = require_lib166();
     var cross_spawn_1 = __importDefault2(require_cross_spawn());
     var semver_12 = __importDefault2(require_semver2());
     var cmd_1 = require_cmd();
@@ -231021,8 +231325,14 @@ var require_switchCliVersion = __commonJS({
         (0, logger_1.globalWarn)(`Cannot switch to pnpm@${pm.version}: "${pm.version}" is not a valid version`);
         return;
       }
-      const pkgName = (0, cli_meta_1.detectIfCurrentPkgIsExecutable)() ? getExePackageName() : "pnpm";
-      const dir = path_1.default.join(config.pnpmHomeDir, ".tools", pkgName.replaceAll("/", "+"), pm.version);
+      const pkgName = (0, cli_meta_1.getCurrentPackageName)();
+      const dir = (0, tools_path_1.getToolDirPath)({
+        pnpmHomeDir: config.pnpmHomeDir,
+        tool: {
+          name: pkgName,
+          version: pm.version
+        }
+      });
       if (!fs_1.default.existsSync(dir)) {
         fs_1.default.mkdirSync(dir, { recursive: true });
         fs_1.default.writeFileSync(path_1.default.join(dir, "package.json"), "{}");
@@ -231043,11 +231353,6 @@ var require_switchCliVersion = __commonJS({
       });
       process.exit(status ?? 0);
     }
-    function getExePackageName() {
-      const platform = process.platform === "win32" ? "win" : process.platform === "darwin" ? "macos" : process.platform;
-      const arch = platform === "win" && process.arch === "ia32" ? "x86" : process.arch;
-      return `@pnpm/${platform}-${arch}`;
-    }
   }
 });
 
@@ -231136,7 +231441,7 @@ var require_main3 = __commonJS({
           checkUnknownSetting: false,
           ignoreNonAuthSettingsFromLocal: isDlxCommand
         });
-        if (!(0, cli_meta_1.isExecutedByCorepack)() && config.wantedPackageManager != null) {
+        if (!(0, cli_meta_1.isExecutedByCorepack)() && cmd !== "setup" && config.wantedPackageManager != null) {
           if (config.managePackageManagerVersions) {
             await (0, switchCliVersion_1.switchCliVersion)(config);
           } else {
@@ -231284,7 +231589,12 @@ var require_main3 = __commonJS({
           if ("webcontainer" in process.versions) {
             (0, logger_1.globalWarn)("Automatic installation of different Node.js versions is not supported in WebContainer");
           } else {
-            config.extraBinPaths = (await (0, plugin_commands_env_1.prepareExecutionEnv)(config, { executionEnv: { nodeVersion: config.useNodeVersion } })).extraBinPaths;
+            config.extraBinPaths = (await (0, plugin_commands_env_1.prepareExecutionEnv)(config, {
+              extraBinPaths: config.extraBinPaths,
+              executionEnv: {
+                nodeVersion: config.useNodeVersion
+              }
+            })).extraBinPaths;
             config.nodeVersion = config.useNodeVersion;
           }
         }

package/dist/worker.js

@@ -10972,9 +10972,9 @@ var require_better_path_resolve = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/symlink-dir@6.0.1/node_modules/symlink-dir/dist/index.js
+// ../node_modules/.pnpm/symlink-dir@6.0.2/node_modules/symlink-dir/dist/index.js
 var require_dist3 = __commonJS({
-  "../node_modules/.pnpm/symlink-dir@6.0.1/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/symlink-dir@6.0.2/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
     "use strict";
     var betterPathResolve = require_better_path_resolve();
     var fs_12 = require("fs");
@@ -10998,6 +10998,7 @@ var require_dist3 = __commonJS({
       return forceSymlink(target, path, opts);
     }
     async function forceSymlink(target, path, opts) {
+      let initialErr;
       try {
         await fs_12.promises.symlink(target, path, symlinkType);
         return { reused: false };
@@ -11014,9 +11015,7 @@ var require_dist3 = __commonJS({
             return { reused: false };
           case "EEXIST":
           case "EISDIR":
-            if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
-              throw err;
-            }
+            initialErr = err;
             break;
           default:
             throw err;
@@ -11026,6 +11025,9 @@ var require_dist3 = __commonJS({
       try {
         linkString = await fs_12.promises.readlink(path);
       } catch (err) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+          throw initialErr;
+        }
         const parentDir = pathLib.dirname(path);
         let warn;
         if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
@@ -11044,6 +11046,9 @@ var require_dist3 = __commonJS({
       if (target === linkString) {
         return { reused: true };
       }
+      if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+        throw initialErr;
+      }
       await fs_12.promises.unlink(path);
       return await forceSymlink(target, path, opts);
     }
@@ -11060,10 +11065,12 @@ var require_dist3 = __commonJS({
       symlinkDir2.sync = sync;
     })(symlinkDir || (symlinkDir = {}));
     function forceSymlinkSync(target, path, opts) {
+      let initialErr;
       try {
         (0, fs_12.symlinkSync)(target, path, symlinkType);
         return { reused: false };
       } catch (err) {
+        initialErr = err;
         switch (err.code) {
           case "ENOENT":
             try {
@@ -11076,9 +11083,6 @@ var require_dist3 = __commonJS({
             return { reused: false };
           case "EEXIST":
           case "EISDIR":
-            if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
-              throw err;
-            }
             break;
           default:
             throw err;
@@ -11088,6 +11092,9 @@ var require_dist3 = __commonJS({
       try {
         linkString = (0, fs_12.readlinkSync)(path);
       } catch (err) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+          throw initialErr;
+        }
         const parentDir = pathLib.dirname(path);
         let warn;
         if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
@@ -11106,6 +11113,9 @@ var require_dist3 = __commonJS({
       if (target === linkString) {
         return { reused: true };
       }
+      if ((opts === null || opts === void 0 ? void 0 : opts.overwrite) === false) {
+        throw initialErr;
+      }
       (0, fs_12.unlinkSync)(path);
       return forceSymlinkSync(target, path, opts);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "9.7.1",
+  "version": "9.9.0",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -73,6 +73,8 @@
     "@pnpm/tabtab": "catalog:",
     "@pnpm/test-fixtures": "workspace:*",
     "@pnpm/test-ipc-server": "workspace:*",
+    "@pnpm/tools.path": "workspace:*",
+    "@pnpm/tools.plugin-commands-self-updater": "workspace:*",
     "@pnpm/types": "workspace:*",
     "@pnpm/worker": "workspace:*",
     "@pnpm/workspace.find-packages": "workspace:*",