pnpm 7.24.0 → 7.24.2

package/dist/node_modules/.modules.yaml

@@ -200,11 +200,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.23.0
+packageManager: pnpm@7.24.1
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Mon, 09 Jan 2023 17:57:23 GMT
+prunedAt: Tue, 10 Jan 2023 12:16:25 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.24.0" != null && true ? "7.24.0" : "0.0.0"
+      version: "7.24.2" != null && true ? "7.24.2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -107165,7 +107165,7 @@ var require_lib76 = __commonJS({
       if (relDepPath[0] !== "/") {
         return null;
       }
-      const sepIndex = relDepPath.indexOf("(", relDepPath.lastIndexOf("/"));
+      const sepIndex = relDepPath.indexOf("(");
       if (sepIndex !== -1) {
         return resolve(registries, relDepPath.slice(0, sepIndex));
       }
@@ -108461,10 +108461,11 @@ var require_write = __commonJS({
       if (isEmptyLockfile(wantedLockfile)) {
         return (0, rimraf_1.default)(lockfilePath);
       }
-      const lockfileToStringify = Boolean(opts?.useInlineSpecifiersFormat) || wantedLockfile["lockfileVersion"].toString().startsWith("6.") ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
+      const isLockfileV6 = wantedLockfile["lockfileVersion"].toString().startsWith("6.");
+      const lockfileToStringify = Boolean(opts?.useInlineSpecifiersFormat) || isLockfileV6 ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
       const yamlDoc = yamlStringify(lockfileToStringify, {
         forceSharedFormat: opts?.forceSharedFormat === true,
-        includeEmptySpecifiersField: !opts?.useInlineSpecifiersFormat
+        includeEmptySpecifiersField: !opts?.useInlineSpecifiersFormat && !isLockfileV6
       });
       return writeFileAtomic(lockfilePath, yamlDoc);
     }
@@ -108605,10 +108606,11 @@ var require_write = __commonJS({
         return;
       }
       const forceSharedFormat = opts?.forceSharedFormat === true;
-      const wantedLockfileToStringify = Boolean(opts.useInlineSpecifiersFormat) || opts.wantedLockfile.lockfileVersion.toString().startsWith("6.") ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
+      const isLockfileV6 = opts.wantedLockfile.lockfileVersion.toString().startsWith("6.");
+      const wantedLockfileToStringify = Boolean(opts.useInlineSpecifiersFormat) || isLockfileV6 ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
       const normalizeOpts = {
         forceSharedFormat,
-        includeEmptySpecifiersField: !opts.useInlineSpecifiersFormat
+        includeEmptySpecifiersField: !opts.useInlineSpecifiersFormat && !isLockfileV6
       };
       const yamlDoc = yamlStringify(wantedLockfileToStringify, normalizeOpts);
       if (opts.wantedLockfile === opts.currentLockfile) {
@@ -108625,7 +108627,8 @@ var require_write = __commonJS({
         message: `\`${constants_1.WANTED_LOCKFILE}\` differs from \`${path_1.default.relative(opts.wantedLockfileDir, currentLockfilePath)}\``,
         prefix: opts.wantedLockfileDir
       });
-      const currentYamlDoc = yamlStringify(opts.currentLockfile, normalizeOpts);
+      const currentLockfileToStringify = Boolean(opts.useInlineSpecifiersFormat) || opts.wantedLockfile.lockfileVersion.toString().startsWith("6.") ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.currentLockfile) : opts.currentLockfile;
+      const currentYamlDoc = yamlStringify(currentLockfileToStringify, normalizeOpts);
       await Promise.all([
         writeFileAtomic(wantedLockfilePath, yamlDoc),
         (async () => {
@@ -186418,7 +186421,7 @@ var require_install = __commonJS({
           ctx.wantedLockfile.patchedDependencies = patchedDependencies;
         }
         const frozenLockfile = opts.frozenLockfile || opts.frozenLockfileIfExists && ctx.existsWantedLockfile;
-        if (!ctx.lockfileHadConflicts && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile && !opts.lockfileOnly || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === Object.keys(ctx.projects).length) && ctx.existsWantedLockfile && ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION && await (0, allProjectsAreUpToDate_1.allProjectsAreUpToDate)(Object.values(ctx.projects), {
+        if (!ctx.lockfileHadConflicts && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile && !opts.lockfileOnly || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === Object.keys(ctx.projects).length) && ctx.existsWantedLockfile && (ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION || ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION_V6) && await (0, allProjectsAreUpToDate_1.allProjectsAreUpToDate)(Object.values(ctx.projects), {
           autoInstallPeers: opts.autoInstallPeers,
           linkWorkspacePackages: opts.linkWorkspacePackagesDepth >= 0,
           wantedLockfile: ctx.wantedLockfile,
@@ -186465,7 +186468,7 @@ var require_install = __commonJS({
                   wantedLockfile: ctx.wantedLockfile,
                   wantedLockfileDir: ctx.lockfileDir,
                   forceSharedFormat: opts.forceSharedLockfile,
-                  useInlineSpecifiersFormat: opts.useInlineSpecifiersLockfileFormat,
+                  useInlineSpecifiersFormat: opts.useInlineSpecifiersLockfileFormat || opts.useLockfileV6,
                   useGitBranchLockfile: opts.useGitBranchLockfile,
                   mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles
                 });
@@ -186814,7 +186817,7 @@ var require_install = __commonJS({
       const depsStateCache = {};
       const lockfileOpts = {
         forceSharedFormat: opts.forceSharedLockfile,
-        useInlineSpecifiersFormat: opts.useInlineSpecifiersLockfileFormat,
+        useInlineSpecifiersFormat: opts.useInlineSpecifiersLockfileFormat || opts.useLockfileV6,
         useGitBranchLockfile: opts.useGitBranchLockfile,
         mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles
       };

package/package.json

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