pnpm 7.9.4-0 → 7.9.4

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.9.3
+packageManager: pnpm@7.9.4-0
 pendingBuilds:
   - /node-gyp/9.1.0
   - /encoding/0.1.13
-prunedAt: Thu, 18 Aug 2022 09:46:52 GMT
+prunedAt: Tue, 23 Aug 2022 00:46:24 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/node_modules/.pnpm/lock.yaml

@@ -399,7 +399,7 @@ packages:
       lru-cache: 7.14.0
       minipass: 3.3.4
       minipass-collect: 1.0.2
-      minipass-fetch: 2.1.1
+      minipass-fetch: 2.1.2
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
       negotiator: 0.6.3
@@ -435,8 +435,8 @@ packages:
     dev: false
     optional: true
 
-  /minipass-fetch/2.1.1:
-    resolution: {integrity: sha512-/kgtXVGS10PTFET6dAbOBWQtgH+iDiI4NhRqAftojRlsOJhk0y45sVVxqCaRQC+AMFH7JkHiWpuKJKQ+mojKiA==}
+  /minipass-fetch/2.1.2:
+    resolution: {integrity: sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       minipass: 3.3.4

package/dist/node_modules/minipass-fetch/lib/body.js

@@ -72,8 +72,8 @@ class Body {
   }
 
   async json () {
+    const buf = await this[CONSUME_BODY]()
     try {
-      const buf = await this[CONSUME_BODY]()
       return JSON.parse(buf.toString())
     } catch (er) {
       throw new FetchError(

package/dist/node_modules/minipass-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minipass-fetch",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "An implementation of window.fetch in Node.js using Minipass streams",
   "license": "MIT",
   "main": "lib/index.js",

package/dist/pnpm.cjs

@@ -3206,7 +3206,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "7.9.4-0" != null && true ? "7.9.4-0" : "0.0.0"
+      version: "7.9.4" != null && true ? "7.9.4" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -74862,9 +74862,9 @@ var require_git_host2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/lru-cache@7.14.0/node_modules/lru-cache/index.js
+// ../../node_modules/.pnpm/lru-cache@7.13.2/node_modules/lru-cache/index.js
 var require_lru_cache3 = __commonJS({
-  "../../node_modules/.pnpm/lru-cache@7.14.0/node_modules/lru-cache/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/lru-cache@7.13.2/node_modules/lru-cache/index.js"(exports2, module2) {
     var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
     var hasAbortController = typeof AbortController === "function";
     var AC = hasAbortController ? AbortController : class AbortController {
@@ -74974,7 +74974,6 @@ var require_lru_cache3 = __commonJS({
           noDisposeOnSet,
           noUpdateTTL,
           maxSize = 0,
-          maxEntrySize = 0,
           sizeCalculation,
           fetchMethod,
           fetchContext,
@@ -74991,12 +74990,11 @@ var require_lru_cache3 = __commonJS({
         }
         this.max = max;
         this.maxSize = maxSize;
-        this.maxEntrySize = maxEntrySize || this.maxSize;
         this.sizeCalculation = sizeCalculation || length;
         if (this.sizeCalculation) {
-          if (!this.maxSize && !this.maxEntrySize) {
+          if (!this.maxSize) {
             throw new TypeError(
-              "cannot set sizeCalculation without setting maxSize or maxEntrySize"
+              "cannot set sizeCalculation without setting maxSize"
             );
           }
           if (typeof this.sizeCalculation !== "function") {
@@ -75038,17 +75036,10 @@ var require_lru_cache3 = __commonJS({
         this.noDisposeOnSet = !!noDisposeOnSet;
         this.noUpdateTTL = !!noUpdateTTL;
         this.noDeleteOnFetchRejection = !!noDeleteOnFetchRejection;
-        if (this.maxEntrySize !== 0) {
-          if (this.maxSize !== 0) {
-            if (!isPosInt(this.maxSize)) {
-              throw new TypeError(
-                "maxSize must be a positive integer if specified"
-              );
-            }
-          }
-          if (!isPosInt(this.maxEntrySize)) {
+        if (this.maxSize !== 0) {
+          if (!isPosInt(this.maxSize)) {
             throw new TypeError(
-              "maxEntrySize must be a positive integer if specified"
+              "maxSize must be a positive integer if specified"
             );
           }
           this.initializeSizeTracking();
@@ -75190,7 +75181,7 @@ var require_lru_cache3 = __commonJS({
       requireSize(k, v, size, sizeCalculation) {
         if (size || sizeCalculation) {
           throw new TypeError(
-            "cannot set size without setting maxSize or maxEntrySize on cache"
+            "cannot set size without setting maxSize on cache"
           );
         }
       }
@@ -75335,7 +75326,7 @@ var require_lru_cache3 = __commonJS({
         noUpdateTTL = this.noUpdateTTL
       } = {}) {
         size = this.requireSize(k, v, size, sizeCalculation);
-        if (this.maxEntrySize && size > this.maxEntrySize) {
+        if (this.maxSize && size > this.maxSize) {
           return this;
         }
         let index = this.size === 0 ? void 0 : this.keyMap.get(k);
@@ -76155,9 +76146,9 @@ var require_is_core_module = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/extract_description.js
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/extract_description.js
 var require_extract_description = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/extract_description.js"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/extract_description.js"(exports2, module2) {
     module2.exports = extractDescription;
     function extractDescription(d) {
       if (!d) {
@@ -76167,23 +76158,21 @@ var require_extract_description = __commonJS({
         return;
       }
       d = d.trim().split("\n");
-      let s = 0;
-      while (d[s] && d[s].trim().match(/^(#|$)/)) {
-        s++;
+      for (var s = 0; d[s] && d[s].trim().match(/^(#|$)/); s++) {
+        ;
       }
-      const l = d.length;
-      let e = s + 1;
-      while (e < l && d[e].trim()) {
-        e++;
+      var l = d.length;
+      for (var e = s + 1; e < l && d[e].trim(); e++) {
+        ;
       }
       return d.slice(s, e).join(" ").trim();
     }
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/typos.json
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/typos.json
 var require_typos = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/typos.json"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/typos.json"(exports2, module2) {
     module2.exports = {
       topLevel: {
         dependancies: "dependencies",
@@ -76212,9 +76201,9 @@ var require_typos = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/fixer.js
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/fixer.js
 var require_fixer = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/fixer.js"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/fixer.js"(exports2, module2) {
     var isValidSemver = require_valid();
     var cleanSemver = require_clean();
     var validateLicense = require_validate_npm_package_license();
@@ -76328,17 +76317,17 @@ var require_fixer = __commonJS({
           this.warn("nonArrayBundleDependencies");
           delete data[bd];
         } else if (data[bd]) {
-          data[bd] = data[bd].filter(function(filtered) {
-            if (!filtered || typeof filtered !== "string") {
-              this.warn("nonStringBundleDependency", filtered);
+          data[bd] = data[bd].filter(function(bd2) {
+            if (!bd2 || typeof bd2 !== "string") {
+              this.warn("nonStringBundleDependency", bd2);
               return false;
             } else {
               if (!data.dependencies) {
                 data.dependencies = {};
               }
-              if (!Object.prototype.hasOwnProperty.call(data.dependencies, filtered)) {
-                this.warn("nonDependencyBundleDependency", filtered);
-                data.dependencies[filtered] = "*";
+              if (!Object.prototype.hasOwnProperty.call(data.dependencies, bd2)) {
+                this.warn("nonDependencyBundleDependency", bd2);
+                data.dependencies[bd2] = "*";
               }
               return true;
             }
@@ -76561,27 +76550,27 @@ var require_fixer = __commonJS({
       }
       var name = person.name || "";
       var u = person.url || person.web;
-      var wrappedUrl = u ? " (" + u + ")" : "";
+      var url2 = u ? " (" + u + ")" : "";
       var e = person.email || person.mail;
-      var wrappedEmail = e ? " <" + e + ">" : "";
-      return name + wrappedEmail + wrappedUrl;
+      var email = e ? " <" + e + ">" : "";
+      return name + email + url2;
     }
     function parsePerson(person) {
       if (typeof person !== "string") {
         return person;
       }
-      var matchedName = person.match(/^([^(<]+)/);
-      var matchedUrl = person.match(/\(([^()]+)\)/);
-      var matchedEmail = person.match(/<([^<>]+)>/);
+      var name = person.match(/^([^(<]+)/);
+      var url2 = person.match(/\(([^()]+)\)/);
+      var email = person.match(/<([^<>]+)>/);
       var obj = {};
-      if (matchedName && matchedName[0].trim()) {
-        obj.name = matchedName[0].trim();
+      if (name && name[0].trim()) {
+        obj.name = name[0].trim();
       }
-      if (matchedEmail) {
-        obj.email = matchedEmail[1];
+      if (email) {
+        obj.email = email[1];
       }
-      if (matchedUrl) {
-        obj.url = matchedUrl[1];
+      if (url2) {
+        obj.url = url2[1];
       }
       return obj;
     }
@@ -76643,9 +76632,9 @@ var require_fixer = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/warning_messages.json
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/warning_messages.json
 var require_warning_messages = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/warning_messages.json"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/warning_messages.json"(exports2, module2) {
     module2.exports = {
       repositories: "'repositories' (plural) Not supported. Please pick one as the 'repository' field",
       missingRepository: "No repository field.",
@@ -76679,9 +76668,9 @@ var require_warning_messages = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/make_warning.js
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/make_warning.js
 var require_make_warning = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/make_warning.js"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/make_warning.js"(exports2, module2) {
     var util = require("util");
     var messages = require_warning_messages();
     module2.exports = function() {
@@ -76705,9 +76694,9 @@ var require_make_warning = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/normalize.js
+// ../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/normalize.js
 var require_normalize = __commonJS({
-  "../../node_modules/.pnpm/normalize-package-data@4.0.1/node_modules/normalize-package-data/lib/normalize.js"(exports2, module2) {
+  "../../node_modules/.pnpm/normalize-package-data@4.0.0/node_modules/normalize-package-data/lib/normalize.js"(exports2, module2) {
     module2.exports = normalize;
     var fixer = require_fixer();
     normalize.fixer = fixer;
@@ -83554,7 +83543,13 @@ var require_normalizeArch = __commonJS({
   "../node.fetcher/lib/normalizeArch.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    function getNormalizedArch(platform, arch) {
+    function getNormalizedArch(platform, arch, nodeVersion) {
+      if (nodeVersion) {
+        const nodeMajorVersion = +nodeVersion.split(".")[0];
+        if (platform === "darwin" && arch === "arm64" && nodeMajorVersion < 16) {
+          return "x64";
+        }
+      }
       if (platform === "win32" && arch === "ia32") {
         return "x86";
       }
@@ -83579,7 +83574,7 @@ var require_getNodeTarball = __commonJS({
     var normalizeArch_1 = __importDefault(require_normalizeArch());
     function getNodeTarball(nodeVersion, nodeMirror, processPlatform, processArch) {
       const platform = processPlatform === "win32" ? "win" : processPlatform;
-      const arch = (0, normalizeArch_1.default)(processPlatform, processArch);
+      const arch = (0, normalizeArch_1.default)(processPlatform, processArch, nodeVersion);
       const extension = platform === "win" ? "zip" : "tar.gz";
       const pkgName = `node-v${nodeVersion}-${platform}-${arch}`;
       return {
@@ -85452,6 +85447,7 @@ var require_node3 = __commonJS({
     var fs_1 = __importDefault(require("fs"));
     var path_1 = __importDefault(require("path"));
     var fetch_1 = require_lib31();
+    var logger_1 = require_lib6();
     var node_fetcher_1 = require_lib43();
     var store_path_1 = __importDefault(require_lib44());
     var load_json_file_1 = __importDefault(require_load_json_file());
@@ -85496,6 +85492,7 @@ var require_node3 = __commonJS({
           pnpmHomeDir: opts.pnpmHomeDir
         });
         const cafsDir = path_1.default.join(storeDir, "files");
+        (0, logger_1.globalInfo)(`Fetching Node.js ${opts.useNodeVersion} ...`);
         await (0, node_fetcher_1.fetchNode)(fetch, opts.useNodeVersion, versionDir, {
           ...opts,
           cafsDir,
@@ -116208,9 +116205,9 @@ var require_dist14 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/write-file-atomic@4.0.2/node_modules/write-file-atomic/lib/index.js
+// ../../node_modules/.pnpm/write-file-atomic@4.0.1/node_modules/write-file-atomic/lib/index.js
 var require_lib93 = __commonJS({
-  "../../node_modules/.pnpm/write-file-atomic@4.0.2/node_modules/write-file-atomic/lib/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/write-file-atomic@4.0.1/node_modules/write-file-atomic/lib/index.js"(exports2, module2) {
     "use strict";
     module2.exports = writeFile;
     module2.exports.sync = writeFileSync;
@@ -116238,7 +116235,7 @@ var require_lib93 = __commonJS({
       return () => {
         try {
           fs2.unlinkSync(typeof tmpfile === "function" ? tmpfile() : tmpfile);
-        } catch {
+        } catch (_) {
         }
       };
     }
@@ -116336,19 +116333,14 @@ var require_lib93 = __commonJS({
         }
       }
     }
-    async function writeFile(filename, data, options, callback) {
+    function writeFile(filename, data, options, callback) {
       if (options instanceof Function) {
         callback = options;
         options = {};
       }
       const promise = writeFileAsync(filename, data, options);
       if (callback) {
-        try {
-          const result2 = await promise;
-          return callback(result2);
-        } catch (err) {
-          return callback(err);
-        }
+        promise.then(callback, callback);
       }
       return promise;
     }
@@ -122931,11 +122923,7 @@ var require_filterLockfileByImportersAndEngine = __commonJS({
         const nextRelDepPaths = Object.entries({
           ...pkgSnapshot.dependencies,
           ...opts.include.optionalDependencies ? pkgSnapshot.optionalDependencies : {}
-        }).map(([pkgName, ref]) => {
-          if (pkgSnapshot.peerDependencies?.[pkgName])
-            return null;
-          return dp.refToRelative(ref, pkgName);
-        }).filter((nodeId) => nodeId !== null);
+        }).map(([pkgName, ref]) => dp.refToRelative(ref, pkgName)).filter((nodeId) => nodeId !== null);
         pkgAllDeps(ctx, nextRelDepPaths, installable, opts);
       }
     }
@@ -135345,6 +135333,18 @@ var require_install = __commonJS({
                 pruneVirtualStore,
                 wantedLockfile: maybeOpts.ignorePackageManifest ? void 0 : ctx.wantedLockfile
               });
+              if (opts.useLockfile && opts.saveLockfile && opts.mergeGitBranchLockfiles) {
+                await (0, lockfile_file_1.writeLockfiles)({
+                  currentLockfile: ctx.currentLockfile,
+                  currentLockfileDir: ctx.virtualStoreDir,
+                  wantedLockfile: ctx.wantedLockfile,
+                  wantedLockfileDir: ctx.lockfileDir,
+                  forceSharedFormat: opts.forceSharedLockfile,
+                  useInlineSpecifiersFormat: opts.useInlineSpecifiersLockfileFormat,
+                  useGitBranchLockfile: opts.useGitBranchLockfile,
+                  mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles
+                });
+              }
               return projects;
             } catch (error) {
               if (frozenLockfile || error.code !== "ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY" && !BROKEN_LOCKFILE_INTEGRITY_ERRORS.has(error.code))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.9.4-0",
+  "version": "7.9.4",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -56,7 +56,7 @@
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",
     "@pnpm/read-project-manifest": "workspace:*",
-    "@pnpm/registry-mock": "3.0.0-0",
+    "@pnpm/registry-mock": "3.0.0-2",
     "@pnpm/run-npm": "workspace:*",
     "@pnpm/tabtab": "^0.1.2",
     "@pnpm/types": "workspace:*",
@@ -75,6 +75,7 @@
     "cross-var-no-babel": "^1.2.0",
     "deep-require-cwd": "1.0.0",
     "delay": "^5.0.0",
+    "dependency-path": "workspace:*",
     "dir-is-case-sensitive": "^2.0.0",
     "esbuild": "^0.15.2",
     "execa": "npm:safe-execa@^0.1.2",