pnpm 7.27.1 → 7.28.0-0

package/dist/node_modules/.modules.yaml

@@ -200,11 +200,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.27.0
+packageManager: pnpm@7.27.1
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Sat, 18 Feb 2023 02:16:44 GMT
+prunedAt: Mon, 20 Feb 2023 20:49:35 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: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "7.27.1" != null && true ? "7.27.1" : "0.0.0"
+      version: "7.28.0-0" != null && true ? "7.28.0-0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -45992,15 +45992,16 @@ var require_recursiveSummary = __commonJS({
     exports2.throwOnCommandFail = void 0;
     var error_1 = require_lib8();
     var RecursiveFailError = class extends error_1.PnpmError {
-      constructor(command, recursiveSummary) {
-        super("RECURSIVE_FAIL", `"${command}" failed in ${recursiveSummary.fails.length} packages`);
-        this.fails = recursiveSummary.fails;
-        this.passes = recursiveSummary.passes;
+      constructor(command, recursiveSummary, failures) {
+        super("RECURSIVE_FAIL", `"${command}" failed in ${failures.length} packages`);
+        this.failures = failures;
+        this.passes = Object.values(recursiveSummary).filter(({ status }) => status === "passed").length;
       }
     };
     function throwOnCommandFail(command, recursiveSummary) {
-      if (recursiveSummary.fails.length > 0) {
-        throw new RecursiveFailError(command, recursiveSummary);
+      const failures = Object.values(recursiveSummary).filter(({ status }) => status === "failure");
+      if (failures.length > 0) {
+        throw new RecursiveFailError(command, recursiveSummary, failures);
       }
     }
     exports2.throwOnCommandFail = throwOnCommandFail;
@@ -113593,7 +113594,8 @@ var require_getPkgInfo2 = __commonJS({
         license: manifest.license,
         author: manifest.author,
         homepage: manifest.homepage,
-        repository: (manifest.repository && (typeof manifest.repository === "string" ? manifest.repository : manifest.repository.url)) ?? void 0
+        repository: (manifest.repository && (typeof manifest.repository === "string" ? manifest.repository : manifest.repository.url)) ?? void 0,
+        path: pkg.path
       };
     }
     exports2.getPkgInfo = getPkgInfo;
@@ -113640,7 +113642,8 @@ var require_renderJson = __commonJS({
           alias: node.alias,
           from: node.name,
           version: node.version,
-          resolved: node.resolved
+          resolved: node.resolved,
+          path: node.path
         };
         if (Object.keys(subDependencies).length > 0) {
           dep.dependencies = subDependencies;
@@ -113807,6 +113810,9 @@ ${depsLabel}
           if (pkg.homepage) {
             labelLines.push(pkg.homepage);
           }
+          if (pkg.path) {
+            labelLines.push(pkg.path);
+          }
           return {
             label: labelLines.join("\n"),
             nodes
@@ -125993,7 +125999,7 @@ var require_implementation2 = __commonJS({
       const warn = (message2) => {
         logger_1.logger.info({ message: message2, prefix: opts.dir });
       };
-      const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath)).map((depPath) => async () => {
+      const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath) && !ctx.skipped.has(depPath)).map((depPath) => async () => {
         const pkgSnapshot = pkgSnapshots[depPath];
         const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
         const pkgRoots = opts.nodeLinker === "hoisted" ? (ctx.modulesFile?.hoistedLocations?.[depPath] ?? []).map((hoistedLocation) => path_1.default.join(opts.lockfileDir, hoistedLocation)) : [path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", pkgInfo.name)];
@@ -126200,10 +126206,7 @@ var require_recursive = __commonJS({
         storeDir: store.dir,
         workspacePackages
       });
-      const result2 = {
-        fails: [],
-        passes: 0
-      };
+      const result2 = {};
       const memReadLocalConfig = (0, mem_1.default)(config_1.readLocalConfig);
       async function getImporters() {
         const importers = [];
@@ -126237,6 +126240,7 @@ var require_recursive = __commonJS({
             if (opts.ignoredPackages?.has(rootDir)) {
               return;
             }
+            result2[rootDir] = { status: "running" };
             const localConfig = await memReadLocalConfig(rootDir);
             await rebuild([
               {
@@ -126254,15 +126258,16 @@ var require_recursive = __commonJS({
                 ...localConfig
               }
             });
-            result2.passes++;
+            result2[rootDir].status = "passed";
           } catch (err) {
             logger_1.logger.info(err);
             if (!opts.bail) {
-              result2.fails.push({
+              result2[rootDir] = {
+                status: "failure",
                 error: err,
                 message: err.message,
                 prefix: rootDir
-              });
+              };
               return;
             }
             err["prefix"] = rootDir;
@@ -176607,7 +176612,16 @@ var require_lib129 = __commonJS({
           storeDir: opts.storeDir,
           virtualStoreDir
         });
-        await (0, lockfile_file_1.writeCurrentLockfile)(virtualStoreDir, filteredLockfile);
+        if (opts.useLockfile) {
+          await (0, lockfile_file_1.writeLockfiles)({
+            wantedLockfileDir: opts.lockfileDir,
+            currentLockfileDir: virtualStoreDir,
+            wantedLockfile,
+            currentLockfile: filteredLockfile
+          });
+        } else {
+          await (0, lockfile_file_1.writeCurrentLockfile)(virtualStoreDir, filteredLockfile);
+        }
       }
       await Promise.all(depNodes.map(({ finishing }) => finishing));
       core_loggers_1.summaryLogger.debug({ prefix: lockfileDir });
@@ -180501,7 +180515,9 @@ var require_resolveDependencies = __commonJS({
       return missingPeers;
     }
     function pkgIsLeaf(pkg) {
-      return (0, isEmpty_1.default)(pkg.dependencies ?? {}) && (0, isEmpty_1.default)(pkg.optionalDependencies ?? {}) && (0, isEmpty_1.default)(pkg.peerDependencies ?? {});
+      return (0, isEmpty_1.default)(pkg.dependencies ?? {}) && (0, isEmpty_1.default)(pkg.optionalDependencies ?? {}) && (0, isEmpty_1.default)(pkg.peerDependencies ?? {}) && // Package manifests can declare peerDependenciesMeta without declaring
+      // peerDependencies. peerDependenciesMeta implies the later.
+      (0, isEmpty_1.default)(pkg.peerDependenciesMeta ?? {});
     }
     function getResolvedPackage(options) {
       const peerDependencies = peerDependenciesWithoutOwn(options.pkg);
@@ -193281,6 +193297,7 @@ var require_install = __commonJS({
             });
           }
           if (opts.lockfileOnly) {
+            await (0, lockfile_file_1.writeWantedLockfile)(ctx.lockfileDir, ctx.wantedLockfile);
             return projects.map((mutatedProject) => ctx.projects[mutatedProject.rootDir]);
           }
           if (!ctx.existsWantedLockfile) {
@@ -194558,10 +194575,7 @@ var require_recursive2 = __commonJS({
         forceHoistPattern: typeof opts.rawLocalConfig?.["hoist-pattern"] !== "undefined" || typeof opts.rawLocalConfig?.["hoist"] !== "undefined",
         forceShamefullyHoist: typeof opts.rawLocalConfig?.["shamefully-hoist"] !== "undefined"
       });
-      const result2 = {
-        fails: [],
-        passes: 0
-      };
+      const result2 = {};
       const memReadLocalConfig = (0, mem_1.default)(config_1.readLocalConfig);
       const updateToLatest = opts.update && opts.latest;
       const includeDirect = opts.includeDirect ?? {
@@ -194708,6 +194722,7 @@ var require_recursive2 = __commonJS({
           if (opts.ignoredPackages?.has(rootDir)) {
             return;
           }
+          result2[rootDir] = { status: "running" };
           const { manifest, writeProjectManifest } = manifestsByPath[rootDir];
           let currentInput = [...params];
           if (updateMatch != null) {
@@ -194774,15 +194789,16 @@ var require_recursive2 = __commonJS({
           if (opts.save !== false) {
             await writeProjectManifest(newManifest);
           }
-          result2.passes++;
+          result2[rootDir].status = "passed";
         } catch (err) {
           logger_1.logger.info(err);
           if (!opts.bail) {
-            result2.fails.push({
+            result2[rootDir] = {
+              status: "failure",
               error: err,
               message: err.message,
               prefix: rootDir
-            });
+            };
             return;
           }
           err["prefix"] = rootDir;
@@ -194796,7 +194812,7 @@ var require_recursive2 = __commonJS({
         }, []);
       }
       throwOnFail(result2);
-      if (!result2.passes && cmdFullName === "update" && opts.depth === 0) {
+      if (!Object.values(result2).filter(({ status }) => status === "passed").length && cmdFullName === "update" && opts.depth === 0) {
         throw new error_1.PnpmError("NO_PACKAGE_IN_DEPENDENCIES", "None of the specified packages were found in the dependencies of any of the projects.");
       }
       return true;
@@ -219102,10 +219118,6 @@ var require_runRecursive = __commonJS({
           selectedProjectsGraph: opts.selectedProjectsGraph
         });
       }
-      const result2 = {
-        fails: [],
-        passes: 0
-      };
       const limitRun = (0, p_limit_12.default)(opts.workspaceConcurrency ?? 4);
       const stdio = !opts.stream && (opts.workspaceConcurrency === 1 || packageChunks.length === 1 && packageChunks[0].length === 1) ? "inherit" : "pipe";
       const existsPnp = existsInDir_1.existsInDir.bind(null, ".pnp.cjs");
@@ -219117,6 +219129,7 @@ var require_runRecursive = __commonJS({
           throw new error_1.PnpmError("RECURSIVE_RUN_NO_SCRIPT", `Missing script "${scriptName}" in packages: ${missingScriptPackages.join(", ")}`);
         }
       }
+      const result2 = (0, exec_1.createEmptyRecursiveSummary)(packageChunks);
       for (const chunk of packageChunks) {
         const selectedScripts = chunk.map((prefix) => {
           const pkg = opts.selectedProjectsGraph[prefix];
@@ -219128,6 +219141,8 @@ var require_runRecursive = __commonJS({
           if (!pkg.package.manifest.scripts?.[scriptName2] || process.env.npm_lifecycle_event === scriptName2 && process.env.PNPM_SCRIPT_SRC_DIR === prefix) {
             return;
           }
+          result2[prefix].status = "running";
+          const startTime = process.hrtime();
           hasCommand++;
           try {
             const lifecycleOpts = {
@@ -219153,19 +219168,26 @@ var require_runRecursive = __commonJS({
             }
             const _runScript = run_1.runScript.bind(null, { manifest: pkg.package.manifest, lifecycleOpts, runScriptOptions: { enablePrePostScripts: opts.enablePrePostScripts ?? false }, passedThruArgs });
             await _runScript(scriptName2);
-            result2.passes++;
+            result2[prefix].status = "passed";
+            result2[prefix].duration = (0, exec_1.getExecutionDuration)(startTime);
           } catch (err) {
             logger_1.logger.info(err);
+            result2[prefix] = {
+              status: "failure",
+              duration: (0, exec_1.getExecutionDuration)(startTime),
+              error: err,
+              message: err.message,
+              prefix
+            };
             if (!opts.bail) {
-              result2.fails.push({
-                error: err,
-                message: err.message,
-                prefix
-              });
               return;
             }
             err["code"] = "ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL";
             err["prefix"] = prefix;
+            opts.reportSummary && await (0, exec_1.writeRecursiveSummary)({
+              dir: opts.workspaceDir ?? opts.dir,
+              summary: result2
+            });
             throw err;
           }
         })));
@@ -219181,6 +219203,10 @@ var require_runRecursive = __commonJS({
           });
         }
       }
+      opts.reportSummary && await (0, exec_1.writeRecursiveSummary)({
+        dir: opts.workspaceDir ?? opts.dir,
+        summary: result2
+      });
       (0, cli_utils_1.throwOnCommandFail)("pnpm recursive run", result2);
     }
     exports2.runRecursive = runRecursive;
@@ -219207,7 +219233,7 @@ var require_run = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.runScript = exports2.handler = exports2.help = exports2.commandNames = exports2.completion = exports2.cliOptionsTypes = exports2.rcOptionsTypes = exports2.shorthands = exports2.SEQUENTIAL_OPTION_HELP = exports2.RESUME_FROM_OPTION_HELP = exports2.PARALLEL_OPTION_HELP = exports2.IF_PRESENT_OPTION_HELP = exports2.IF_PRESENT_OPTION = void 0;
+    exports2.runScript = exports2.handler = exports2.help = exports2.commandNames = exports2.completion = exports2.cliOptionsTypes = exports2.rcOptionsTypes = exports2.shorthands = exports2.REPORT_SUMMARY_OPTION_HELP = exports2.SEQUENTIAL_OPTION_HELP = exports2.RESUME_FROM_OPTION_HELP = exports2.PARALLEL_OPTION_HELP = exports2.IF_PRESENT_OPTION_HELP = exports2.IF_PRESENT_OPTION = void 0;
     var path_1 = __importDefault3(require("path"));
     var p_limit_12 = __importDefault3(require_p_limit());
     var cli_utils_1 = require_lib27();
@@ -219240,6 +219266,10 @@ var require_run = __commonJS({
       description: "Run the specified scripts one by one",
       name: "--sequential"
     };
+    exports2.REPORT_SUMMARY_OPTION_HELP = {
+      description: 'Save the execution results of every package to "pnpm-exec-summary.json". Useful to inspect the execution time and status of each package.',
+      name: "--report-summary"
+    };
     exports2.shorthands = {
       parallel: [
         "--workspace-concurrency=Infinity",
@@ -219273,7 +219303,8 @@ var require_run = __commonJS({
         ...exports2.IF_PRESENT_OPTION,
         recursive: Boolean,
         reverse: Boolean,
-        "resume-from": String
+        "resume-from": String,
+        "report-summary": Boolean
       };
     }
     exports2.cliOptionsTypes = cliOptionsTypes;
@@ -219307,7 +219338,8 @@ var require_run = __commonJS({
               exports2.PARALLEL_OPTION_HELP,
               exports2.RESUME_FROM_OPTION_HELP,
               ...common_cli_options_help_1.UNIVERSAL_OPTIONS,
-              exports2.SEQUENTIAL_OPTION_HELP
+              exports2.SEQUENTIAL_OPTION_HELP,
+              exports2.REPORT_SUMMARY_OPTION_HELP
             ]
           },
           common_cli_options_help_1.FILTERING
@@ -219496,7 +219528,8 @@ var require_exec = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.handler = exports2.getResumedPackageChunks = exports2.help = exports2.cliOptionsTypes = exports2.rcOptionsTypes = exports2.commandNames = exports2.shorthands = void 0;
+    exports2.handler = exports2.getExecutionDuration = exports2.createEmptyRecursiveSummary = exports2.writeRecursiveSummary = exports2.getResumedPackageChunks = exports2.help = exports2.cliOptionsTypes = exports2.rcOptionsTypes = exports2.commandNames = exports2.shorthands = void 0;
+    var path_1 = __importDefault3(require("path"));
     var cli_utils_1 = require_lib27();
     var config_1 = require_lib21();
     var lifecycle_1 = require_lib58();
@@ -219511,6 +219544,7 @@ var require_exec = __commonJS({
     var makeEnv_1 = require_makeEnv();
     var run_1 = require_run();
     var error_1 = require_lib8();
+    var write_json_file_1 = __importDefault3(require_write_json_file());
     exports2.shorthands = {
       parallel: run_1.shorthands.parallel,
       c: "--shell-mode"
@@ -219526,7 +219560,8 @@ var require_exec = __commonJS({
           "workspace-concurrency"
         ], config_1.types),
         "shell-mode": Boolean,
-        "resume-from": String
+        "resume-from": String,
+        "report-summary": Boolean
       };
     }
     exports2.rcOptionsTypes = rcOptionsTypes;
@@ -219554,7 +219589,8 @@ var require_exec = __commonJS({
                 name: "--shell-mode",
                 shortAlias: "-c"
               },
-              run_1.RESUME_FROM_OPTION_HELP
+              run_1.RESUME_FROM_OPTION_HELP,
+              run_1.REPORT_SUMMARY_OPTION_HELP
             ]
           }
         ],
@@ -219572,15 +219608,29 @@ var require_exec = __commonJS({
       return chunks.slice(chunkPosition);
     }
     exports2.getResumedPackageChunks = getResumedPackageChunks;
+    async function writeRecursiveSummary(opts) {
+      await (0, write_json_file_1.default)(path_1.default.join(opts.dir, "pnpm-exec-summary.json"), {
+        executionStatus: opts.summary
+      });
+    }
+    exports2.writeRecursiveSummary = writeRecursiveSummary;
+    function createEmptyRecursiveSummary(chunks) {
+      return chunks.flat().reduce((acc, prefix) => {
+        acc[prefix] = { status: "queued" };
+        return acc;
+      }, {});
+    }
+    exports2.createEmptyRecursiveSummary = createEmptyRecursiveSummary;
+    function getExecutionDuration(start) {
+      const end = process.hrtime(start);
+      return (end[0] * 1e9 + end[1]) / 1e6;
+    }
+    exports2.getExecutionDuration = getExecutionDuration;
     async function handler(opts, params) {
       if (params[0] === "--") {
         params.shift();
       }
       const limitRun = (0, p_limit_12.default)(opts.workspaceConcurrency ?? 4);
-      const result2 = {
-        fails: [],
-        passes: 0
-      };
       let chunks;
       if (opts.recursive) {
         chunks = opts.sort ? (0, sort_packages_1.sortPackages)(opts.selectedProjectsGraph) : [Object.keys(opts.selectedProjectsGraph).sort()];
@@ -219609,11 +219659,14 @@ var require_exec = __commonJS({
           selectedProjectsGraph: opts.selectedProjectsGraph
         });
       }
+      const result2 = createEmptyRecursiveSummary(chunks);
       const existsPnp = existsInDir_1.existsInDir.bind(null, ".pnp.cjs");
       const workspacePnpPath = opts.workspaceDir && await existsPnp(opts.workspaceDir);
       let exitCode = 0;
       for (const chunk of chunks) {
         await Promise.all(chunk.map(async (prefix) => limitRun(async () => {
+          result2[prefix].status = "running";
+          const startTime = process.hrtime();
           try {
             const pnpPath = workspacePnpPath ?? await existsPnp(prefix);
             const extraEnv = {
@@ -219637,29 +219690,40 @@ var require_exec = __commonJS({
               stdio: "inherit",
               shell: opts.shellMode ?? false
             });
-            result2.passes++;
+            result2[prefix].status = "passed";
+            result2[prefix].duration = getExecutionDuration(startTime);
           } catch (err) {
             if (!opts.recursive && typeof err.exitCode === "number") {
               exitCode = err.exitCode;
               return;
             }
             logger_1.logger.info(err);
+            result2[prefix] = {
+              status: "failure",
+              duration: getExecutionDuration(startTime),
+              error: err,
+              message: err.message,
+              prefix
+            };
             if (!opts.bail) {
-              result2.fails.push({
-                error: err,
-                message: err.message,
-                prefix
-              });
               return;
             }
             if (!err["code"]?.startsWith("ERR_PNPM_")) {
               err["code"] = "ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL";
             }
             err["prefix"] = prefix;
+            opts.reportSummary && await writeRecursiveSummary({
+              dir: opts.lockfileDir ?? opts.dir,
+              summary: result2
+            });
             throw err;
           }
         })));
       }
+      opts.reportSummary && await writeRecursiveSummary({
+        dir: opts.lockfileDir ?? opts.dir,
+        summary: result2
+      });
       (0, cli_utils_1.throwOnCommandFail)("pnpm recursive exec", result2);
       return { exitCode };
     }

package/package.json

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