pnpm 6.32.13 → 6.32.14

package/dist/node_modules/.modules.yaml

@@ -11,7 +11,7 @@ packageManager: pnpm@7.0.0-alpha.2
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Fri, 13 May 2022 23:39:55 GMT
+prunedAt: Tue, 17 May 2022 23:01:21 GMT
 publicHoistPattern:
   - '*types*'
   - '*eslint*'

package/dist/node_modules/.pnpm/lock.yaml

@@ -113,7 +113,7 @@ packages:
       '@npmcli/move-file': 1.1.2
       chownr: 2.0.0
       fs-minipass: 2.1.0
-      glob: 7.2.2
+      glob: 7.2.3
       infer-owner: 1.0.4
       lru-cache: 6.0.0
       minipass: 3.1.6
@@ -234,8 +234,8 @@ packages:
     dev: false
     optional: true
 
-  /glob/7.2.2:
-    resolution: {integrity: sha512-NzDgHDiJwKYByLrL5lONmQFpK/2G78SMMfo+E9CuGlX4IkvfKDsiQSNPwAYxEy+e6p7ZQ3uslSLlwlJcqezBmQ==}
+  /glob/7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -481,7 +481,7 @@ packages:
     requiresBuild: true
     dependencies:
       env-paths: 2.2.1
-      glob: 7.2.2
+      glob: 7.2.3
       graceful-fs: 4.2.10
       make-fetch-happen: 9.1.0
       nopt: 5.0.0
@@ -570,7 +570,7 @@ packages:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
     dependencies:
-      glob: 7.2.2
+      glob: 7.2.3
     dev: false
     optional: true
 

package/dist/node_modules/glob/common.js

