pnpm 9.0.4 → 9.0.6

package/dist/node_modules/.modules.yaml

@@ -202,9 +202,9 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@9.0.3
+packageManager: pnpm@9.0.5
 pendingBuilds: []
-prunedAt: Fri, 19 Apr 2024 01:02:47 GMT
+prunedAt: Wed, 24 Apr 2024 13:15:00 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3357,7 +3357,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault2(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "9.0.4" : "0.0.0"
+      version: true ? "9.0.6" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -81011,9 +81011,9 @@ var require_lib55 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@20.12.7/node_modules/@rushstack/worker-pool/lib/WorkerPool.js
+// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.19.31/node_modules/@rushstack/worker-pool/lib/WorkerPool.js
 var require_WorkerPool = __commonJS({
-  "../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@20.12.7/node_modules/@rushstack/worker-pool/lib/WorkerPool.js"(exports2) {
+  "../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.19.31/node_modules/@rushstack/worker-pool/lib/WorkerPool.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.WorkerPool = exports2.WORKER_ID_SYMBOL = void 0;
@@ -112132,6 +112132,25 @@ var require_parsePref2 = __commonJS({
   }
 });
 
+// ../resolving/git-resolver/lib/createGitHostedPkgId.js
+var require_createGitHostedPkgId = __commonJS({
+  "../resolving/git-resolver/lib/createGitHostedPkgId.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.createGitHostedPkgId = void 0;
+    function createGitHostedPkgId({ repo, commit, path: path2 }) {
+      let id = `${repo.includes("://") ? "" : "https://"}${repo}#${commit}`;
+      if (!id.startsWith("git+"))
+        id = `git+${id}`;
+      if (path2) {
+        id += `&path:${path2}`;
+      }
+      return id;
+    }
+    exports2.createGitHostedPkgId = createGitHostedPkgId;
+  }
+});
+
 // ../resolving/git-resolver/lib/index.js
 var require_lib79 = __commonJS({
   "../resolving/git-resolver/lib/index.js"(exports2) {
@@ -112140,10 +112159,14 @@ var require_lib79 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createGitResolver = void 0;
+    exports2.createGitResolver = exports2.createGitHostedPkgId = void 0;
     var graceful_git_1 = __importDefault2(require_graceful_git());
     var semver_12 = __importDefault2(require_semver2());
     var parsePref_1 = require_parsePref2();
+    var createGitHostedPkgId_1 = require_createGitHostedPkgId();
+    Object.defineProperty(exports2, "createGitHostedPkgId", { enumerable: true, get: function() {
+      return createGitHostedPkgId_1.createGitHostedPkgId;
+    } });
     function createGitResolver(opts) {
       return async function resolveGit(wantedDependency) {
         const parsedSpec = await (0, parsePref_1.parsePref)(wantedDependency.pref);
@@ -112177,10 +112200,7 @@ var require_lib79 = __commonJS({
             id += `#path:${resolution.path}`;
           }
         } else {
-          id = `${resolution.repo.startsWith("git+") ? "" : "git+"}${resolution.repo}#${resolution.commit}`;
-          if (resolution.path) {
-            id += `&path:${resolution.path}`;
-          }
+          id = (0, createGitHostedPkgId_1.createGitHostedPkgId)(resolution);
         }
         return {
           id,
@@ -113952,6 +113972,7 @@ var require_lockfileFormatConverters = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.convertLockfileV9ToLockfileObject = exports2.convertToLockfileObject = exports2.convertToLockfileFile = void 0;
     var dependency_path_1 = require_lib87();
+    var git_resolver_1 = require_lib79();
     var types_1 = require_lib29();
     var equals_1 = __importDefault2(require_equals2());
     var isEmpty_1 = __importDefault2(require_isEmpty2());
@@ -113959,6 +113980,7 @@ var require_lockfileFormatConverters = __commonJS({
     var omit_1 = __importDefault2(require_omit());
     var pickBy_1 = __importDefault2(require_pickBy());
     var pick_1 = __importDefault2(require_pick());
+    var constants_1 = require_lib6();
     function convertToLockfileFile(lockfile, opts) {
       const packages = {};
       const snapshots = {};
@@ -113992,7 +114014,7 @@ var require_lockfileFormatConverters = __commonJS({
         ...lockfile,
         snapshots,
         packages,
-        lockfileVersion: lockfile.lockfileVersion.toString(),
+        lockfileVersion: constants_1.LOCKFILE_VERSION,
         importers: mapValues(lockfile.importers, convertProjectSnapshotToInlineSpecifiersFormat)
       };
       return normalizeLockfile(newLockfile, opts);
@@ -114127,21 +114149,20 @@ var require_lockfileFormatConverters = __commonJS({
         return;
       for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
         if (pkg.name) {
-          let newId;
+          const { id, peersSuffix } = (0, dependency_path_1.parseDepPath)(pkgId);
+          let newId = `${pkg.name}@`;
           if ("tarball" in pkg.resolution) {
-            newId = pkg.resolution.tarball;
+            newId += pkg.resolution.tarball;
             if (pkg.resolution.path) {
               newId += `#path:${pkg.resolution.path}`;
             }
           } else if ("repo" in pkg.resolution) {
-            newId = `${pkg.resolution.repo.startsWith("git+") ? "" : "git+"}${pkg.resolution.repo}#${pkg.resolution.commit}`;
-            if (pkg.resolution.path) {
-              newId += `&path:${pkg.resolution.path}`;
-            }
+            newId += (0, git_resolver_1.createGitHostedPkgId)(pkg.resolution);
+          } else if ("directory" in pkg.resolution) {
+            newId += id;
           } else {
             continue;
           }
-          const { id, peersSuffix } = (0, dependency_path_1.parseDepPath)(pkgId);
           oldIdToNewId[pkgId] = `${newId}${peersSuffix}`;
           if (id !== pkgId) {
             oldIdToNewId[id] = newId;
@@ -114168,17 +114189,36 @@ var require_lockfileFormatConverters = __commonJS({
         for (const depType of ["dependencies", "optionalDependencies"]) {
           for (const [alias, depPath] of Object.entries(pkg[depType] ?? {})) {
             if (oldIdToNewId[depPath]) {
-              pkg[depType][alias] = oldIdToNewId[depPath];
+              if (oldIdToNewId[depPath].startsWith(`${alias}@`)) {
+                pkg[depType][alias] = oldIdToNewId[depPath].substring(alias.length + 1);
+              } else {
+                pkg[depType][alias] = oldIdToNewId[depPath];
+              }
             }
           }
         }
       }
       lockfile.packages = newLockfilePackages;
+      if ((lockfile.dependencies != null || lockfile.devDependencies != null || lockfile.optionalDependencies != null) && !lockfile.importers?.["."]) {
+        lockfile.importers = lockfile.importers ?? {};
+        lockfile.importers["."] = {
+          dependencies: lockfile.dependencies,
+          devDependencies: lockfile.devDependencies,
+          optionalDependencies: lockfile.optionalDependencies
+        };
+        delete lockfile.dependencies;
+        delete lockfile.devDependencies;
+        delete lockfile.optionalDependencies;
+      }
       for (const importer of Object.values(lockfile.importers ?? {})) {
         for (const depType of ["dependencies", "optionalDependencies", "devDependencies"]) {
           for (const [alias, { version: version2 }] of Object.entries(importer[depType] ?? {})) {
             if (oldIdToNewId[version2]) {
-              importer[depType][alias].version = oldIdToNewId[version2];
+              if (oldIdToNewId[version2].startsWith(`${alias}@`)) {
+                importer[depType][alias].version = oldIdToNewId[version2].substring(alias.length + 1);
+              } else {
+                importer[depType][alias].version = oldIdToNewId[version2];
+              }
             }
           }
         }
@@ -174640,6 +174680,40 @@ var require_nodeIdUtils = __commonJS({
   }
 });
 
+// ../pkg-manager/resolve-dependencies/lib/hoistPeers.js
+var require_hoistPeers = __commonJS({
+  "../pkg-manager/resolve-dependencies/lib/hoistPeers.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.hoistPeers = void 0;
+    var semver_12 = __importDefault2(require_semver2());
+    function hoistPeers(missingRequiredPeers, opts) {
+      const dependencies = {};
+      for (const [peerName, { range }] of missingRequiredPeers) {
+        if (opts.allPreferredVersions[peerName]) {
+          const versions = [];
+          const nonVersions = [];
+          for (const [spec, specType] of Object.entries(opts.allPreferredVersions[peerName])) {
+            if (specType === "version") {
+              versions.push(spec);
+            } else {
+              nonVersions.push(spec);
+            }
+          }
+          dependencies[peerName] = [semver_12.default.maxSatisfying(versions, "*", { includePrerelease: true }), ...nonVersions].join(" || ");
+        } else if (opts.autoInstallPeers) {
+          dependencies[peerName] = range;
+        }
+      }
+      return dependencies;
+    }
+    exports2.hoistPeers = hoistPeers;
+  }
+});
+
 // ../pkg-manager/resolve-dependencies/lib/wantedDepIsLocallyAvailable.js
 var require_wantedDepIsLocallyAvailable = __commonJS({
   "../pkg-manager/resolve-dependencies/lib/wantedDepIsLocallyAvailable.js"(exports2) {
@@ -174674,6 +174748,33 @@ var require_wantedDepIsLocallyAvailable = __commonJS({
   }
 });
 
+// ../pkg-manager/resolve-dependencies/lib/replaceVersionInPref.js
+var require_replaceVersionInPref = __commonJS({
+  "../pkg-manager/resolve-dependencies/lib/replaceVersionInPref.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.replaceVersionInPref = void 0;
+    var semver_12 = __importDefault2(require_semver2());
+    function replaceVersionInPref(pref, version2) {
+      if (semver_12.default.validRange(pref)) {
+        return version2;
+      }
+      if (!pref.startsWith("npm:")) {
+        return pref;
+      }
+      const versionDelimiter = pref.lastIndexOf("@");
+      if (versionDelimiter === -1 || pref.indexOf("/") > versionDelimiter) {
+        return `${pref}@${version2}`;
+      }
+      return `${pref.substring(0, versionDelimiter + 1)}${version2}`;
+    }
+    exports2.replaceVersionInPref = replaceVersionInPref;
+  }
+});
+
 // ../pkg-manager/resolve-dependencies/lib/resolveDependencies.js
 var require_resolveDependencies = __commonJS({
   "../pkg-manager/resolve-dependencies/lib/resolveDependencies.js"(exports2) {
@@ -174737,7 +174838,9 @@ var require_resolveDependencies = __commonJS({
     var getNonDevWantedDependencies_1 = require_getNonDevWantedDependencies();
     var mergePeers_1 = require_mergePeers();
     var nodeIdUtils_1 = require_nodeIdUtils();
+    var hoistPeers_1 = require_hoistPeers();
     var wantedDepIsLocallyAvailable_1 = require_wantedDepIsLocallyAvailable();
+    var replaceVersionInPref_1 = require_replaceVersionInPref();
     var dependencyResolvedLogger = (0, logger_1.logger)("_dependency_resolved");
     var omitDepsFields = (0, omit_1.default)(["dependencies", "optionalDependencies", "peerDependencies", "peerDependenciesMeta"]);
     function nodeIdToParents(nodeId, resolvedPackagesByDepPath) {
@@ -174780,23 +174883,7 @@ var require_resolveDependencies = __commonJS({
           ]));
           if (!missingRequiredPeers.length && !missingOptionalPeerNames.length)
             break;
-          const dependencies = {};
-          for (const [peerName, { range }] of missingRequiredPeers) {
-            if (ctx.allPreferredVersions[peerName]) {
-              const versions = [];
-              const nonVersions = [];
-              for (const [spec, specType] of Object.entries(ctx.allPreferredVersions[peerName])) {
-                if (specType === "version") {
-                  versions.push(spec);
-                } else {
-                  nonVersions.push(spec);
-                }
-              }
-              dependencies[peerName] = [semver_12.default.maxSatisfying(versions, "*"), ...nonVersions].join(" || ");
-            } else if (ctx.autoInstallPeers) {
-              dependencies[peerName] = range;
-            }
-          }
+          const dependencies = (0, hoistPeers_1.hoistPeers)(missingRequiredPeers, ctx);
           const nextMissingOptionalPeers = [];
           const optionalDependencies = {};
           for (const missingOptionalPeerName of missingOptionalPeerNames) {
@@ -175307,11 +175394,7 @@ var require_resolveDependencies = __commonJS({
       }
       try {
         if (!options.update && currentPkg.version && currentPkg.pkgId?.endsWith(`@${currentPkg.version}`)) {
-          if (semver_12.default.validRange(wantedDependency.pref)) {
-            wantedDependency.pref = currentPkg.version;
-          } else if (wantedDependency.pref.startsWith("npm:")) {
-            wantedDependency.pref = `${wantedDependency.pref.substring(0, wantedDependency.pref.lastIndexOf("@") + 1)}${currentPkg.version}`;
-          }
+          wantedDependency.pref = (0, replaceVersionInPref_1.replaceVersionInPref)(wantedDependency.pref, currentPkg.version);
         }
         pkgResponse = await ctx.storeController.requestPackage(wantedDependency, {
           alwaysTryWorkspacePackages: ctx.linkWorkspacePackagesDepth >= options.currentDepth,
@@ -180039,8 +180122,7 @@ var require_createVersionsOverrider = __commonJS({
         }
         let linkFileTarget;
         if (override.newPref.startsWith("file:")) {
-          const pkgPath = override.newPref.substring(5);
-          linkFileTarget = path_1.default.isAbsolute(pkgPath) ? pkgPath : path_1.default.join(rootDir, pkgPath);
+          linkFileTarget = override.newPref.substring(5);
         }
         return {
           ...override,
@@ -180901,7 +180983,8 @@ var require_install = __commonJS({
             throw new LockfileConfigMismatchError(outdatedLockfileSettingName);
           }
         }
-        let needsFullResolution = outdatedLockfileSettings || opts.fixLockfile || !ctx.wantedLockfile.lockfileVersion.toString().startsWith(`${constants_1.LOCKFILE_MAJOR_VERSION}.`) && ctx.wantedLockfile.lockfileVersion !== constants_1.LOCKFILE_VERSION_V6 || opts.forceFullResolution;
+        const upToDateLockfileMajorVersion = ctx.wantedLockfile.lockfileVersion.toString().startsWith(`${constants_1.LOCKFILE_MAJOR_VERSION}.`);
+        let needsFullResolution = outdatedLockfileSettings || opts.fixLockfile || !upToDateLockfileMajorVersion && ctx.wantedLockfile.lockfileVersion !== constants_1.LOCKFILE_VERSION_V6 || opts.forceFullResolution;
         if (needsFullResolution) {
           ctx.wantedLockfile.settings = {
             autoInstallPeers: opts.autoInstallPeers,
@@ -180990,7 +181073,7 @@ Note that in CI environments, this setting is enabled by default.`
                 wantedLockfile: maybeOpts.ignorePackageManifest ? void 0 : ctx.wantedLockfile,
                 useLockfile: opts.useLockfile && ctx.wantedLockfileIsModified
               });
-              if (opts.useLockfile && opts.saveLockfile && opts.mergeGitBranchLockfiles) {
+              if (opts.useLockfile && opts.saveLockfile && opts.mergeGitBranchLockfiles || !upToDateLockfileMajorVersion && !opts.frozenLockfile) {
                 await (0, lockfile_file_1.writeLockfiles)({
                   currentLockfile: ctx.currentLockfile,
                   currentLockfileDir: ctx.virtualStoreDir,

package/package.json

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