pnpm 7.1.6 → 7.1.7

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.1.5
+packageManager: pnpm@7.1.6
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Fri, 27 May 2022 00:51:55 GMT
+prunedAt: Sun, 29 May 2022 09:14:06 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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

@@ -156,7 +156,7 @@ packages:
     optional: true
 
   /console-control-strings/1.1.0:
-    resolution: {integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=}
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
     dev: false
     optional: true
 
@@ -174,12 +174,12 @@ packages:
     optional: true
 
   /delegates/1.0.0:
-    resolution: {integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=}
+    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
     dev: false
     optional: true
 
   /depd/1.1.2:
-    resolution: {integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=}
+    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
     engines: {node: '>= 0.6'}
     dev: false
     optional: true
@@ -217,7 +217,7 @@ packages:
     optional: true
 
   /fs.realpath/1.0.0:
-    resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=}
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: false
     optional: true
 
@@ -254,7 +254,7 @@ packages:
     optional: true
 
   /has-unicode/2.0.1:
-    resolution: {integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=}
+    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
     dev: false
     optional: true
 

package/dist/pnpm.cjs

@@ -3182,7 +3182,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.1.6" != null && true ? "7.1.6" : "0.0.0"
+      version: "7.1.7" != null && true ? "7.1.7" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -109617,6 +109617,49 @@ var require_lib87 = __commonJS({
   }
 });
 
