pnpm 7.9.3 → 7.9.5

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.9.2
+packageManager: pnpm@7.9.4
 pendingBuilds:
   - /node-gyp/9.1.0
   - /encoding/0.1.13
-prunedAt: Wed, 17 Aug 2022 10:09:31 GMT
+prunedAt: Wed, 24 Aug 2022 12:08:52 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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

@@ -113,8 +113,8 @@ packages:
     dev: false
     optional: true
 
-  /cacache/16.1.2:
-    resolution: {integrity: sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==}
+  /cacache/16.1.3:
+    resolution: {integrity: sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       '@npmcli/fs': 2.1.2
@@ -134,7 +134,7 @@ packages:
       rimraf: 3.0.2
       ssri: 9.0.1
       tar: 6.1.11
-      unique-filename: 1.1.1
+      unique-filename: 2.0.0
     transitivePeerDependencies:
       - bluebird
     dev: false
@@ -391,7 +391,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       agentkeepalive: 4.2.1
-      cacache: 16.1.2
+      cacache: 16.1.3
       http-cache-semantics: 4.1.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
@@ -399,7 +399,7 @@ packages:
       lru-cache: 7.14.0
       minipass: 3.3.4
       minipass-collect: 1.0.2
-      minipass-fetch: 2.1.0
+      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.0:
-    resolution: {integrity: sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==}
+  /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
@@ -719,8 +719,9 @@ packages:
     dev: false
     optional: true
 
-  /unique-filename/1.1.1:
-    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
+  /unique-filename/2.0.0:
+    resolution: {integrity: sha512-tpzoz2RpZ//6Zt4GPpOFTyrnfZuSvjIfe8lvx6Thp4yTQwJtAFwPlssEBE62VhGA2We5/COyNpcIu+OABu3/Yg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       unique-slug: 2.0.2
     dev: false

package/dist/node_modules/cacache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "16.1.2",
+  "version": "16.1.3",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -65,7 +65,7 @@
     "rimraf": "^3.0.2",
     "ssri": "^9.0.0",
     "tar": "^6.1.11",
-    "unique-filename": "^1.1.1"
+    "unique-filename": "^2.0.0"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.0.1",

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

@@ -10,7 +10,9 @@ const FetchError = require('./fetch-error.js')
 let convert
 try {
   convert = require('encoding').convert
-} catch (e) {}
+} catch (e) {
+  // defer error until textConverted is called
+}
 
 const INTERNALS = Symbol('Body internals')
 const CONSUME_BODY = Symbol('consumeBody')
@@ -69,16 +71,16 @@ class Body {
     ))
   }
 