@@ -111,7 +111,7 @@ function setopts (self, pattern, options) {
   options.nonegate = true
   options.nocomment = true
   // always treat \ in patterns as escapes, not path separators
-  options.allowWindowsEscape = true
+  options.allowWindowsEscape = false
 
   self.minimatch = new Minimatch(pattern, options)
   self.options = self.minimatch.options

package/dist/node_modules/glob/package.json

@@ -2,7 +2,7 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
   "name": "glob",
   "description": "a little globber",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "publishConfig": {
     "tag": "v7-legacy"
   },

package/dist/pnpm.cjs

@@ -3182,7 +3182,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "6.32.13" != null && true ? "6.32.13" : "0.0.0"
+      version: "6.32.14" != null && true ? "6.32.14" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -73820,7 +73820,7 @@ var require_lib35 = __commonJS({
     }
     exports2.parse = parse;
     function depPathToFilename(depPath, lockfileDir) {
-      const filename = depPathToFilenameUnescaped(depPath, lockfileDir).replace(/\//g, "+");
+      const filename = depPathToFilenameUnescaped(depPath, lockfileDir).replace(/[\\/:*?"<>|]/g, "+");
       if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("local+")) {
         return `${filename.substring(0, 50)}_${crypto_1.default.createHash("md5").update(filename).digest("hex")}`;
       }
@@ -85008,7 +85008,7 @@ var require_parsePref = __commonJS({
     async function fromHostedGit(hosted) {
       var _a;
       let fetchSpec = null;
-      const gitUrl = (_a = hosted.git({ noCommittish: true })) !== null && _a !== void 0 ? _a : hosted.ssh({ noCommittish: true });
+      const gitUrl = (_a = hosted.https({ noCommittish: true })) !== null && _a !== void 0 ? _a : hosted.ssh({ noCommittish: true });
       if (gitUrl && await accessRepository(gitUrl)) {
         fetchSpec = gitUrl;
       }
@@ -182423,24 +182423,34 @@ var require_string_prototype = __commonJS({
   }
 });
 
-// ../plugin-commands-setup/lib/BadHomeDirError.js
-var require_BadHomeDirError = __commonJS({
-  "../plugin-commands-setup/lib/BadHomeDirError.js"(exports2) {
+// ../plugin-commands-setup/lib/errors.js
+var require_errors9 = __commonJS({
+  "../plugin-commands-setup/lib/errors.js"(exports2) {
     "use strict";
     var __importDefault = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.BadHomeDirError = void 0;
+    exports2.BadShellSectionError = exports2.BadEnvVariableError = void 0;
     var error_1 = __importDefault(require_lib8());
-    var BadHomeDirError = class extends error_1.default {
-      constructor({ wantedDir, currentDir }) {
-        super("DIFFERENT_HOME_DIR_IS_SET", `Currently 'PNPM_HOME' is set to '${currentDir}'`, {
-          hint: "If you want to override the existing PNPM_HOME env variable, use the --force option"
+    var BadEnvVariableError = class extends error_1.default {
+      constructor({ envName, wantedValue, currentValue }) {
+        super("BAD_ENV_FOUND", `Currently '${envName}' is set to '${wantedValue}'`, {
+          hint: `If you want to override the existing ${envName} env variable, use the --force option`
         });
       }
     };
-    exports2.BadHomeDirError = BadHomeDirError;
+    exports2.BadEnvVariableError = BadEnvVariableError;
+    var BadShellSectionError = class extends error_1.default {
+      constructor({ wanted, current, configFile }) {
+        super("BAD_SHELL_SECTION", `The config file at "${configFile} already contains a pnpm section but with other configuration`, {
+          hint: "If you want to override the existing configuration section, use the --force option"
+        });
+        this.current = current;
+        this.wanted = wanted;
+      }
+    };
+    exports2.BadShellSectionError = BadShellSectionError;
   }
 });
 
@@ -182453,22 +182463,12 @@ var require_setupOnWindows = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.setupWindowsEnvironmentPath = void 0;
+    var error_1 = __importDefault(require_lib8());
     var path_1 = require("path");
     var execa_1 = __importDefault(require_lib19());
     var string_prototype_matchall_1 = __importDefault(require_string_prototype());
-    var BadHomeDirError_1 = require_BadHomeDirError();
+    var errors_1 = require_errors9();
     var REG_KEY = "HKEY_CURRENT_USER\\Environment";
-    function findEnvValuesInRegistry(regEntries, envVarName) {
-      const regexp = new RegExp(`^ {4}(?<name>${envVarName}) {4}(?<type>\\w+) {4}(?<data>.*)$`, "gim");
-      return Array.from((0, string_prototype_matchall_1.default)(regEntries, regexp));
-    }
-    function setEnvVarInRegistry(envVarName, envVarValue) {
-      return (0, execa_1.default)("reg", ["add", REG_KEY, "/v", envVarName, "/t", "REG_EXPAND_SZ", "/d", envVarValue, "/f"], { windowsHide: false });
-    }
-    function pathIncludesDir(pathValue, dir) {
-      const dirPath = path_1.win32.parse(path_1.win32.normalize(dir));
-      return pathValue.split(path_1.win32.delimiter).map((p) => path_1.win32.normalize(p)).map((p) => path_1.win32.parse(p)).map((p) => `${p.dir}${path_1.win32.sep}${p.base}`.toUpperCase()).filter((p) => p !== "").includes(`${dirPath.dir}${path_1.win32.sep}${dirPath.base}`.toUpperCase());
-    }
     async function setupWindowsEnvironmentPath(pnpmHomeDir, opts) {
       var _a;
       const chcpResult = await (0, execa_1.default)("chcp");
@@ -182486,53 +182486,60 @@ var require_setupOnWindows = __commonJS({
     }
     exports2.setupWindowsEnvironmentPath = setupWindowsEnvironmentPath;
     async function _setupWindowsEnvironmentPath(pnpmHomeDir, opts) {
-      var _a;
-      const queryResult = await (0, execa_1.default)("reg", ["query", REG_KEY], { windowsHide: false });
-      if (queryResult.failed) {
-        return "Win32 registry environment values could not be retrieved";
-      }
-      const queryOutput = queryResult.stdout;
-      const pathValueMatch = findEnvValuesInRegistry(queryOutput, "PATH");
-      const homeValueMatch = findEnvValuesInRegistry(queryOutput, "PNPM_HOME");
-      let commitNeeded = false;
       const logger = [];
-      if (homeValueMatch.length === 1 && !opts.force) {
-        const currentHomeDir = homeValueMatch[0].groups.data;
-        if (currentHomeDir !== pnpmHomeDir) {
-          throw new BadHomeDirError_1.BadHomeDirError({ currentDir: currentHomeDir, wantedDir: pnpmHomeDir });
+      logger.push(logEnvUpdate(await updateEnvVariable("PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
+      logger.push(logEnvUpdate(await prependToPath("%PNPM_HOME%"), "Path"));
+      return logger.join("\n");
+    }
+    function logEnvUpdate(envUpdateResult, envName) {
+      switch (envUpdateResult) {
+        case "skipped":
+          return `${envName} was already up-to-date`;
+        case "updated":
+          return `${envName} was updated`;
+      }
+      return "";
+    }
+    async function updateEnvVariable(name, value, opts) {
+      const currentValue = await getEnvValueFromRegistry(name);
+      if (currentValue && !opts.force) {
+        if (currentValue !== value) {
+          throw new errors_1.BadEnvVariableError({ envName: name, currentValue, wantedValue: value });
         }
+        return "skipped";
       } else {
-        logger.push(`Setting 'PNPM_HOME' to value '${pnpmHomeDir}'`);
-        const addResult = await setEnvVarInRegistry("PNPM_HOME", pnpmHomeDir);
-        if (addResult.failed) {
-          logger.push(`	${addResult.stderr}`);
-        } else {
-          commitNeeded = true;
-          logger.push(`	${addResult.stdout}`);
-        }
-      }
-      const pathData = (_a = pathValueMatch[0]) === null || _a === void 0 ? void 0 : _a.groups.data;
-      if (pathData === void 0) {
-        logger.push("Current PATH is not set. No changes to this environment variable are applied");
-      } else if (pathData == null || pathData.trim() === "") {
-        logger.push("Current PATH is empty. No changes to this environment variable are applied");
-      } else if (pathIncludesDir(pathData, pnpmHomeDir)) {
-        logger.push("PATH already contains PNPM_HOME");
+        await setEnvVarInRegistry(name, value);
+        return "updated";
+      }
+    }
+    async function prependToPath(prependDir) {
+      const pathData = await getEnvValueFromRegistry("Path");
+      if (pathData === void 0 || pathData == null || pathData.trim() === "") {
+        throw new error_1.default("NO_PATH", '"Path" environment variable is not found in the registry');
+      } else if (pathData.split(path_1.win32.delimiter).includes(prependDir)) {
+        return "skipped";
       } else {
-        logger.push("Updating PATH");
-        const newPathValue = `${pnpmHomeDir}${path_1.win32.delimiter}${pathData}`;
-        const addResult = await setEnvVarInRegistry(pathValueMatch[0].groups.name, newPathValue);
-        if (addResult.failed) {
-          logger.push(`	${addResult.stderr}`);
-        } else {
-          commitNeeded = true;
-          logger.push(`	${addResult.stdout}`);
-        }
+        const newPathValue = `${prependDir}${path_1.win32.delimiter}${pathData}`;
+        await setEnvVarInRegistry("Path", newPathValue);
+        return "updated";
       }
-      if (commitNeeded) {
-        await (0, execa_1.default)("setx", ["PNPM_HOME", pnpmHomeDir]);
+    }
+    async function getEnvValueFromRegistry(envVarName) {
+      const queryResult = await (0, execa_1.default)("reg", ["query", REG_KEY, "/v", envVarName], { windowsHide: false });
+      if (queryResult.failed) {
+        throw new error_1.default("REG_READ", "Win32 registry environment values could not be retrieved");
+      }
+      const regexp = new RegExp(`^ {4}(?<name>${envVarName}) {4}(?<type>\\w+) {4}(?<data>.*)$`, "gim");
+      const match = Array.from((0, string_prototype_matchall_1.default)(queryResult.stdout, regexp))[0];
+      return match === null || match === void 0 ? void 0 : match.groups.data;
+    }
+    async function setEnvVarInRegistry(envVarName, envVarValue) {
+      const addResult = await (0, execa_1.default)("reg", ["add", REG_KEY, "/v", envVarName, "/t", "REG_EXPAND_SZ", "/d", envVarValue, "/f"], { windowsHide: false });
+      if (addResult.failed) {
+        throw new error_1.default("FAILED_SET_ENV", `Failed to set "${envVarName}" to "${envVarValue}": ${addResult.stderr}`);
+      } else {
+        await (0, execa_1.default)("setx", [envVarName, envVarValue]);
       }
-      return logger.join("\n");
     }
   }
 });
@@ -182553,7 +182560,7 @@ var require_setup = __commonJS({
     var logger_1 = __importDefault(require_lib6());
     var render_help_1 = __importDefault(require_lib32());
     var setupOnWindows_1 = require_setupOnWindows();
-    var BadHomeDirError_1 = require_BadHomeDirError();
+    var errors_1 = require_errors9();
     var rcOptionsTypes = () => ({});
     exports2.rcOptionsTypes = rcOptionsTypes;
     var cliOptionsTypes = () => ({
@@ -182601,11 +182608,11 @@ var require_setup = __commonJS({
     }
     async function handler(opts) {
       var _a;
-      const currentShell = detectCurrentShell();
       const execPath = getExecPath();
       if (execPath.match(/\.[cm]?js$/) == null) {
         copyCli(execPath, opts.pnpmHomeDir);
       }
+      const currentShell = detectCurrentShell();
       const updateOutput = await updateShell(currentShell, opts.pnpmHomeDir, { force: (_a = opts.force) !== null && _a !== void 0 ? _a : false });
       return `${updateOutput}
 
@@ -182623,16 +182630,12 @@ Setup complete. Open a new terminal to start using pnpm.`;
     }
     async function updateShell(currentShell, pnpmHomeDir, opts) {
       switch (currentShell) {
-        case "bash": {
-          const configFile = path_1.default.join(os_1.default.homedir(), ".bashrc");
-          return setupShell(configFile, pnpmHomeDir, opts);
-        }
+        case "bash":
         case "zsh": {
-          const configFile = path_1.default.join(os_1.default.homedir(), ".zshrc");
-          return setupShell(configFile, pnpmHomeDir, opts);
+          return reportShellChange(await setupShell(currentShell, pnpmHomeDir, opts));
         }
         case "fish": {
-          return setupFishShell(pnpmHomeDir, opts);
+          return reportShellChange(await setupFishShell(pnpmHomeDir, opts));
         }
       }
       if (process.platform === "win32") {
@@ -182640,60 +182643,61 @@ Setup complete. Open a new terminal to start using pnpm.`;
       }
       return "Could not infer shell type.";
     }
-    async function setupShell(configFile, pnpmHomeDir, opts) {
+    function reportShellChange({ action, configFile }) {
+      switch (action) {
+        case "created":
+          return `Created ${configFile}`;
+        case "added":
+          return `Appended new lines to ${configFile}`;
+        case "updated":
+          return `Replaced configuration in ${configFile}`;
+        case "skipped":
+          return `Configuration already up-to-date in ${configFile}`;
+      }
+    }
+    async function setupShell(shell, pnpmHomeDir, opts) {
+      const configFile = path_1.default.join(os_1.default.homedir(), `.${shell}rc`);
       const content = `# pnpm
 export PNPM_HOME="${pnpmHomeDir}"
 export PATH="$PNPM_HOME:$PATH"
-# pnpm end
-`;
-      if (!fs_1.default.existsSync(configFile)) {
-        await fs_1.default.promises.writeFile(configFile, content, "utf8");
-        return `Created ${configFile}`;
-      }
-      const configContent = await fs_1.default.promises.readFile(configFile, "utf8");
-      if (!configContent.includes("PNPM_HOME")) {
-        await fs_1.default.promises.appendFile(configFile, `
-${content}`, "utf8");
-        return `Updated ${configFile}`;
-      }
-      const match = configContent.match(/export PNPM_HOME="(.*)"/);
-      if (match && match[1] !== pnpmHomeDir) {
-        if (!opts.force) {
-          throw new BadHomeDirError_1.BadHomeDirError({ currentDir: match[1], wantedDir: pnpmHomeDir });
-        }
-        const newConfigContent = replaceSection(configContent, content);
-        await fs_1.default.promises.writeFile(configFile, newConfigContent, "utf8");
-        return `Updated ${configFile}`;
-      }
-      return `PNPM_HOME is already in ${configFile}`;
+# pnpm end`;
+      return {
+        action: await updateShellConfig(configFile, content, opts),
+        configFile
+      };
     }
     async function setupFishShell(pnpmHomeDir, opts) {
       const configFile = path_1.default.join(os_1.default.homedir(), ".config/fish/config.fish");
       const content = `# pnpm
 set -gx PNPM_HOME "${pnpmHomeDir}"
 set -gx PATH "$PNPM_HOME" $PATH
-# pnpm end
-`;
+# pnpm end`;
+      return {
+        action: await updateShellConfig(configFile, content, opts),
+        configFile
+      };
+    }
+    async function updateShellConfig(configFile, newContent, opts) {
       if (!fs_1.default.existsSync(configFile)) {
-        await fs_1.default.promises.writeFile(configFile, content, "utf8");
-        return `Created ${configFile}`;
+        await fs_1.default.promises.writeFile(configFile, newContent, "utf8");
+        return "created";
       }
       const configContent = await fs_1.default.promises.readFile(configFile, "utf8");
-      if (!configContent.includes("PNPM_HOME")) {
+      const match = configContent.match(/# pnpm[\s\S]*# pnpm end/);
+      if (!match) {
         await fs_1.default.promises.appendFile(configFile, `
-${content}`, "utf8");
-        return `Updated ${configFile}`;
+${newContent}`, "utf8");
+        return "added";
       }
-      const match = configContent.match(/set -gx PNPM_HOME "(.*)"/);
-      if (match && match[1] !== pnpmHomeDir) {
+      if (match[0] !== newContent) {
         if (!opts.force) {
-          throw new BadHomeDirError_1.BadHomeDirError({ currentDir: match[1], wantedDir: pnpmHomeDir });
+          throw new errors_1.BadShellSectionError({ current: match[1], wanted: newContent, configFile });
         }
-        const newConfigContent = replaceSection(configContent, content);
+        const newConfigContent = replaceSection(configContent, newContent);
         await fs_1.default.promises.writeFile(configFile, newConfigContent, "utf8");
-        return `Updated ${configFile}`;
+        return "updated";
       }
-      return `PNPM_HOME is already in ${configFile}`;
+      return "skipped";
     }
     function replaceSection(originalContent, newSection) {
       return originalContent.replace(/# pnpm[\s\S]*# pnpm end/g, newSection);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "6.32.13",
+  "version": "6.32.14",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -23,7 +23,7 @@
     "@pnpm/byline": "^1.0.0",
     "@pnpm/cli-meta": "workspace:2.0.2",
     "@pnpm/cli-utils": "workspace:0.6.53",
-    "@pnpm/client": "workspace:6.1.3",
+    "@pnpm/client": "workspace:6.1.4",
     "@pnpm/command": "workspace:2.0.0",
     "@pnpm/common-cli-options-help": "workspace:0.8.0",
     "@pnpm/config": "workspace:13.13.3",
@@ -40,17 +40,17 @@
     "@pnpm/nopt": "^0.2.1",
     "@pnpm/parse-cli-args": "workspace:4.4.1",
     "@pnpm/pick-registry-for-package": "workspace:2.0.11",
-    "@pnpm/plugin-commands-audit": "workspace:5.1.45",
-    "@pnpm/plugin-commands-env": "workspace:1.4.19",
-    "@pnpm/plugin-commands-installation": "workspace:8.4.13",
-    "@pnpm/plugin-commands-listing": "workspace:4.1.14",
-    "@pnpm/plugin-commands-outdated": "workspace:5.1.13",
-    "@pnpm/plugin-commands-publishing": "workspace:4.5.7",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.4.19",
-    "@pnpm/plugin-commands-script-runners": "workspace:4.6.7",
-    "@pnpm/plugin-commands-server": "workspace:3.0.75",
+    "@pnpm/plugin-commands-audit": "workspace:5.1.46",
+    "@pnpm/plugin-commands-env": "workspace:1.4.20",
+    "@pnpm/plugin-commands-installation": "workspace:8.4.14",
+    "@pnpm/plugin-commands-listing": "workspace:4.1.15",
+    "@pnpm/plugin-commands-outdated": "workspace:5.1.14",
+    "@pnpm/plugin-commands-publishing": "workspace:4.5.8",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.4.20",
+    "@pnpm/plugin-commands-script-runners": "workspace:4.6.8",
+    "@pnpm/plugin-commands-server": "workspace:3.0.76",
     "@pnpm/plugin-commands-setup": "workspace:1.1.39",
-    "@pnpm/plugin-commands-store": "workspace:4.1.18",
+    "@pnpm/plugin-commands-store": "workspace:4.1.19",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:5.0.12",
     "@pnpm/read-project-manifest": "workspace:2.0.13",