pnpm 8.10.3 → 8.10.5

package/README.md

@@ -136,7 +136,7 @@ To quote the [Rush](https://rushjs.io/) team:
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://pnpm.io/img/users/macpaw.svg" />
             <source media="(prefers-color-scheme: dark)" srcset="https://pnpm.io/img/users/macpaw_light.svg" />
-            <img src="https://pnpm.io/img/users/thinkmill.svg" width="200" />
+            <img src="https://pnpm.io/img/users/macpaw.svg" width="200" />
           </picture>
         </a>
       </td>

package/dist/node_modules/.modules.yaml

@@ -202,7 +202,7 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@8.10.2
+packageManager: pnpm@8.10.4
 pendingBuilds:
   - /node-gyp/9.4.1
   - /env-paths/2.2.1
@@ -300,7 +300,7 @@ pendingBuilds:
   - /imurmurhash/0.1.4
   - /safer-buffer/2.1.2
   - /safe-buffer/5.2.1
-prunedAt: Sun, 12 Nov 2023 12:25:51 GMT
+prunedAt: Tue, 14 Nov 2023 12:08:39 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3323,7 +3323,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault3(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "8.10.3" : "0.0.0"
+      version: true ? "8.10.5" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -49142,12 +49142,9 @@ var require_lib29 = __commonJS({
       }
     }
     function validateWorkspaceManifest(manifest) {
-      if (manifest === void 0) {
+      if (manifest === void 0 || manifest === null) {
         return true;
       }
-      if (manifest === null) {
-        throw new InvalidWorkspaceManifestError("Expected object but found - null");
-      }
       if (typeof manifest !== "object") {
         throw new InvalidWorkspaceManifestError(`Expected object but found - ${typeof manifest}`);
       }
@@ -82729,7 +82726,7 @@ var require_lib53 = __commonJS({
     }
     exports2.finishWorkers = finishWorkers;
     function createTarballWorkerPool() {
-      const maxWorkers = Math.max(2, os_1.default.cpus().length - Math.abs(process.env.PNPM_WORKERS ? parseInt(process.env.PNPM_WORKERS) : 0)) - 1;
+      const maxWorkers = Math.max(2, (os_1.default.availableParallelism?.() ?? os_1.default.cpus().length) - Math.abs(process.env.PNPM_WORKERS ? parseInt(process.env.PNPM_WORKERS) : 0)) - 1;
       const workerPool2 = new WorkerPool_1.WorkerPool({
         id: "pnpm",
         maxWorkers,
@@ -111548,6 +111545,8 @@ var require_extendProjectsWithTargetDirs = __commonJS({
         if (projectsById[importerId] == null)
           return;
         const localLocations = getLocalLocations(depPath, pkg.name);
+        if (!localLocations)
+          return;
         projectsById[importerId].targetDirs.push(...localLocations);
         projectsById[importerId].stages = ["preinstall", "install", "postinstall", "prepare", "prepublishOnly"];
       });
@@ -123046,7 +123045,7 @@ var require_packageRequester = __commonJS({
     }
     function createPackageRequester(opts) {
       opts = opts || {};
-      const networkConcurrency = opts.networkConcurrency ?? Math.max(os_1.default.cpus().length, 16);
+      const networkConcurrency = opts.networkConcurrency ?? Math.max(os_1.default.availableParallelism?.() ?? os_1.default.cpus().length, 16);
       const requestsQueue = new p_queue_1.default({
         concurrency: networkConcurrency
       });
@@ -124870,7 +124869,9 @@ var require_lib114 = __commonJS({
           await purgeModulesDirsOfImporters(opts, projects);
           return { purged: true };
         }
-        throw new error_1.PnpmError("REGISTRIES_MISMATCH", `This modules directory was created using the following registries configuration: ${JSON.stringify(modules.registries)}. The current configuration is ${JSON.stringify(opts.registries)}. To recreate the modules directory using the new settings, run "pnpm install${opts.global ? " -g" : ""}".`);
+        throw new error_1.PnpmError("REGISTRIES_MISMATCH", `This modules directory was created using the following registries configuration: ${JSON.stringify(modules.registries)}. The current configuration is ${JSON.stringify(opts.registries)}.`, {
+          hint: `To recreate the modules directory using the new settings, run "pnpm install${opts.global ? " -g" : ""}".`
+        });
       }
       if (purged && rootProject == null) {
         await purgeModulesDirsOfImporter(opts, {
@@ -181346,13 +181347,20 @@ var require_lib135 = __commonJS({
     var nm_1 = require_lib134();
     function hoist(lockfile, opts) {
       const nodes = /* @__PURE__ */ new Map();
+      const ctx = {
+        autoInstallPeers: opts?.autoInstallPeers,
+        nodes,
+        lockfile,
+        depPathByPkgId: /* @__PURE__ */ new Map()
+      };
+      const _toTree = toTree.bind(null, ctx);
       const node = {
         name: ".",
         identName: ".",
         reference: "",
         peerNames: /* @__PURE__ */ new Set([]),
         dependencyKind: nm_1.HoisterDependencyKind.WORKSPACE,
-        dependencies: toTree(nodes, lockfile, {
+        dependencies: _toTree({
           ...lockfile.importers["."]?.dependencies,
           ...lockfile.importers["."]?.devDependencies,
           ...lockfile.importers["."]?.optionalDependencies,
@@ -181360,7 +181368,7 @@ var require_lib135 = __commonJS({
             acc[dep] = "link:";
             return acc;
           }, {})
-        }, opts?.autoInstallPeers)
+        })
       };
       for (const [importerId, importer] of Object.entries(lockfile.importers)) {
         if (importerId === ".")
@@ -181371,11 +181379,11 @@ var require_lib135 = __commonJS({
           reference: `workspace:${importerId}`,
           peerNames: /* @__PURE__ */ new Set([]),
           dependencyKind: nm_1.HoisterDependencyKind.WORKSPACE,
-          dependencies: toTree(nodes, lockfile, {
+          dependencies: _toTree({
             ...importer.dependencies,
             ...importer.devDependencies,
             ...importer.optionalDependencies
-          }, opts?.autoInstallPeers)
+          })
         };
         node.dependencies.add(importerNode);
       }
@@ -181390,7 +181398,7 @@ var require_lib135 = __commonJS({
       return hoisterResult;
     }
     exports2.hoist = hoist;
-    function toTree(nodes, lockfile, deps, autoInstallPeers) {
+    function toTree({ nodes, lockfile, depPathByPkgId, autoInstallPeers }, deps) {
       return new Set(Object.entries(deps).map(([alias, ref]) => {
         const depPath = dp.refToRelative(ref, alias);
         if (!depPath) {
@@ -181416,11 +181424,15 @@ var require_lib135 = __commonJS({
           if (!pkgSnapshot) {
             throw new error_1.LockfileMissingDependencyError(depPath);
           }
-          const pkgName = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot).name;
+          const { name: pkgName, version: version2 } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
+          const id = `${pkgName}@${version2}`;
+          if (!depPathByPkgId.has(id)) {
+            depPathByPkgId.set(id, depPath);
+          }
           node = {
             name: alias,
             identName: pkgName,
-            reference: depPath,
+            reference: depPathByPkgId.get(id),
             dependencyKind: nm_1.HoisterDependencyKind.REGULAR,
             dependencies: /* @__PURE__ */ new Set(),
             peerNames: new Set(autoInstallPeers ? [] : [
@@ -181429,7 +181441,7 @@ var require_lib135 = __commonJS({
             ])
           };
           nodes.set(key, node);
-          node.dependencies = toTree(nodes, lockfile, { ...pkgSnapshot.dependencies, ...pkgSnapshot.optionalDependencies });
+          node.dependencies = toTree({ nodes, lockfile, depPathByPkgId, autoInstallPeers }, { ...pkgSnapshot.dependencies, ...pkgSnapshot.optionalDependencies });
         }
         return node;
       }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "8.10.3",
+  "version": "8.10.5",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"