pnpm 6.32.13 → 6.32.16

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.16" != null && true ? "6.32.16" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -36758,11 +36758,22 @@ ${foundSettings.join("\n")}`;
       return value;
     }
     function reportPeerDependencyIssuesError(err, msg) {
+      const hasMissingPeers = getHasMissingPeers(msg.issuesByProjects);
+      const hints = [];
+      if (hasMissingPeers) {
+        hints.push('If you want peer dependencies to be automatically installed, set the "auto-install-peers" setting to "true".');
+      }
+      hints.push(`If you don't want pnpm to fail on peer dependency issues, set the "strict-peer-dependencies" setting to "false".`);
       return {
         title: err.message,
-        body: (0, render_peer_issues_1.default)(msg.issuesByProjects)
+        body: `${(0, render_peer_issues_1.default)(msg.issuesByProjects)}
+${hints.map((hint) => `hint: ${hint}`).join("\n")}
+`
       };
     }
+    function getHasMissingPeers(issuesByProjects) {
+      return Object.values(issuesByProjects).some((issues) => Object.values(issues.missing).flat().some(({ optional }) => !optional));
+    }
   }
 });
 
@@ -73820,7 +73831,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 +85019,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;
       }
@@ -106875,8 +106886,15 @@ var require_lib76 = __commonJS({
     }
     async function getBinNodePaths(target) {
       const targetDir = path_1.default.dirname(target);
-      const targetRealPath = await fs_1.promises.realpath(targetDir);
-      return (0, union_1.default)(module_1.default["_nodeModulePaths"](targetRealPath), module_1.default["_nodeModulePaths"](targetDir));
+      try {
+        const targetRealPath = await fs_1.promises.realpath(targetDir);
+        return (0, union_1.default)(module_1.default["_nodeModulePaths"](targetRealPath), module_1.default["_nodeModulePaths"](targetDir));
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+        return module_1.default["_nodeModulePaths"](targetDir);
+      }
     }
     async function safeReadPkgJson(pkgDir) {
       try {
@@ -110232,7 +110250,6 @@ var require_lib85 = __commonJS({
     var dependency_path_1 = require_lib35();
     var difference_1 = __importDefault(require_difference());
     var isEmpty_1 = __importDefault(require_isEmpty2());
-    var omit_1 = __importDefault(require_omit());
     var unnest_1 = __importDefault(require_unnest());
     __exportStar(require_lib57(), exports2);
     function pruneSharedLockfile(lockfile, opts) {
@@ -110353,7 +110370,7 @@ var require_lib85 = __commonJS({
       return Object.entries(deps).map(([alias, ref]) => (0, dependency_path_1.refToRelative)(ref, alias)).filter((depPath) => depPath !== null);
     }
     function copyDependencySubGraph(ctx, depPaths, opts) {
-      var _a, _b, _c, _d;
+      var _a, _b;
       for (const depPath of depPaths) {
         const key = `${depPath}:${opts.optional.toString()}:${opts.dev.toString()}`;
         if (ctx.walked.has(key))
@@ -110381,9 +110398,9 @@ var require_lib85 = __commonJS({
         } else if (depLockfile.dev === void 0 && !ctx.notProdOnly.has(depPath)) {
           depLockfile.dev = false;
         }
-        const newDependencies = resolvedDepsToDepPaths((0, omit_1.default)((_b = Object.keys((_a = depLockfile.peerDependencies) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], (_c = depLockfile.dependencies) !== null && _c !== void 0 ? _c : {}));
+        const newDependencies = resolvedDepsToDepPaths((_a = depLockfile.dependencies) !== null && _a !== void 0 ? _a : {});
         copyDependencySubGraph(ctx, newDependencies, opts);
-        const newOptionalDependencies = resolvedDepsToDepPaths((_d = depLockfile.optionalDependencies) !== null && _d !== void 0 ? _d : {});
+        const newOptionalDependencies = resolvedDepsToDepPaths((_b = depLockfile.optionalDependencies) !== null && _b !== void 0 ? _b : {});
         copyDependencySubGraph(ctx, newOptionalDependencies, { dev: opts.dev, optional: true });
       }
     }
@@ -115863,6 +115880,526 @@ var require_getNonDevWantedDependencies = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/utils.js
+var require_utils9 = __commonJS({
+  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/utils.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var semver_12 = __importDefault(require_semver3());
+    function isNotNull(value) {
+      return value !== null;
+    }
+    exports2.isNotNull = isNotNull;
+    function uniqueArray(array) {
+      return [...new Set(array)];
+    }
+    exports2.uniqueArray = uniqueArray;
+    function isNoIncludeNull(value) {
+      return value.every(isNotNull);
+    }
+    exports2.isNoIncludeNull = isNoIncludeNull;
+    function isPrerelease(version) {
+      if (version instanceof semver_12.default.SemVer) {
+        return version.prerelease.length !== 0;
+      } else {
+        return false;
+      }
+    }
+    exports2.isPrerelease = isPrerelease;
+    function isValidOperator(comparator, operatorList) {
+      return operatorList.includes(comparator.operator);
+    }
+    exports2.isValidOperator = isValidOperator;
+    function equalComparator(comparatorA, comparatorB) {
+      return comparatorA.value === comparatorB.value;
+    }
+    exports2.equalComparator = equalComparator;
+    function comparator2versionStr(comparator) {
+      const compSemver = comparator.semver;
+      return compSemver instanceof semver_12.default.SemVer ? compSemver.version : "";
+    }
+    exports2.comparator2versionStr = comparator2versionStr;
+    function isSameVersionEqualsLikeComparator(comparatorA, comparatorB) {
+      const compVersionA = comparator2versionStr(comparatorA);
+      const compVersionB = comparator2versionStr(comparatorB);
+      return compVersionA !== "" && compVersionB !== "" && compVersionA === compVersionB && /=|^$/.test(comparatorA.operator) && /=|^$/.test(comparatorB.operator);
+    }
+    exports2.isSameVersionEqualsLikeComparator = isSameVersionEqualsLikeComparator;
+    function isEqualsComparator(comparator) {
+      return comparator.semver instanceof semver_12.default.SemVer && isValidOperator(comparator, ["", "="]);
+    }
+    exports2.isEqualsComparator = isEqualsComparator;
+    function filterUniqueComparator(comparator, index, self2) {
+      return self2.findIndex((comp) => equalComparator(comparator, comp)) === index;
+    }
+    exports2.filterUniqueComparator = filterUniqueComparator;
+    function filterOperator(operatorList) {
+      return (comparator) => isValidOperator(comparator, operatorList);
+    }
+    exports2.filterOperator = filterOperator;
+    function isIntersectRanges(semverRangeList) {
+      return semverRangeList.every((rangeA, index, rangeList) => rangeList.slice(index + 1).every((rangeB) => rangeA.intersects(rangeB)));
+    }
+    exports2.isIntersectRanges = isIntersectRanges;
+    function stripSemVerPrerelease(semverVersion) {
+      if (!(semverVersion instanceof semver_12.default.SemVer)) {
+        return "";
+      }
+      if (!semverVersion.prerelease.length) {
+        return semverVersion.version;
+      }
+      const newSemverVersion = new semver_12.default.SemVer(semverVersion.version, semverVersion.options);
+      newSemverVersion.prerelease = [];
+      return newSemverVersion.format();
+    }
+    exports2.stripSemVerPrerelease = stripSemVerPrerelease;
+    function stripComparatorOperator(comparator) {
+      if (!comparator.operator) {
+        return comparator;
+      }
+      const versionStr = comparator2versionStr(comparator);
+      return new semver_12.default.Comparator(versionStr, comparator.options);
+    }
+    exports2.stripComparatorOperator = stripComparatorOperator;
+    function getLowerBoundComparator(comparatorList, options = {}) {
+      const validComparatorList = comparatorList.filter((comparator) => isValidOperator(comparator, [">", ">="]) || !(comparator.semver instanceof semver_12.default.SemVer));
+      const leComparatorVersionList = comparatorList.filter(filterOperator(["<="])).map(comparator2versionStr);
+      if (validComparatorList.length >= 1) {
+        return validComparatorList.reduce((a, b) => {
+          const semverA = a.semver;
+          const semverB = b.semver;
+          if (!(semverA instanceof semver_12.default.SemVer)) {
+            if (!options.singleRange && isPrerelease(semverB) && !(b.operator === ">=" && leComparatorVersionList.some((version) => version === String(semverB)))) {
+              return new semver_12.default.Comparator(`>=${stripSemVerPrerelease(semverB)}`, b.options);
+            }
+            return b;
+          } else if (!(semverB instanceof semver_12.default.SemVer)) {
+            if (!options.singleRange && isPrerelease(semverA) && !(a.operator === ">=" && leComparatorVersionList.some((version) => version === String(semverA)))) {
+              return new semver_12.default.Comparator(`>=${stripSemVerPrerelease(semverA)}`, a.options);
+            }
+            return a;
+          }
+          const semverCmp = semver_12.default.compare(semverA, semverB);
+          if (a.operator === b.operator || semverCmp !== 0) {
+            if (!options.singleRange) {
+              const semverCmpMain = semverA.compareMain(semverB);
+              if (semverCmpMain !== 0 && semverA.prerelease.length && semverB.prerelease.length) {
+                if (semverCmpMain > 0) {
+                  return new semver_12.default.Comparator(a.operator + stripSemVerPrerelease(semverA), a.options);
+                } else {
+                  return new semver_12.default.Comparator(b.operator + stripSemVerPrerelease(semverB), b.options);
+                }
+              }
+            }
+            if (semverCmp > 0) {
+              return a;
+            } else {
+              return b;
+            }
+          } else {
+            if (a.operator === ">") {
+              return a;
+            } else {
+              return b;
+            }
+          }
+        });
+      } else {
+        return new semver_12.default.Comparator("");
+      }
+    }
+    exports2.getLowerBoundComparator = getLowerBoundComparator;
+    function getUpperBoundComparator(comparatorList, options = {}) {
+      const validComparatorList = comparatorList.filter((comparator) => isValidOperator(comparator, ["<", "<="]) || !(comparator.semver instanceof semver_12.default.SemVer));
+      const geComparatorVersionList = comparatorList.filter(filterOperator([">="])).map(comparator2versionStr);
+      if (validComparatorList.length >= 1) {
+        return validComparatorList.reduce((a, b) => {
+          const semverA = a.semver;
+          const semverB = b.semver;
+          if (!(semverA instanceof semver_12.default.SemVer)) {
+            if (!options.singleRange && isPrerelease(semverB) && !(b.operator === "<=" && geComparatorVersionList.some((version) => version === String(semverB)))) {
+              return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverB)}`, b.options);
+            }
+            return b;
+          } else if (!(semverB instanceof semver_12.default.SemVer)) {
+            if (!options.singleRange && isPrerelease(semverA) && !(a.operator === "<=" && geComparatorVersionList.some((version) => version === String(semverA)))) {
+              return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverA)}`, a.options);
+            }
+            return a;
+          }
+          const semverCmp = semver_12.default.compare(semverA, semverB);
+          if (a.operator === b.operator || semverCmp !== 0) {
+            if (!options.singleRange) {
+              const semverCmpMain = semverA.compareMain(semverB);
+              if (semverCmpMain !== 0 && semverA.prerelease.length && semverB.prerelease.length) {
+                if (semverCmpMain < 0) {
+                  return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverA)}`, a.options);
+                } else {
+                  return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverB)}`, b.options);
+                }
+              }
+            }
+            if (semverCmp < 0) {
+              return a;
+            } else {
+              return b;
+            }
+          } else {
+            if (a.operator === "<") {
+              return a;
+            } else {
+              return b;
+            }
+          }
+        });
+      } else {
+        return new semver_12.default.Comparator("");
+      }
+    }
+    exports2.getUpperBoundComparator = getUpperBoundComparator;
+  }
+});
+
+// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/single-range.js
+var require_single_range = __commonJS({
+  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/single-range.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var semver_12 = __importDefault(require_semver3());
+    var utils_1 = require_utils9();
+    var SingleVer = class {
+      constructor(comp) {
+        this.comp = comp;
+      }
+      toString() {
+        return this.comp.value;
+      }
+      intersect(singleRange) {
+        if (semver_12.default.intersects(String(this), String(singleRange))) {
+          return this;
+        } else {
+          return null;
+        }
+      }
+      merge(singleRange) {
+        if (semver_12.default.intersects(String(this), String(singleRange))) {
+          return singleRange;
+        }
+        return null;
+      }
+    };
+    exports2.SingleVer = SingleVer;
+    var SingleRange = class {
+      constructor(lowerBound, upperBound) {
+        this.lowerBound = lowerBound;
+        this.upperBound = upperBound;
+        if (!lowerBound.intersects(upperBound)) {
+          throw new Error(`Invalid range; version range does not intersect: ${this}`);
+        }
+      }
+      toString() {
+        return [this.lowerBound.value, this.upperBound.value].filter((v) => v !== "").join(" ");
+      }
+      intersect(singleRange) {
+        if (semver_12.default.intersects(String(this), String(singleRange))) {
+          if (singleRange instanceof SingleVer) {
+            return singleRange;
+          } else {
+            const lowerBoundComparatorList = [
+              this.lowerBound,
+              singleRange.lowerBound
+            ];
+            const upperBoundComparatorList = [
+              this.upperBound,
+              singleRange.upperBound
+            ];
+            const lowerBound = utils_1.getLowerBoundComparator([
+              ...lowerBoundComparatorList,
+              ...upperBoundComparatorList.filter((comparator) => comparator.semver instanceof semver_12.default.SemVer)
+            ]);
+            const upperBound = utils_1.getUpperBoundComparator([
+              ...upperBoundComparatorList,
+              ...lowerBoundComparatorList.filter((comparator) => comparator.semver instanceof semver_12.default.SemVer)
+            ]);
+            if (utils_1.isSameVersionEqualsLikeComparator(lowerBound, upperBound)) {
+              return new SingleVer(utils_1.stripComparatorOperator(lowerBound));
+            }
+            return new SingleRange(lowerBound, upperBound);
+          }
+        } else {
+          return null;
+        }
+      }
+      merge(singleRange) {
+        if (semver_12.default.intersects(String(this), String(singleRange))) {
+          if (singleRange instanceof SingleVer) {
+            return this;
+          } else {
+            const lowerBound = ((a, b) => {
+              const semverA = a.semver;
+              const semverB = b.semver;
+              if (!(semverA instanceof semver_12.default.SemVer)) {
+                if (utils_1.isPrerelease(semverB)) {
+                  return null;
+                }
+                return a;
+              } else if (!(semverB instanceof semver_12.default.SemVer)) {
+                if (utils_1.isPrerelease(semverA)) {
+                  return null;
+                }
+                return b;
+              }
+              const cmpMain = semverA.compareMain(semverB);
+              if (cmpMain < 0 && utils_1.isPrerelease(semverB) || cmpMain > 0 && utils_1.isPrerelease(semverA)) {
+                return null;
+              }
+              const semverCmp = semver_12.default.compare(semverA, semverB);
+              if (a.operator === b.operator || semverCmp !== 0) {
+                if (semverCmp < 0) {
+                  return a;
+                } else {
+                  return b;
+                }
+              } else {
+                if (a.operator === ">=") {
+                  return a;
+                } else {
+                  return b;
+                }
+              }
+            })(this.lowerBound, singleRange.lowerBound);
+            const upperBound = ((a, b) => {
+              const semverA = a.semver;
+              const semverB = b.semver;
+              if (!(semverA instanceof semver_12.default.SemVer)) {
+                if (utils_1.isPrerelease(semverB)) {
+                  return null;
+                }
+                return a;
+              } else if (!(semverB instanceof semver_12.default.SemVer)) {
+                if (utils_1.isPrerelease(semverA)) {
+                  return null;
+                }
+                return b;
+              }
+              const cmpMain = semverA.compareMain(semverB);
+              if (cmpMain > 0 && utils_1.isPrerelease(semverB) || cmpMain < 0 && utils_1.isPrerelease(semverA)) {
+                return null;
+              }
+              const semverCmp = semver_12.default.compare(semverA, semverB);
+              if (a.operator === b.operator || semverCmp !== 0) {
+                if (semverCmp > 0) {
+                  return a;
+                } else {
+                  return b;
+                }
+              } else {
+                if (a.operator === "<=") {
+                  return a;
+                } else {
+                  return b;
+                }
+              }
+            })(this.upperBound, singleRange.upperBound);
+            if (lowerBound && upperBound) {
+              return new SingleRange(lowerBound, upperBound);
+            }
+          }
+        }
+        return null;
+      }
+    };
+    exports2.SingleRange = SingleRange;
+    function createSingleRange(comparatorList) {
+      const equalsComparatorList = comparatorList.filter(utils_1.isEqualsComparator).filter(utils_1.filterUniqueComparator);
+      switch (equalsComparatorList.length) {
+        case 0: {
+          const lowerBound = utils_1.getLowerBoundComparator(comparatorList, {
+            singleRange: true
+          });
+          const upperBound = utils_1.getUpperBoundComparator(comparatorList, {
+            singleRange: true
+          });
+          if (utils_1.isSameVersionEqualsLikeComparator(lowerBound, upperBound)) {
+            return new SingleVer(utils_1.stripComparatorOperator(lowerBound));
+          }
+          try {
+            return new SingleRange(lowerBound, upperBound);
+          } catch (err) {
+            return null;
+          }
+        }
+        case 1:
+          return new SingleVer(equalsComparatorList[0]);
+        default:
+          return null;
+      }
+    }
+    exports2.createSingleRange = createSingleRange;
+    function isSingleRange(value) {
+      return value instanceof SingleVer || value instanceof SingleRange;
+    }
+    exports2.isSingleRange = isSingleRange;
+  }
+});
+
+// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/multi-range.js
+var require_multi_range = __commonJS({
+  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/multi-range.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var single_range_1 = require_single_range();
+    var utils_1 = require_utils9();
+    function normalizeSingleRangeList(singleRangeList) {
+      return singleRangeList.reduce((singleRangeList2, singleRange) => {
+        if (!singleRange) {
+          return [...singleRangeList2, singleRange];
+        }
+        let insertFirst = false;
+        const removeIndexList = [];
+        const appendSingleRange = singleRangeList2.reduce((appendSingleRange2, insertedSingleRange, index) => {
+          if (insertedSingleRange && appendSingleRange2) {
+            const mergedSingleRange = insertedSingleRange.merge(appendSingleRange2);
+            if (mergedSingleRange) {
+              if (String(mergedSingleRange) === String(insertedSingleRange)) {
+                return;
+              } else {
+                removeIndexList.push(index);
+                if (insertedSingleRange instanceof single_range_1.SingleRange && appendSingleRange2 instanceof single_range_1.SingleRange) {
+                  insertFirst = true;
+                }
+                return mergedSingleRange;
+              }
+            }
+          }
+          return appendSingleRange2;
+        }, singleRange);
+        const removedSingleRangeList = singleRangeList2.filter((_, index) => !removeIndexList.includes(index));
+        if (appendSingleRange) {
+          if (insertFirst) {
+            return [appendSingleRange, ...removedSingleRangeList];
+          } else {
+            return [...removedSingleRangeList, appendSingleRange];
+          }
+        }
+        return removedSingleRangeList;
+      }, []);
+    }
+    exports2.normalizeSingleRangeList = normalizeSingleRangeList;
+    var MultiRange = class {
+      get valid() {
+        return this.set.length >= 1;
+      }
+      constructor(rangeList) {
+        if (rangeList) {
+          const singleRangeList = normalizeSingleRangeList(rangeList.map((singleRangeOrComparatorList) => {
+            if (single_range_1.isSingleRange(singleRangeOrComparatorList) || !singleRangeOrComparatorList) {
+              return singleRangeOrComparatorList;
+            } else {
+              return single_range_1.createSingleRange(singleRangeOrComparatorList);
+            }
+          }));
+          this.set = singleRangeList.filter(utils_1.isNotNull);
+        } else {
+          this.set = [];
+        }
+      }
+      toString() {
+        if (!this.valid) {
+          throw new Error("Invalid range");
+        }
+        return utils_1.uniqueArray(this.set.map(String)).join(" || ");
+      }
+      intersect(multiRange) {
+        if (this.valid && multiRange.valid) {
+          const singleRangeList = this.set.map((singleRangeA) => multiRange.set.map((singleRangeB) => singleRangeA.intersect(singleRangeB))).reduce((a, b) => [...a, ...b]).filter(utils_1.isNotNull);
+          return new MultiRange(singleRangeList);
+        } else if (this.valid) {
+          return this;
+        } else if (multiRange.valid) {
+          return multiRange;
+        } else {
+          return new MultiRange(null);
+        }
+      }
+    };
+    exports2.MultiRange = MultiRange;
+  }
+});
+
+// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/index.js
+var require_dist12 = __commonJS({
+  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/index.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    var semver_12 = __importDefault(require_semver3());
+    var multi_range_1 = require_multi_range();
+    var utils_1 = require_utils9();
+    function intersect(...ranges) {
+      const semverRangeList = (() => {
+        try {
+          return ranges.map((rangeStr) => new semver_12.default.Range(rangeStr));
+        } catch (err) {
+          return null;
+        }
+      })();
+      if (!semverRangeList || !utils_1.isIntersectRanges(semverRangeList)) {
+        return null;
+      }
+      const intersectRange = semverRangeList.map((range) => new multi_range_1.MultiRange(range.set)).reduce((multiRangeA, multiRangeB) => multiRangeA.intersect(multiRangeB), new multi_range_1.MultiRange(null));
+      return intersectRange.valid ? String(intersectRange) || "*" : null;
+    }
+    exports2.intersect = intersect;
+  }
+});
+
+// ../resolve-dependencies/lib/mergePeers.js
+var require_mergePeers = __commonJS({
+  "../resolve-dependencies/lib/mergePeers.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.safeIntersect = exports2.mergePeers = void 0;
+    var semver_range_intersect_1 = require_dist12();
+    function mergePeers(missingPeers) {
+      const conflicts = [];
+      const intersections = {};
+      for (const [peerName, ranges] of Object.entries(missingPeers)) {
+        if (ranges.every(({ optional }) => optional))
+          continue;
+        if (ranges.length === 1) {
+          intersections[peerName] = ranges[0].wantedRange;
+          continue;
+        }
+        const intersection = safeIntersect(ranges.map(({ wantedRange }) => wantedRange));
+        if (intersection === null) {
+          conflicts.push(peerName);
+        } else {
+          intersections[peerName] = intersection;
+        }
+      }
+      return { conflicts, intersections };
+    }
+    exports2.mergePeers = mergePeers;
+    function safeIntersect(ranges) {
+      try {
+        return (0, semver_range_intersect_1.intersect)(...ranges);
+      } catch {
+        return null;
+      }
+    }
+    exports2.safeIntersect = safeIntersect;
+  }
+});
+
 // ../resolve-dependencies/lib/wantedDepIsLocallyAvailable.js
 var require_wantedDepIsLocallyAvailable = __commonJS({
   "../resolve-dependencies/lib/wantedDepIsLocallyAvailable.js"(exports2) {
@@ -115949,6 +116486,7 @@ var require_resolveDependencies = __commonJS({
     var semver_12 = __importDefault(require_semver2());
     var encodePkgId_1 = __importDefault(require_encodePkgId());
     var getNonDevWantedDependencies_1 = __importDefault(require_getNonDevWantedDependencies());
+    var mergePeers_1 = require_mergePeers();
     var nodeIdUtils_1 = require_nodeIdUtils();
     var wantedDepIsLocallyAvailable_1 = __importDefault(require_wantedDepIsLocallyAvailable());
     var dependencyResolvedLogger = (0, logger_1.default)("_dependency_resolved");
@@ -115960,17 +116498,30 @@ var require_resolveDependencies = __commonJS({
     }
     exports2.nodeIdToParents = nodeIdToParents;
     async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
-      const extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
-        preferredDependencies: options.preferredDependencies,
-        prefix: ctx.prefix,
-        proceed: options.proceed || ctx.forceFullResolution,
-        registries: ctx.registries,
-        resolvedDependencies: options.resolvedDependencies
-      });
+      let extendedWantedDeps = [];
       const postponedResolutionsQueue = [];
-      const pkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
+      const pkgAddresses = [];
+      while (true) {
+        extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
+          preferredDependencies: options.preferredDependencies,
+          prefix: ctx.prefix,
+          proceed: options.proceed || ctx.forceFullResolution,
+          registries: ctx.registries,
+          resolvedDependencies: options.resolvedDependencies
+        });
+        const newPkgAddresses = (await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep)))).filter(Boolean);
+        pkgAddresses.push(...newPkgAddresses);
+        if (!ctx.autoInstallPeers)
+          break;
+        const allMissingPeers = mergePkgsDeps(newPkgAddresses.map(({ missingPeers }) => missingPeers));
+        if (!Object.keys(allMissingPeers).length)
+          break;
+        wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: allMissingPeers });
+      }
       const newPreferredVersions = { ...preferredVersions };
