pnpm 7.1.8 → 7.1.9

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.1.7
+packageManager: pnpm@7.1.8
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Sat, 04 Jun 2022 21:40:31 GMT
+prunedAt: Mon, 06 Jun 2022 00:38:35 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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.8" != null && true ? "7.1.8" : "0.0.0"
+      version: "7.1.9" != null && true ? "7.1.9" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -116188,7 +116188,7 @@ var require_resolveDependencies = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.nodeIdToParents = void 0;
+    exports2.resolveDependencies = exports2.resolveRootDependencies = exports2.nodeIdToParents = void 0;
     var path_1 = __importDefault(require("path"));
     var core_loggers_1 = require_lib9();
     var error_1 = __importDefault(require_lib8());
@@ -116212,31 +116212,56 @@ var require_resolveDependencies = __commonJS({
       });
     }
     exports2.nodeIdToParents = nodeIdToParents;
-    async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
-      let extendedWantedDeps = [];
-      const postponedResolutionsQueue = [];
+    async function resolveRootDependencies(ctx, preferredVersions, wantedDependencies, options) {
       const pkgAddresses = [];
+      const parentPkgAliases = {};
+      for (const wantedDep of wantedDependencies) {
+        if (wantedDep.alias) {
+          parentPkgAliases[wantedDep.alias] = true;
+        }
+      }
       while (true) {
-        extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
-          preferredDependencies: options.preferredDependencies,
-          prefix: ctx.prefix,
-          proceed: options.proceed || ctx.forceFullResolution,
-          registries: ctx.registries,
-          resolvedDependencies: options.resolvedDependencies
+        const result2 = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+          ...options,
+          parentPkgAliases
         });
-        const newPkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
-        pkgAddresses.push(...newPkgAddresses);
+        pkgAddresses.push(...result2.pkgAddresses);
         if (!ctx.autoInstallPeers)
           break;
-        const allMissingPeers = mergePkgsDeps(newPkgAddresses.map(({ missingPeers }) => missingPeers).filter(Boolean));
-        if (!Object.keys(allMissingPeers).length)
+        for (const pkgAddress of result2.pkgAddresses) {
+          parentPkgAliases[pkgAddress.alias] = true;
+        }
+        for (const missingPeerName of Object.keys(result2.missingPeers ?? {})) {
+          parentPkgAliases[missingPeerName] = true;
+        }
+        for (const [resolvedPeerName, resolvedPeerAddress] of Object.entries(result2.resolvedPeers ?? {})) {
+          if (!parentPkgAliases[resolvedPeerName]) {
+            pkgAddresses.push(resolvedPeerAddress);
+          }
+        }
+        if (!Object.keys(result2.missingPeers).length)
           break;
-        wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: allMissingPeers });
+        wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: result2.missingPeers });
       }
+      return pkgAddresses;
+    }
+    exports2.resolveRootDependencies = resolveRootDependencies;
+    async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
+      const postponedResolutionsQueue = [];
+      const extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
+        preferredDependencies: options.preferredDependencies,
+        prefix: ctx.prefix,
+        proceed: options.proceed || ctx.forceFullResolution,
+        registries: ctx.registries,
+        resolvedDependencies: options.resolvedDependencies
+      });
+      const pkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
       const newPreferredVersions = { ...preferredVersions };
       const newParentPkgAliases = { ...options.parentPkgAliases };
       for (const pkgAddress of pkgAddresses) {
-        newParentPkgAliases[pkgAddress.alias] = true;
+        if (newParentPkgAliases[pkgAddress.alias] !== true) {
+          newParentPkgAliases[pkgAddress.alias] = pkgAddress;
+        }
         if (pkgAddress.updated) {
           ctx.updatedSet.add(pkgAddress.alias);
         }
@@ -116248,10 +116273,25 @@ var require_resolveDependencies = __commonJS({
         }
         newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
       }
-      await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions, newParentPkgAliases)));
-      return pkgAddresses;
+      const childrenResults = await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions, newParentPkgAliases)));
+      if (!ctx.autoInstallPeers) {
+        return {
+          missingPeers: {},
+          pkgAddresses,
+          resolvedPeers: {}
+        };
+      }
+      const allMissingPeers = mergePkgsDeps([
+        ...pkgAddresses,
+        ...childrenResults
+      ].map(({ missingPeers }) => missingPeers).filter(Boolean));
+      return {
+        missingPeers: allMissingPeers,
+        pkgAddresses,
+        resolvedPeers: [...pkgAddresses, ...childrenResults].reduce((acc, { resolvedPeers }) => Object.assign(acc, resolvedPeers), {})
+      };
     }