-  json () {
-    return this[CONSUME_BODY]().then(buf => {
-      try {
-        return JSON.parse(buf.toString())
-      } catch (er) {
-        return Promise.reject(new FetchError(
-          `invalid json response body at ${
-            this.url} reason: ${er.message}`, 'invalid-json'))
-      }
-    })
+  async json () {
+    const buf = await this[CONSUME_BODY]()
+    try {
+      return JSON.parse(buf.toString())
+    } catch (er) {
+      throw new FetchError(
+        `invalid json response body at ${this.url} reason: ${er.message}`,
+        'invalid-json'
+      )
+    }
   }
 
   text () {

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

@@ -1,6 +1,6 @@
 {
   "name": "minipass-fetch",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "An implementation of window.fetch in Node.js using Minipass streams",
   "license": "MIT",
   "main": "lib/index.js",
@@ -23,10 +23,11 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "3.1.2",
+    "@npmcli/template-oss": "3.5.0",
     "@ungap/url-search-params": "^0.2.2",
     "abort-controller": "^3.0.0",
     "abortcontroller-polyfill": "~1.7.3",
+    "encoding": "^0.1.13",
     "form-data": "^4.0.0",
     "nock": "^13.2.4",
     "parted": "^0.1.1",
@@ -61,6 +62,6 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.1.2"
+    "version": "3.5.0"
   }
 }

package/dist/node_modules/unique-filename/{index.js → lib/index.js}

@@ -1,4 +1,3 @@
-'use strict'
 var path = require('path')
 
 var uniqueSlug = require('unique-slug')

package/dist/node_modules/unique-filename/package.json

@@ -1,27 +1,48 @@
 {
   "name": "unique-filename",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "Generate a unique filename for use in temporary directories or caches.",
-  "main": "index.js",
+  "main": "lib/index.js",
   "scripts": {
-    "test": "standard && tap test"
+    "test": "tap",
+    "lint": "eslint \"**/*.js\"",
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force",
+    "lintfix": "npm run lint -- --fix",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "prepublishOnly": "git push origin --follow-tags",
+    "snap": "tap",
+    "posttest": "npm run lint"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/iarna/unique-filename.git"
+    "url": "https://github.com/npm/unique-filename.git"
   },
   "keywords": [],
-  "author": "Rebecca Turner <me@re-becca.org> (http://re-becca.org/)",
+  "author": "GitHub Inc.",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/unique-filename/issues"
   },
   "homepage": "https://github.com/iarna/unique-filename",
   "devDependencies": {
-    "standard": "^5.4.1",
-    "tap": "^2.3.1"
+    "@npmcli/eslint-config": "^3.1.0",
+    "@npmcli/template-oss": "3.5.0",
+    "tap": "^16.3.0"
   },
   "dependencies": {
-    "unique-slug": "^2.0.0"
+    "unique-slug": "^2.0.2"
+  },
+  "files": [
+    "bin/",
+    "lib/"
+  ],
+  "engines": {
+    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+  },
+  "templateOSS": {
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "3.5.0"
   }
 }

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.3" != null && true ? "7.9.3" : "0.0.0"
+      version: "7.9.5" != null && true ? "7.9.5" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -23591,9 +23591,11 @@ var require_lib18 = __commonJS({
     var git_utils_1 = require_lib16();
     var matcher_1 = __importDefault(require_lib17());
     var camelcase_1 = __importDefault(require_camelcase());
+    var is_windows_1 = __importDefault(require_is_windows());
     var normalize_registry_url_1 = __importDefault(require_normalize_registry_url());
     var fromPairs_1 = __importDefault(require_fromPairs());
     var realpath_missing_1 = __importDefault(require_realpath_missing());
+    var path_absolute_1 = __importDefault(require_path_absolute());
     var which_1 = __importDefault(require_which2());
     var checkGlobalBinDir_1 = require_checkGlobalBinDir();
     var getScopeRegistries_1 = __importDefault(require_getScopeRegistries());
@@ -23931,6 +23933,13 @@ var require_lib18 = __commonJS({
       } else {
         pnpmConfig.extraBinPaths = [];
       }
+      if (pnpmConfig.preferSymlinkedExecutables && !(0, is_windows_1.default)()) {
+        const cwd2 = pnpmConfig.lockfileDir ?? pnpmConfig.dir;
+        const virtualStoreDir = pnpmConfig.virtualStoreDir ? pnpmConfig.virtualStoreDir : pnpmConfig.modulesDir ? path_1.default.join(pnpmConfig.modulesDir, ".pnpm") : "node_modules/.pnpm";
+        pnpmConfig.extraEnv = {
+          NODE_PATH: (0, path_absolute_1.default)(path_1.default.join(virtualStoreDir, "node_modules"), cwd2)
+        };
+      }
       if (pnpmConfig["shamefullyFlatten"]) {
         warnings.push(`The "shamefully-flatten" setting has been renamed to "shamefully-hoist". Also, in most cases you won't need "shamefully-hoist". Since v4, a semistrict node_modules structure is on by default (via hoist-pattern=[*]).`);
         pnpmConfig.shamefullyHoist = true;
@@ -72668,7 +72677,8 @@ var require_lib36 = __commonJS({
       return {
         addFilesFromDir: addFilesFromDir_1.default.bind(null, { addBuffer, addStream }),
         addFilesFromTarball: addFilesFromTarball_1.default.bind(null, addStream, ignore ?? null),
-        getFilePathInCafs: getFilePathInCafs_1.default.bind(null, cafsDir)
+        getFilePathInCafs: getFilePathInCafs_1.default.bind(null, cafsDir),
+        getFilePathByModeInCafs: getFilePathInCafs_1.getFilePathByModeInCafs.bind(null, cafsDir)
       };
     }
     exports2.default = createCafs;
@@ -74861,9 +74871,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 {
@@ -74973,7 +74983,6 @@ var require_lru_cache3 = __commonJS({
           noDisposeOnSet,
           noUpdateTTL,
           maxSize = 0,
-          maxEntrySize = 0,
           sizeCalculation,
           fetchMethod,
           fetchContext,
@@ -74990,12 +74999,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") {
@@ -75037,17 +75045,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();
@@ -75189,7 +75190,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"
           );
         }
       }
@@ -75334,7 +75335,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);
@@ -76154,9 +76155,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) {
@@ -76166,23 +76167,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",
@@ -76211,9 +76210,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();
@@ -76327,17 +76326,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;
             }
@@ -76560,27 +76559,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;
     }
@@ -76642,9 +76641,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.",
@@ -76678,9 +76677,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() {
@@ -76704,9 +76703,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;
@@ -83553,7 +83552,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";
       }
@@ -83578,7 +83583,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 {
@@ -85451,6 +85456,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());
@@ -85495,6 +85501,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,
@@ -91234,6 +91241,7 @@ var require_lib67 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.AuditEndpointNotExistsError = void 0;
     var error_1 = __importDefault(require_lib8());
     var fetch_1 = require_lib31();
     var lockfileToAuditTree_1 = __importDefault(require_lockfileToAuditTree());
@@ -91254,6 +91262,9 @@ var require_lib67 = __commonJS({
         retry: opts.retry,
         timeout: opts.timeout
       });
+      if (res.status === 404) {
+        throw new AuditEndpointNotExistsError(auditUrl);
+      }
       if (res.status !== 200) {
         throw new error_1.default("AUDIT_BAD_RESPONSE", `The audit endpoint (at ${auditUrl}) responded with ${res.status}: ${await res.text()}`);
       }
@@ -91267,6 +91278,15 @@ var require_lib67 = __commonJS({
       }
       return headers;
     }
+    var AuditEndpointNotExistsError = class extends error_1.default {
+      constructor(endpoint) {
+        const message2 = `The audit endpoint (at ${endpoint}) is doesn't exist.`;
+        super("AUDIT_ENDPOINT_NOT_EXISTS", message2, {
+          hint: "This issue is probably because you are using a private npm registry and that endpoint doesn't have an implementation of audit."
+        });
+      }
+    };
+    exports2.AuditEndpointNotExistsError = AuditEndpointNotExistsError;
   }
 });
 