+// ../build-modules/lib/buildSequence.js
+var require_buildSequence = __commonJS({
+  "../build-modules/lib/buildSequence.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var graph_sequencer_1 = __importDefault(require_graph_sequencer());
+    var filter_1 = __importDefault(require_filter3());
+    function buildSequence(depGraph, rootDepPaths) {
+      const nodesToBuild = /* @__PURE__ */ new Set();
+      getSubgraphToBuild(depGraph, rootDepPaths, nodesToBuild, /* @__PURE__ */ new Set());
+      const onlyFromBuildGraph = (0, filter_1.default)((depPath) => nodesToBuild.has(depPath));
+      const nodesToBuildArray = Array.from(nodesToBuild);
+      const graph = new Map(nodesToBuildArray.map((depPath) => [depPath, onlyFromBuildGraph(Object.values(depGraph[depPath].children))]));
+      const graphSequencerResult = (0, graph_sequencer_1.default)({
+        graph,
+        groups: [nodesToBuildArray]
+      });
+      const chunks = graphSequencerResult.chunks;
+      return chunks;
+    }
+    exports2.default = buildSequence;
+    function getSubgraphToBuild(graph, entryNodes, nodesToBuild, walked) {
+      let currentShouldBeBuilt = false;
+      for (const depPath of entryNodes) {
+        if (!graph[depPath])
+          continue;
+        if (walked.has(depPath))
+          continue;
+        walked.add(depPath);
+        const childShouldBeBuilt = getSubgraphToBuild(graph, Object.values(graph[depPath].children), nodesToBuild, walked) || graph[depPath].requiresBuild;
+        if (childShouldBeBuilt) {
+          nodesToBuild.add(depPath);
+          currentShouldBeBuilt = true;
+        }
+      }
+      return currentShouldBeBuilt;
+    }
+  }
+});
+
 // ../build-modules/lib/index.js
 var require_lib88 = __commonJS({
   "../build-modules/lib/index.js"(exports2) {
@@ -109666,21 +109709,11 @@ var require_lib88 = __commonJS({
     var logger_1 = __importDefault(require_lib6());
     var read_package_json_1 = require_lib35();
     var run_groups_1 = __importDefault(require_lib78());
-    var graph_sequencer_1 = __importDefault(require_graph_sequencer());
-    var filter_1 = __importDefault(require_filter3());
+    var buildSequence_1 = __importDefault(require_buildSequence());
     exports2.default = async (depGraph, rootDepPaths, opts) => {
       const warn = (message2) => logger_1.default.warn({ message: message2, prefix: opts.lockfileDir });
-      const nodesToBuild = /* @__PURE__ */ new Set();
-      getSubgraphToBuild(depGraph, rootDepPaths, nodesToBuild, /* @__PURE__ */ new Set());
-      const onlyFromBuildGraph = (0, filter_1.default)((depPath) => nodesToBuild.has(depPath));
-      const nodesToBuildArray = Array.from(nodesToBuild);
-      const graph = new Map(nodesToBuildArray.map((depPath) => [depPath, onlyFromBuildGraph(Object.values(depGraph[depPath].children))]));
-      const graphSequencerResult = (0, graph_sequencer_1.default)({
-        graph,
-        groups: [nodesToBuildArray]
-      });
-      const chunks = graphSequencerResult.chunks;
       const buildDepOpts = { ...opts, warn };
+      const chunks = (0, buildSequence_1.default)(depGraph, rootDepPaths);
       const groups = chunks.map((chunk) => {
         chunk = chunk.filter((depPath) => depGraph[depPath].requiresBuild && !depGraph[depPath].isBuilt);
         if (opts.depsToBuild != null) {
@@ -109747,25 +109780,6 @@ var require_lib88 = __commonJS({
         throw err;
       }
     }
-    function getSubgraphToBuild(graph, entryNodes, nodesToBuild, walked) {
-      let currentShouldBeBuilt = false;
-      for (const depPath of entryNodes) {
-        if (!graph[depPath])
-          continue;
-        if (nodesToBuild.has(depPath)) {
-          currentShouldBeBuilt = true;
-        }
-        if (walked.has(depPath))
-          continue;
-        walked.add(depPath);
-        const childShouldBeBuilt = getSubgraphToBuild(graph, Object.values(graph[depPath].children), nodesToBuild, walked) || graph[depPath].requiresBuild;
-        if (childShouldBeBuilt) {
-          nodesToBuild.add(depPath);
-          currentShouldBeBuilt = true;
-        }
-      }
-      return currentShouldBeBuilt;
-    }
     async function linkBinsOfDependencies(depNode, depGraph, opts) {
       const childrenToLink = opts.optional ? depNode.children : Object.keys(depNode.children).reduce((nonOptionalChildren, childAlias) => {
         if (!depNode.optionalDependencies.has(childAlias)) {
@@ -115454,8 +115468,8 @@ var require_nodeIdUtils = __commonJS({
       const pkg1Index = pkgIds.indexOf(pkgId1);
       if (pkg1Index === -1)
         return false;
-      const pkg2Index = pkgIds.indexOf(pkgId2);
-      return pkg2Index > -1 && pkg1Index < pkg2Index;
+      const pkg2Index = pkgIds.lastIndexOf(pkgId2);
+      return pkg1Index < pkg2Index;
     }
     exports2.nodeIdContainsSequence = nodeIdContainsSequence;
     function createNodeId(parentNodeId, pkgId) {

package/dist/pnpx.cjs

@@ -104607,6 +104607,49 @@ var require_lib86 = __commonJS({
   }
 });
 
+// ../build-modules/lib/buildSequence.js
+var require_buildSequence = __commonJS({
+  "../build-modules/lib/buildSequence.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var graph_sequencer_1 = __importDefault2(require_graph_sequencer());
+    var filter_1 = __importDefault2(require_filter3());
+    function buildSequence(depGraph, rootDepPaths) {
+      const nodesToBuild = /* @__PURE__ */ new Set();
+      getSubgraphToBuild(depGraph, rootDepPaths, nodesToBuild, /* @__PURE__ */ new Set());
+      const onlyFromBuildGraph = (0, filter_1.default)((depPath) => nodesToBuild.has(depPath));
+      const nodesToBuildArray = Array.from(nodesToBuild);
+      const graph = new Map(nodesToBuildArray.map((depPath) => [depPath, onlyFromBuildGraph(Object.values(depGraph[depPath].children))]));
+      const graphSequencerResult = (0, graph_sequencer_1.default)({
+        graph,
+        groups: [nodesToBuildArray]
+      });
+      const chunks = graphSequencerResult.chunks;
+      return chunks;
+    }
+    exports2.default = buildSequence;
+    function getSubgraphToBuild(graph, entryNodes, nodesToBuild, walked) {
+      let currentShouldBeBuilt = false;
+      for (const depPath of entryNodes) {
+        if (!graph[depPath])
+          continue;
+        if (walked.has(depPath))
+          continue;
+        walked.add(depPath);
+        const childShouldBeBuilt = getSubgraphToBuild(graph, Object.values(graph[depPath].children), nodesToBuild, walked) || graph[depPath].requiresBuild;
+        if (childShouldBeBuilt) {
+          nodesToBuild.add(depPath);
+          currentShouldBeBuilt = true;
+        }
+      }
+      return currentShouldBeBuilt;
+    }
+  }
+});
+
 // ../build-modules/lib/index.js
 var require_lib87 = __commonJS({
   "../build-modules/lib/index.js"(exports2) {
@@ -104656,21 +104699,11 @@ var require_lib87 = __commonJS({
     var logger_1 = __importDefault2(require_lib());
     var read_package_json_1 = require_lib34();
     var run_groups_1 = __importDefault2(require_lib77());
-    var graph_sequencer_1 = __importDefault2(require_graph_sequencer());
-    var filter_1 = __importDefault2(require_filter3());
+    var buildSequence_1 = __importDefault2(require_buildSequence());
     exports2.default = async (depGraph, rootDepPaths, opts) => {
       const warn = (message2) => logger_1.default.warn({ message: message2, prefix: opts.lockfileDir });
-      const nodesToBuild = /* @__PURE__ */ new Set();
-      getSubgraphToBuild(depGraph, rootDepPaths, nodesToBuild, /* @__PURE__ */ new Set());
-      const onlyFromBuildGraph = (0, filter_1.default)((depPath) => nodesToBuild.has(depPath));
-      const nodesToBuildArray = Array.from(nodesToBuild);
-      const graph = new Map(nodesToBuildArray.map((depPath) => [depPath, onlyFromBuildGraph(Object.values(depGraph[depPath].children))]));
-      const graphSequencerResult = (0, graph_sequencer_1.default)({
-        graph,
-        groups: [nodesToBuildArray]
-      });
-      const chunks = graphSequencerResult.chunks;
       const buildDepOpts = { ...opts, warn };
+      const chunks = (0, buildSequence_1.default)(depGraph, rootDepPaths);
       const groups = chunks.map((chunk) => {
         chunk = chunk.filter((depPath) => depGraph[depPath].requiresBuild && !depGraph[depPath].isBuilt);
         if (opts.depsToBuild != null) {
@@ -104737,25 +104770,6 @@ var require_lib87 = __commonJS({
         throw err;
       }
     }
-    function getSubgraphToBuild(graph, entryNodes, nodesToBuild, walked) {
-      let currentShouldBeBuilt = false;
-      for (const depPath of entryNodes) {
-        if (!graph[depPath])
-          continue;
-        if (nodesToBuild.has(depPath)) {
-          currentShouldBeBuilt = true;
-        }
-        if (walked.has(depPath))
-          continue;
-        walked.add(depPath);
-        const childShouldBeBuilt = getSubgraphToBuild(graph, Object.values(graph[depPath].children), nodesToBuild, walked) || graph[depPath].requiresBuild;
-        if (childShouldBeBuilt) {
-          nodesToBuild.add(depPath);
-          currentShouldBeBuilt = true;
-        }
-      }
-      return currentShouldBeBuilt;
-    }
     async function linkBinsOfDependencies(depNode, depGraph, opts) {
       const childrenToLink = opts.optional ? depNode.children : Object.keys(depNode.children).reduce((nonOptionalChildren, childAlias) => {
         if (!depNode.optionalDependencies.has(childAlias)) {
@@ -110444,8 +110458,8 @@ var require_nodeIdUtils = __commonJS({
       const pkg1Index = pkgIds.indexOf(pkgId1);
       if (pkg1Index === -1)
         return false;
-      const pkg2Index = pkgIds.indexOf(pkgId2);
-      return pkg2Index > -1 && pkg1Index < pkg2Index;
+      const pkg2Index = pkgIds.lastIndexOf(pkgId2);
+      return pkg1Index < pkg2Index;
     }
     exports2.nodeIdContainsSequence = nodeIdContainsSequence;
     function createNodeId(parentNodeId, pkgId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.1.6",
+  "version": "7.1.7",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -43,12 +43,12 @@
     "@pnpm/plugin-commands-audit": "workspace:6.0.9",
     "@pnpm/plugin-commands-env": "workspace:2.1.8",
     "@pnpm/plugin-commands-init": "workspace:1.0.9",
-    "@pnpm/plugin-commands-installation": "workspace:10.0.9",
+    "@pnpm/plugin-commands-installation": "workspace:10.0.10",
     "@pnpm/plugin-commands-listing": "workspace:5.0.9",
     "@pnpm/plugin-commands-outdated": "workspace:6.0.9",
     "@pnpm/plugin-commands-publishing": "workspace:5.0.10",
     "@pnpm/plugin-commands-rebuild": "workspace:6.1.8",
-    "@pnpm/plugin-commands-script-runners": "workspace:5.0.10",
+    "@pnpm/plugin-commands-script-runners": "workspace:5.0.11",
     "@pnpm/plugin-commands-server": "workspace:4.0.9",
     "@pnpm/plugin-commands-setup": "workspace:2.0.10",
     "@pnpm/plugin-commands-store": "workspace:5.1.8",