pnpm 9.0.6 → 9.1.0-0

package/dist/node_modules/.modules.yaml

@@ -202,9 +202,9 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@9.0.5
+packageManager: pnpm@9.0.6
 pendingBuilds: []
-prunedAt: Wed, 24 Apr 2024 13:15:00 GMT
+prunedAt: Mon, 29 Apr 2024 14:13:11 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3357,7 +3357,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault2(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "9.0.6" : "0.0.0"
+      version: true ? "9.1.0-0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -22243,6 +22243,7 @@ var require_lib21 = __commonJS({
       "use-stderr": Boolean,
       "verify-store-integrity": Boolean,
       "virtual-store-dir": String,
+      "virtual-store-dir-max-length": Number,
       "workspace-concurrency": Number,
       "workspace-packages": [String, Array],
       "workspace-root": Boolean,
@@ -22352,7 +22353,8 @@ var require_lib21 = __commonJS({
         "workspace-concurrency": 4,
         "workspace-prefix": opts.workspaceDir,
         "embed-readme": false,
-        "registry-supports-time-field": false
+        "registry-supports-time-field": false,
+        "virtual-store-dir-max-length": 120
       };
       const { config: npmConfig, warnings, failedToLoadBuiltInConfig } = (0, npm_conf_1.default)(cliOptions, rcOptionsTypes, defaultOptions);
       const configDir = (0, dirs_1.getConfigDir)(process);
@@ -112987,14 +112989,13 @@ var require_lib87 = __commonJS({
       return {};
     }
     exports2.parse = parse2;
-    var MAX_LENGTH_WITHOUT_HASH = 120 - 26 - 1;
-    function depPathToFilename(depPath) {
+    function depPathToFilename(depPath, maxLengthWithoutHash) {
       let filename = depPathToFilenameUnescaped(depPath).replace(/[\\/:*?"<>|]/g, "+");
       if (filename.includes("(")) {
         filename = filename.replace(/\)$/, "").replace(/(\)\()|\(|\)/g, "_");
       }
-      if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("file+")) {
-        return `${filename.substring(0, MAX_LENGTH_WITHOUT_HASH)}_${(0, crypto_base32_hash_1.createBase32Hash)(filename)}`;
+      if (filename.length > maxLengthWithoutHash || filename !== filename.toLowerCase() && !filename.startsWith("file+")) {
+        return `${filename.substring(0, maxLengthWithoutHash - 27)}_${(0, crypto_base32_hash_1.createBase32Hash)(filename)}`;
       }
       return filename;
     }
@@ -113140,7 +113141,7 @@ var require_extendProjectsWithTargetDirs = __commonJS({
     var packageIdFromSnapshot_1 = require_packageIdFromSnapshot();
     var nameVerFromPkgSnapshot_1 = require_nameVerFromPkgSnapshot();
     function extendProjectsWithTargetDirs(projects, lockfile, ctx) {
-      const getLocalLocations = ctx.pkgLocationsByDepPath != null ? (depPath) => ctx.pkgLocationsByDepPath[depPath] : (depPath, pkgName) => [path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath), "node_modules", pkgName)];
+      const getLocalLocations = ctx.pkgLocationsByDepPath != null ? (depPath) => ctx.pkgLocationsByDepPath[depPath] : (depPath, pkgName) => [path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.virtualStoreDirMaxLength), "node_modules", pkgName)];
       const projectsById = Object.fromEntries(projects.map((project) => [project.id, { ...project, targetDirs: [] }]));
       Object.entries(lockfile.packages ?? {}).forEach(([depPath, pkg]) => {
         if (pkg.resolution?.type !== "directory")
@@ -114948,6 +114949,9 @@ var require_lib95 = __commonJS({
       if (!modules.prunedAt) {
         modules.prunedAt = (/* @__PURE__ */ new Date()).toUTCString();
       }
+      if (!modules.virtualStoreDirMaxLength) {
+        modules.virtualStoreDirMaxLength = 120;
+      }
       return modules;
     }
     exports2.readModulesManifest = readModulesManifest;
@@ -115095,7 +115099,7 @@ var require_getPkgInfo = __commonJS({
       if (!version2) {
         version2 = opts.ref;
       }
-      const fullPackagePath = depPath ? path_1.default.join(opts.virtualStoreDir ?? ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath), "node_modules", name) : path_1.default.join(opts.linkedPathBaseDir, opts.ref.slice(5));
+      const fullPackagePath = depPath ? path_1.default.join(opts.virtualStoreDir ?? ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath, opts.virtualStoreDirMaxLength), "node_modules", name) : path_1.default.join(opts.linkedPathBaseDir, opts.ref.slice(5));
       if (version2.startsWith("link:") && opts.rewriteLinkVersionDir) {
         version2 = `link:${(0, normalize_path_1.default)(path_1.default.relative(opts.rewriteLinkVersionDir, fullPackagePath))}`;
       }
@@ -115309,7 +115313,8 @@ var require_getTree = __commonJS({
           registries: opts.registries,
           skipped: opts.skipped,
           wantedPackages: opts.wantedPackages,
-          virtualStoreDir: opts.virtualStoreDir
+          virtualStoreDir: opts.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         });
         let circular;
         const matchedSearched = opts.search?.(packageInfo);
@@ -115457,7 +115462,8 @@ var require_buildDependenciesHierarchy = __commonJS({
         search: maybeOpts.search,
         skipped: new Set(modules?.skipped ?? []),
         modulesDir: maybeOpts.modulesDir,
-        virtualStoreDir: modules?.virtualStoreDir
+        virtualStoreDir: modules?.virtualStoreDir,
+        virtualStoreDirMaxLength: modules?.virtualStoreDirMaxLength ?? maybeOpts.virtualStoreDirMaxLength
       };
       (await Promise.all(projectPaths.map(async (projectPath) => {
         return [
@@ -115493,7 +115499,8 @@ var require_buildDependenciesHierarchy = __commonJS({
         search: opts.search,
         skipped: opts.skipped,
         wantedPackages: wantedLockfile?.packages ?? {},
-        virtualStoreDir: opts.virtualStoreDir
+        virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       });
       const parentId = { type: "importer", importerId };
       const result2 = {};
@@ -115511,7 +115518,8 @@ var require_buildDependenciesHierarchy = __commonJS({
             registries: opts.registries,
             skipped: opts.skipped,
             wantedPackages: wantedLockfile?.packages ?? {},
-            virtualStoreDir: opts.virtualStoreDir
+            virtualStoreDir: opts.virtualStoreDir,
+            virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
           });
           let newEntry = null;
           const matchedSearched = opts.search?.(packageInfo);
@@ -116142,7 +116150,8 @@ var require_lib98 = __commonJS({
         onlyProjects: opts.onlyProjects,
         registries: opts.registries,
         search,
-        modulesDir: opts.modulesDir
+        modulesDir: opts.modulesDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       })).map(async ([projectPath, buildDependenciesHierarchy]) => {
         const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {};
         return {
@@ -116179,7 +116188,8 @@ var require_lib98 = __commonJS({
         lockfileDir: maybeOpts?.lockfileDir,
         onlyProjects: maybeOpts?.onlyProjects,
         registries: opts.registries,
-        modulesDir: opts.modulesDir
+        modulesDir: opts.modulesDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       })).map(async ([projectPath, dependenciesHierarchy]) => {
         const entryPkg = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(projectPath) ?? {};
         return {
@@ -116286,7 +116296,8 @@ var require_lib99 = __commonJS({
         return await extendWithDependencyPaths(auditReport, {
           lockfile,
           lockfileDir: opts.lockfileDir,
-          include: opts.include
+          include: opts.include,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         });
       } catch (err) {
         (0, assert_1.default)(util_1.default.types.isNativeError(err));
@@ -116310,7 +116321,8 @@ var require_lib99 = __commonJS({
       const searchOpts = {
         lockfileDir: opts.lockfileDir,
         depth: Infinity,
-        include: opts.include
+        include: opts.include,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       };
       const _searchPackagePaths = searchPackagePaths.bind(null, searchOpts, projectDirs);
       await Promise.all(Object.values(advisories).map(async ({ findings, module_name }) => {
@@ -122257,7 +122269,8 @@ var require_audit2 = __commonJS({
             minTimeout: opts.fetchRetryMintimeout,
             retries: opts.fetchRetries
           },
-          timeout: opts.fetchTimeout
+          timeout: opts.fetchTimeout,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         });
       } catch (err) {
         if (opts.ignoreRegistryErrors) {
@@ -130854,7 +130867,8 @@ var require_packageRequester = __commonJS({
           counter: 0,
           concurrency: networkConcurrency
         }),
-        storeDir: opts.storeDir
+        storeDir: opts.storeDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       });
       const requestPackage = resolveAndFetch.bind(null, {
         engineStrict: opts.engineStrict,
@@ -130870,7 +130884,8 @@ var require_packageRequester = __commonJS({
         fetchPackageToStore,
         getFilesIndexFilePath: getFilesIndexFilePath.bind(null, {
           getFilePathInCafs,
-          storeDir: opts.storeDir
+          storeDir: opts.storeDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         }),
         requestPackage
       });
@@ -130986,7 +131001,7 @@ var require_packageRequester = __commonJS({
       };
     }
     function getFilesIndexFilePath(ctx, opts) {
-      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id);
+      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id, ctx.virtualStoreDirMaxLength);
       const target = path_1.default.join(ctx.storeDir, targetRelative);
       const filesIndexFile = opts.pkg.resolution.integrity ? ctx.getFilePathInCafs(opts.pkg.resolution.integrity, "index") : path_1.default.join(target, opts.ignoreScripts ? "integrity-not-built.json" : "integrity.json");
       return { filesIndexFile, target };
@@ -131290,7 +131305,8 @@ var require_storeController = __commonJS({
         ignoreFile: initOpts.ignoreFile,
         networkConcurrency: initOpts.networkConcurrency,
         storeDir: initOpts.storeDir,
-        verifyStoreIntegrity: initOpts.verifyStoreIntegrity
+        verifyStoreIntegrity: initOpts.verifyStoreIntegrity,
+        virtualStoreDirMaxLength: initOpts.virtualStoreDirMaxLength
       });
       return {
         close: async () => {
@@ -131455,7 +131471,8 @@ var require_createNewStoreController = __commonJS({
           packageImportMethod: opts.packageImportMethod,
           cacheDir: opts.cacheDir,
           storeDir: opts.storeDir,
-          verifyStoreIntegrity: typeof opts.verifyStoreIntegrity === "boolean" ? opts.verifyStoreIntegrity : true
+          verifyStoreIntegrity: typeof opts.verifyStoreIntegrity === "boolean" ? opts.verifyStoreIntegrity : true,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         }),
         dir: opts.storeDir
       };
@@ -132284,7 +132301,8 @@ var require_lib120 = __commonJS({
         })),
         registries: modules?.registries != null ? (0, normalize_registries_1.normalizeRegistries)(modules.registries) : void 0,
         rootModulesDir,
-        skipped: new Set(modules?.skipped ?? [])
+        skipped: new Set(modules?.skipped ?? []),
+        virtualStoreDirMaxLength: modules?.virtualStoreDirMaxLength
       };
     }
     exports2.readProjectsContext = readProjectsContext;
@@ -132959,6 +132977,7 @@ var require_lib121 = __commonJS({
           registries: opts.registries,
           storeDir: opts.storeDir,
           virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
           confirmModulesPurge: opts.confirmModulesPurge && !ci_info_1.isCI,
           forceHoistPattern: opts.forceHoistPattern,
           hoistPattern: opts.hoistPattern,
@@ -133011,6 +133030,7 @@ var require_lib121 = __commonJS({
         skipped: importersContext.skipped,
         storeDir: opts.storeDir,
         virtualStoreDir,
+        virtualStoreDirMaxLength: importersContext.virtualStoreDirMaxLength ?? opts.virtualStoreDirMaxLength,
         ...await (0, readLockfiles_1.readLockfiles)({
           autoInstallPeers: opts.autoInstallPeers,
           excludeLinksFromLockfile: opts.excludeLinksFromLockfile,
@@ -133035,6 +133055,13 @@ var require_lib121 = __commonJS({
     exports2.getContext = getContext;
     async function validateModules(modules, projects, opts) {
       const rootProject = projects.find(({ id }) => id === ".");
+      if (opts.virtualStoreDirMaxLength !== modules.virtualStoreDirMaxLength) {
+        if (opts.forceNewModules && rootProject != null) {
+          await purgeModulesDirsOfImporter(opts, rootProject);
+          return { purged: true };
+        }
+        throw new error_1.PnpmError("VIRTUAL_STORE_DIR_MAX_LENGTH_DIFF", 'This modules directory was created using a different virtual-store-dir-max-length value. Run "pnpm install" to recreate the modules directory.');
+      }
       if (opts.forcePublicHoistPattern && // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
       !(0, equals_1.default)(modules.publicHoistPattern, opts.publicHoistPattern || void 0)) {
         if (opts.forceNewModules && rootProject != null) {
@@ -133155,6 +133182,7 @@ var require_lib121 = __commonJS({
           registries: opts.registries,
           storeDir: opts.storeDir,
           virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
           confirmModulesPurge: opts.confirmModulesPurge && !ci_info_1.isCI,
           forceHoistPattern: opts.forceHoistPattern,
           hoistPattern: opts.hoistPattern,
@@ -133605,7 +133633,8 @@ var require_implementation2 = __commonJS({
         registries: ctx.registries,
         skipped: Array.from(ctx.skipped),
         storeDir: ctx.storeDir,
-        virtualStoreDir: ctx.virtualStoreDir
+        virtualStoreDir: ctx.virtualStoreDir,
+        virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength
       });
     }
     exports2.rebuildProjects = rebuildProjects;
@@ -133657,7 +133686,7 @@ var require_implementation2 = __commonJS({
       const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath) && !ctx.skipped.has(depPath)).map((depPath) => async () => {
         const pkgSnapshot = pkgSnapshots[depPath];
         const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-        const pkgRoots = opts.nodeLinker === "hoisted" ? (ctx.modulesFile?.hoistedLocations?.[depPath] ?? []).map((hoistedLocation) => path_1.default.join(opts.lockfileDir, hoistedLocation)) : [path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", pkgInfo.name)];
+        const pkgRoots = opts.nodeLinker === "hoisted" ? (ctx.modulesFile?.hoistedLocations?.[depPath] ?? []).map((hoistedLocation) => path_1.default.join(opts.lockfileDir, hoistedLocation)) : [path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), "node_modules", pkgInfo.name)];
         if (pkgRoots.length === 0) {
           if (pkgSnapshot.optional)
             return;
@@ -133669,7 +133698,7 @@ var require_implementation2 = __commonJS({
         try {
           const extraBinPaths = ctx.extraBinPaths;
           if (opts.nodeLinker !== "hoisted") {
-            const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
+            const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), "node_modules");
             const binPath = path_1.default.join(pkgRoot, "node_modules", ".bin");
             await (0, link_bins_1.linkBins)(modules, binPath, { extraNodePaths: ctx.extraNodePaths, warn });
           } else {
@@ -133756,7 +133785,7 @@ var require_implementation2 = __commonJS({
         await Promise.all(Object.keys(pkgSnapshots).filter((depPath) => !(0, lockfile_utils_1.packageIsIndependent)(pkgSnapshots[depPath])).map(async (depPath) => limitLinking(async () => {
           const pkgSnapshot = pkgSnapshots[depPath];
           const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
+          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), "node_modules");
           const binPath = path_1.default.join(modules, pkgInfo.name, "node_modules", ".bin");
           return (0, link_bins_1.linkBins)(modules, binPath, { warn });
         })));
@@ -137561,6 +137590,7 @@ var require_lib129 = __commonJS({
         privateHoistedModulesDir: opts.privateHoistedModulesDir,
         publicHoistedModulesDir: opts.publicHoistedModulesDir,
         virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         hoistedWorkspacePackages: opts.hoistedWorkspacePackages
       });
       await linkAllBins(opts.privateHoistedModulesDir, {
@@ -137686,7 +137716,7 @@ var require_lib129 = __commonJS({
         let depLocation;
         if (pkgSnapshot) {
           const pkgName = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(hoistedDepId, pkgSnapshot).name;
-          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(hoistedDepId), "node_modules");
+          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(hoistedDepId, opts.virtualStoreDirMaxLength), "node_modules");
           depLocation = path_1.default.join(modules, pkgName);
         } else {
           if (!opts.lockfile.importers[hoistedDepId]) {
@@ -140388,7 +140418,7 @@ var require_lib131 = __commonJS({
           packageStore = /* @__PURE__ */ new Map();
           packageRegistry.set(name, packageStore);
         }
-        let packageLocation = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, path_1.default.join(opts.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(relDepPath), "node_modules", name)));
+        let packageLocation = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, path_1.default.join(opts.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(relDepPath, opts.virtualStoreDirMaxLength), "node_modules", name)));
         if (!packageLocation.startsWith("../")) {
           packageLocation = `./${packageLocation}`;
         }
@@ -140616,12 +140646,12 @@ var require_prune2 = __commonJS({
         }
         if (opts.pruneVirtualStore !== false) {
           const _tryRemovePkg = tryRemovePkg.bind(null, opts.lockfileDir, opts.virtualStoreDir);
-          await Promise.all(orphanDepPaths.map((orphanDepPath) => (0, dependency_path_1.depPathToFilename)(orphanDepPath)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
+          await Promise.all(orphanDepPaths.map((orphanDepPath) => (0, dependency_path_1.depPathToFilename)(orphanDepPath, opts.virtualStoreDirMaxLength)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
           const neededPkgs = /* @__PURE__ */ new Set(["node_modules"]);
           for (const depPath of Object.keys(opts.wantedLockfile.packages ?? {})) {
             if (opts.skipped.has(depPath))
               continue;
-            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath));
+            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath, opts.virtualStoreDirMaxLength));
           }
           const availablePkgs = await readVirtualStoreDir(opts.virtualStoreDir, opts.lockfileDir);
           await Promise.all(availablePkgs.filter((availablePkg) => !neededPkgs.has(availablePkg)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
@@ -141191,7 +141221,7 @@ var require_lockfileToDepGraph = __commonJS({
           if (opts.skipped.has(depPath))
             return;
           const { name: pkgName, version: pkgVersion } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
+          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), "node_modules");
           const packageId = (0, lockfile_utils_1.packageIdFromSnapshot)(depPath, pkgSnapshot);
           const pkg = {
             name: pkgName,
@@ -141288,7 +141318,8 @@ var require_lockfileToDepGraph = __commonJS({
           skipped: opts.skipped,
           storeController: opts.storeController,
           storeDir: opts.storeDir,
-          virtualStoreDir: opts.virtualStoreDir
+          virtualStoreDir: opts.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         };
         for (const [dir, node] of Object.entries(graph)) {
           const pkgSnapshot = pkgSnapshotByLocation[dir];
@@ -141328,7 +141359,7 @@ var require_lockfileToDepGraph = __commonJS({
           if (ctx.skipped.has(childRelDepPath))
             continue;
           const pkgName = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(childRelDepPath, childPkgSnapshot).name;
-          children[alias] = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(childRelDepPath), "node_modules", pkgName);
+          children[alias] = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(childRelDepPath, ctx.virtualStoreDirMaxLength), "node_modules", pkgName);
         } else if (ref.indexOf("file:") === 0) {
           children[alias] = path_1.default.resolve(ctx.lockfileDir, ref.slice(5));
         } else if (!ctx.skipped.has(childRelDepPath) && (peerDeps == null || !peerDeps.has(alias))) {
@@ -173289,6 +173320,7 @@ var require_lib140 = __commonJS({
             skipped,
             storeController: opts.storeController,
             virtualStoreDir,
+            virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
             wantedLockfile: (0, filter_lockfile_1.filterLockfileByEngine)(wantedLockfile, filterOpts).lockfile
           });
           removed = removedDepPaths.size;
@@ -173347,6 +173379,7 @@ var require_lib140 = __commonJS({
           importerNames,
           lockfileDir,
           virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
           registries: opts.registries
         });
       }
@@ -173422,6 +173455,7 @@ var require_lib140 = __commonJS({
             publicHoistedModulesDir,
             publicHoistPattern: opts.publicHoistPattern ?? [],
             virtualStoreDir,
+            virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
             hoistedWorkspacePackages: opts.hoistWorkspacePackages ? Object.values(opts.allProjects).reduce((hoistedWorkspacePackages, project) => {
               if (project.manifest.name && project.id !== ".") {
                 hoistedWorkspacePackages[project.id] = {
@@ -173506,7 +173540,8 @@ var require_lib140 = __commonJS({
       }
       const projectsToBeBuilt = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(selectedProjects, wantedLockfile, {
         pkgLocationsByDepPath,
-        virtualStoreDir
+        virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       });
       if (opts.enableModulesDir !== false) {
         const rootProjectDeps = !opts.dedupeDirectDeps ? {} : directDependenciesByImporterId["."] ?? {};
@@ -173560,7 +173595,8 @@ var require_lib140 = __commonJS({
           registries: opts.registries,
           skipped: Array.from(skipped),
           storeDir: opts.storeDir,
-          virtualStoreDir
+          virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         }, {
           makeModulesDir: Object.keys(filteredLockfile.packages ?? {}).length > 0
         });
@@ -174688,7 +174724,7 @@ var require_hoistPeers = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.hoistPeers = void 0;
+    exports2.getHoistableOptionalPeers = exports2.hoistPeers = void 0;
     var semver_12 = __importDefault2(require_semver2());
     function hoistPeers(missingRequiredPeers, opts) {
       const dependencies = {};
@@ -174711,6 +174747,24 @@ var require_hoistPeers = __commonJS({
       return dependencies;
     }
     exports2.hoistPeers = hoistPeers;
+    function getHoistableOptionalPeers(allMissingOptionalPeers, allPreferredVersions) {
+      const optionalDependencies = {};
+      for (const [missingOptionalPeerName, ranges] of Object.entries(allMissingOptionalPeers)) {
+        if (!allPreferredVersions[missingOptionalPeerName])
+          continue;
+        let maxSatisfyingVersion;
+        for (const [version2, specType] of Object.entries(allPreferredVersions[missingOptionalPeerName])) {
+          if (specType === "version" && ranges.every((range) => semver_12.default.satisfies(version2, range)) && (!maxSatisfyingVersion || semver_12.default.gt(version2, maxSatisfyingVersion))) {
+            maxSatisfyingVersion = version2;
+          }
+        }
+        if (maxSatisfyingVersion) {
+          optionalDependencies[missingOptionalPeerName] = maxSatisfyingVersion;
+        }
+      }
+      return optionalDependencies;
+    }
+    exports2.getHoistableOptionalPeers = getHoistableOptionalPeers;
   }
 });
 
@@ -174861,7 +174915,7 @@ var require_resolveDependencies = __commonJS({
         const pkgAddresses = importerResolutionResult.pkgAddresses;
         if (!ctx.hoistPeers)
           return pkgAddresses;
-        let prevMissingOptionalPeers = [];
+        const allMissingOptionalPeers = {};
         while (true) {
           for (const pkgAddress of importerResolutionResult.pkgAddresses) {
             parentPkgAliases[pkgAddress.alias] = true;
@@ -174877,26 +174931,19 @@ var require_resolveDependencies = __commonJS({
               }
             }
           }
-          const missingOptionalPeerNames = Array.from(/* @__PURE__ */ new Set([
-            ...missingOptionalPeers.map(([peerName]) => peerName),
-            ...prevMissingOptionalPeers
-          ]));
-          if (!missingRequiredPeers.length && !missingOptionalPeerNames.length)
-            break;
-          const dependencies = (0, hoistPeers_1.hoistPeers)(missingRequiredPeers, ctx);
-          const nextMissingOptionalPeers = [];
-          const optionalDependencies = {};
-          for (const missingOptionalPeerName of missingOptionalPeerNames) {
-            if (ctx.allPreferredVersions[missingOptionalPeerName]) {
-              optionalDependencies[missingOptionalPeerName] = Object.keys(ctx.allPreferredVersions[missingOptionalPeerName]).join(" || ");
-            } else {
-              nextMissingOptionalPeers.push(missingOptionalPeerName);
+          for (const [missingOptionalPeerName, { range: missingOptionalPeerRange }] of missingOptionalPeers) {
+            if (!allMissingOptionalPeers[missingOptionalPeerName]) {
+              allMissingOptionalPeers[missingOptionalPeerName] = [missingOptionalPeerRange];
+            } else if (!allMissingOptionalPeers[missingOptionalPeerName].includes(missingOptionalPeerRange)) {
+              allMissingOptionalPeers[missingOptionalPeerName].push(missingOptionalPeerRange);
             }
           }
-          prevMissingOptionalPeers = nextMissingOptionalPeers;
-          if (!Object.keys(dependencies).length && !Object.keys(optionalDependencies).length)
+          if (!missingRequiredPeers.length)
+            break;
+          const dependencies = (0, hoistPeers_1.hoistPeers)(missingRequiredPeers, ctx);
+          if (!Object.keys(dependencies).length)
             break;
-          const wantedDependencies = (0, getNonDevWantedDependencies_1.getNonDevWantedDependencies)({ dependencies, optionalDependencies });
+          const wantedDependencies = (0, getNonDevWantedDependencies_1.getNonDevWantedDependencies)({ dependencies });
           const resolveDependenciesResult = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
             ...options,
             parentPkgAliases,
@@ -174909,6 +174956,22 @@ var require_resolveDependencies = __commonJS({
           };
           pkgAddresses.push(...importerResolutionResult.pkgAddresses);
         }
+        if (Object.keys(allMissingOptionalPeers).length && ctx.allPreferredVersions) {
+          const optionalDependencies = (0, hoistPeers_1.getHoistableOptionalPeers)(allMissingOptionalPeers, ctx.allPreferredVersions);
+          if (Object.keys(optionalDependencies).length) {
+            const wantedDependencies = (0, getNonDevWantedDependencies_1.getNonDevWantedDependencies)({ optionalDependencies });
+            const resolveDependenciesResult = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+              ...options,
+              parentPkgAliases,
+              publishedBy
+            });
+            importerResolutionResult = {
+              pkgAddresses: resolveDependenciesResult.pkgAddresses,
+              ...filterMissingPeers(await resolveDependenciesResult.resolvingPeers, parentPkgAliases)
+            };
+            pkgAddresses.push(...importerResolutionResult.pkgAddresses);
+          }
+        }
         return pkgAddresses;
       }, pkgAddressesByImportersWithoutPeers, importers));
       return { pkgAddressesByImporters, time };
@@ -175380,7 +175443,7 @@ var require_resolveDependencies = __commonJS({
       const depIsLinked = Boolean(
         // if package is not in `node_modules/.pnpm-lock.yaml`
         // we can safely assume that it doesn't exist in `node_modules`
-        currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && currentPkg.name && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath), "node_modules", currentPkg.name, "package.json"))
+        currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && currentPkg.name && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath, ctx.virtualStoreDirMaxLength), "node_modules", currentPkg.name, "package.json"))
       );
       if (!options.update && !options.proceed && currentPkg.resolution != null && depIsLinked) {
         return null;
@@ -175806,6 +175869,7 @@ var require_resolveDependencyTree = __commonJS({
         skipped: wantedToBeSkippedPackageIds,
         storeController: opts.storeController,
         virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         wantedLockfile: opts.wantedLockfile,
         appliedPatches: /* @__PURE__ */ new Set(),
         updatedSet: /* @__PURE__ */ new Set(),
@@ -177188,7 +177252,8 @@ var require_resolvePeers = __commonJS({
           peerDependencyIssues,
           purePkgs: /* @__PURE__ */ new Set(),
           rootDir,
-          virtualStoreDir: opts.virtualStoreDir
+          virtualStoreDir: opts.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
         });
         if (finishing) {
           finishingList.push(finishing);
@@ -177487,7 +177552,7 @@ var require_resolvePeers = __commonJS({
         }
         const peerDependencies = { ...resolvedPackage.peerDependencies };
         if (!ctx.depGraph[depPath] || ctx.depGraph[depPath].depth > node.depth) {
-          const modules = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath), "node_modules");
+          const modules = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.virtualStoreDirMaxLength), "node_modules");
           const dir = path_1.default.join(modules, resolvedPackage.name);
           const transitivePeerDependencies = /* @__PURE__ */ new Set();
           for (const unknownPeer of allResolvedPeers.keys()) {
@@ -178408,6 +178473,7 @@ var require_lib144 = __commonJS({
         lockfileDir: opts.lockfileDir,
         projects: projectsToLink,
         virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         resolvePeersFromWorkspaceRoot: Boolean(opts.resolvePeersFromWorkspaceRoot),
         resolvedImporters
       });
@@ -180352,7 +180418,8 @@ var require_extendInstallOptions = __commonJS({
         extendNodePath: true,
         ignoreWorkspaceCycles: false,
         disallowWorkspaceCycles: false,
-        excludeLinksFromLockfile: false
+        excludeLinksFromLockfile: false,
+        virtualStoreDirMaxLength: 120
       };
     };
     function extendOptions(opts) {
@@ -180463,6 +180530,7 @@ var require_link3 = __commonJS({
         skipped: opts.skipped,
         storeController: opts.storeController,
         virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         wantedLockfile: opts.wantedLockfile
       });
       core_loggers_1.stageLogger.debug({
@@ -180546,6 +180614,7 @@ var require_link3 = __commonJS({
           publicHoistedModulesDir: opts.rootModulesDir,
           publicHoistPattern: opts.publicHoistPattern ?? [],
           virtualStoreDir: opts.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
           hoistedWorkspacePackages: opts.hoistWorkspacePackages ? projects.reduce((hoistedWorkspacePackages, project) => {
             if (project.manifest.name && project.id !== ".") {
               hoistedWorkspacePackages[project.id] = {
@@ -181443,6 +181512,7 @@ Note that in CI environments, this setting is enabled by default.`
         tag: opts.tag,
         updateToLatest: opts.updateToLatest,
         virtualStoreDir: ctx.virtualStoreDir,
+        virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength,
         wantedLockfile: ctx.wantedLockfile,
         workspacePackages: opts.workspacePackages,
         patchedDependencies: opts.patchedDependencies,
@@ -181505,6 +181575,7 @@ Note that in CI environments, this setting is enabled by default.`
           skipped: ctx.skipped,
           storeController: opts.storeController,
           virtualStoreDir: ctx.virtualStoreDir,
+          virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength,
           wantedLockfile: newLockfile,
           wantedToBeSkippedPackageIds,
           hoistWorkspacePackages: opts.hoistWorkspacePackages
@@ -181516,6 +181587,7 @@ Note that in CI environments, this setting is enabled by default.`
             importerNames,
             lockfileDir: ctx.lockfileDir,
             virtualStoreDir: ctx.virtualStoreDir,
+            virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength,
             registries: ctx.registries
           });
         }
@@ -181619,7 +181691,10 @@ Note that in CI environments, this setting is enabled by default.`
             });
           }
         }));
-        const projectsWithTargetDirs = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(projects, newLockfile, ctx);
+        const projectsWithTargetDirs = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(projects, newLockfile, {
+          virtualStoreDir: ctx.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
+        });
         await Promise.all([
           opts.useLockfile && opts.saveLockfile ? (0, lockfile_file_1.writeLockfiles)({
             currentLockfile: result2.currentLockfile,
@@ -181653,7 +181728,8 @@ Note that in CI environments, this setting is enabled by default.`
               registries: ctx.registries,
               skipped: Array.from(ctx.skipped),
               storeDir: ctx.storeDir,
-              virtualStoreDir: ctx.virtualStoreDir
+              virtualStoreDir: ctx.virtualStoreDir,
+              virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength
             }, {
               makeModulesDir: Object.keys(result2.currentLockfile.packages ?? {}).length > 0
             });
@@ -181795,7 +181871,8 @@ var require_options4 = __commonJS({
         registries: normalize_registries_1.DEFAULT_REGISTRIES,
         storeController: opts.storeController,
         storeDir: opts.storeDir,
-        useLockfile: true
+        useLockfile: true,
+        virtualStoreDirMaxLength: 120
       };
     }
   }
@@ -182005,6 +182082,7 @@ var require_getPeerDependencyIssues = __commonJS({
         storeController: opts.storeController,
         tag: "latest",
         virtualStoreDir: ctx.virtualStoreDir,
+        virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength,
         wantedLockfile: ctx.wantedLockfile,
         workspacePackages: opts.workspacePackages ?? {},
         supportedArchitectures: opts.supportedArchitectures
@@ -198170,7 +198248,8 @@ var require_list3 = __commonJS({
         onlyProjects: opts.onlyProjects,
         reportAs: opts.parseable ? "parseable" : opts.json ? "json" : "tree",
         showExtraneous: false,
-        modulesDir: opts.modulesDir
+        modulesDir: opts.modulesDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       };
       return params.length > 0 ? (0, list_1.listForPackages)(params, prefixes, listOpts) : (0, list_1.list)(prefixes, listOpts);
     }
@@ -198564,7 +198643,7 @@ var require_getPkgInfo3 = __commonJS({
       if (isPackageWithIntegrity) {
         pkgIndexFilePath = (0, store_cafs_1.getFilePathInCafs)(opts.cafsDir, packageResolution.integrity, "index");
       } else if (!packageResolution.type && packageResolution.tarball) {
-        const packageDirInStore = (0, dependency_path_1.depPathToFilename)((0, dependency_path_1.parse)(id).nonSemverVersion ?? id);
+        const packageDirInStore = (0, dependency_path_1.depPathToFilename)((0, dependency_path_1.parse)(id).nonSemverVersion ?? id, opts.virtualStoreDirMaxLength);
         pkgIndexFilePath = path_1.default.join(opts.storeDir, packageDirInStore, "integrity.json");
       } else {
         throw new error_1.PnpmError("UNSUPPORTED_PACKAGE_TYPE", `Unsupported package resolution type for ${id}`);
@@ -198589,7 +198668,8 @@ var require_getPkgInfo3 = __commonJS({
       const packageFileIndexInfo = await readPackageIndexFile(packageResolution, pkg.id, {
         cafsDir,
         storeDir: opts.storeDir,
-        lockfileDir: opts.dir
+        lockfileDir: opts.dir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength
       });
       let packageManifestDir;
       if (packageFileIndexInfo.local) {
@@ -198610,7 +198690,7 @@ var require_getPkgInfo3 = __commonJS({
       }
       const modulesDir = opts.modulesDir ?? "node_modules";
       const virtualStoreDir = (0, path_absolute_1.default)(opts.virtualStoreDir ?? path_1.default.join(modulesDir, ".pnpm"), opts.dir);
-      const packageModulePath = path_1.default.join(virtualStoreDir, (0, dependency_path_1.depPathToFilename)(pkg.depPath), modulesDir, manifest.name);
+      const packageModulePath = path_1.default.join(virtualStoreDir, (0, dependency_path_1.depPathToFilename)(pkg.depPath, opts.virtualStoreDirMaxLength), modulesDir, manifest.name);
       const licenseInfo = await parseLicense({ manifest, files: packageFileIndexInfo }, { cafsDir });
       const packageInfo = {
         from: manifest.name,
@@ -198673,6 +198753,7 @@ var require_lockfileToLicenseNodeTree = __commonJS({
         }, {
           storeDir: options.storeDir,
           virtualStoreDir: options.virtualStoreDir,
+          virtualStoreDirMaxLength: options.virtualStoreDirMaxLength,
           dir: options.dir,
           modulesDir: options.modulesDir ?? "node_modules"
         });
@@ -198706,6 +198787,7 @@ var require_lockfileToLicenseNodeTree = __commonJS({
         const importerDeps = await lockfileToLicenseNode(importerWalker.step, {
           storeDir: opts.storeDir,
           virtualStoreDir: opts.virtualStoreDir,
+          virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
           modulesDir: opts.modulesDir,
           dir: opts.dir,
           registries: opts.registries,
@@ -198786,6 +198868,7 @@ var require_licenses = __commonJS({
         modulesDir: opts.modulesDir,
         storeDir: opts.storeDir,
         virtualStoreDir: opts.virtualStoreDir,
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         include: opts.include,
         registries: opts.registries,
         includedImporterIds: opts.includedImporterIds,
@@ -198968,6 +199051,7 @@ var require_licensesList = __commonJS({
         lockfileDir: opts.lockfileDir ?? opts.dir,
         storeDir,
         virtualStoreDir: opts.virtualStoreDir ?? ".",
+        virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         modulesDir: opts.modulesDir,
         registries: opts.registries,
         wantedLockfile: lockfile,
@@ -209755,9 +209839,9 @@ var require_storeStatus = __commonJS({
       });
       const cafsDir = path_1.default.join(storeDir, "files");
       const modified = await (0, p_filter_1.default)(pkgs, async ({ id, integrity, depPath, name }) => {
-        const pkgIndexFilePath = integrity ? (0, store_cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id), "integrity.json");
+        const pkgIndexFilePath = integrity ? (0, store_cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id, maybeOpts.virtualStoreDirMaxLength), "integrity.json");
         const { files } = await (0, load_json_file_1.default)(pkgIndexFilePath);
-        return await dint_1.default.check(path_1.default.join(virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", name), files) === false;
+        return await dint_1.default.check(path_1.default.join(virtualStoreDir, dp.depPathToFilename(depPath, maybeOpts.virtualStoreDirMaxLength), "node_modules", name), files) === false;
       }, { concurrency: 8 });
       if (reporter != null && typeof reporter === "function") {
         logger_1.streamParser.removeListener("data", reporter);

package/package.json

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