pnpm 7.9.2 → 7.9.4

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.9.1
+packageManager: pnpm@7.9.4-0
 pendingBuilds:
   - /node-gyp/9.1.0
   - /encoding/0.1.13
-prunedAt: Wed, 17 Aug 2022 09:19:55 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.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

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/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.2" != null && true ? "7.9.2" : "0.0.0"
+      version: "7.9.4" != null && true ? "7.9.4" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -72668,7 +72668,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;
@@ -83542,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";
       }
@@ -83567,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 {
@@ -85440,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());
@@ -85484,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,
@@ -122914,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);
       }
     }
@@ -135328,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))
@@ -198829,7 +198846,6 @@ var require_main2 = __commonJS({
     var isEmpty_1 = __importDefault(require_isEmpty2());
     var strip_ansi_1 = __importDefault(require_strip_ansi());
     var which_1 = __importDefault(require_which2());
-    process.once("SIGINT", () => process.exit(0)).once("SIGTERM", () => process.exit(0));
     (0, loud_rejection_1.default)();
     var DEPRECATED_OPTIONS = /* @__PURE__ */ new Set([
       "independent-leaves",

package/package.json

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