pnpm 7.26.2 → 7.26.3

package/README.md

@@ -38,17 +38,6 @@ To quote the [Rush](https://rushjs.io/) team:
       <td align="center" valign="middle">
         <a href="https://bit.dev/?utm_source=pnpm&utm_medium=readme" target="_blank"><img src="https://pnpm.io/img/users/bit.svg" width="80"></a>
       </td>
-      <td align="center" valign="middle">
-        <a href="https://nhost.io/?utm_source=pnpm&utm_medium=readme" target="_blank">
-          <picture>
-            <source media="(prefers-color-scheme: light)" srcset="https://pnpm.io/img/users/nhost.svg" />
-            <source media="(prefers-color-scheme: dark)" srcset="https://pnpm.io/img/users/nhost_light.svg" />
-            <img src="https://pnpm.io/img/users/nhost.svg" width="180" />
-          </picture>
-        </a>
-      </td>
-    </tr>
-    <tr>
       <td align="center" valign="middle">
         <a href="https://novu.co/?utm_source=pnpm&utm_medium=readme" target="_blank">
           <picture>
@@ -58,6 +47,8 @@ To quote the [Rush](https://rushjs.io/) team:
           </picture>
         </a>
       </td>
+    </tr>
+    <tr>
       <td align="center" valign="middle">
         <a href="https://prisma.io/?utm_source=pnpm&utm_medium=readme" target="_blank">
           <picture>
@@ -67,8 +58,6 @@ To quote the [Rush](https://rushjs.io/) team:
           </picture>
         </a>
       </td>
-    </tr>
-    <tr>
       <td align="center" valign="middle">
         <a href="https://www.flightcontrol.dev/?ref=pnpm" target="_blank"><img src="https://pnpm.io/img/users/flightcontrol.png" width="240"></a>
       </td>
@@ -97,11 +86,6 @@ To quote the [Rush](https://rushjs.io/) team:
       </td>
     </tr>
     <tr>
-      <td align="center" valign="middle">
-        <a href="https://www.takeshape.io/?utm_source=pnpm&utm_medium=readme" target="_blank">
-          <img src="https://pnpm.io/img/users/takeshape.svg" width="280">
-        </a>
-      </td>
       <td align="center" valign="middle">
         <a href="https://doppler.com/?utm_source=pnpm&utm_medium=readme" target="_blank">
           <picture>
@@ -111,8 +95,6 @@ To quote the [Rush](https://rushjs.io/) team:
           </picture>
         </a>
       </td>
-    </tr>
-    <tr>
       <td align="center" valign="middle">
         <a href="https://depot.dev/?utm_source=pnpm&utm_medium=readme" target="_blank">
           <picture>

package/dist/node_modules/.modules.yaml

@@ -200,11 +200,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.26.1
+packageManager: pnpm@7.26.2
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Sun, 29 Jan 2023 03:35:36 GMT
+prunedAt: Wed, 01 Feb 2023 01:45:12 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3241,7 +3241,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.26.2" != null && true ? "7.26.2" : "0.0.0"
+      version: "7.26.3" != null && true ? "7.26.3" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -58575,9 +58575,9 @@ var require_src2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/render-help@1.0.2/node_modules/render-help/lib/index.js
+// ../node_modules/.pnpm/render-help@1.0.3/node_modules/render-help/lib/index.js
 var require_lib34 = __commonJS({
-  "../node_modules/.pnpm/render-help@1.0.2/node_modules/render-help/lib/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/render-help@1.0.3/node_modules/render-help/lib/index.js"(exports2, module2) {
     "use strict";
     var table_1 = require_src2();
     var NO_BORDERS = {
@@ -58600,21 +58600,22 @@ var require_lib34 = __commonJS({
       border: NO_BORDERS,
       singleLine: true
     };
-    var FIRST_COLUMN = { paddingLeft: 2, width: 3 };
+    var FIRST_COLUMN = { paddingLeft: 2, paddingRight: 0 };
     var SHORT_OPTION_COLUMN = { alignment: "right" };
-    var LONG_OPTION_COLUMN = { paddingLeft: 0 };
+    var LONG_OPTION_COLUMN = { paddingLeft: 1, paddingRight: 2 };
     var DESCRIPTION_COLUMN = {
+      paddingLeft: 0,
       paddingRight: 0,
       wrapWord: true
     };
     function renderDescriptionList(descriptionItems, width) {
       const data = descriptionItems.sort((item1, item2) => item1.name.localeCompare(item2.name)).map(({ shortAlias, name, description }) => [shortAlias && `${shortAlias},` || " ", name, description || ""]);
-      const firstColumnMaxWidth = getColumnMaxWidth(data, 0);
-      const nameColumnWidth = Math.max(getColumnMaxWidth(data, 1), 19);
-      const descriptionColumnWidth = Math.max(2, width - firstColumnMaxWidth - nameColumnWidth - 2 - 2 - 1);
-      return multiTrim(table_1.table(data, Object.assign(Object.assign({}, TABLE_OPTIONS), { columns: {
-        0: Object.assign(Object.assign({}, SHORT_OPTION_COLUMN), FIRST_COLUMN),
-        1: Object.assign({ width: nameColumnWidth }, LONG_OPTION_COLUMN),
+      const firstColumnMaxWidth = Math.max(getColumnMaxWidth(data, 0), 3);
+      const nameColumnMaxWidth = Math.max(getColumnMaxWidth(data, 1), 19);
+      const descriptionColumnWidth = Math.max(width - (FIRST_COLUMN.paddingLeft + firstColumnMaxWidth + FIRST_COLUMN.paddingRight + LONG_OPTION_COLUMN.paddingLeft + nameColumnMaxWidth + LONG_OPTION_COLUMN.paddingRight + DESCRIPTION_COLUMN.paddingLeft + DESCRIPTION_COLUMN.paddingRight), 2);
+      return multiTrim((0, table_1.table)(data, Object.assign(Object.assign({}, TABLE_OPTIONS), { columns: {
+        0: Object.assign(Object.assign({ width: firstColumnMaxWidth }, SHORT_OPTION_COLUMN), FIRST_COLUMN),
+        1: Object.assign({ width: nameColumnMaxWidth }, LONG_OPTION_COLUMN),
         2: Object.assign({ width: descriptionColumnWidth }, DESCRIPTION_COLUMN)
       } })));
     }
@@ -110748,7 +110749,10 @@ var require_lib78 = __commonJS({
     }
     exports2.parse = parse2;
     function depPathToFilename(depPath) {
-      const filename = depPathToFilenameUnescaped(depPath).replace(/[\\/:*?"<>|]/g, "+");
+      let filename = depPathToFilenameUnescaped(depPath).replace(/[\\/:*?"<>|]/g, "+");
+      if (filename.includes("(")) {
+        filename = filename.replace(/(\)\()|\(/g, "_").replace(/\)$/, "");
+      }
       if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("file+")) {
         return `${filename.substring(0, 50)}_${(0, crypto_base32_hash_1.createBase32Hash)(filename)}`;
       }
@@ -124319,9 +124323,9 @@ var require_unnest = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/symlink-dir@5.1.0/node_modules/symlink-dir/dist/index.js
+// ../node_modules/.pnpm/symlink-dir@5.1.1/node_modules/symlink-dir/dist/index.js
 var require_dist15 = __commonJS({
-  "../node_modules/.pnpm/symlink-dir@5.1.0/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/symlink-dir@5.1.1/node_modules/symlink-dir/dist/index.js"(exports2, module2) {
     "use strict";
     var betterPathResolve = require_better_path_resolve();
     var fs_1 = require("fs");
@@ -124357,7 +124361,7 @@ var require_dist15 = __commonJS({
               mkdirError.message = `Error while trying to symlink "${src}" to "${dest}". The error happened while trying to create the parent directory for the symlink target. Details: ${mkdirError}`;
               throw mkdirError;
             }
-            await forceSymlink(src, dest);
+            await forceSymlink(src, dest, opts);
             return { reused: false };
           case "EEXIST":
           case "EISDIR":
@@ -124374,18 +124378,25 @@ var require_dist15 = __commonJS({
         linkString = await fs_1.promises.readlink(dest);
       } catch (err) {
         const parentDir = path2.dirname(dest);
-        const ignore = `.ignored_${path2.basename(dest)}`;
-        await renameOverwrite(dest, path2.join(parentDir, ignore));
+        let warn;
+        if (opts === null || opts === void 0 ? void 0 : opts.renameTried) {
+          await fs_1.promises.unlink(dest);
+          warn = `Symlink wanted name was occupied by directory or file. Old entity removed: "${parentDir}${path2.sep}{${path2.basename(dest)}".`;
+        } else {
+          const ignore = `.ignored_${path2.basename(dest)}`;
+          await renameOverwrite(dest, path2.join(parentDir, ignore));
+          warn = `Symlink wanted name was occupied by directory or file. Old entity moved: "${parentDir}${path2.sep}{${path2.basename(dest)} => ${ignore}".`;
+        }
         return {
-          ...await forceSymlink(src, dest),
-          warn: `Symlink wanted name was occupied by directory or file. Old entity moved: "${parentDir}${path2.sep}{${path2.basename(dest)} => ${ignore}}".`
+          ...await forceSymlink(src, dest, { ...opts, renameTried: true }),
+          warn
         };
       }
       if (src === linkString) {
         return { reused: true };
       }
       await fs_1.promises.unlink(dest);
-      return await forceSymlink(src, dest);
+      return await forceSymlink(src, dest, opts);
     }
     symlinkDir["default"] = symlinkDir;
     module2.exports = symlinkDir;
@@ -124626,36 +124637,47 @@ var require_lib108 = __commonJS({
           return;
         const srcFile = path_1.default.join(src, file);
         if ((await fs_1.promises.lstat(srcFile)).isDirectory()) {
-          await Promise.all(destDirs.map(async (destDir) => {
-            const destFile = path_1.default.join(destDir, file);
+          const destSubdirs = await Promise.all(destDirs.map(async (destDir) => {
+            const destSubdir = path_1.default.join(destDir, file);
             try {
-              await fs_1.promises.mkdir(destFile, { recursive: true });
+              await fs_1.promises.mkdir(destSubdir, { recursive: true });
             } catch (err) {
               if (err.code !== "EEXIST")
                 throw err;
             }
-            return hardLinkDir(srcFile, [destFile]);
+            return destSubdir;
           }));
+          await hardLinkDir(srcFile, destSubdirs);
           return;
         }
         await Promise.all(destDirs.map(async (destDir) => {
           const destFile = path_1.default.join(destDir, file);
           try {
-            await linkOrCopy(srcFile, destFile);
+            await linkOrCopyFile(srcFile, destFile);
           } catch (err) {
             if (err.code === "ENOENT") {
-              await fs_1.promises.mkdir(destDir, { recursive: true });
-              await linkOrCopy(srcFile, destFile);
               return;
             }
-            if (err.code !== "EEXIST") {
-              throw err;
-            }
+            throw err;
           }
         }));
       }));
     }
     exports2.hardLinkDir = hardLinkDir;
+    async function linkOrCopyFile(srcFile, destFile) {
+      try {
+        await linkOrCopy(srcFile, destFile);
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          await fs_1.promises.mkdir(path_1.default.dirname(destFile), { recursive: true });
+          await linkOrCopy(srcFile, destFile);
+          return;
+        }
+        if (err.code !== "EEXIST") {
+          throw err;
+        }
+      }
+    }
     async function linkOrCopy(srcFile, destFile) {
       try {
         await fs_1.promises.link(srcFile, destFile);
@@ -189393,7 +189415,7 @@ var require_updateProjectManifest = __commonJS({
       }
       const specsToUpsert = opts.directDependencies.filter((rdd, index) => importer.wantedDependencies[index]?.updateSpec).map((rdd, index) => {
         const wantedDep = importer.wantedDependencies[index];
-        return resolvedDirectDepToSpecObject({ ...rdd, isNew: wantedDep.isNew, specRaw: wantedDep.raw }, importer, {
+        return resolvedDirectDepToSpecObject({ ...rdd, isNew: wantedDep.isNew, specRaw: wantedDep.raw, preserveNonSemverVersionSpec: wantedDep.preserveNonSemverVersionSpec }, importer, {
           nodeExecPath: wantedDep.nodeExecPath,
           pinnedVersion: wantedDep.pinnedVersion ?? importer.pinnedVersion ?? "major",
           preserveWorkspaceProtocol: opts.preserveWorkspaceProtocol,
@@ -189415,7 +189437,7 @@ var require_updateProjectManifest = __commonJS({
       return [hookedManifest, originalManifest];
     }
     exports2.updateProjectManifest = updateProjectManifest;
-    function resolvedDirectDepToSpecObject({ alias, isNew, name, normalizedPref, resolution, specRaw, version: version2 }, importer, opts) {
+    function resolvedDirectDepToSpecObject({ alias, isNew, name, normalizedPref, resolution, specRaw, version: version2, preserveNonSemverVersionSpec }, importer, opts) {
       let pref;
       if (normalizedPref) {
         pref = normalizedPref;
@@ -189437,7 +189459,8 @@ var require_updateProjectManifest = __commonJS({
             pinnedVersion: opts.pinnedVersion,
             specRaw,
             version: version2,
-            rolling: shouldUseWorkspaceProtocol && opts.saveWorkspaceProtocol === "rolling"
+            rolling: shouldUseWorkspaceProtocol && opts.saveWorkspaceProtocol === "rolling",
+            preserveNonSemverVersionSpec
           });
         }
         if (shouldUseWorkspaceProtocol && !pref.startsWith("workspace:")) {
@@ -189479,7 +189502,7 @@ var require_updateProjectManifest = __commonJS({
           }
         }
         const selector = (0, version_selector_type_1.default)(specWithoutName);
-        if (!selector) {
+        if ((selector == null || selector.type !== "version" && selector.type !== "range") && opts.preserveNonSemverVersionSpec) {
           return opts.specRaw.slice(opts.alias.length + 1);
         }
       }
@@ -192367,7 +192390,7 @@ var require_install = __commonJS({
             includeDirect: opts.includeDirect,
             updateWorkspaceDependencies: opts.update,
             nodeExecPath: opts.nodeExecPath
-          }).map((wantedDependency) => ({ ...wantedDependency, updateSpec: true }));
+          }).map((wantedDependency) => ({ ...wantedDependency, updateSpec: true, preserveNonSemverVersionSpec: true }));
           if (ctx.wantedLockfile?.importers) {
             forgetResolutionsOfPrevWantedDeps(ctx.wantedLockfile.importers[project.id], wantedDependencies);
           }
@@ -219103,9 +219126,9 @@ var require_lib156 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.6/node_modules/@pnpm/os.env.path-extender-posix/dist/path-extender-posix.js
+// ../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.7/node_modules/@pnpm/os.env.path-extender-posix/dist/path-extender-posix.js
 var require_path_extender_posix = __commonJS({
-  "../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.6/node_modules/@pnpm/os.env.path-extender-posix/dist/path-extender-posix.js"(exports2) {
+  "../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.7/node_modules/@pnpm/os.env.path-extender-posix/dist/path-extender-posix.js"(exports2) {
     "use strict";
     var __awaiter3 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
@@ -219170,7 +219193,10 @@ var require_path_extender_posix = __commonJS({
       return __awaiter3(this, void 0, void 0, function* () {
         switch (currentShell) {
           case "bash":
-          case "zsh": {
+          case "zsh":
+          case "ksh":
+          case "dash":
+          case "sh": {
             return setupShell(currentShell, pnpmHomeDir, opts);
           }
           case "fish": {
@@ -219207,7 +219233,19 @@ export PATH="${_createPathValue(`$${opts.proxyVarName}`)}"`;
       });
     }
     function getConfigFilePath(shell) {
-      return shell === "zsh" ? path_1.default.join(process.env.ZDOTDIR || os_1.default.homedir(), `.${shell}rc`) : path_1.default.join(os_1.default.homedir(), `.${shell}rc`);
+      switch (shell) {
+        case "zsh":
+          return path_1.default.join(process.env.ZDOTDIR || os_1.default.homedir(), `.${shell}rc`);
+        case "dash":
+        case "sh": {
+          if (!process.env.ENV) {
+            throw new error_1.PnpmError("NO_SHELL_CONFIG", `Cannot find a config file for ${shell}. The ENV environment variable is not set.`);
+          }
+          return process.env.ENV;
+        }
+        default:
+          return path_1.default.join(os_1.default.homedir(), `.${shell}rc`);
+      }
     }
     function createPathValue(position, dir) {
       return position === "start" ? `${dir}:$PATH` : `$PATH:${dir}`;
@@ -219295,9 +219333,9 @@ ${newContent}`, "utf8");
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.6/node_modules/@pnpm/os.env.path-extender-posix/dist/index.js
+// ../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.7/node_modules/@pnpm/os.env.path-extender-posix/dist/index.js
 var require_dist18 = __commonJS({
-  "../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.6/node_modules/@pnpm/os.env.path-extender-posix/dist/index.js"(exports2) {
+  "../node_modules/.pnpm/@pnpm+os.env.path-extender-posix@0.2.7/node_modules/@pnpm/os.env.path-extender-posix/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.addDirToPosixEnvPath = void 0;
@@ -221456,9 +221494,9 @@ var require_dist19 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.8/node_modules/@pnpm/os.env.path-extender/dist/path-extender.js
+// ../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.9/node_modules/@pnpm/os.env.path-extender/dist/path-extender.js
 var require_path_extender = __commonJS({
-  "../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.8/node_modules/@pnpm/os.env.path-extender/dist/path-extender.js"(exports2) {
+  "../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.9/node_modules/@pnpm/os.env.path-extender/dist/path-extender.js"(exports2) {
     "use strict";
     var __awaiter3 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
@@ -221524,9 +221562,9 @@ var require_path_extender = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.8/node_modules/@pnpm/os.env.path-extender/dist/index.js
+// ../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.9/node_modules/@pnpm/os.env.path-extender/dist/index.js
 var require_dist20 = __commonJS({
-  "../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.8/node_modules/@pnpm/os.env.path-extender/dist/index.js"(exports2) {
+  "../node_modules/.pnpm/@pnpm+os.env.path-extender@0.2.9/node_modules/@pnpm/os.env.path-extender/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.addDirToEnvPath = void 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.26.2",
+  "version": "7.26.3",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -97,11 +97,11 @@
     "ps-list": "^7.2.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "read-yaml-file": "^2.1.0",
-    "render-help": "^1.0.2",
+    "render-help": "^1.0.3",
     "semver": "^7.3.8",
     "split-cmd": "^1.0.1",
     "strip-ansi": "^6.0.1",
-    "symlink-dir": "^5.1.0",
+    "symlink-dir": "^5.1.1",
     "tempy": "^1.0.1",
     "tree-kill": "^1.2.2",
     "which": "^3.0.0",