pnpm 7.18.0 → 7.18.2

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.17.1
+packageManager: pnpm@7.18.1
 pendingBuilds:
   - /node-gyp/9.3.0
   - /encoding/0.1.13
-prunedAt: Sat, 03 Dec 2022 22:25:22 GMT
+prunedAt: Mon, 12 Dec 2022 12:21:10 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.18.0" != null && true ? "7.18.0" : "0.0.0"
+      version: "7.18.2" != null && true ? "7.18.2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -44220,14 +44220,15 @@ var require_reportUpdateCheck = __commonJS({
     var semver_12 = __importDefault(require_semver2());
     function reportUpdateCheck(log$, opts) {
       return log$.pipe((0, operators_1.take)(1), (0, operators_1.filter)((log2) => semver_12.default.gt(log2.latestVersion, log2.currentVersion)), (0, operators_1.map)((log2) => {
-        const updateCommand = renderUpdateCommand({
+        const updateMessage = renderUpdateMessage({
+          currentPkgIsExecutable: detectIfCurrentPkgIsExecutable(opts.process),
           latestVersion: log2.latestVersion,
           env: opts.env
         });
         return Rx.of({
           msg: (0, boxen_1.default)(`Update available! ${chalk_1.default.red(log2.currentVersion)} \u2192 ${chalk_1.default.green(log2.latestVersion)}.
 ${chalk_1.default.magenta("Changelog:")} https://github.com/pnpm/pnpm/releases/tag/v${log2.latestVersion}
-Run "${chalk_1.default.magenta(updateCommand)}" to update.
+${updateMessage}
 
 Follow ${chalk_1.default.magenta("@pnpmjs")} for updates: https://twitter.com/pnpmjs`, {
             padding: 1,
@@ -44240,13 +44241,23 @@ Follow ${chalk_1.default.magenta("@pnpmjs")} for updates: https://twitter.com/pn
       }));
     }
     exports2.reportUpdateCheck = reportUpdateCheck;
+    function renderUpdateMessage(opts) {
+      if (opts.currentPkgIsExecutable && opts.env.PNPM_HOME) {
+        return "Run a script from: https://pnpm.io/installation";
+      }
+      const updateCommand = renderUpdateCommand(opts);
+      return `Run "${chalk_1.default.magenta(updateCommand)}" to update.`;
+    }
     function renderUpdateCommand(opts) {
       if (opts.env.COREPACK_ROOT) {
         return `corepack prepare pnpm@${opts.latestVersion} --activate`;
       }
-      const pkgName = process["pkg"] != null ? "@pnpm/exe" : "pnpm";
+      const pkgName = opts.currentPkgIsExecutable ? "@pnpm/exe" : "pnpm";
       return `pnpm add -g ${pkgName}`;
     }
+    function detectIfCurrentPkgIsExecutable(process2) {
+      return process2["pkg"] != null;
+    }
   }
 });
 
@@ -44611,6 +44622,7 @@ var require_lib23 = __commonJS({
         cmd: opts.context.argv[0],
         config: opts.context.config,
         env: opts.context.env ?? process.env,
+        process: opts.context.process ?? process,
         isRecursive: opts.context.config?.["recursive"] === true,
         logLevel: opts.reportingOptions?.logLevel,
         pnpmConfig: opts.context.config,
@@ -78661,6 +78673,11 @@ var require_remoteTarballFetcher = __commonJS({
                 }
                 resolve({ filesIndex });
               } catch (err) {
+                if (err["code"] !== "ERR_PNPM_TARBALL_INTEGRITY" && err["code"] !== "ERR_PNPM_BAD_TARBALL_SIZE") {
+                  const extractError = new error_1.PnpmError("TARBALL_EXTRACT", `Failed to unpack the tarball from "${url}": ${err.message}`);
+                  reject(extractError);
+                  return;
+                }
                 reject(err);
               }
             });
@@ -105535,8 +105552,9 @@ var require_audit2 = __commonJS({
     var lockfile_file_1 = require_lib76();
     var table_1 = require_dist13();
     var chalk_1 = __importDefault(require_source());
+    var difference_1 = __importDefault(require_difference());
     var pick_1 = __importDefault(require_pick());
-    var ramda_1 = require_src6();
+    var pickBy_1 = __importDefault(require_pickBy());
     var render_help_1 = __importDefault(require_lib34());
     var fix_1 = require_fix();
     var AUDIT_LEVEL_NUMBER = {
@@ -105684,6 +105702,10 @@ ${JSON.stringify(newOverrides, null, 2)}`
       }
       const vulnerabilities = auditReport.metadata.vulnerabilities;
       const totalVulnerabilityCount = Object.values(vulnerabilities).reduce((sum, vulnerabilitiesCount) => sum + vulnerabilitiesCount, 0);
+      const ignoreCves = opts.rootProjectManifest?.pnpm?.auditConfig?.ignoreCves;
+      if (ignoreCves) {
+        auditReport.advisories = (0, pickBy_1.default)(({ cves }) => cves.length === 0 || (0, difference_1.default)(cves, ignoreCves).length > 0, auditReport.advisories);
+      }
       if (opts.json) {
         return {
           exitCode: totalVulnerabilityCount > 0 ? 1 : 0,
@@ -105693,10 +105715,6 @@ ${JSON.stringify(newOverrides, null, 2)}`
       let output = "";
       const auditLevel = AUDIT_LEVEL_NUMBER[opts.auditLevel ?? "low"];
       let advisories = Object.values(auditReport.advisories);
-      const ignoreCves = opts.rootProjectManifest?.pnpm?.auditConfig?.ignoreCves;
-      if (ignoreCves) {
-        advisories = advisories.filter(({ cves }) => (0, ramda_1.difference)(cves, ignoreCves).length > 0);
-      }
       advisories = advisories.filter(({ severity }) => AUDIT_LEVEL_NUMBER[severity] >= auditLevel).sort((a1, a2) => AUDIT_LEVEL_NUMBER[a2.severity] - AUDIT_LEVEL_NUMBER[a1.severity]);
       for (const advisory of advisories) {
         output += (0, table_1.table)([
@@ -123051,6 +123069,8 @@ var require_runLifecycleHook = __commonJS({
     var core_loggers_1 = require_lib9();
     var logger_1 = require_lib6();
     var npm_lifecycle_1 = __importDefault(require_npm_lifecycle());
+    var error_1 = require_lib8();
+    var fs_1 = require("fs");
     function noop() {
     }
     async function runLifecycleHook(stage, manifest, opts) {
@@ -123058,6 +123078,9 @@ var require_runLifecycleHook = __commonJS({
       const m = { _id: getId(manifest), ...manifest };
       m.scripts = { ...m.scripts };
       if (stage === "start" && !m.scripts.start) {
+        if (!(0, fs_1.existsSync)("server.js")) {
+          throw new error_1.PnpmError("NO_SCRIPT_OR_SERVER", "Missing script start or file server.js");
+        }
         m.scripts.start = "node server.js";
       }
       if (opts.args?.length && m.scripts?.[stage]) {
@@ -173887,7 +173910,7 @@ var require_getWantedDependencies = __commonJS({
           nodeExecPath: opts.nodeExecPath ?? opts.dependenciesMeta[alias]?.node,
           pinnedVersion: (0, which_version_is_pinned_1.whichVersionIsPinned)(pref),
           pref: updatedPref,
-          raw: `${alias}@${updatedPref}`
+          raw: `${alias}@${pref}`
         };
       });
     }
@@ -178616,7 +178639,7 @@ var require_updateProjectManifest = __commonJS({
         nodeExecPath: opts.nodeExecPath,
         peer: importer["peer"],
         pref,
-        saveType: isNew === true ? importer["targetDependenciesField"] : void 0
+        saveType: importer["targetDependenciesField"]
       };
     }
     function getPrefPreferSpecifiedSpec(opts) {
@@ -178637,13 +178660,22 @@ var require_updateProjectManifest = __commonJS({
     }
     function getPrefPreferSpecifiedExoticSpec(opts) {
       const prefix = (0, manifest_utils_1.getPrefix)(opts.alias, opts.name);
-      if (opts.specRaw?.startsWith(`${opts.alias}@${prefix}`) && opts.specRaw !== `${opts.alias}@workspace:*`) {
-        const specWithoutName = opts.specRaw.slice(`${opts.alias}@${prefix}`.length);
+      if (opts.specRaw?.startsWith(`${opts.alias}@${prefix}`)) {
+        let specWithoutName = opts.specRaw.slice(`${opts.alias}@${prefix}`.length);
+        if (specWithoutName.startsWith("workspace:")) {
+          specWithoutName = specWithoutName.slice(10);
+          if (specWithoutName === "*" || specWithoutName === "^" || specWithoutName === "~") {
+            return specWithoutName;
+          }
+        }
         const selector = (0, version_selector_type_1.default)(specWithoutName);
-        if (!(selector != null && (selector.type === "version" || selector.type === "range"))) {
+        if (!selector) {
           return opts.specRaw.slice(opts.alias.length + 1);
         }
       }
+      if (semver_12.default.parse(opts.version)?.prerelease.length) {
+        return `${prefix}${opts.version}`;
+      }
       return `${prefix}${(0, manifest_utils_1.createVersionSpec)(opts.version, { pinnedVersion: opts.pinnedVersion, rolling: opts.rolling })}`;
     }
   }
@@ -179086,7 +179118,7 @@ var require_parseWantedDependencies = __commonJS({
           dev: Boolean(opts.dev || alias && !!opts.devDependencies[alias]),
           optional: Boolean(opts.optional || alias && !!opts.optionalDependencies[alias]),
           pinnedVersion,
-          raw: rawWantedDependency
+          raw: alias && opts.currentPrefs?.[alias]?.startsWith("workspace:") ? `${alias}@${opts.currentPrefs[alias]}` : rawWantedDependency
         };
         if (pref) {
           return {
@@ -180218,7 +180250,8 @@ var require_createVersionsOverrider = __commonJS({
         }
         let linkFileTarget;
         if (override.newPref.startsWith("file:")) {
-          linkFileTarget = path_1.default.join(rootDir, override.newPref.substring(5));
+          const pkgPath = override.newPref.substring(5);
+          linkFileTarget = path_1.default.isAbsolute(pkgPath) ? pkgPath : path_1.default.join(rootDir, pkgPath);
         }
         return {
           ...override,
@@ -181305,7 +181338,7 @@ var require_install = __commonJS({
           projectsToInstall.push({
             pruneDirectDependencies: false,
             ...project,
-            wantedDependencies: wantedDeps.map((wantedDep) => ({ ...wantedDep, isNew: true, updateSpec: true, nodeExecPath: opts.nodeExecPath }))
+            wantedDependencies: wantedDeps.map((wantedDep) => ({ ...wantedDep, isNew: !currentPrefs[wantedDep.alias], updateSpec: true, nodeExecPath: opts.nodeExecPath }))
           });
         }
         const makePartialCurrentLockfile = !installsOnly && (ctx.existsWantedLockfile && !ctx.existsCurrentLockfile || !ctx.currentLockfileIsUpToDate);
@@ -182249,7 +182282,7 @@ var require_updateWorkspaceDependencies = __commonJS({
         if (!workspacePackages[parsed.alias])
           throw new error_1.PnpmError("WORKSPACE_PACKAGE_NOT_FOUND", `"${parsed.alias}" not found in the workspace`);
         if (!parsed.pref)
-          return `${parsed.alias}@workspace:*`;
+          return `${parsed.alias}@workspace:>=0.0.0`;
         if (parsed.pref.startsWith("workspace:"))
           return spec;
         return `${parsed.alias}@workspace:${parsed.pref}`;
@@ -200278,7 +200311,7 @@ var require_getPkgInfo2 = __commonJS({
           if (pkg.files.local) {
             licenseContents = await (0, promises_1.readFile)(licensePackageFileInfo);
           } else {
-            licenseContents = await readLicenseFileFromCafs(opts.cafsDir, licensePackageFileInfo.integrity);
+            licenseContents = await readLicenseFileFromCafs(opts.cafsDir, licensePackageFileInfo);
           }
           return {
             name: "Unknown",
@@ -200288,8 +200321,8 @@ var require_getPkgInfo2 = __commonJS({
       }
       return { name: license ?? "Unknown" };
     }
-    async function readLicenseFileFromCafs(cafsDir, fileIntegrity) {
-      const fileName = (0, cafs_1.getFilePathByModeInCafs)(cafsDir, fileIntegrity, 0);
+    async function readLicenseFileFromCafs(cafsDir, { integrity, mode }) {
+      const fileName = (0, cafs_1.getFilePathByModeInCafs)(cafsDir, integrity, mode);
       const fileContents = await (0, promises_1.readFile)(fileName);
       return fileContents;
     }
@@ -200297,7 +200330,7 @@ var require_getPkgInfo2 = __commonJS({
       const isPackageWithIntegrity = "integrity" in packageResolution;
       let pkgIndexFilePath;
       if (isPackageWithIntegrity) {
-        pkgIndexFilePath = await (0, cafs_1.getFilePathInCafs)(opts.cafsDir, packageResolution.integrity, "index");
+        pkgIndexFilePath = (0, cafs_1.getFilePathInCafs)(opts.cafsDir, packageResolution.integrity, "index");
       } else if (!packageResolution.type && packageResolution.tarball) {
         const packageDirInStore = (0, dependency_path_1.depPathToFilename)(depPath.split("_")[0]);
         pkgIndexFilePath = path_1.default.join(opts.storeDir, packageDirInStore, "integrity.json");
@@ -200341,7 +200374,7 @@ var require_getPkgInfo2 = __commonJS({
       } else {
         const packageFileIndex = packageFileIndexInfo.files;
         const packageManifestFile = packageFileIndex["package.json"];
-        packageManifestDir = await (0, cafs_1.getFilePathByModeInCafs)(cafsDir, packageManifestFile.integrity, packageManifestFile.mode);
+        packageManifestDir = (0, cafs_1.getFilePathByModeInCafs)(cafsDir, packageManifestFile.integrity, packageManifestFile.mode);
       }
       let manifest;
       try {
@@ -200764,7 +200797,9 @@ var require_licenses2 = __commonJS({
     exports2.completion = completion;
     async function handler(opts, params = []) {
       if (params.length === 0) {
-        throw new error_1.PnpmError("LICENCES_NO_SUBCOMMAND", "Please specify the subcommand");
+        throw new error_1.PnpmError("LICENCES_NO_SUBCOMMAND", "Please specify the subcommand", {
+          hint: help()
+        });
       }
       switch (params[0]) {
         case "list":
@@ -201738,6 +201773,10 @@ var require_publish2 = __commonJS({
                 description: "Does everything a publish would do except actually publishing to the registry",
                 name: "--dry-run"
               },
+              {
+                description: "Show information in JSON format",
+                name: "--json"
+              },
               {
                 description: 'Registers the published package with the given tag. By default, the "latest" tag is used.',
                 name: "--tag <tag>"
@@ -209781,8 +209820,8 @@ var require_main2 = __commonJS({
           cmd,
           config
         });
+        global[exports2.REPORTER_INITIALIZED] = reporterType;
       }
-      global[exports2.REPORTER_INITIALIZED] = reporterType;
       const selfUpdate = config.global && (cmd === "add" || cmd === "update") && cliParams.includes(cli_meta_1.packageManager.name);
       if (selfUpdate) {
         await cmd_1.pnpmCmds.server(config, ["stop"]);
@@ -209926,8 +209965,19 @@ var require_errorHandler = __commonJS({
     var logger_1 = require_lib6();
     var main_1 = require_main2();
     function errorHandler(error) {
+      if (error.name != null && error.name !== "pnpm" && !error.name.startsWith("pnpm:")) {
+        try {
+          error.name = "pnpm";
+        } catch {
+        }
+      }
       if (!global[main_1.REPORTER_INITIALIZED]) {
-        console.log(error);
+        console.log(JSON.stringify({
+          error: {
+            code: error.code ?? error.name,
+            message: error.message
+          }
+        }, null, 2));
         process.exitCode = 1;
         return;
       }
@@ -209935,12 +209985,6 @@ var require_errorHandler = __commonJS({
         process.exitCode = 1;
         return;
       }
-      if (error.name != null && error.name !== "pnpm" && !error.name.startsWith("pnpm:")) {
-        try {
-          error.name = "pnpm";
-        } catch {
-        }
-      }
       logger_1.logger.error(error, error);
       setTimeout(() => process.exit(1), 0);
     }

package/package.json

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