-    exports2.default = resolveDependencies;
+    exports2.resolveDependencies = resolveDependencies;
     function mergePkgsDeps(pkgsDeps) {
       const groupedRanges = {};
       for (const deps of pkgsDeps) {
@@ -116314,7 +116354,7 @@ var require_resolveDependencies = __commonJS({
       const resolvedDependencies = parentPkg.updated ? void 0 : currentResolvedDependencies;
       const parentDependsOnPeer = Boolean(Object.keys(dependencyLockfile?.peerDependencies ?? parentPkg.pkg.peerDependencies ?? {}).length);
       const wantedDependencies = (0, getNonDevWantedDependencies_1.default)(parentPkg.pkg);
-      const children = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+      const { pkgAddresses, missingPeers, resolvedPeers } = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
         currentDepth: parentDepth + 1,
         parentPkg,
         parentPkgAliases,
@@ -116324,12 +116364,12 @@ var require_resolveDependencies = __commonJS({
         updateDepth,
         workspacePackages
       });
-      ctx.childrenByParentDepPath[parentPkg.depPath] = children.map((child) => ({
+      ctx.childrenByParentDepPath[parentPkg.depPath] = pkgAddresses.map((child) => ({
         alias: child.alias,
         depPath: child.depPath
       }));
       ctx.dependenciesTree[parentPkg.nodeId] = {
-        children: children.reduce((chn, child) => {
+        children: pkgAddresses.reduce((chn, child) => {
           chn[child.alias] = child["nodeId"] ?? child.pkgId;
           return chn;
         }, {}),
@@ -116337,6 +116377,10 @@ var require_resolveDependencies = __commonJS({
         installable: parentPkg.installable,
         resolvedPackage: ctx.resolvedPackagesByDepPath[parentPkg.depPath]
       };
+      return {
+        missingPeers,
+        resolvedPeers
+      };
     }
     function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
       const resolvedDependencies = options.resolvedDependencies ?? {};
@@ -116606,7 +116650,7 @@ var require_resolveDependencies = __commonJS({
         normalizedPref: options.currentDepth === 0 ? pkgResponse.body.normalizedPref : void 0,
         pkgId: pkgResponse.body.id,
         rootDir,
-        missingPeers: getMissingPeers(pkg, options.parentPkgAliases),
+        ...getMissingPeers(pkg, options.parentPkgAliases),
         installable,
         isLinkedDependency: void 0,
         pkg,
@@ -116624,12 +116668,17 @@ var require_resolveDependencies = __commonJS({
     }
     function getMissingPeers(pkg, parentPkgAliases) {
       const missingPeers = {};
+      const resolvedPeers = {};
       for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
-        if (!parentPkgAliases[peerName] && !pkg.peerDependenciesMeta?.[peerName]?.optional) {
+        if (parentPkgAliases[peerName]) {
+          if (parentPkgAliases[peerName] !== true) {
+            resolvedPeers[peerName] = parentPkgAliases[peerName];
+          }
+        } else if (!pkg.peerDependenciesMeta?.[peerName]?.optional) {
           missingPeers[peerName] = peerVersion;
         }
       }
-      return missingPeers;
+      return { missingPeers, resolvedPeers };
     }
     function pkgIsLeaf(pkg) {
       return (0, isEmpty_1.default)(pkg.dependencies ?? {}) && (0, isEmpty_1.default)(pkg.optionalDependencies ?? {}) && (0, isEmpty_1.default)(pkg.peerDependencies ?? {});
@@ -116727,7 +116776,7 @@ var require_resolveDependencyTree = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var partition_1 = __importDefault(require_partition4());
     var nodeIdUtils_1 = require_nodeIdUtils();
-    var resolveDependencies_1 = __importDefault(require_resolveDependencies());
+    var resolveDependencies_1 = require_resolveDependencies();
     __exportStar(require_nodeIdUtils(), exports2);
     async function default_1(importers, opts) {
       const directDepsByImporterId = {};
@@ -116789,7 +116838,7 @@ var require_resolveDependencyTree = __commonJS({
           updateDepth: -1,
           workspacePackages: opts.workspacePackages
         };
-        directDepsByImporterId[importer.id] = await (0, resolveDependencies_1.default)(resolveCtx, importer.preferredVersions ?? {}, importer.wantedDependencies, resolveOpts);
+        directDepsByImporterId[importer.id] = await (0, resolveDependencies_1.resolveRootDependencies)(resolveCtx, importer.preferredVersions ?? {}, importer.wantedDependencies, resolveOpts);
       }));
       ctx.pendingNodes.forEach((pendingNode) => {
         ctx.dependenciesTree[pendingNode.nodeId] = {

package/dist/pnpx.cjs

@@ -111178,7 +111178,7 @@ var require_resolveDependencies = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.nodeIdToParents = void 0;
+    exports2.resolveDependencies = exports2.resolveRootDependencies = exports2.nodeIdToParents = void 0;
     var path_1 = __importDefault2(require("path"));
     var core_loggers_1 = require_lib8();
     var error_1 = __importDefault2(require_lib7());
@@ -111202,31 +111202,56 @@ var require_resolveDependencies = __commonJS({
       });
     }
     exports2.nodeIdToParents = nodeIdToParents;
-    async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
-      let extendedWantedDeps = [];
-      const postponedResolutionsQueue = [];
+    async function resolveRootDependencies(ctx, preferredVersions, wantedDependencies, options) {
       const pkgAddresses = [];
+      const parentPkgAliases = {};
+      for (const wantedDep of wantedDependencies) {
+        if (wantedDep.alias) {
+          parentPkgAliases[wantedDep.alias] = true;
+        }
+      }
       while (true) {
-        extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
-          preferredDependencies: options.preferredDependencies,
-          prefix: ctx.prefix,
-          proceed: options.proceed || ctx.forceFullResolution,
-          registries: ctx.registries,
-          resolvedDependencies: options.resolvedDependencies
+        const result2 = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+          ...options,
+          parentPkgAliases
         });
-        const newPkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
-        pkgAddresses.push(...newPkgAddresses);
+        pkgAddresses.push(...result2.pkgAddresses);
         if (!ctx.autoInstallPeers)
           break;
-        const allMissingPeers = mergePkgsDeps(newPkgAddresses.map(({ missingPeers }) => missingPeers).filter(Boolean));
-        if (!Object.keys(allMissingPeers).length)
+        for (const pkgAddress of result2.pkgAddresses) {
+          parentPkgAliases[pkgAddress.alias] = true;
+        }
+        for (const missingPeerName of Object.keys(result2.missingPeers ?? {})) {
+          parentPkgAliases[missingPeerName] = true;
+        }
+        for (const [resolvedPeerName, resolvedPeerAddress] of Object.entries(result2.resolvedPeers ?? {})) {
+          if (!parentPkgAliases[resolvedPeerName]) {
+            pkgAddresses.push(resolvedPeerAddress);
+          }
+        }
+        if (!Object.keys(result2.missingPeers).length)
           break;
-        wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: allMissingPeers });
+        wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: result2.missingPeers });
       }
+      return pkgAddresses;
+    }
+    exports2.resolveRootDependencies = resolveRootDependencies;
+    async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
+      const postponedResolutionsQueue = [];
+      const extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
+        preferredDependencies: options.preferredDependencies,
+        prefix: ctx.prefix,
+        proceed: options.proceed || ctx.forceFullResolution,
+        registries: ctx.registries,
+        resolvedDependencies: options.resolvedDependencies
+      });
+      const pkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
       const newPreferredVersions = { ...preferredVersions };
       const newParentPkgAliases = { ...options.parentPkgAliases };
       for (const pkgAddress of pkgAddresses) {
-        newParentPkgAliases[pkgAddress.alias] = true;
+        if (newParentPkgAliases[pkgAddress.alias] !== true) {
+          newParentPkgAliases[pkgAddress.alias] = pkgAddress;
+        }
         if (pkgAddress.updated) {
           ctx.updatedSet.add(pkgAddress.alias);
         }
@@ -111238,10 +111263,25 @@ var require_resolveDependencies = __commonJS({
         }
         newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
       }
-      await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions, newParentPkgAliases)));
-      return pkgAddresses;
+      const childrenResults = await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions, newParentPkgAliases)));
+      if (!ctx.autoInstallPeers) {
+        return {
+          missingPeers: {},
+          pkgAddresses,
+          resolvedPeers: {}
+        };
+      }
+      const allMissingPeers = mergePkgsDeps([
+        ...pkgAddresses,
+        ...childrenResults
+      ].map(({ missingPeers }) => missingPeers).filter(Boolean));
+      return {
+        missingPeers: allMissingPeers,
+        pkgAddresses,
+        resolvedPeers: [...pkgAddresses, ...childrenResults].reduce((acc, { resolvedPeers }) => Object.assign(acc, resolvedPeers), {})
+      };
     }
-    exports2.default = resolveDependencies;
+    exports2.resolveDependencies = resolveDependencies;
     function mergePkgsDeps(pkgsDeps) {
       const groupedRanges = {};
       for (const deps of pkgsDeps) {
@@ -111304,7 +111344,7 @@ var require_resolveDependencies = __commonJS({
       const resolvedDependencies = parentPkg.updated ? void 0 : currentResolvedDependencies;
       const parentDependsOnPeer = Boolean(Object.keys(dependencyLockfile?.peerDependencies ?? parentPkg.pkg.peerDependencies ?? {}).length);
       const wantedDependencies = (0, getNonDevWantedDependencies_1.default)(parentPkg.pkg);
-      const children = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+      const { pkgAddresses, missingPeers, resolvedPeers } = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
         currentDepth: parentDepth + 1,
         parentPkg,
         parentPkgAliases,
@@ -111314,12 +111354,12 @@ var require_resolveDependencies = __commonJS({
         updateDepth,
         workspacePackages
       });
-      ctx.childrenByParentDepPath[parentPkg.depPath] = children.map((child) => ({
+      ctx.childrenByParentDepPath[parentPkg.depPath] = pkgAddresses.map((child) => ({
         alias: child.alias,
         depPath: child.depPath
       }));
       ctx.dependenciesTree[parentPkg.nodeId] = {
-        children: children.reduce((chn, child) => {
+        children: pkgAddresses.reduce((chn, child) => {
           chn[child.alias] = child["nodeId"] ?? child.pkgId;
           return chn;
         }, {}),
@@ -111327,6 +111367,10 @@ var require_resolveDependencies = __commonJS({
         installable: parentPkg.installable,
         resolvedPackage: ctx.resolvedPackagesByDepPath[parentPkg.depPath]
       };
+      return {
+        missingPeers,
+        resolvedPeers
+      };
     }
     function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
       const resolvedDependencies = options.resolvedDependencies ?? {};
@@ -111596,7 +111640,7 @@ var require_resolveDependencies = __commonJS({
         normalizedPref: options.currentDepth === 0 ? pkgResponse.body.normalizedPref : void 0,
         pkgId: pkgResponse.body.id,
         rootDir,
-        missingPeers: getMissingPeers(pkg, options.parentPkgAliases),
+        ...getMissingPeers(pkg, options.parentPkgAliases),
         installable,
         isLinkedDependency: void 0,
         pkg,
@@ -111614,12 +111658,17 @@ var require_resolveDependencies = __commonJS({
     }
     function getMissingPeers(pkg, parentPkgAliases) {
       const missingPeers = {};
+      const resolvedPeers = {};
       for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
-        if (!parentPkgAliases[peerName] && !pkg.peerDependenciesMeta?.[peerName]?.optional) {
+        if (parentPkgAliases[peerName]) {
+          if (parentPkgAliases[peerName] !== true) {
+            resolvedPeers[peerName] = parentPkgAliases[peerName];
+          }
+        } else if (!pkg.peerDependenciesMeta?.[peerName]?.optional) {
           missingPeers[peerName] = peerVersion;
         }
       }
-      return missingPeers;
+      return { missingPeers, resolvedPeers };
     }
     function pkgIsLeaf(pkg) {
       return (0, isEmpty_1.default)(pkg.dependencies ?? {}) && (0, isEmpty_1.default)(pkg.optionalDependencies ?? {}) && (0, isEmpty_1.default)(pkg.peerDependencies ?? {});
@@ -111717,7 +111766,7 @@ var require_resolveDependencyTree = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var partition_1 = __importDefault2(require_partition4());
     var nodeIdUtils_1 = require_nodeIdUtils();
-    var resolveDependencies_1 = __importDefault2(require_resolveDependencies());
+    var resolveDependencies_1 = require_resolveDependencies();
     __exportStar(require_nodeIdUtils(), exports2);
     async function default_1(importers, opts) {
       const directDepsByImporterId = {};
@@ -111779,7 +111828,7 @@ var require_resolveDependencyTree = __commonJS({
           updateDepth: -1,
           workspacePackages: opts.workspacePackages
         };
-        directDepsByImporterId[importer.id] = await (0, resolveDependencies_1.default)(resolveCtx, importer.preferredVersions ?? {}, importer.wantedDependencies, resolveOpts);
+        directDepsByImporterId[importer.id] = await (0, resolveDependencies_1.resolveRootDependencies)(resolveCtx, importer.preferredVersions ?? {}, importer.wantedDependencies, resolveOpts);
       }));
       ctx.pendingNodes.forEach((pendingNode) => {
         ctx.dependenciesTree[pendingNode.nodeId] = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.1.8",
+  "version": "7.1.9",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -43,19 +43,19 @@
     "@pnpm/plugin-commands-audit": "workspace:6.0.10",
     "@pnpm/plugin-commands-env": "workspace:2.1.9",
     "@pnpm/plugin-commands-init": "workspace:1.0.10",
-    "@pnpm/plugin-commands-installation": "workspace:10.0.11",
+    "@pnpm/plugin-commands-installation": "workspace:10.0.12",
     "@pnpm/plugin-commands-listing": "workspace:5.0.10",
     "@pnpm/plugin-commands-outdated": "workspace:6.0.10",
     "@pnpm/plugin-commands-publishing": "workspace:5.0.11",
     "@pnpm/plugin-commands-rebuild": "workspace:6.1.9",
-    "@pnpm/plugin-commands-script-runners": "workspace:5.0.12",
+    "@pnpm/plugin-commands-script-runners": "workspace:5.0.13",
     "@pnpm/plugin-commands-server": "workspace:4.0.10",
     "@pnpm/plugin-commands-setup": "workspace:2.0.11",
     "@pnpm/plugin-commands-store": "workspace:5.1.9",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:6.0.2",
     "@pnpm/read-project-manifest": "workspace:3.0.2",
-    "@pnpm/registry-mock": "2.17.0",
+    "@pnpm/registry-mock": "2.19.0",
     "@pnpm/run-npm": "workspace:4.0.1",
     "@pnpm/tabtab": "^0.1.2",
     "@pnpm/types": "workspace:8.0.1",