pnpm 7.30.2 → 7.30.3

package/dist/node_modules/.modules.yaml

@@ -204,7 +204,7 @@ packageManager: pnpm@7.24.2
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Fri, 24 Mar 2023 01:54:37 GMT
+prunedAt: Fri, 24 Mar 2023 13:36:02 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3244,7 +3244,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault3(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "7.30.2" : "0.0.0"
+      version: true ? "7.30.3" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -186733,10 +186733,7 @@ var require_lib133 = __commonJS({
           const projectSnapshot = opts.wantedLockfile.importers[project.id];
           opts.wantedLockfile.importers[project.id] = addDirectDependenciesToLockfile(updatedManifest, projectSnapshot, resolvedImporter.linkedDependencies, resolvedImporter.directDependencies, opts.registries, opts.autoInstallPeers);
         }
-        const topParents = project.manifest ? await getTopParents((0, difference_1.default)(Object.keys((0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest)), [
-          ...resolvedImporter.directDependencies.filter((_, index2) => project.wantedDependencies[index2]?.isNew === true).map(({ alias }) => alias) || [],
-          ...resolvedImporter.linkedDependencies.map(({ alias }) => alias)
-        ]), project.modulesDir) : [];
+        const topParents = project.manifest ? await getTopParents((0, difference_1.default)(Object.keys((0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest)), resolvedImporter.directDependencies.map(({ alias }) => alias) || []), project.modulesDir) : [];
         resolvedImporter.linkedDependencies.forEach((linkedDependency) => {
           topParents.push({
             name: linkedDependency.alias,
@@ -188508,10 +188505,10 @@ var require_createVersionsOverrider = __commonJS({
         };
       }));
       return (manifest, dir) => {
-        overrideDepsOfPkg({ manifest, dir }, versionOverrides.filter(({ parentPkg }) => {
+        const versionOverridesWithParent = versionOverrides.filter(({ parentPkg }) => {
           return parentPkg.name === manifest.name && (!parentPkg.pref || semver_12.default.satisfies(manifest.version, parentPkg.pref));
-        }));
-        overrideDepsOfPkg({ manifest, dir }, genericVersionOverrides);
+        });
+        overrideDepsOfPkg({ manifest, dir }, versionOverridesWithParent, genericVersionOverrides);
         return manifest;
       };
     }
@@ -188523,21 +188520,18 @@ var require_createVersionsOverrider = __commonJS({
         throw new error_1.PnpmError("INVALID_OVERRIDES_SELECTOR", `${e.message} in pnpm.overrides`);
       }
     }
-    function overrideDepsOfPkg({ manifest, dir }, versionOverrides) {
+    function overrideDepsOfPkg({ manifest, dir }, versionOverrides, genericVersionOverrides) {
       if (manifest.dependencies != null)
-        overrideDeps(versionOverrides, manifest.dependencies, dir);
+        overrideDeps(versionOverrides, genericVersionOverrides, manifest.dependencies, dir);
       if (manifest.optionalDependencies != null)
-        overrideDeps(versionOverrides, manifest.optionalDependencies, dir);
+        overrideDeps(versionOverrides, genericVersionOverrides, manifest.optionalDependencies, dir);
       if (manifest.devDependencies != null)
-        overrideDeps(versionOverrides, manifest.devDependencies, dir);
-      return manifest;
+        overrideDeps(versionOverrides, genericVersionOverrides, manifest.devDependencies, dir);
     }
-    function overrideDeps(versionOverrides, deps, dir) {
-      for (const versionOverride of versionOverrides) {
-        const actual = deps[versionOverride.targetPkg.name];
-        if (actual == null)
-          continue;
-        if (!(0, isSubRange_1.isSubRange)(versionOverride.targetPkg.pref, actual))
+    function overrideDeps(versionOverrides, genericVersionOverrides, deps, dir) {
+      for (const [name, pref] of Object.entries(deps)) {
+        const versionOverride = pickMostSpecificVersionOverride(versionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isSubRange_1.isSubRange)(targetPkg.pref, pref))) ?? pickMostSpecificVersionOverride(genericVersionOverrides.filter(({ targetPkg }) => targetPkg.name === name && (0, isSubRange_1.isSubRange)(targetPkg.pref, pref)));
+        if (!versionOverride)
           continue;
         if (versionOverride.linkTarget && dir) {
           deps[versionOverride.targetPkg.name] = `link:${(0, normalize_path_1.default)(path_1.default.relative(dir, versionOverride.linkTarget))}`;
@@ -188550,6 +188544,9 @@ var require_createVersionsOverrider = __commonJS({
         deps[versionOverride.targetPkg.name] = versionOverride.newPref;
       }
     }
+    function pickMostSpecificVersionOverride(versionOverrides) {
+      return versionOverrides.sort((a, b) => (0, isSubRange_1.isSubRange)(b.targetPkg.pref ?? "", a.targetPkg.pref ?? "") ? -1 : 1)[0];
+    }
   }
 });
 

package/package.json

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