+      const newParentPkgAliases = { ...options.parentPkgAliases };
       for (const pkgAddress of pkgAddresses) {
+        newParentPkgAliases[pkgAddress.alias] = true;
         if (pkgAddress.updated) {
           ctx.updatedSet.add(pkgAddress.alias);
         }
@@ -115982,10 +116533,29 @@ var require_resolveDependencies = __commonJS({
         }
         newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
       }
-      await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions)));
+      await Promise.all(postponedResolutionsQueue.map(async (postponedResolution) => postponedResolution(newPreferredVersions, newParentPkgAliases)));
       return pkgAddresses;
     }
     exports2.default = resolveDependencies;
+    function mergePkgsDeps(pkgsDeps) {
+      const groupedRanges = {};
+      for (const deps of pkgsDeps) {
+        for (const [name, range] of Object.entries(deps)) {
+          if (!groupedRanges[name]) {
+            groupedRanges[name] = [];
+          }
+          groupedRanges[name].push(range);
+        }
+      }
+      const mergedPkgDeps = {};
+      for (const [name, ranges] of Object.entries(groupedRanges)) {
+        const intersection = (0, mergePeers_1.safeIntersect)(ranges);
+        if (intersection) {
+          mergedPkgDeps[name] = intersection;
+        }
+      }
+      return mergedPkgDeps;
+    }
     async function resolveDependenciesOfDependency(postponedResolutionsQueue, ctx, preferredVersions, options, extendedWantedDep) {
       var _a, _b;
       const updateDepth = typeof extendedWantedDep.wantedDependency.updateDepth === "number" ? extendedWantedDep.wantedDependency.updateDepth : options.updateDepth;
@@ -115994,6 +116564,7 @@ var require_resolveDependencies = __commonJS({
       const resolveDependencyOpts = {
         currentDepth: options.currentDepth,
         parentPkg: options.parentPkg,
+        parentPkgAliases: options.parentPkgAliases,
         preferredVersions,
         workspacePackages: options.workspacePackages,
         currentPkg: (_b = extendedWantedDep.infoFromLockfile) !== null && _b !== void 0 ? _b : void 0,
@@ -116018,13 +116589,13 @@ var require_resolveDependencies = __commonJS({
       }
       if (!resolveDependencyResult.isNew)
         return resolveDependencyResult;
-      postponedResolutionsQueue.push(async (preferredVersions2) => {
+      postponedResolutionsQueue.push(async (preferredVersions2, parentPkgAliases) => {
         var _a2;
-        return resolveChildren(ctx, resolveDependencyResult, (_a2 = extendedWantedDep.infoFromLockfile) === null || _a2 === void 0 ? void 0 : _a2.dependencyLockfile, options.workspacePackages, options.currentDepth, updateDepth, preferredVersions2);
+        return resolveChildren(ctx, resolveDependencyResult, parentPkgAliases, (_a2 = extendedWantedDep.infoFromLockfile) === null || _a2 === void 0 ? void 0 : _a2.dependencyLockfile, options.workspacePackages, options.currentDepth, updateDepth, preferredVersions2);
       });
       return resolveDependencyResult;
     }
-    async function resolveChildren(ctx, parentPkg, dependencyLockfile, workspacePackages, parentDepth, updateDepth, preferredVersions) {
+    async function resolveChildren(ctx, parentPkg, parentPkgAliases, dependencyLockfile, workspacePackages, parentDepth, updateDepth, preferredVersions) {
       var _a, _b;
       const currentResolvedDependencies = dependencyLockfile != null ? {
         ...dependencyLockfile.dependencies,
@@ -116036,6 +116607,7 @@ var require_resolveDependencies = __commonJS({
       const children = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
         currentDepth: parentDepth + 1,
         parentPkg,
+        parentPkgAliases,
         preferredDependencies: currentResolvedDependencies,
         proceed: !parentPkg.depIsLinked || parentDependsOnPeer,
         resolvedDependencies,
@@ -116324,12 +116896,23 @@ var require_resolveDependencies = __commonJS({
         normalizedPref: options.currentDepth === 0 ? pkgResponse.body.normalizedPref : void 0,
         pkgId: pkgResponse.body.id,
         rootDir,
+        missingPeers: getMissingPeers(pkg, options.parentPkgAliases),
         installable,
         isLinkedDependency: void 0,
         pkg,
         updated: pkgResponse.body.updated
       };
     }
+    function getMissingPeers(pkg, parentPkgAliases) {
+      var _a, _b, _c;
+      const missingPeers = {};
+      for (const [peerName, peerVersion] of Object.entries((_a = pkg.peerDependencies) !== null && _a !== void 0 ? _a : {})) {
+        if (!parentPkgAliases[peerName] && !((_c = (_b = pkg.peerDependenciesMeta) === null || _b === void 0 ? void 0 : _b[peerName]) === null || _c === void 0 ? void 0 : _c.optional)) {
+          missingPeers[peerName] = peerVersion;
+        }
+      }
+      return missingPeers;
+    }
     function pkgIsLeaf(pkg) {
       var _a, _b, _c;
       return (0, isEmpty_1.default)((_a = pkg.dependencies) !== null && _a !== void 0 ? _a : {}) && (0, isEmpty_1.default)((_b = pkg.optionalDependencies) !== null && _b !== void 0 ? _b : {}) && (0, isEmpty_1.default)((_c = pkg.peerDependencies) !== null && _c !== void 0 ? _c : {});
@@ -116435,6 +117018,7 @@ var require_resolveDependencyTree = __commonJS({
       const directDepsByImporterId = {};
       const wantedToBeSkippedPackageIds = /* @__PURE__ */ new Set();
       const ctx = {
+        autoInstallPeers: opts.autoInstallPeers === true,
         allowBuild: opts.allowBuild,
         childrenByParentDepPath: {},
         currentLockfile: opts.currentLockfile,
@@ -116481,6 +117065,7 @@ var require_resolveDependencyTree = __commonJS({
             depPath: importer.id,
             rootDir: importer.rootDir
           },
+          parentPkgAliases: {},
           proceed,
           resolvedDependencies: {
             ...projectSnapshot.dependencies,
@@ -116748,525 +117333,6 @@ var require_scan4 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/utils.js
-var require_utils9 = __commonJS({
-  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/utils.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    var semver_12 = __importDefault(require_semver3());
-    function isNotNull(value) {
-      return value !== null;
-    }
-    exports2.isNotNull = isNotNull;
-    function uniqueArray(array) {
-      return [...new Set(array)];
-    }
-    exports2.uniqueArray = uniqueArray;
-    function isNoIncludeNull(value) {
-      return value.every(isNotNull);
-    }
-    exports2.isNoIncludeNull = isNoIncludeNull;
-    function isPrerelease(version) {
-      if (version instanceof semver_12.default.SemVer) {
-        return version.prerelease.length !== 0;
-      } else {
-        return false;
-      }
-    }
-    exports2.isPrerelease = isPrerelease;
-    function isValidOperator(comparator, operatorList) {
-      return operatorList.includes(comparator.operator);
-    }
-    exports2.isValidOperator = isValidOperator;
-    function equalComparator(comparatorA, comparatorB) {
-      return comparatorA.value === comparatorB.value;
-    }
-    exports2.equalComparator = equalComparator;
-    function comparator2versionStr(comparator) {
-      const compSemver = comparator.semver;
-      return compSemver instanceof semver_12.default.SemVer ? compSemver.version : "";
-    }
-    exports2.comparator2versionStr = comparator2versionStr;
-    function isSameVersionEqualsLikeComparator(comparatorA, comparatorB) {
-      const compVersionA = comparator2versionStr(comparatorA);
-      const compVersionB = comparator2versionStr(comparatorB);
-      return compVersionA !== "" && compVersionB !== "" && compVersionA === compVersionB && /=|^$/.test(comparatorA.operator) && /=|^$/.test(comparatorB.operator);
-    }
-    exports2.isSameVersionEqualsLikeComparator = isSameVersionEqualsLikeComparator;
-    function isEqualsComparator(comparator) {
-      return comparator.semver instanceof semver_12.default.SemVer && isValidOperator(comparator, ["", "="]);
-    }
-    exports2.isEqualsComparator = isEqualsComparator;
-    function filterUniqueComparator(comparator, index, self2) {
-      return self2.findIndex((comp) => equalComparator(comparator, comp)) === index;
-    }
-    exports2.filterUniqueComparator = filterUniqueComparator;
-    function filterOperator(operatorList) {
-      return (comparator) => isValidOperator(comparator, operatorList);
-    }
-    exports2.filterOperator = filterOperator;
-    function isIntersectRanges(semverRangeList) {
-      return semverRangeList.every((rangeA, index, rangeList) => rangeList.slice(index + 1).every((rangeB) => rangeA.intersects(rangeB)));
-    }
-    exports2.isIntersectRanges = isIntersectRanges;
-    function stripSemVerPrerelease(semverVersion) {
-      if (!(semverVersion instanceof semver_12.default.SemVer)) {
-        return "";
-      }
-      if (!semverVersion.prerelease.length) {
-        return semverVersion.version;
-      }
-      const newSemverVersion = new semver_12.default.SemVer(semverVersion.version, semverVersion.options);
-      newSemverVersion.prerelease = [];
-      return newSemverVersion.format();
-    }
-    exports2.stripSemVerPrerelease = stripSemVerPrerelease;
-    function stripComparatorOperator(comparator) {
-      if (!comparator.operator) {
-        return comparator;
-      }
-      const versionStr = comparator2versionStr(comparator);
-      return new semver_12.default.Comparator(versionStr, comparator.options);
-    }
-    exports2.stripComparatorOperator = stripComparatorOperator;
-    function getLowerBoundComparator(comparatorList, options = {}) {
-      const validComparatorList = comparatorList.filter((comparator) => isValidOperator(comparator, [">", ">="]) || !(comparator.semver instanceof semver_12.default.SemVer));
-      const leComparatorVersionList = comparatorList.filter(filterOperator(["<="])).map(comparator2versionStr);
-      if (validComparatorList.length >= 1) {
-        return validComparatorList.reduce((a, b) => {
-          const semverA = a.semver;
-          const semverB = b.semver;
-          if (!(semverA instanceof semver_12.default.SemVer)) {
-            if (!options.singleRange && isPrerelease(semverB) && !(b.operator === ">=" && leComparatorVersionList.some((version) => version === String(semverB)))) {
-              return new semver_12.default.Comparator(`>=${stripSemVerPrerelease(semverB)}`, b.options);
-            }
-            return b;
-          } else if (!(semverB instanceof semver_12.default.SemVer)) {
-            if (!options.singleRange && isPrerelease(semverA) && !(a.operator === ">=" && leComparatorVersionList.some((version) => version === String(semverA)))) {
-              return new semver_12.default.Comparator(`>=${stripSemVerPrerelease(semverA)}`, a.options);
-            }
-            return a;
-          }
-          const semverCmp = semver_12.default.compare(semverA, semverB);
-          if (a.operator === b.operator || semverCmp !== 0) {
-            if (!options.singleRange) {
-              const semverCmpMain = semverA.compareMain(semverB);
-              if (semverCmpMain !== 0 && semverA.prerelease.length && semverB.prerelease.length) {
-                if (semverCmpMain > 0) {
-                  return new semver_12.default.Comparator(a.operator + stripSemVerPrerelease(semverA), a.options);
-                } else {
-                  return new semver_12.default.Comparator(b.operator + stripSemVerPrerelease(semverB), b.options);
-                }
-              }
-            }
-            if (semverCmp > 0) {
-              return a;
-            } else {
-              return b;
-            }
-          } else {
-            if (a.operator === ">") {
-              return a;
-            } else {
-              return b;
-            }
-          }
-        });
-      } else {
-        return new semver_12.default.Comparator("");
-      }
-    }
-    exports2.getLowerBoundComparator = getLowerBoundComparator;
-    function getUpperBoundComparator(comparatorList, options = {}) {
-      const validComparatorList = comparatorList.filter((comparator) => isValidOperator(comparator, ["<", "<="]) || !(comparator.semver instanceof semver_12.default.SemVer));
-      const geComparatorVersionList = comparatorList.filter(filterOperator([">="])).map(comparator2versionStr);
-      if (validComparatorList.length >= 1) {
-        return validComparatorList.reduce((a, b) => {
-          const semverA = a.semver;
-          const semverB = b.semver;
-          if (!(semverA instanceof semver_12.default.SemVer)) {
-            if (!options.singleRange && isPrerelease(semverB) && !(b.operator === "<=" && geComparatorVersionList.some((version) => version === String(semverB)))) {
-              return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverB)}`, b.options);
-            }
-            return b;
-          } else if (!(semverB instanceof semver_12.default.SemVer)) {
-            if (!options.singleRange && isPrerelease(semverA) && !(a.operator === "<=" && geComparatorVersionList.some((version) => version === String(semverA)))) {
-              return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverA)}`, a.options);
-            }
-            return a;
-          }
-          const semverCmp = semver_12.default.compare(semverA, semverB);
-          if (a.operator === b.operator || semverCmp !== 0) {
-            if (!options.singleRange) {
-              const semverCmpMain = semverA.compareMain(semverB);
-              if (semverCmpMain !== 0 && semverA.prerelease.length && semverB.prerelease.length) {
-                if (semverCmpMain < 0) {
-                  return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverA)}`, a.options);
-                } else {
-                  return new semver_12.default.Comparator(`<${stripSemVerPrerelease(semverB)}`, b.options);
-                }
-              }
-            }
-            if (semverCmp < 0) {
-              return a;
-            } else {
-              return b;
-            }
-          } else {
-            if (a.operator === "<") {
-              return a;
-            } else {
-              return b;
-            }
-          }
-        });
-      } else {
-        return new semver_12.default.Comparator("");
-      }
-    }
-    exports2.getUpperBoundComparator = getUpperBoundComparator;
-  }
-});
-
-// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/single-range.js
-var require_single_range = __commonJS({
-  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/single-range.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    var semver_12 = __importDefault(require_semver3());
-    var utils_1 = require_utils9();
-    var SingleVer = class {
-      constructor(comp) {
-        this.comp = comp;
-      }
-      toString() {
-        return this.comp.value;
-      }
-      intersect(singleRange) {
-        if (semver_12.default.intersects(String(this), String(singleRange))) {
-          return this;
-        } else {
-          return null;
-        }
-      }
-      merge(singleRange) {
-        if (semver_12.default.intersects(String(this), String(singleRange))) {
-          return singleRange;
-        }
-        return null;
-      }
-    };
-    exports2.SingleVer = SingleVer;
-    var SingleRange = class {
-      constructor(lowerBound, upperBound) {
-        this.lowerBound = lowerBound;
-        this.upperBound = upperBound;
-        if (!lowerBound.intersects(upperBound)) {
-          throw new Error(`Invalid range; version range does not intersect: ${this}`);
-        }
-      }
-      toString() {
-        return [this.lowerBound.value, this.upperBound.value].filter((v) => v !== "").join(" ");
-      }
-      intersect(singleRange) {
-        if (semver_12.default.intersects(String(this), String(singleRange))) {
-          if (singleRange instanceof SingleVer) {
-            return singleRange;
-          } else {
-            const lowerBoundComparatorList = [
-              this.lowerBound,
-              singleRange.lowerBound
-            ];
-            const upperBoundComparatorList = [
-              this.upperBound,
-              singleRange.upperBound
-            ];
-            const lowerBound = utils_1.getLowerBoundComparator([
-              ...lowerBoundComparatorList,
-              ...upperBoundComparatorList.filter((comparator) => comparator.semver instanceof semver_12.default.SemVer)
-            ]);
-            const upperBound = utils_1.getUpperBoundComparator([
-              ...upperBoundComparatorList,
-              ...lowerBoundComparatorList.filter((comparator) => comparator.semver instanceof semver_12.default.SemVer)
-            ]);
-            if (utils_1.isSameVersionEqualsLikeComparator(lowerBound, upperBound)) {
-              return new SingleVer(utils_1.stripComparatorOperator(lowerBound));
-            }
-            return new SingleRange(lowerBound, upperBound);
-          }
-        } else {
-          return null;
-        }
-      }
-      merge(singleRange) {
-        if (semver_12.default.intersects(String(this), String(singleRange))) {
-          if (singleRange instanceof SingleVer) {
-            return this;
-          } else {
-            const lowerBound = ((a, b) => {
-              const semverA = a.semver;
-              const semverB = b.semver;
-              if (!(semverA instanceof semver_12.default.SemVer)) {
-                if (utils_1.isPrerelease(semverB)) {
-                  return null;
-                }
-                return a;
-              } else if (!(semverB instanceof semver_12.default.SemVer)) {
-                if (utils_1.isPrerelease(semverA)) {
-                  return null;
-                }
-                return b;
-              }
-              const cmpMain = semverA.compareMain(semverB);
-              if (cmpMain < 0 && utils_1.isPrerelease(semverB) || cmpMain > 0 && utils_1.isPrerelease(semverA)) {
-                return null;
-              }
-              const semverCmp = semver_12.default.compare(semverA, semverB);
-              if (a.operator === b.operator || semverCmp !== 0) {
-                if (semverCmp < 0) {
-                  return a;
-                } else {
-                  return b;
-                }
-              } else {
-                if (a.operator === ">=") {
-                  return a;
-                } else {
-                  return b;
-                }
-              }
-            })(this.lowerBound, singleRange.lowerBound);
-            const upperBound = ((a, b) => {
-              const semverA = a.semver;
-              const semverB = b.semver;
-              if (!(semverA instanceof semver_12.default.SemVer)) {
-                if (utils_1.isPrerelease(semverB)) {
-                  return null;
-                }
-                return a;
-              } else if (!(semverB instanceof semver_12.default.SemVer)) {
-                if (utils_1.isPrerelease(semverA)) {
-                  return null;
-                }
-                return b;
-              }
-              const cmpMain = semverA.compareMain(semverB);
-              if (cmpMain > 0 && utils_1.isPrerelease(semverB) || cmpMain < 0 && utils_1.isPrerelease(semverA)) {
-                return null;
-              }
-              const semverCmp = semver_12.default.compare(semverA, semverB);
-              if (a.operator === b.operator || semverCmp !== 0) {
-                if (semverCmp > 0) {
-                  return a;
-                } else {
-                  return b;
-                }
-              } else {
-                if (a.operator === "<=") {
-                  return a;
-                } else {
-                  return b;
-                }
-              }
-            })(this.upperBound, singleRange.upperBound);
-            if (lowerBound && upperBound) {
-              return new SingleRange(lowerBound, upperBound);
-            }
-          }
-        }
-        return null;
-      }
-    };
-    exports2.SingleRange = SingleRange;
-    function createSingleRange(comparatorList) {
-      const equalsComparatorList = comparatorList.filter(utils_1.isEqualsComparator).filter(utils_1.filterUniqueComparator);
-      switch (equalsComparatorList.length) {
-        case 0: {
-          const lowerBound = utils_1.getLowerBoundComparator(comparatorList, {
-            singleRange: true
-          });
-          const upperBound = utils_1.getUpperBoundComparator(comparatorList, {
-            singleRange: true
-          });
-          if (utils_1.isSameVersionEqualsLikeComparator(lowerBound, upperBound)) {
-            return new SingleVer(utils_1.stripComparatorOperator(lowerBound));
-          }
-          try {
-            return new SingleRange(lowerBound, upperBound);
-          } catch (err) {
-            return null;
-          }
-        }
-        case 1:
-          return new SingleVer(equalsComparatorList[0]);
-        default:
-          return null;
-      }
-    }
-    exports2.createSingleRange = createSingleRange;
-    function isSingleRange(value) {
-      return value instanceof SingleVer || value instanceof SingleRange;
-    }
-    exports2.isSingleRange = isSingleRange;
-  }
-});
-
-// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/multi-range.js
-var require_multi_range = __commonJS({
-  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/multi-range.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    var single_range_1 = require_single_range();
-    var utils_1 = require_utils9();
-    function normalizeSingleRangeList(singleRangeList) {
-      return singleRangeList.reduce((singleRangeList2, singleRange) => {
-        if (!singleRange) {
-          return [...singleRangeList2, singleRange];
-        }
-        let insertFirst = false;
-        const removeIndexList = [];
-        const appendSingleRange = singleRangeList2.reduce((appendSingleRange2, insertedSingleRange, index) => {
-          if (insertedSingleRange && appendSingleRange2) {
-            const mergedSingleRange = insertedSingleRange.merge(appendSingleRange2);
-            if (mergedSingleRange) {
-              if (String(mergedSingleRange) === String(insertedSingleRange)) {
-                return;
-              } else {
-                removeIndexList.push(index);
-                if (insertedSingleRange instanceof single_range_1.SingleRange && appendSingleRange2 instanceof single_range_1.SingleRange) {
-                  insertFirst = true;
-                }
-                return mergedSingleRange;
-              }
-            }
-          }
-          return appendSingleRange2;
-        }, singleRange);
-        const removedSingleRangeList = singleRangeList2.filter((_, index) => !removeIndexList.includes(index));
-        if (appendSingleRange) {
-          if (insertFirst) {
-            return [appendSingleRange, ...removedSingleRangeList];
-          } else {
-            return [...removedSingleRangeList, appendSingleRange];
-          }
-        }
-        return removedSingleRangeList;
-      }, []);
-    }
-    exports2.normalizeSingleRangeList = normalizeSingleRangeList;
-    var MultiRange = class {
-      get valid() {
-        return this.set.length >= 1;
-      }
-      constructor(rangeList) {
-        if (rangeList) {
-          const singleRangeList = normalizeSingleRangeList(rangeList.map((singleRangeOrComparatorList) => {
-            if (single_range_1.isSingleRange(singleRangeOrComparatorList) || !singleRangeOrComparatorList) {
-              return singleRangeOrComparatorList;
-            } else {
-              return single_range_1.createSingleRange(singleRangeOrComparatorList);
-            }
-          }));
-          this.set = singleRangeList.filter(utils_1.isNotNull);
-        } else {
-          this.set = [];
-        }
-      }
-      toString() {
-        if (!this.valid) {
-          throw new Error("Invalid range");
-        }
-        return utils_1.uniqueArray(this.set.map(String)).join(" || ");
-      }
-      intersect(multiRange) {
-        if (this.valid && multiRange.valid) {
-          const singleRangeList = this.set.map((singleRangeA) => multiRange.set.map((singleRangeB) => singleRangeA.intersect(singleRangeB))).reduce((a, b) => [...a, ...b]).filter(utils_1.isNotNull);
-          return new MultiRange(singleRangeList);
-        } else if (this.valid) {
-          return this;
-        } else if (multiRange.valid) {
-          return multiRange;
-        } else {
-          return new MultiRange(null);
-        }
-      }
-    };
-    exports2.MultiRange = MultiRange;
-  }
-});
-
-// ../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/index.js
-var require_dist12 = __commonJS({
-  "../../node_modules/.pnpm/semver-range-intersect@0.3.1/node_modules/semver-range-intersect/dist/index.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    var semver_12 = __importDefault(require_semver3());
-    var multi_range_1 = require_multi_range();
-    var utils_1 = require_utils9();
-    function intersect(...ranges) {
-      const semverRangeList = (() => {
-        try {
-          return ranges.map((rangeStr) => new semver_12.default.Range(rangeStr));
-        } catch (err) {
-          return null;
-        }
-      })();
-      if (!semverRangeList || !utils_1.isIntersectRanges(semverRangeList)) {
-        return null;
-      }
-      const intersectRange = semverRangeList.map((range) => new multi_range_1.MultiRange(range.set)).reduce((multiRangeA, multiRangeB) => multiRangeA.intersect(multiRangeB), new multi_range_1.MultiRange(null));
-      return intersectRange.valid ? String(intersectRange) || "*" : null;
-    }
-    exports2.intersect = intersect;
-  }
-});
-
-// ../resolve-dependencies/lib/mergePeers.js
-var require_mergePeers = __commonJS({
-  "../resolve-dependencies/lib/mergePeers.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.mergePeers = void 0;
-    var semver_range_intersect_1 = require_dist12();
-    function mergePeers(missingPeers) {
-      const conflicts = [];
-      const intersections = {};
-      for (const [peerName, ranges] of Object.entries(missingPeers)) {
-        if (ranges.every(({ optional }) => optional))
-          continue;
-        if (ranges.length === 1) {
-          intersections[peerName] = ranges[0].wantedRange;
-          continue;
-        }
-        const intersection = safeIntersect(ranges.map(({ wantedRange }) => wantedRange));
-        if (intersection === null) {
-          conflicts.push(peerName);
-        } else {
-          intersections[peerName] = intersection;
-        }
-      }
-      return { conflicts, intersections };
-    }
-    exports2.mergePeers = mergePeers;
-    function safeIntersect(ranges) {
-      try {
-        return (0, semver_range_intersect_1.intersect)(...ranges);
-      } catch {
-        return null;
-      }
-    }
-  }
-});
-
 // ../resolve-dependencies/lib/resolvePeers.js
 var require_resolvePeers = __commonJS({
   "../resolve-dependencies/lib/resolvePeers.js"(exports2) {
@@ -118208,7 +118274,10 @@ var require_updateProjectManifest = __commonJS({
       if (!importer.manifest) {
         throw new Error("Cannot save because no package.json found");
       }
-      const specsToUpsert = opts.directDependencies.filter((rdd, index) => importer.wantedDependencies[index].updateSpec).map((rdd, index) => {
+      const specsToUpsert = opts.directDependencies.filter((rdd, index) => {
+        var _a;
+        return (_a = importer.wantedDependencies[index]) === null || _a === void 0 ? void 0 : _a.updateSpec;
+      }).map((rdd, index) => {
         var _a, _b;
         const wantedDep = importer.wantedDependencies[index];
         return resolvedDirectDepToSpecObject({ ...rdd, isNew: wantedDep.isNew, specRaw: wantedDep.raw }, importer, {
@@ -118354,7 +118423,10 @@ var require_lib95 = __commonJS({
           const projectSnapshot = opts.wantedLockfile.importers[project.id];
           opts.wantedLockfile.importers[project.id] = addDirectDependenciesToLockfile(updatedManifest, projectSnapshot, resolvedImporter.linkedDependencies, resolvedImporter.directDependencies, opts.registries);
         }
-        const topParents = project.manifest ? await getTopParents((0, difference_1.default)(Object.keys((0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest)), resolvedImporter.directDependencies.filter((dep, index2) => project.wantedDependencies[index2].isNew === true).map(({ alias }) => alias) || []), project.modulesDir) : [];
+        const topParents = project.manifest ? await getTopParents((0, difference_1.default)(Object.keys((0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest)), resolvedImporter.directDependencies.filter((dep, index2) => {
+          var _a3;
+          return ((_a3 = project.wantedDependencies[index2]) === null || _a3 === void 0 ? void 0 : _a3.isNew) === true;
+        }).map(({ alias }) => alias) || []), project.modulesDir) : [];
         resolvedImporter.linkedDependencies.forEach((linkedDependency) => {
           topParents.push({
             name: linkedDependency.alias,
@@ -119900,6 +119972,7 @@ var require_extendInstallOptions = __commonJS({
         version: pnpmPkgJson_1.default.version
       };
       return {
+        autoInstallPeers: false,
         childConcurrency: 5,
         depth: 0,
         enablePnp: false,
@@ -120906,6 +120979,7 @@ var require_install = __commonJS({
       }
       let { dependenciesGraph, dependenciesByProjectId, finishLockfileUpdates, linkedDependenciesByProjectId, newLockfile, outdatedDependencies, peerDependencyIssuesByProjects, wantedToBeSkippedPackageIds, waitTillAllFetchingsFinish } = await (0, resolve_dependencies_1.default)(projects, {
         allowBuild: createAllowBuildFunction(opts),
+        autoInstallPeers: opts.autoInstallPeers,
         currentLockfile: ctx.currentLockfile,
         defaultUpdateDepth: opts.update || opts.updateMatching != null ? opts.depth : -1,
         dryRun: opts.lockfileOnly,
@@ -122743,7 +122817,6 @@ var require_installDeps = __commonJS({
     var logger_1 = __importDefault(require_lib6());
     var sort_packages_1 = require_lib99();
     var is_subdir_1 = __importDefault(require_is_subdir());
-    var isEmpty_1 = __importDefault(require_isEmpty2());
     var getOptionsFromRootManifest_1 = __importDefault(require_getOptionsFromRootManifest());
     var getPinnedVersion_1 = __importDefault(require_getPinnedVersion());
     var getSaveType_1 = __importDefault(require_getSaveType());
@@ -122756,7 +122829,7 @@ var require_installDeps = __commonJS({
       update: false
     };
     async function handler(opts, params) {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d;
       if (opts.workspace) {
         if (opts.latest) {
           throw new error_1.default("BAD_OPTIONS", "Cannot use --latest with --workspace simultaneously");
@@ -122868,25 +122941,8 @@ var require_installDeps = __commonJS({
           rootDir: opts.dir,
           targetDependenciesField: (0, getSaveType_1.default)(opts)
         };
-        let [updatedImporter] = await (0, core_1.mutateModules)([mutatedProject], installOpts);
+        const [updatedImporter] = await (0, core_1.mutateModules)([mutatedProject], installOpts);
         if (opts.save !== false) {
-          if (opts.autoInstallPeers && !(0, isEmpty_1.default)((_f = (_e = updatedImporter.peerDependencyIssues) === null || _e === void 0 ? void 0 : _e.intersections) !== null && _f !== void 0 ? _f : {})) {
-            logger_1.default.info({
-              message: "Installing missing peer dependencies",
-              prefix: opts.dir
-            });
-            const dependencySelectors = Object.entries(updatedImporter.peerDependencyIssues.intersections).map(([name, version]) => `${name}@${version}`);
-            const result2 = await (0, core_1.mutateModules)([
-              {
-                ...mutatedProject,
-                dependencySelectors,
-                manifest: updatedImporter.manifest,
-                peer: false,
-                targetDependenciesField: "devDependencies"
-              }
-            ], installOpts);
-            updatedImporter = result2[0];
-          }
           await writeProjectManifest(updatedImporter.manifest);
         }
         return;
@@ -178690,6 +178746,7 @@ var require_dlx = __commonJS({
     var package_bins_1 = __importDefault(require_lib74());
     var store_path_1 = __importDefault(require_lib40());
     var execa_1 = __importDefault(require_lib19());
+    var omit_1 = __importDefault(require_omit());
     var render_help_1 = __importDefault(require_lib32());
     var makeEnv_1 = require_makeEnv();
     exports2.commandNames = ["dlx"];
@@ -178743,9 +178800,10 @@ var require_dlx = __commonJS({
       const pkgs = (_a = opts.package) !== null && _a !== void 0 ? _a : [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, {
@@ -182423,24 +182481,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.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.BadHomeDirError = BadHomeDirError;
+    exports2.BadShellSectionError = BadShellSectionError;
   }
 });
 
@@ -182453,22 +182521,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 +182544,66 @@ 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 registryOutput = await getRegistryOutput();
       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(registryOutput, "PNPM_HOME", pnpmHomeDir, opts), "PNPM_HOME"));
+      logger.push(logEnvUpdate(await prependToPath(registryOutput, "%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(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 });
         }
+        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(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)) {
+        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]);
+    }
+    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");
       }
-      return logger.join("\n");
+    }
+    async function getEnvValueFromRegistry(registryOutput, envVarName) {
+      const regexp = new RegExp(`^ {4}(?<name>${envVarName}) {4}(?<type>\\w+) {4}(?<data>.*)$`, "gim");
+      const match = Array.from((0, string_prototype_matchall_1.default)(registryOutput, regexp))[0];
+      return match === null || match === void 0 ? void 0 : match.groups.data;
+    }
+    async function setEnvVarInRegistry(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);
     }
   }
 });
@@ -182553,7 +182624,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 +182672,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 +182694,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 +182707,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);