pnpm 7.23.0 → 7.24.0

package/dist/node_modules/.modules.yaml

@@ -200,11 +200,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.22.0
+packageManager: pnpm@7.23.0
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Thu, 05 Jan 2023 13:49:34 GMT
+prunedAt: Mon, 09 Jan 2023 17:57:23 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3224,7 +3224,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.23.0" != null && true ? "7.23.0" : "0.0.0"
+      version: "7.24.0" != null && true ? "7.24.0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -12835,9 +12835,10 @@ var require_lib7 = __commonJS({
   "../packages/constants/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.WORKSPACE_MANIFEST_FILENAME = exports2.LAYOUT_VERSION = exports2.ENGINE_NAME = exports2.LOCKFILE_VERSION = exports2.WANTED_LOCKFILE = void 0;
+    exports2.WORKSPACE_MANIFEST_FILENAME = exports2.LAYOUT_VERSION = exports2.ENGINE_NAME = exports2.LOCKFILE_VERSION_V6 = exports2.LOCKFILE_VERSION = exports2.WANTED_LOCKFILE = void 0;
     exports2.WANTED_LOCKFILE = "pnpm-lock.yaml";
     exports2.LOCKFILE_VERSION = 5.4;
+    exports2.LOCKFILE_VERSION_V6 = "6.0";
     exports2.ENGINE_NAME = `${process.platform}-${process.arch}-node-${process.version.split(".")[0]}`;
     exports2.LAYOUT_VERSION = 5;
     exports2.WORKSPACE_MANIFEST_FILENAME = "pnpm-workspace.yaml";