@@ -97811,6 +97831,7 @@ var require_audit2 = __commonJS({
             output: err.message
           };
         }
+        throw err;
       }
       if (opts.fix) {
         const newOverrides = await (0, fix_1.default)(opts.dir, auditReport);
@@ -116207,9 +116228,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;
@@ -116237,7 +116258,7 @@ var require_lib93 = __commonJS({
       return () => {
         try {
           fs2.unlinkSync(typeof tmpfile === "function" ? tmpfile() : tmpfile);
-        } catch {
+        } catch (_) {
         }
       };
     }
@@ -116335,19 +116356,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;
     }
@@ -116974,6 +116990,7 @@ var require_implementation2 = __commonJS({
       const store = await (0, store_connection_manager_1.createOrConnectStoreController)(opts);
       const scriptsOpts = {
         extraBinPaths: ctx.extraBinPaths,
+        extraEnv: opts.extraEnv,
         rawConfig: opts.rawConfig,
         scriptsPrependNodePath: opts.scriptsPrependNodePath,
         scriptShell: opts.scriptShell,
@@ -117056,6 +117073,7 @@ var require_implementation2 = __commonJS({
           await (0, lifecycle_1.runPostinstallHooks)({
             depPath,
             extraBinPaths: ctx.extraBinPaths,
+            extraEnv: opts.extraEnv,
             optional: pkgSnapshot.optional === true,
             pkgRoot,
             rawConfig: opts.rawConfig,
@@ -118071,7 +118089,7 @@ var require_symlinkDirectRootDependency = __commonJS({
         if (err.code !== "ENOENT")
           throw err;
         (0, logger_1.globalWarn)(`Local dependency not found at ${dependencyLocation}`);
-        return;
+        dependencyRealLocation = dependencyLocation;
       }
       const dest = path_1.default.join(destModulesDirReal, importAs);
       const { reused } = await (0, symlink_dir_1.default)(dependencyRealLocation, dest);
@@ -122930,11 +122948,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);
       }
     }
@@ -127799,6 +127813,7 @@ var require_lib109 = __commonJS({
       const scriptsOpts = {
         optional: false,
         extraBinPaths: opts.extraBinPaths,
+        extraEnv: opts.extraEnv,
         rawConfig: opts.rawConfig,
         scriptsPrependNodePath: opts.scriptsPrependNodePath,
         scriptShell: opts.scriptShell,
@@ -127981,9 +127996,12 @@ var require_lib109 = __commonJS({
         if (opts.hoistPattern != null) {
           extraBinPaths.unshift(path_1.default.join(virtualStoreDir, "node_modules/.bin"));
         }
-        let extraEnv;
+        let extraEnv = opts.extraEnv;
         if (opts.enablePnp) {
-          extraEnv = (0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"));
+          extraEnv = {
+            ...extraEnv,
+            ...(0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"))
+          };
         }
         await (0, build_modules_1.default)(graph, Array.from(directNodes), {
           childConcurrency: opts.childConcurrency,
@@ -135269,6 +135287,7 @@ var require_install = __commonJS({
       async function _install() {
         const scriptsOpts = {
           extraBinPaths: opts.extraBinPaths,
+          extraEnv: opts.extraEnv,
           rawConfig: opts.rawConfig,
           scriptsPrependNodePath: opts.scriptsPrependNodePath,
           scriptShell: opts.scriptShell,
@@ -135344,6 +135363,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))
@@ -135746,9 +135777,12 @@ var require_install = __commonJS({
           if (!opts.ignoreScripts || Object.keys(opts.patchedDependencies ?? {}).length > 0) {
             const depPaths = Object.keys(dependenciesGraph);
             const rootNodes = depPaths.filter((depPath) => dependenciesGraph[depPath].depth === 0);
-            let extraEnv;
+            let extraEnv = opts.scriptsOpts.extraEnv;
             if (opts.enablePnp) {
-              extraEnv = (0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"));
+              extraEnv = {
+                ...extraEnv,
+                ...(0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"))
+              };
             }
             await (0, build_modules_1.default)(dependenciesGraph, rootNodes, {
               childConcurrency: opts.childConcurrency,
@@ -135872,7 +135906,10 @@ var require_install = __commonJS({
         ]);
         if (!opts.ignoreScripts) {
           if (opts.enablePnp) {
-            opts.scriptsOpts.extraEnv = (0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"));
+            opts.scriptsOpts.extraEnv = {
+              ...opts.scriptsOpts.extraEnv,
+              ...(0, lifecycle_1.makeNodeRequireOption)(path_1.default.join(opts.lockfileDir, ".pnp.cjs"))
+            };
           }
           const projectsToBeBuilt = projectsWithTargetDirs.filter(({ mutation }) => mutation === "install");
           await (0, lifecycle_1.runLifecycleHooksConcurrently)(["preinstall", "install", "postinstall", "prepare"], projectsToBeBuilt, opts.childConcurrency, opts.scriptsOpts);
@@ -191097,6 +191134,7 @@ var require_publish2 = __commonJS({
       const _runScriptsIfPresent = runScriptsIfPresent.bind(null, {
         depPath: dir,
         extraBinPaths: opts.extraBinPaths,
+        extraEnv: opts.extraEnv,
         pkgRoot: dir,
         rawConfig: opts.rawConfig,
         rootModulesDir: await (0, realpath_missing_1.default)(path_1.default.join(dir, "node_modules")),
@@ -191922,6 +191960,7 @@ var require_runRecursive = __commonJS({
             const lifecycleOpts = {
               depPath: prefix,
               extraBinPaths: opts.extraBinPaths,
+              extraEnv: opts.extraEnv,
               pkgRoot: prefix,
               rawConfig: opts.rawConfig,
               rootModulesDir: await (0, realpath_missing_1.default)(path_1.default.join(prefix, "node_modules")),
@@ -191933,7 +191972,10 @@ var require_runRecursive = __commonJS({
             };
             const pnpPath = workspacePnpPath ?? await existsPnp(prefix);
             if (pnpPath) {
-              lifecycleOpts.extraEnv = (0, lifecycle_1.makeNodeRequireOption)(pnpPath);
+              lifecycleOpts.extraEnv = {
+                ...lifecycleOpts.extraEnv,
+                ...(0, lifecycle_1.makeNodeRequireOption)(pnpPath)
+              };
             }
             if (opts.enablePrePostScripts && pkg.package.manifest.scripts?.[`pre${scriptName}`] && !pkg.package.manifest.scripts[scriptName].includes(`pre${scriptName}`)) {
               await (0, lifecycle_1.default)(`pre${scriptName}`, pkg.package.manifest, lifecycleOpts);
@@ -192151,6 +192193,7 @@ so you may run "pnpm -w run ${scriptName}"`
       const lifecycleOpts = {
         depPath: dir,
         extraBinPaths: opts.extraBinPaths,
+        extraEnv: opts.extraEnv,
         pkgRoot: dir,
         rawConfig: opts.rawConfig,
         rootModulesDir: await (0, realpath_missing_1.default)(path_1.default.join(dir, "node_modules")),
@@ -192164,7 +192207,10 @@ so you may run "pnpm -w run ${scriptName}"`
       const existsPnp = existsInDir_1.default.bind(null, ".pnp.cjs");
       const pnpPath = (opts.workspaceDir && await existsPnp(opts.workspaceDir)) ?? await existsPnp(dir);
       if (pnpPath) {
-        lifecycleOpts.extraEnv = (0, lifecycle_1.makeNodeRequireOption)(pnpPath);
+        lifecycleOpts.extraEnv = {
+          ...lifecycleOpts.extraEnv,
+          ...(0, lifecycle_1.makeNodeRequireOption)(pnpPath)
+        };
       }
       try {
         if (opts.enablePrePostScripts && manifest.scripts?.[`pre${scriptName}`] && !manifest.scripts[scriptName].includes(`pre${scriptName}`)) {
@@ -192369,7 +192415,10 @@ var require_exec = __commonJS({
         await Promise.all(chunk.map(async (prefix) => limitRun(async () => {
           try {
             const pnpPath = workspacePnpPath ?? await existsPnp(prefix);
-            const extraEnv = pnpPath ? (0, lifecycle_1.makeNodeRequireOption)(pnpPath) : {};
+            const extraEnv = {
+              ...opts.extraEnv,
+              ...pnpPath ? (0, lifecycle_1.makeNodeRequireOption)(pnpPath) : {}
+            };
             const env = (0, makeEnv_1.makeEnv)({
               extraEnv: {
                 ...extraEnv,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.9.3",
+  "version": "7.9.5",
   "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",