pnpm 7.12.0 → 7.12.2

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.12.0-0
+packageManager: pnpm@7.12.1
 pendingBuilds:
   - /node-gyp/9.1.0
   - /encoding/0.1.13
-prunedAt: Sun, 18 Sep 2022 19:15:48 GMT
+prunedAt: Thu, 22 Sep 2022 22:44:23 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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.12.0" != null && true ? "7.12.0" : "0.0.0"
+      version: "7.12.2" != null && true ? "7.12.2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -131608,10 +131608,10 @@ var require_resolveDependencies = __commonJS({
       }
       const pkgAddressesByImportersWithoutPeers = await Promise.all((0, zipWith_1.default)(async (importer, { pkgAddresses, postponedResolutionsQueue, postponedPeersResolutionQueue }) => {
         const newPreferredVersions = { ...importer.preferredVersions };
-        const newParentPkgAliases = { ...importer.parentPkgAliases };
+        const currentParentPkgAliases = {};
         for (const pkgAddress of pkgAddresses) {
-          if (newParentPkgAliases[pkgAddress.alias] !== true) {
-            newParentPkgAliases[pkgAddress.alias] = pkgAddress;
+          if (currentParentPkgAliases[pkgAddress.alias] !== true) {
+            currentParentPkgAliases[pkgAddress.alias] = pkgAddress;
           }
           if (pkgAddress.updated) {
             ctx.updatedSet.add(pkgAddress.alias);
@@ -131624,6 +131624,7 @@ var require_resolveDependencies = __commonJS({
           }
           newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
         }
+        const newParentPkgAliases = { ...importer.parentPkgAliases, ...currentParentPkgAliases };
         const postponedResolutionOpts = {
           preferredVersions: newPreferredVersions,
           parentPkgAliases: newParentPkgAliases,
@@ -131638,15 +131639,16 @@ var require_resolveDependencies = __commonJS({
           };
         }
         const postponedPeersResolution = await Promise.all(postponedPeersResolutionQueue.map((postponedMissingPeers) => postponedMissingPeers(postponedResolutionOpts.parentPkgAliases)));
+        const resolvedPeers = [...childrenResults, ...postponedPeersResolution].reduce((acc, { resolvedPeers: resolvedPeers2 }) => Object.assign(acc, resolvedPeers2), {});
         const allMissingPeers = mergePkgsDeps([
-          ...pkgAddresses,
+          ...filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers),
           ...childrenResults,
           ...postponedPeersResolution
         ].map(({ missingPeers }) => missingPeers).filter(Boolean));
         return {
           missingPeers: allMissingPeers,
           pkgAddresses,
-          resolvedPeers: [...childrenResults, ...postponedPeersResolution].reduce((acc, { resolvedPeers }) => Object.assign(acc, resolvedPeers), {})
+          resolvedPeers
         };
       }, importers, resolveResults));
       return {
@@ -131655,6 +131657,19 @@ var require_resolveDependencies = __commonJS({
         time
       };
     }
+    function filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers) {
+      return pkgAddresses.map((pkgAddress) => ({
+        ...pkgAddress,
+        missingPeers: (0, fromPairs_1.default)(Object.entries(pkgAddress.missingPeers || {}).filter(([peerName]) => {
+          if (!currentParentPkgAliases[peerName])
+            return true;
+          if (currentParentPkgAliases[peerName] !== true) {
+            resolvedPeers[peerName] = currentParentPkgAliases[peerName];
+          }
+          return false;
+        }))
+      }));
+    }
     function getPublishedByDate(pkgAddresses, timeFromLockfile = {}) {
       const newTime = {};
       for (const pkgAddress of pkgAddresses) {
@@ -131741,17 +131756,7 @@ var require_resolveDependencies = __commonJS({
       const results = await Promise.all(postponedPeersResolutionQueue.map((postponedPeersResolution) => postponedPeersResolution(parentPkgAliases)));
       const resolvedPeers = [...childrenResults, ...results].reduce((acc, { resolvedPeers: resolvedPeers2 }) => Object.assign(acc, resolvedPeers2), {});
       const allMissingPeers = mergePkgsDeps([
-        ...pkgAddresses.map((pkgAddress) => ({
-          ...pkgAddress,
-          missingPeers: (0, fromPairs_1.default)(Object.entries(pkgAddress.missingPeers || {}).filter(([peerName]) => {
-            if (!currentParentPkgAliases[peerName])
-              return true;
-            if (currentParentPkgAliases[peerName] !== true) {
-              resolvedPeers[peerName] = currentParentPkgAliases[peerName];
-            }
-            return false;
-          }))
-        })),
+        ...filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers),
         ...childrenResults,
         ...results
       ].map(({ missingPeers }) => missingPeers).filter(Boolean));
@@ -132172,7 +132177,7 @@ var require_resolveDependencies = __commonJS({
       let missingPeersOfChildren;
       if (!(0, nodeIdUtils_1.nodeIdContains)(options.parentPkg.nodeId, depPath)) {
         if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
-          if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)) {
+          if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentImporterId)) {
             missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeersOfChildren;
           }
         } else {
@@ -132183,7 +132188,7 @@ var require_resolveDependencies = __commonJS({
             get: (0, promise_share_1.default)(p.promise)
           };
           ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = {
-            parentNodeId: options.parentPkg.nodeId,
+            parentImporterId: options.parentPkg.nodeId.substring(0, options.parentPkg.nodeId.indexOf(">", 1) + 1),
             missingPeersOfChildren
           };
         }
@@ -138313,7 +138318,7 @@ var require_link4 = __commonJS({
           throw new error_1.default("LINK_BAD_PARAMS", "You must provide a parameter");
         }
         const { manifest: manifest2, writeProjectManifest: writeProjectManifest2 } = await (0, cli_utils_1.tryReadProjectManifest)(opts.dir, opts);
-        const newManifest2 = await (0, core_1.addDependenciesToPackage)(manifest2 ?? {}, [`link:${cwd}`], linkOpts);
+        const newManifest2 = await (0, core_1.addDependenciesToPackage)(manifest2 ?? {}, [`link:${opts.cliOptions?.dir ? path_1.default.join(cwd, opts.cliOptions.dir) : cwd}`], linkOpts);
         await writeProjectManifest2(newManifest2);
         return;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.12.0",
+  "version": "7.12.2",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"