@@ -24905,6 +24906,7 @@ var require_lib21 = __commonJS({
       "strict-peer-dependencies": Boolean,
       "use-beta-cli": Boolean,
       "use-inline-specifiers-lockfile-format": Boolean,
+      "use-lockfile-v6": Boolean,
       "use-node-version": String,
       "use-running-store-server": Boolean,
       "use-store-server": Boolean,
@@ -98852,7 +98854,9 @@ var require_lib58 = __commonJS({
     async function preparePackage(opts, pkgDir) {
       const manifest = await (0, read_package_json_1.safeReadPackageJsonFromDir)(pkgDir);
       if (manifest?.scripts == null || !packageShouldBeBuilt(manifest, pkgDir))
-        return;
+        return false;
+      if (opts.ignoreScripts)
+        return true;
       const pm = (await (0, preferred_pm_1.default)(pkgDir))?.name ?? "npm";
       const execOpts = {
         depPath: `${manifest.name}@${manifest.version}`,
@@ -98875,6 +98879,7 @@ var require_lib58 = __commonJS({
         throw err;
       }
       await (0, rimraf_1.default)(path_1.default.join(pkgDir, "node_modules"));
+      return true;
     }
     exports2.preparePackage = preparePackage;
     function packageShouldBeBuilt(manifest, pkgDir) {
@@ -98917,6 +98922,7 @@ var require_gitHostedTarballFetcher = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.waitForFilesIndex = exports2.createGitHostedTarballFetcher = void 0;
+    var logger_1 = require_lib6();
     var prepare_package_1 = require_lib58();
     var p_map_values_1 = __importDefault(require_lib59());
     var omit_1 = __importDefault(require_omit());
@@ -98924,7 +98930,11 @@ var require_gitHostedTarballFetcher = __commonJS({
       const fetch = async (cafs, resolution, opts) => {
         const { filesIndex } = await fetchRemoteTarball(cafs, resolution, opts);
         try {
-          return { filesIndex: await prepareGitHostedPkg(filesIndex, cafs, fetcherOpts) };
+          const prepareResult = await prepareGitHostedPkg(filesIndex, cafs, fetcherOpts);
+          if (prepareResult.ignoredBuild) {
+            (0, logger_1.globalWarn)(`The git-hosted package fetched from "${resolution.tarball}" has to be built but the build scripts were ignored.`);
+          }
+          return { filesIndex: prepareResult.filesIndex };
         } catch (err) {
           err.message = `Failed to prepare git-hosted package fetched from "${resolution.tarball}": ${err.message}`;
           throw err;
@@ -98942,9 +98952,12 @@ var require_gitHostedTarballFetcher = __commonJS({
         },
         force: true
       });
-      await (0, prepare_package_1.preparePackage)(opts, tempLocation);
+      const shouldBeBuilt = await (0, prepare_package_1.preparePackage)(opts, tempLocation);
       const newFilesIndex = await cafs.addFilesFromDir(tempLocation);
-      return newFilesIndex;
+      return {
+        filesIndex: newFilesIndex,
+        ignoredBuild: opts.ignoreScripts && shouldBeBuilt
+      };
     }
     async function waitForFilesIndex(filesIndex) {
       return (0, p_map_values_1.default)(async (fileInfo) => {
@@ -106621,13 +106634,19 @@ var require_lib70 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createGitFetcher = void 0;
     var path_1 = __importDefault(require("path"));
+    var logger_1 = require_lib6();
     var prepare_package_1 = require_lib58();
     var rimraf_1 = __importDefault(require_rimraf2());
     var execa_1 = __importDefault(require_lib17());
     var url_1 = require("url");
     function createGitFetcher(createOpts) {
       const allowedHosts = new Set(createOpts?.gitShallowHosts ?? []);
-      const preparePkg = prepare_package_1.preparePackage.bind(null, { rawConfig: createOpts.rawConfig, unsafePerm: createOpts.unsafePerm });
+      const ignoreScripts = createOpts.ignoreScripts ?? false;
+      const preparePkg = prepare_package_1.preparePackage.bind(null, {
+        ignoreScripts: createOpts.ignoreScripts,
+        rawConfig: createOpts.rawConfig,
+        unsafePerm: createOpts.unsafePerm
+      });
       const gitFetcher = async (cafs, resolution, opts) => {
         const tempLocation = await cafs.tempDir();
         if (allowedHosts.size > 0 && shouldUseShallow(resolution.repo, allowedHosts)) {
@@ -106639,7 +106658,10 @@ var require_lib70 = __commonJS({
         }
         await execGit(["checkout", resolution.commit], { cwd: tempLocation });
         try {
-          await preparePkg(tempLocation);
+          const shouldBeBuilt = await preparePkg(tempLocation);
+          if (ignoreScripts && shouldBeBuilt) {
+            (0, logger_1.globalWarn)(`The git-hosted package fetched from "${resolution.repo}" has to be built but the build scripts were ignored.`);
+          }
         } catch (err) {
           err.message = `Failed to prepare git-hosted package fetched from "${resolution.repo}": ${err.message}`;
           throw err;
@@ -107115,7 +107137,7 @@ var require_lib76 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createPeersFolderSuffix = exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.resolve = exports2.isAbsolute = void 0;
+    exports2.createPeersFolderSuffix = exports2.createPeersFolderSuffixNewFormat = exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.resolve = exports2.isAbsolute = void 0;
     var crypto_base32_hash_1 = require_lib75();
     var encode_registry_1 = __importDefault(require_encode_registry());
     var semver_12 = __importDefault(require_semver2());
@@ -107143,6 +107165,10 @@ var require_lib76 = __commonJS({
       if (relDepPath[0] !== "/") {
         return null;
       }
+      const sepIndex = relDepPath.indexOf("(", relDepPath.lastIndexOf("/"));
+      if (sepIndex !== -1) {
+        return resolve(registries, relDepPath.slice(0, sepIndex));
+      }
       const underscoreIndex = relDepPath.indexOf("_", relDepPath.lastIndexOf("/"));
       if (underscoreIndex !== -1) {
         return resolve(registries, relDepPath.slice(0, underscoreIndex));
@@ -107154,7 +107180,7 @@ var require_lib76 = __commonJS({
       if (reference.startsWith("link:")) {
         return null;
       }
-      if (!reference.includes("/")) {
+      if (!reference.includes("/") || reference.includes("(") && reference.lastIndexOf("/", reference.indexOf("(")) === -1) {
         const registryName2 = (0, encode_registry_1.default)(getRegistryByPackageName(registries, pkgName));
         return `${registryName2}/${pkgName}/${reference}`;
       }
@@ -107186,7 +107212,7 @@ var require_lib76 = __commonJS({
       if (reference.startsWith("file:")) {
         return reference;
       }
-      if (!reference.includes("/")) {
+      if (!reference.includes("/") || reference.includes("(") && reference.lastIndexOf("/", reference.indexOf("(")) === -1) {
         return `/${pkgName}/${reference}`;
       }
       return reference;
@@ -107202,13 +107228,22 @@ var require_lib76 = __commonJS({
         parts.shift();
       const host = _isAbsolute ? parts.shift() : void 0;
       const name = parts[0].startsWith("@") ? `${parts.shift()}/${parts.shift()}` : parts.shift();
-      let version = parts.shift();
+      let version = parts.join("/");
       if (version) {
-        const underscoreIndex = version.indexOf("_");
+        let peerSepIndex;
         let peersSuffix;
-        if (underscoreIndex !== -1) {
-          peersSuffix = version.substring(underscoreIndex + 1);
-          version = version.substring(0, underscoreIndex);
+        if (version.includes("(") && version.endsWith(")")) {
+          peerSepIndex = version.indexOf("(");
+          if (peerSepIndex !== -1) {
+            peersSuffix = version.substring(peerSepIndex);
+            version = version.substring(0, peerSepIndex);
+          }
+        } else {
+          peerSepIndex = version.indexOf("_");
+          if (peerSepIndex !== -1) {
+            peersSuffix = version.substring(peerSepIndex + 1);
+            version = version.substring(0, peerSepIndex);
+          }
         }
         if (semver_12.default.valid(version)) {
           return {
@@ -107241,11 +107276,16 @@ var require_lib76 = __commonJS({
         if (depPath.startsWith("/")) {
           depPath = depPath.substring(1);
         }
-        const index = depPath.lastIndexOf("/");
+        const index = depPath.lastIndexOf("/", depPath.includes("(") ? depPath.indexOf("(") - 1 : depPath.length);
         return `${depPath.substring(0, index)}@${depPath.slice(index + 1)}`;
       }
       return depPath.replace(":", "+");
     }
+    function createPeersFolderSuffixNewFormat(peers) {
+      const folderName = peers.map(({ name, version }) => `${name}@${version}`).sort().join(")(");
+      return `(${folderName})`;
+    }
+    exports2.createPeersFolderSuffixNewFormat = createPeersFolderSuffixNewFormat;
     function createPeersFolderSuffix(peers) {
       const folderName = peers.map(({ name, version }) => `${name.replace("/", "+")}@${version}`).sort().join("+");
       if (folderName.length > 26) {
@@ -108113,22 +108153,113 @@ var require_InlineSpecifiersLockfile = __commonJS({
 var require_inlineSpecifiersLockfileConverters = __commonJS({
   "../lockfile/lockfile-file/lib/experiments/inlineSpecifiersLockfileConverters.js"(exports2) {
     "use strict";
+    var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault2 = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar2 = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result2 = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding2(result2, mod, k);
+      }
+      __setModuleDefault2(result2, mod);
+      return result2;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.revertFromInlineSpecifiersFormat = exports2.revertFromInlineSpecifiersFormatIfNecessary = exports2.convertToInlineSpecifiersFormat = exports2.isExperimentalInlineSpecifiersFormat = void 0;
+    exports2.convertNewDepPathToOldDepPath = exports2.revertFromInlineSpecifiersFormat = exports2.revertFromInlineSpecifiersFormatIfNecessary = exports2.convertToInlineSpecifiersFormat = exports2.isExperimentalInlineSpecifiersFormat = void 0;
+    var dp = __importStar2(require_lib76());
     var InlineSpecifiersLockfile_1 = require_InlineSpecifiersLockfile();
     function isExperimentalInlineSpecifiersFormat(lockfile) {
       const { lockfileVersion } = lockfile;
-      return typeof lockfileVersion === "string" && lockfileVersion.endsWith(InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX);
+      return lockfileVersion.toString().startsWith("6.") || typeof lockfileVersion === "string" && lockfileVersion.endsWith(InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX);
     }
     exports2.isExperimentalInlineSpecifiersFormat = isExperimentalInlineSpecifiersFormat;
     function convertToInlineSpecifiersFormat(lockfile) {
-      return {
+      let importers = lockfile.importers;
+      let packages = lockfile.packages;
+      if (lockfile.lockfileVersion.toString().startsWith("6.")) {
+        importers = Object.fromEntries(Object.entries(lockfile.importers ?? {}).map(([importerId, pkgSnapshot]) => {
+          const newSnapshot = { ...pkgSnapshot };
+          if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
+          }
+          if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
+          }
+          if (newSnapshot.devDependencies != null) {
+            newSnapshot.devDependencies = mapValues(newSnapshot.devDependencies, convertOldRefToNewRef);
+          }
+          return [importerId, newSnapshot];
+        }));
+        packages = Object.fromEntries(Object.entries(lockfile.packages ?? {}).map(([depPath, pkgSnapshot]) => {
+          const newSnapshot = { ...pkgSnapshot };
+          if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
+          }
+          if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
+          }
+          return [convertOldDepPathToNewDepPath(depPath), newSnapshot];
+        }));
+      }
+      const newLockfile = {
         ...lockfile,
-        lockfileVersion: `${lockfile.lockfileVersion}${InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX}`,
-        importers: mapValues(lockfile.importers, convertProjectSnapshotToInlineSpecifiersFormat)
+        packages,
+        lockfileVersion: lockfile.lockfileVersion.toString().startsWith("6.") ? lockfile.lockfileVersion.toString() : lockfile.lockfileVersion.toString().endsWith(InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX) ? lockfile.lockfileVersion.toString() : `${lockfile.lockfileVersion}${InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX}`,
+        importers: mapValues(importers, convertProjectSnapshotToInlineSpecifiersFormat)
       };
+      if (lockfile.lockfileVersion.toString().startsWith("6.") && newLockfile.time) {
+        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [convertOldDepPathToNewDepPath(depPath), time]));
+      }
+      return newLockfile;
     }
     exports2.convertToInlineSpecifiersFormat = convertToInlineSpecifiersFormat;
+    function convertOldDepPathToNewDepPath(oldDepPath) {
+      const parsedDepPath = dp.parse(oldDepPath);
+      if (!parsedDepPath.name || !parsedDepPath.version)
+        return oldDepPath;
+      let newDepPath = `/${parsedDepPath.name}@${parsedDepPath.version}`;
+      if (parsedDepPath.peersSuffix) {
+        if (parsedDepPath.peersSuffix.startsWith("(")) {
+          newDepPath += parsedDepPath.peersSuffix;
+        } else {
+          newDepPath += `_${parsedDepPath.peersSuffix}`;
+        }
+      }
+      if (parsedDepPath.host) {
+        newDepPath = `${parsedDepPath.host}${newDepPath}`;
+      }
+      return newDepPath;
+    }
+    function convertOldRefToNewRef(oldRef) {
+      if (oldRef.startsWith("link:") || oldRef.startsWith("file:")) {
+        return oldRef;
+      }
+      if (oldRef.includes("/")) {
+        return convertOldDepPathToNewDepPath(oldRef);
+      }
+      return oldRef;
+    }
     function revertFromInlineSpecifiersFormatIfNecessary(lockfile) {
       return isExperimentalInlineSpecifiersFormat(lockfile) ? revertFromInlineSpecifiersFormat(lockfile) : lockfile;
     }
@@ -108140,13 +108271,63 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
       if (isNaN(originalVersion)) {
         throw new Error(`Unable to revert lockfile from inline specifiers format. Invalid version parsed: ${originalVersionStr}`);
       }
-      return {
+      let revertedImporters = mapValues(importers, revertProjectSnapshot);
+      let packages = lockfile.packages;
+      if (originalVersion === 6) {
+        revertedImporters = Object.fromEntries(Object.entries(revertedImporters ?? {}).map(([importerId, pkgSnapshot]) => {
+          const newSnapshot = { ...pkgSnapshot };
+          if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertNewRefToOldRef);
+          }
+          if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertNewRefToOldRef);
+          }
+          if (newSnapshot.devDependencies != null) {
+            newSnapshot.devDependencies = mapValues(newSnapshot.devDependencies, convertNewRefToOldRef);
+          }
+          return [importerId, newSnapshot];
+        }));
+        packages = Object.fromEntries(Object.entries(lockfile.packages ?? {}).map(([depPath, pkgSnapshot]) => {
+          const newSnapshot = { ...pkgSnapshot };
+          if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertNewRefToOldRef);
+          }
+          if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertNewRefToOldRef);
+          }
+          return [convertNewDepPathToOldDepPath(depPath), newSnapshot];
+        }));
+      }
+      const newLockfile = {
         ...rest,
-        lockfileVersion: originalVersion,
-        importers: mapValues(importers, revertProjectSnapshot)
+        lockfileVersion: lockfileVersion.endsWith(InlineSpecifiersLockfile_1.INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX) ? originalVersion : lockfileVersion,
+        packages,
+        importers: revertedImporters
       };
+      if (originalVersion === 6 && newLockfile.time) {
+        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [convertNewDepPathToOldDepPath(depPath), time]));
+      }
+      return newLockfile;
     }
     exports2.revertFromInlineSpecifiersFormat = revertFromInlineSpecifiersFormat;
+    function convertNewDepPathToOldDepPath(oldDepPath) {
+      if (!oldDepPath.includes("@", 2))
+        return oldDepPath;
+      const index = oldDepPath.indexOf("@", oldDepPath.indexOf("/@") + 2);
+      if (oldDepPath.includes("(") && index > oldDepPath.indexOf("("))
+        return oldDepPath;
+      return `${oldDepPath.substring(0, index)}/${oldDepPath.substring(index + 1)}`;
+    }
+    exports2.convertNewDepPathToOldDepPath = convertNewDepPathToOldDepPath;
+    function convertNewRefToOldRef(oldRef) {
+      if (oldRef.startsWith("link:") || oldRef.startsWith("file:")) {
+        return oldRef;
+      }
+      if (oldRef.includes("@")) {
+        return convertNewDepPathToOldDepPath(oldRef);
+      }
+      return oldRef;
+    }
     function convertProjectSnapshotToInlineSpecifiersFormat(projectSnapshot) {
       const { specifiers, ...rest } = projectSnapshot;
       const convertBlock = (block) => block != null ? convertResolvedDependenciesToInlineSpecifiersFormat(block, { specifiers }) : block;
@@ -108280,7 +108461,7 @@ var require_write = __commonJS({
       if (isEmptyLockfile(wantedLockfile)) {
         return (0, rimraf_1.default)(lockfilePath);
       }
-      const lockfileToStringify = opts?.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
+      const lockfileToStringify = Boolean(opts?.useInlineSpecifiersFormat) || wantedLockfile["lockfileVersion"].toString().startsWith("6.") ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
       const yamlDoc = yamlStringify(lockfileToStringify, {
         forceSharedFormat: opts?.forceSharedFormat === true,
         includeEmptySpecifiersField: !opts?.useInlineSpecifiersFormat
@@ -108338,7 +108519,7 @@ var require_write = __commonJS({
         }
       }
       if (lockfileToSave.time) {
-        lockfileToSave.time = pruneTime(lockfileToSave.time, lockfile.importers);
+        lockfileToSave.time = (lockfileToSave.lockfileVersion.toString().startsWith("6.") ? pruneTimeInLockfileV6 : pruneTime)(lockfileToSave.time, lockfile.importers);
       }
       if (lockfileToSave.overrides != null && (0, isEmpty_1.default)(lockfileToSave.overrides)) {
         delete lockfileToSave.overrides;
@@ -108362,6 +108543,37 @@ var require_write = __commonJS({
       return lockfileToSave;
     }
     exports2.normalizeLockfile = normalizeLockfile;
+    function pruneTimeInLockfileV6(time, importers) {
+      const rootDepPaths = /* @__PURE__ */ new Set();
+      for (const importer of Object.values(importers)) {
+        for (const depType of types_1.DEPENDENCIES_FIELDS) {
+          for (let [depName, ref] of Object.entries(importer[depType] ?? {})) {
+            if (ref["version"]) {
+              ref = ref["version"];
+            }
+            const suffixStart = ref.indexOf("(");
+            const refWithoutPeerSuffix = suffixStart === -1 ? ref : ref.slice(0, suffixStart);
+            const depPath = refToRelative(refWithoutPeerSuffix, depName);
+            if (!depPath)
+              continue;
+            rootDepPaths.add(depPath);
+          }
+        }
+      }
+      return (0, pickBy_1.default)((_, depPath) => rootDepPaths.has(depPath), time);
+    }
+    function refToRelative(reference, pkgName) {
+      if (reference.startsWith("link:")) {
+        return null;
+      }
+      if (reference.startsWith("file:")) {
+        return reference;
+      }
+      if (!reference.includes("/") || !reference.replace(/(\([^)]+\))+$/, "").includes("/")) {
+        return `/${pkgName}@${reference}`;
+      }
+      return reference;
+    }
     function pruneTime(time, importers) {
       const rootDepPaths = /* @__PURE__ */ new Set();
       for (const importer of Object.values(importers)) {
@@ -108393,7 +108605,7 @@ var require_write = __commonJS({
         return;
       }
       const forceSharedFormat = opts?.forceSharedFormat === true;
-      const wantedLockfileToStringify = opts.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
+      const wantedLockfileToStringify = Boolean(opts.useInlineSpecifiersFormat) || opts.wantedLockfile.lockfileVersion.toString().startsWith("6.") ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
       const normalizeOpts = {
         forceSharedFormat,
         includeEmptySpecifiersField: !opts.useInlineSpecifiersFormat
@@ -108757,13 +108969,17 @@ var require_read = __commonJS({
       if (lockfileFile) {
         const lockfile = (0, inlineSpecifiersLockfileConverters_1.revertFromInlineSpecifiersFormatIfNecessary)(convertFromLockfileFileMutable(lockfileFile));
         const lockfileSemver = (0, comver_to_semver_1.default)((lockfile.lockfileVersion ?? 0).toString());
-        if (typeof opts.wantedVersion !== "number" || semver_12.default.major(lockfileSemver) === semver_12.default.major((0, comver_to_semver_1.default)(opts.wantedVersion.toString()))) {
-          if (typeof opts.wantedVersion === "number" && semver_12.default.gt(lockfileSemver, (0, comver_to_semver_1.default)(opts.wantedVersion.toString()))) {
+        if (!opts.wantedVersions || opts.wantedVersions.length === 0 || opts.wantedVersions.some((wantedVersion) => {
+          if (semver_12.default.major(lockfileSemver) !== semver_12.default.major((0, comver_to_semver_1.default)(wantedVersion)))
+            return false;
+          if (semver_12.default.gt(lockfileSemver, (0, comver_to_semver_1.default)(wantedVersion))) {
             logger_1.lockfileLogger.warn({
-              message: `Your ${constants_1.WANTED_LOCKFILE} was generated by a newer version of pnpm. It is a compatible version but it might get downgraded to version ${opts.wantedVersion}`,
+              message: `Your ${constants_1.WANTED_LOCKFILE} was generated by a newer version of pnpm. It is a compatible version but it might get downgraded to version ${wantedVersion}`,
               prefix
             });
           }
+          return true;
+        })) {
           return { lockfile, hadConflicts };
         }
       }
@@ -114814,7 +115030,13 @@ var require_config2 = __commonJS({
       }
       switch (params[0]) {
         case "set": {
-          return (0, configSet_1.configSet)(opts, params[1], params[2] ?? "");
+          let [key, value] = params.slice(1);
+          if (value == null) {
+            const parts = key.split("=");
+            key = parts.shift();
+            value = parts.join("=");
+          }
+          return (0, configSet_1.configSet)(opts, key, value ?? "");
         }
         case "get": {
           return (0, configGet_1.configGet)(opts, params[1]);
@@ -115797,6 +116019,7 @@ var require_connectStoreController = __commonJS({
           close: async () => {
           },
           fetchPackage: fetchPackage.bind(null, remotePrefix, limitedFetch),
+          getFilesIndexFilePath: () => ({ filesIndexFile: "", target: "" }),
           importPackage: async (to, opts) => {
             return limitedFetch(`${remotePrefix}/importPackage`, {
               opts,
@@ -116838,7 +117061,14 @@ var require_packageRequester = __commonJS({
         resolve: opts.resolve,
         storeDir: opts.storeDir
       });
-      return Object.assign(requestPackage, { fetchPackageToStore, requestPackage });
+      return Object.assign(requestPackage, {
+        fetchPackageToStore,
+        getFilesIndexFilePath: getFilesIndexFilePath.bind(null, {
+          getFilePathInCafs,
+          storeDir: opts.storeDir
+        }),
+        requestPackage
+      });
     }
     exports2.createPackageRequester = createPackageRequester;
     async function resolveAndFetch(ctx, wantedDependency, options) {
@@ -116919,6 +117149,7 @@ var require_packageRequester = __commonJS({
       const fetchResult = ctx.fetchPackageToStore({
         fetchRawManifest: true,
         force: forceFetch,
+        ignoreScripts: options.ignoreScripts,
         lockfileDir: options.lockfileDir,
         pkg: {
           ...pkg,
@@ -116946,18 +117177,22 @@ var require_packageRequester = __commonJS({
         finishing: fetchResult.finishing
       };
     }
+    function getFilesIndexFilePath(ctx, opts) {
+      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id);
+      const target = path_1.default.join(ctx.storeDir, targetRelative);
+      const filesIndexFile = opts.pkg.resolution["integrity"] ? ctx.getFilePathInCafs(opts.pkg.resolution["integrity"], "index") : path_1.default.join(target, opts.ignoreScripts ? "integrity-not-built.json" : "integrity.json");
+      return { filesIndexFile, target };
+    }
     function fetchToStore(ctx, opts) {
       if (!opts.pkg.name) {
         opts.fetchRawManifest = true;
       }
-      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id);
-      const target = path_1.default.join(ctx.storeDir, targetRelative);
       if (!ctx.fetchingLocker.has(opts.pkg.id)) {
         const bundledManifest = (0, p_defer_1.default)();
         const files = (0, p_defer_1.default)();
         const finishing = (0, p_defer_1.default)();
-        const filesIndexFile = opts.pkg.resolution["integrity"] ? ctx.getFilePathInCafs(opts.pkg.resolution["integrity"], "index") : path_1.default.join(target, "integrity.json");
-        doFetchToStore(filesIndexFile, bundledManifest, files, finishing);
+        const { filesIndexFile, target } = getFilesIndexFilePath(ctx, opts);
+        doFetchToStore(filesIndexFile, bundledManifest, files, finishing, target);
         if (opts.fetchRawManifest) {
           ctx.fetchingLocker.set(opts.pkg.id, {
             bundledManifest: removeKeyOnFail(bundledManifest.promise),
@@ -117022,7 +117257,7 @@ var require_packageRequester = __commonJS({
           throw err;
         }
       }
-      async function doFetchToStore(filesIndexFile, bundledManifest, files, finishing) {
+      async function doFetchToStore(filesIndexFile, bundledManifest, files, finishing, target) {
         try {
           const isLocalTarballDep = opts.pkg.id.startsWith("file:");
           const isLocalPkg = opts.pkg.resolution.type === "directory";
@@ -117288,6 +117523,7 @@ var require_storeController = __commonJS({
         close: async () => {
         },
         fetchPackage: packageRequester.fetchPackageToStore,
+        getFilesIndexFilePath: packageRequester.getFilesIndexFilePath,
         importPackage: cafs.importPackage,
         prune: prune_1.prune.bind(null, { storeDir, cacheDir: initOpts.cacheDir }),
         requestPackage: packageRequester.requestPackage,
@@ -117415,6 +117651,7 @@ var require_createNewStoreController = __commonJS({
         filterMetadata: fullMetadata,
         httpProxy: opts.httpProxy,
         httpsProxy: opts.httpsProxy,
+        ignoreScripts: opts.ignoreScripts,
         key: opts.key,
         localAddress: opts.localAddress,
         noProxy: opts.noProxy,
@@ -118367,9 +118604,10 @@ var require_readLockfiles = __commonJS({
     var clone_1 = __importDefault(require_clone3());
     var equals_1 = __importDefault(require_equals2());
     async function readLockfiles(opts) {
+      const wantedLockfileVersion = opts.useLockfileV6 ? constants_1.LOCKFILE_VERSION_V6 : constants_1.LOCKFILE_VERSION;
       const lockfileOpts = {
         ignoreIncompatible: opts.force || ci_info_1.isCI,
-        wantedVersion: constants_1.LOCKFILE_VERSION,
+        wantedVersions: [constants_1.LOCKFILE_VERSION.toString(), constants_1.LOCKFILE_VERSION_V6],
         useGitBranchLockfile: opts.useGitBranchLockfile,
         mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles
       };
@@ -118414,7 +118652,7 @@ var require_readLockfiles = __commonJS({
         }
       })());
       const files = await Promise.all(fileReads);
-      const sopts = { lockfileVersion: constants_1.LOCKFILE_VERSION };
+      const sopts = { lockfileVersion: wantedLockfileVersion };
       const importerIds = opts.projects.map((importer) => importer.id);
       const currentLockfile = files[1] ?? (0, lockfile_file_1.createLockfileObject)(importerIds, sopts);
       for (const importerId of importerIds) {
@@ -118553,7 +118791,8 @@ var require_lib101 = __commonJS({
           useLockfile: opts.useLockfile,
           useGitBranchLockfile: opts.useGitBranchLockfile,
           mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
-          virtualStoreDir
+          virtualStoreDir,
+          useLockfileV6: opts.useLockfileV6
         })
       };
       core_loggers_1.contextLogger.debug({
@@ -118725,7 +118964,8 @@ var require_lib101 = __commonJS({
           useLockfile: opts.useLockfile,
           useGitBranchLockfile: opts.useGitBranchLockfile,
           mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
-          virtualStoreDir
+          virtualStoreDir,
+          useLockfileV6: opts.useLockfileV6
         })
       };
       core_loggers_1.packageManifestLogger.debug({
@@ -128310,6 +128550,7 @@ var require_lockfileToDepGraph = __commonJS({
             fetchResponse = opts.storeController.fetchPackage({
               force: false,
               lockfileDir: opts.lockfileDir,
+              ignoreScripts: opts.ignoreScripts,
               pkg: {
                 id: packageId,
                 resolution
@@ -169230,17 +169471,23 @@ var require_lockfileToHoistedDepGraph = __commonJS({
         const resolution = (0, lockfile_utils_1.pkgSnapshotToResolution)(depPath, pkgSnapshot, opts.registries);
         let fetchResponse;
         const skipFetch = opts.currentHoistedLocations?.[depPath]?.includes(depLocation);
+        const pkgResolution = {
+          id: packageId,
+          resolution
+        };
         if (skipFetch) {
-          fetchResponse = {};
+          const { filesIndexFile } = opts.storeController.getFilesIndexFilePath({
+            ignoreScripts: opts.ignoreScripts,
+            pkg: pkgResolution
+          });
+          fetchResponse = { filesIndexFile };
         } else {
           try {
             fetchResponse = opts.storeController.fetchPackage({
               force: false,
               lockfileDir: opts.lockfileDir,
-              pkg: {
-                id: packageId,
-                resolution
-              },
+              ignoreScripts: opts.ignoreScripts,
+              pkg: pkgResolution,
               expectedPkg: {
                 name: pkgName,
                 version: pkgVersion
@@ -170233,7 +170480,7 @@ var require_depPathToRef = __commonJS({
       }
       if (depPath[0] === "/" && opts.alias === opts.realName) {
         const ref = depPath.replace(`/${opts.realName}/`, "");
-        if (!ref.includes("/"))
+        if (!ref.includes("/") || !ref.replace(/(\([^)]+\))+$/, "").includes("/"))
           return ref;
       }
       return depPath;
@@ -173428,6 +173675,7 @@ var require_resolveDependencies = __commonJS({
           } : void 0,
           expectedPkg: currentPkg,
           defaultTag: ctx.defaultTag,
+          ignoreScripts: ctx.ignoreScripts,
           publishedBy: options.publishedBy,
           pickLowestVersion: options.pickLowestVersion,
           downloadPriority: -options.currentDepth,
@@ -173793,6 +174041,7 @@ var require_resolveDependencyTree = __commonJS({
         engineStrict: opts.engineStrict,
         force: opts.force,
         forceFullResolution: opts.forceFullResolution,
+        ignoreScripts: opts.ignoreScripts,
         linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? -1,
         lockfileDir: opts.lockfileDir,
         nodeVersion: opts.nodeVersion,
@@ -182630,7 +182879,8 @@ var require_resolvePeers = __commonJS({
           peerDependencyIssues,
           purePkgs: /* @__PURE__ */ new Set(),
           rootDir,
-          virtualStoreDir: opts.virtualStoreDir
+          virtualStoreDir: opts.virtualStoreDir,
+          useLockfileV6: opts.useLockfileV6
         });
         if (!(0, isEmpty_1.default)(peerDependencyIssues.bad) || !(0, isEmpty_1.default)(peerDependencyIssues.missing)) {
           peerDependencyIssuesByProjects[id] = {
@@ -182732,7 +182982,7 @@ var require_resolvePeers = __commonJS({
       if ((0, isEmpty_1.default)(allResolvedPeers)) {
         depPath = resolvedPackage.depPath;
       } else {
-        const peersFolderSuffix = (0, dependency_path_1.createPeersFolderSuffix)(Object.entries(allResolvedPeers).map(([alias, nodeId2]) => {
+        const peersFolderSuffix = (ctx.useLockfileV6 ? dependency_path_1.createPeersFolderSuffixNewFormat : dependency_path_1.createPeersFolderSuffix)(Object.entries(allResolvedPeers).map(([alias, nodeId2]) => {
           if (nodeId2.startsWith("link:")) {
             const linkedDir = nodeId2.slice(5);
             return {
@@ -183703,7 +183953,8 @@ var require_lib128 = __commonJS({
         lockfileDir: opts.lockfileDir,
         projects: projectsToLink,
         virtualStoreDir: opts.virtualStoreDir,
-        resolvePeersFromWorkspaceRoot: Boolean(opts.resolvePeersFromWorkspaceRoot)
+        resolvePeersFromWorkspaceRoot: Boolean(opts.resolvePeersFromWorkspaceRoot),
+        useLockfileV6: Boolean(opts.useLockfileV6)
       });
       for (const { id, manifest } of projectsToLink) {
         for (const [alias, depPath] of Object.entries(dependenciesByProjectId[id])) {
@@ -185554,7 +185805,8 @@ var require_extendInstallOptions = __commonJS({
         modulesCacheMaxAge: 7 * 24 * 60,
         resolveSymlinksInInjectedDirs: false,
         dedupeDirectDeps: false,
-        resolvePeersFromWorkspaceRoot: false
+        resolvePeersFromWorkspaceRoot: false,
+        useLockfileV6: false
       };
     };
     async function extendOptions(opts) {
@@ -186157,7 +186409,7 @@ var require_install = __commonJS({
           onlyBuiltDependencies: opts.onlyBuiltDependencies,
           packageExtensionsChecksum,
           patchedDependencies
-        }) || opts.fixLockfile;
+        }) || opts.fixLockfile || opts.useLockfileV6 && !ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.");
         if (needsFullResolution) {
           ctx.wantedLockfile.overrides = opts.overrides;
           ctx.wantedLockfile.neverBuiltDependencies = opts.neverBuiltDependencies;
@@ -186509,6 +186761,7 @@ var require_install = __commonJS({
         engineStrict: opts.engineStrict,
         force: opts.force,
         forceFullResolution,
+        ignoreScripts: opts.ignoreScripts,
         hooks: {
           readPackage: opts.readPackageHook
         },
@@ -186530,7 +186783,8 @@ var require_install = __commonJS({
         workspacePackages: opts.workspacePackages,
         patchedDependencies: opts.patchedDependencies,
         lockfileIncludeTarballUrl: opts.lockfileIncludeTarballUrl,
-        resolvePeersFromWorkspaceRoot: opts.resolvePeersFromWorkspaceRoot
+        resolvePeersFromWorkspaceRoot: opts.resolvePeersFromWorkspaceRoot,
+        useLockfileV6: opts.useLockfileV6
       });
       if (!opts.include.optionalDependencies || !opts.include.devDependencies || !opts.include.dependencies) {
         linkedDependenciesByProjectId = (0, map_1.default)((linkedDeps) => linkedDeps.filter((linkedDep) => !(linkedDep.dev && !opts.include.devDependencies || linkedDep.optional && !opts.include.optionalDependencies || !linkedDep.dev && !linkedDep.optional && !opts.include.dependencies)), linkedDependenciesByProjectId ?? {});
@@ -186551,7 +186805,11 @@ var require_install = __commonJS({
       });
       newLockfile = opts.hooks?.afterAllResolved != null ? await (0, pipeWith_1.default)(async (f, res) => f(await res), opts.hooks.afterAllResolved)(newLockfile) : newLockfile;
       if (opts.updateLockfileMinorVersion) {
-        newLockfile.lockfileVersion = constants_1.LOCKFILE_VERSION;
+        if (opts.useLockfileV6 || newLockfile.lockfileVersion.toString().startsWith("6.")) {
+          newLockfile.lockfileVersion = constants_1.LOCKFILE_VERSION_V6;
+        } else {
+          newLockfile.lockfileVersion = constants_1.LOCKFILE_VERSION;
+        }
       }
       const depsStateCache = {};
       const lockfileOpts = {
@@ -188254,6 +188512,7 @@ var require_install2 = __commonJS({
         "only",
         "optional",
         "unsafe-perm",
+        "use-lockfile-v6",
         "use-running-store-server",
         "use-store-server",
         "verify-store-integrity",
@@ -212161,9 +212420,15 @@ var require_makeEnv = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.makeEnv = void 0;
+    var error_1 = require_lib8();
     var path_1 = __importDefault(require("path"));
     var path_name_1 = __importDefault(require_path_name());
     function makeEnv(opts) {
+      for (const prependPath of opts.prependPaths) {
+        if (prependPath.includes(path_1.default.delimiter)) {
+          throw new error_1.PnpmError("BAD_PATH_DIR", `Cannot add ${prependPath} to PATH because it contains the path delimiter character (${path_1.default.delimiter})`);
+        }
+      }
       return {
         ...process.env,
         ...opts.extraEnv,
@@ -212839,7 +213104,6 @@ var require_exec = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.handler = exports2.getResumedPackageChunks = exports2.help = exports2.cliOptionsTypes = exports2.rcOptionsTypes = exports2.commandNames = exports2.shorthands = void 0;
-    var path_1 = __importDefault(require("path"));
     var cli_utils_1 = require_lib27();
     var config_1 = require_lib21();
     var lifecycle_1 = require_lib57();
@@ -212969,7 +213233,7 @@ var require_exec = __commonJS({
                 PNPM_PACKAGE_NAME: opts.selectedProjectsGraph[prefix]?.package.manifest.name
               },
               prependPaths: [
-                path_1.default.join(prefix, "node_modules/.bin"),
+                "./node_modules/.bin",
                 ...opts.extraBinPaths
               ],
               userAgent: opts.userAgent
@@ -212995,7 +213259,9 @@ var require_exec = __commonJS({
               });
               return;
             }
-            err["code"] = "ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL";
+            if (!err["code"]?.startsWith("ERR_PNPM_")) {
+              err["code"] = "ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL";
+            }
             err["prefix"] = prefix;
             throw err;
           }

package/package.json

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