pnpm 7.1.1 → 7.1.2

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.1.0
+packageManager: pnpm@7.1.1
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Tue, 17 May 2022 14:20:06 GMT
+prunedAt: Thu, 19 May 2022 01:33:24 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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: "7.1.1" != null && true ? "7.1.1" : "0.0.0"
+      version: "7.1.2" != null && true ? "7.1.2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -171391,6 +171391,7 @@ var require_dlx = __commonJS({
     var package_bins_1 = __importDefault(require_lib80());
     var store_path_1 = __importDefault(require_lib34());
     var execa_1 = __importDefault(require_lib18());
+    var omit_1 = __importDefault(require_omit());
     var render_help_1 = __importDefault(require_lib31());
     var makeEnv_1 = require_makeEnv();
     exports2.commandNames = ["dlx"];
@@ -171444,9 +171445,10 @@ var require_dlx = __commonJS({
       const pkgs = opts.package ?? [command];
       const env = (0, makeEnv_1.makeEnv)({ userAgent: opts.userAgent, prependPaths: [binsDir] });
       await plugin_commands_installation_1.add.handler({
-        ...opts,
+        ...(0, omit_1.default)(["workspaceDir"], opts),
+        bin: binsDir,
         dir: prefix,
-        bin: binsDir
+        lockfileDir: prefix
       }, pkgs);
       const binName = opts.package ? command : await getBinName(modulesDir, await getPkgName(prefix));
       await (0, execa_1.default)(binName, args2, {
@@ -173074,9 +173076,10 @@ var require_setupOnWindows = __commonJS({
     }
     exports2.setupWindowsEnvironmentPath = setupWindowsEnvironmentPath;
     async function _setupWindowsEnvironmentPath(pnpmHomeDir, opts) {
+      const registryOutput = await getRegistryOutput();
       const logger = [];
-      logger.push(logEnvUpdate(await updateEnvVariable("PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
-      logger.push(logEnvUpdate(await prependToPath("%PNPM_HOME%"), "Path"));
+      logger.push(logEnvUpdate(await updateEnvVariable(registryOutput, "PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
+      logger.push(logEnvUpdate(await prependToPath(registryOutput, "%PNPM_HOME%"), "Path"));
       return logger.join("\n");
     }
     function logEnvUpdate(envUpdateResult, envName) {
@@ -173088,8 +173091,8 @@ var require_setupOnWindows = __commonJS({
       }
       return "";
     }
-    async function updateEnvVariable(name, value, opts) {
-      const currentValue = await getEnvValueFromRegistry(name);
+    async function updateEnvVariable(registryOutput, name, value, opts) {
+      const currentValue = await getEnvValueFromRegistry(registryOutput, name);
       if (currentValue && !opts.force) {
         if (currentValue !== value) {
           throw new errors_1.BadEnvVariableError({ envName: name, currentValue, wantedValue: value });
@@ -173100,8 +173103,8 @@ var require_setupOnWindows = __commonJS({
         return "updated";
       }
     }
-    async function prependToPath(prependDir) {
-      const pathData = await getEnvValueFromRegistry("Path");
+    async function prependToPath(registryOutput, prependDir) {
+      const pathData = await getEnvValueFromRegistry(registryOutput, "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)) {
@@ -173112,22 +173115,27 @@ var require_setupOnWindows = __commonJS({
         return "updated";
       }
     }
-    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");
+    var EXEC_OPTS = { windowsHide: false };
+    async function getRegistryOutput() {
+      try {
+        const queryResult = await (0, execa_1.default)("reg", ["query", REG_KEY], EXEC_OPTS);
+        return queryResult.stdout;
+      } catch (err) {
+        throw new error_1.default("REG_READ", "win32 registry environment values could not be retrieved");
       }
+    }
+    async function getEnvValueFromRegistry(registryOutput, envVarName) {
       const regexp = new RegExp(`^ {4}(?<name>${envVarName}) {4}(?<type>\\w+) {4}(?<data>.*)$`, "gim");
-      const match = Array.from(queryResult.stdout.matchAll(regexp))[0];
+      const match = Array.from(registryOutput.matchAll(regexp))[0];
       return 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]);
+      try {
+        await (0, execa_1.default)("reg", ["add", REG_KEY, "/v", envVarName, "/t", "REG_EXPAND_SZ", "/d", envVarValue, "/f"], EXEC_OPTS);
+      } catch (err) {
+        throw new error_1.default("FAILED_SET_ENV", `Failed to set "${envVarName}" to "${envVarValue}": ${err.stderr}`);
       }
+      await (0, execa_1.default)("setx", [envVarName, envVarValue], EXEC_OPTS);
     }
   }
 });

package/dist/pnpx.cjs

@@ -170866,6 +170866,7 @@ var require_dlx = __commonJS({
     var package_bins_1 = __importDefault2(require_lib79());
     var store_path_1 = __importDefault2(require_lib33());
     var execa_1 = __importDefault2(require_lib17());
+    var omit_1 = __importDefault2(require_omit());
     var render_help_1 = __importDefault2(require_lib30());
     var makeEnv_1 = require_makeEnv();
     exports2.commandNames = ["dlx"];
@@ -170919,9 +170920,10 @@ var require_dlx = __commonJS({
       const pkgs = opts.package ?? [command];
       const env = (0, makeEnv_1.makeEnv)({ userAgent: opts.userAgent, prependPaths: [binsDir] });
       await plugin_commands_installation_1.add.handler({
-        ...opts,
+        ...(0, omit_1.default)(["workspaceDir"], opts),
+        bin: binsDir,
         dir: prefix,
-        bin: binsDir
+        lockfileDir: prefix
       }, pkgs);
       const binName = opts.package ? command : await getBinName(modulesDir, await getPkgName(prefix));
       await (0, execa_1.default)(binName, args2, {
@@ -172549,9 +172551,10 @@ var require_setupOnWindows = __commonJS({
     }
     exports2.setupWindowsEnvironmentPath = setupWindowsEnvironmentPath;
     async function _setupWindowsEnvironmentPath(pnpmHomeDir, opts) {
+      const registryOutput = await getRegistryOutput();
       const logger = [];
-      logger.push(logEnvUpdate(await updateEnvVariable("PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
-      logger.push(logEnvUpdate(await prependToPath("%PNPM_HOME%"), "Path"));
+      logger.push(logEnvUpdate(await updateEnvVariable(registryOutput, "PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
+      logger.push(logEnvUpdate(await prependToPath(registryOutput, "%PNPM_HOME%"), "Path"));
       return logger.join("\n");
     }
     function logEnvUpdate(envUpdateResult, envName) {
@@ -172563,8 +172566,8 @@ var require_setupOnWindows = __commonJS({
       }
       return "";
     }
-    async function updateEnvVariable(name, value, opts) {
-      const currentValue = await getEnvValueFromRegistry(name);
+    async function updateEnvVariable(registryOutput, name, value, opts) {
+      const currentValue = await getEnvValueFromRegistry(registryOutput, name);
       if (currentValue && !opts.force) {
         if (currentValue !== value) {
           throw new errors_1.BadEnvVariableError({ envName: name, currentValue, wantedValue: value });
@@ -172575,8 +172578,8 @@ var require_setupOnWindows = __commonJS({
         return "updated";
       }
     }
-    async function prependToPath(prependDir) {
-      const pathData = await getEnvValueFromRegistry("Path");
+    async function prependToPath(registryOutput, prependDir) {
+      const pathData = await getEnvValueFromRegistry(registryOutput, "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)) {
@@ -172587,22 +172590,27 @@ var require_setupOnWindows = __commonJS({
         return "updated";
       }
     }
-    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");
+    var EXEC_OPTS = { windowsHide: false };
+    async function getRegistryOutput() {
+      try {
+        const queryResult = await (0, execa_1.default)("reg", ["query", REG_KEY], EXEC_OPTS);
+        return queryResult.stdout;
+      } catch (err) {
+        throw new error_1.default("REG_READ", "win32 registry environment values could not be retrieved");
       }
+    }
+    async function getEnvValueFromRegistry(registryOutput, envVarName) {
       const regexp = new RegExp(`^ {4}(?<name>${envVarName}) {4}(?<type>\\w+) {4}(?<data>.*)$`, "gim");
-      const match = Array.from(queryResult.stdout.matchAll(regexp))[0];
+      const match = Array.from(registryOutput.matchAll(regexp))[0];
       return 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]);
+      try {
+        await (0, execa_1.default)("reg", ["add", REG_KEY, "/v", envVarName, "/t", "REG_EXPAND_SZ", "/d", envVarValue, "/f"], EXEC_OPTS);
+      } catch (err) {
+        throw new error_1.default("FAILED_SET_ENV", `Failed to set "${envVarName}" to "${envVarValue}": ${err.stderr}`);
       }
+      await (0, execa_1.default)("setx", [envVarName, envVarValue], EXEC_OPTS);
     }
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -48,9 +48,9 @@
     "@pnpm/plugin-commands-outdated": "workspace:6.0.6",
     "@pnpm/plugin-commands-publishing": "workspace:5.0.7",
     "@pnpm/plugin-commands-rebuild": "workspace:6.1.5",
-    "@pnpm/plugin-commands-script-runners": "workspace:5.0.6",
+    "@pnpm/plugin-commands-script-runners": "workspace:5.0.7",
     "@pnpm/plugin-commands-server": "workspace:4.0.6",
-    "@pnpm/plugin-commands-setup": "workspace:2.0.6",
+    "@pnpm/plugin-commands-setup": "workspace:2.0.7",
     "@pnpm/plugin-commands-store": "workspace:5.1.5",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:6.0.2",