pnpm 7.0.0-beta.0 → 7.0.0-beta.1

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.0.0-alpha.4
+packageManager: pnpm@7.0.0-beta.0
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Tue, 15 Mar 2022 22:58:50 GMT
+prunedAt: Sat, 19 Mar 2022 19:16:03 GMT
 publicHoistPattern:
   - '*types*'
   - '*eslint*'

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

@@ -45,7 +45,7 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.3
+      debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -55,7 +55,7 @@ packages:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
     engines: {node: '>= 8.0.0'}
     dependencies:
-      debug: 4.3.3
+      debug: 4.3.4
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
@@ -158,8 +158,8 @@ packages:
     dev: false
     optional: true
 
-  /debug/4.3.3:
-    resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
+  /debug/4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -267,7 +267,7 @@ packages:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.3
+      debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -278,7 +278,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.3
+      debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -614,7 +614,7 @@ packages:
     engines: {node: '>= 10'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.3
+      debug: 4.3.4
       socks: 2.6.2
     transitivePeerDependencies:
       - supports-color

package/dist/node_modules/debug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "debug",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "repository": {
     "type": "git",
     "url": "git://github.com/debug-js/debug.git"

package/dist/node_modules/debug/src/common.js

@@ -179,7 +179,7 @@ function setup(env) {
 			namespaces = split[i].replace(/\*/g, '.*?');
 
 			if (namespaces[0] === '-') {
-				createDebug.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+				createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
 			} else {
 				createDebug.names.push(new RegExp('^' + namespaces + '$'));
 			}

package/dist/pnpm.cjs

@@ -3167,7 +3167,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "7.0.0-beta.0" != null && true ? "7.0.0-beta.0" : "0.0.0"
+      version: "7.0.0-beta.1" != null && true ? "7.0.0-beta.1" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -73477,9 +73477,7 @@ var require_lib34 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.resolve = exports2.isAbsolute = void 0;
     var crypto_1 = __importDefault(require("crypto"));
-    var path_1 = __importDefault(require("path"));
     var encode_registry_1 = __importDefault(require_encode_registry());
-    var normalize_path_1 = __importDefault(require_normalize_path());
     var semver_12 = __importDefault(require_semver2());
     function isAbsolute(dependencyPath) {
       return dependencyPath[0] !== "/";
@@ -73589,15 +73587,15 @@ var require_lib34 = __commonJS({
       };
     }
     exports2.parse = parse;
-    function depPathToFilename(depPath, lockfileDir) {
-      const filename = depPathToFilenameUnescaped(depPath, lockfileDir).replace(/\//g, "+");
-      if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("local+")) {
+    function depPathToFilename(depPath) {
+      const filename = depPathToFilenameUnescaped(depPath).replace(/\//g, "+");
+      if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("file+")) {
         return `${filename.substring(0, 50)}_${crypto_1.default.createHash("md5").update(filename).digest("hex")}`;
       }
       return filename;
     }
     exports2.depPathToFilename = depPathToFilename;
-    function depPathToFilenameUnescaped(depPath, lockfileDir) {
+    function depPathToFilenameUnescaped(depPath) {
       if (depPath.indexOf("file:") !== 0) {
         if (depPath.startsWith("/")) {
           depPath = depPath.substring(1);
@@ -73605,8 +73603,7 @@ var require_lib34 = __commonJS({
         const index = depPath.lastIndexOf("/");
         return `${depPath.substring(0, index)}@${depPath.substr(index + 1)}`;
       }
-      const absolutePath = (0, normalize_path_1.default)(path_1.default.join(lockfileDir, depPath.slice(5)));
-      return `local+${absolutePath.replace(":", "+")}`;
+      return depPath.replace(":", "+");
     }
   }
 });
@@ -74434,7 +74431,7 @@ var require_packageRequester = __commonJS({
       if (!opts.pkg.name) {
         opts.fetchRawManifest = true;
       }
-      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id, opts.lockfileDir);
+      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id);
       const target = path_1.default.join(ctx.storeDir, targetRelative);
       if (!ctx.fetchingLocker.has(opts.pkg.id)) {
         const bundledManifest = (0, p_defer_1.default)();
@@ -85356,6 +85353,7 @@ var require_pickPackage = __commonJS({
           pickedPackage: (0, pickPackageFromMeta_1.default)(spec, opts.preferredVersionSelectors, meta)
         };
       } catch (err) {
+        err.spec = spec;
         const meta = await loadMeta(pkgMirror);
         if (meta == null)
           throw err;
@@ -87124,7 +87122,7 @@ var require_extendProjectsWithTargetDirs = __commonJS({
     var dependency_path_1 = require_lib34();
     var fromPairs_1 = __importDefault(require_fromPairs());
     function extendProjectsWithTargetDirs(projects, lockfile, ctx) {
-      const getLocalLocation = ctx.pkgLocationByDepPath != null ? (depPath) => ctx.pkgLocationByDepPath[depPath] : (depPath, pkgName) => path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.lockfileDir), "node_modules", pkgName);
+      const getLocalLocation = ctx.pkgLocationByDepPath != null ? (depPath) => ctx.pkgLocationByDepPath[depPath] : (depPath, pkgName) => path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath), "node_modules", pkgName);
       const projectsById = (0, fromPairs_1.default)(projects.map((project) => [project.id, { ...project, targetDirs: [] }]));
       Object.entries(lockfile.packages ?? {}).forEach(([depPath, pkg]) => {
         if (pkg.resolution?.["type"] !== "directory")
@@ -109087,9 +109085,9 @@ var require_implementation4 = __commonJS({
       const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath)).map((depPath) => async () => {
         const pkgSnapshot = pkgSnapshots[depPath];
         const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-        const pkgRoot = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules", pkgInfo.name);
+        const pkgRoot = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", pkgInfo.name);
         try {
-          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
           const binPath = path_1.default.join(pkgRoot, "node_modules", ".bin");
           await (0, link_bins_1.default)(modules, binPath, { warn });
           await (0, lifecycle_1.runPostinstallHooks)({
@@ -109125,7 +109123,7 @@ var require_implementation4 = __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, opts.lockfileDir), "node_modules");
+        const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
         const binPath = path_1.default.join(modules, pkgInfo.name, "node_modules", ".bin");
         return (0, link_bins_1.default)(modules, binPath, { warn });
       })));
@@ -110413,12 +110411,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, opts.lockfileDir)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
+          await Promise.all(orphanDepPaths.map((orphanDepPath) => (0, dependency_path_1.depPathToFilename)(orphanDepPath)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
           const neededPkgs = /* @__PURE__ */ new Set();
           for (const depPath of Object.keys(opts.wantedLockfile.packages ?? {})) {
             if (opts.skipped.has(depPath))
               continue;
-            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath, opts.lockfileDir));
+            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath));
           }
           const availablePkgs = await readVirtualStoreDir(opts.virtualStoreDir, opts.lockfileDir);
           await Promise.all(availablePkgs.filter((availablePkg) => !neededPkgs.has(availablePkg)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
@@ -111420,7 +111418,6 @@ var require_lib90 = __commonJS({
       });
       await symlinkHoistedDependencies(hoistedDependencies, {
         lockfile: opts.lockfile,
-        lockfileDir: opts.lockfileDir,
         privateHoistedModulesDir: opts.privateHoistedModulesDir,
         publicHoistedModulesDir: opts.publicHoistedModulesDir,
         virtualStoreDir: opts.virtualStoreDir
@@ -111507,7 +111504,7 @@ var require_lib90 = __commonJS({
           return;
         }
         const pkgName = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot).name;
-        const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+        const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
         const depLocation = path_1.default.join(modules, pkgName);
         await Promise.all(Object.entries(pkgAliases).map(async ([pkgAlias, hoistType]) => {
           const targetDir = hoistType === "public" ? opts.publicHoistedModulesDir : opts.privateHoistedModulesDir;
@@ -114075,7 +114072,7 @@ var require_lib92 = __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, opts.lockfileDir), "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), "node_modules", name)));
         if (!packageLocation.startsWith("../")) {
           packageLocation = `./${packageLocation}`;
         }
@@ -114440,7 +114437,7 @@ var require_lockfileToDepGraph = __commonJS({
             return;
           const pkgSnapshot = lockfile.packages[depPath];
           const { name: pkgName, version: pkgVersion } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
           const packageId = (0, lockfile_utils_1.packageIdFromSnapshot)(depPath, pkgSnapshot, opts.registries);
           const pkg = {
             name: pkgName,
@@ -114563,7 +114560,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, ctx.lockfileDir), "node_modules", pkgName);
+          children[alias] = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(childRelDepPath), "node_modules", pkgName);
         } else if (allDeps[alias].indexOf("file:") === 0) {
           children[alias] = path_1.default.resolve(ctx.lockfileDir, allDeps[alias].substr(5));
         } else if (!ctx.skipped.has(childRelDepPath) && (peerDeps == null || !peerDeps.has(alias))) {
@@ -115853,7 +115850,6 @@ var require_lib94 = __commonJS({
           newHoistedDependencies = await (0, hoist_1.default)({
             lockfile: hoistLockfile,
             importerIds,
-            lockfileDir,
             privateHoistedModulesDir: hoistedModulesDir,
             privateHoistPattern: opts.hoistPattern ?? [],
             publicHoistedModulesDir,
@@ -115919,7 +115915,6 @@ var require_lib94 = __commonJS({
         });
       }
       const projectsToBeBuilt = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(opts.projects, wantedLockfile, {
-        lockfileDir: opts.lockfileDir,
         pkgLocationByDepPath,
         virtualStoreDir
       });
@@ -116755,7 +116750,7 @@ var require_resolveDependencies = __commonJS({
     async function resolveDependency(wantedDependency, ctx, options) {
       const currentPkg = options.currentPkg ?? {};
       const currentLockfileContainsTheDep = currentPkg.depPath ? Boolean(ctx.currentLockfile.packages?.[currentPkg.depPath]) : void 0;
-      const depIsLinked = Boolean(currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath, ctx.prefix), "node_modules", currentPkg.name, "package.json")));
+      const depIsLinked = Boolean(currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath), "node_modules", currentPkg.name, "package.json")));
       if (!options.update && !options.proceed && currentPkg.resolution != null && depIsLinked) {
         return null;
       }
@@ -117913,7 +117908,7 @@ var require_resolvePeers = __commonJS({
         const peersFolderSuffix = createPeersFolderSuffix(Object.keys(allResolvedPeers).map((alias) => ctx.dependenciesTree[allResolvedPeers[alias]].resolvedPackage).map(({ name, version }) => ({ name, version })));
         depPath = `${resolvedPackage.depPath}${peersFolderSuffix}`;
       }
-      const localLocation = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.lockfileDir));
+      const localLocation = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath));
       const modules = path_1.default.join(localLocation, "node_modules");
       const isPure = (0, isEmpty_1.default)(allResolvedPeers) && allMissingPeers.length === 0;
       if (isPure) {
@@ -119479,7 +119474,7 @@ var require_extendInstallOptions = __commonJS({
         preferFrozenLockfile: true,
         preferWorkspacePackages: false,
         preserveWorkspaceProtocol: true,
-        pruneLockfileImporters: false,
+        pruneLockfileImporters: true,
         pruneStore: false,
         rawConfig: {},
         registries: normalize_registries_1.DEFAULT_REGISTRIES,
@@ -119781,7 +119776,6 @@ var require_link2 = __commonJS({
         newHoistedDependencies = await (0, hoist_1.default)({
           lockfile: hoistLockfile,
           importerIds: projectIds,
-          lockfileDir: opts.lockfileDir,
           privateHoistedModulesDir: opts.hoistedModulesDir,
           privateHoistPattern: opts.hoistPattern ?? [],
           publicHoistedModulesDir: opts.rootModulesDir,
@@ -169047,7 +169041,7 @@ var require_lib109 = __commonJS({
         isPeer: Boolean(opts.peers?.has(opts.alias)),
         isSkipped,
         name,
-        path: depPath ? path_1.default.join(opts.modulesDir, ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath, opts.lockfileDir)) : path_1.default.join(opts.modulesDir, "..", opts.ref.substr(5)),
+        path: depPath ? path_1.default.join(opts.modulesDir, ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath)) : path_1.default.join(opts.modulesDir, "..", opts.ref.substr(5)),
         version
       };
       if (resolved) {
@@ -173311,9 +173305,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, cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id, opts.dir), "integrity.json");
+        const pkgIndexFilePath = integrity ? (0, cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id), "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, opts.dir), "node_modules", name), files) === false;
+        return await dint_1.default.check(path_1.default.join(virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", name), files) === false;
       }, { concurrency: 8 });
       if (reporter != null && typeof reporter === "function") {
         logger_1.streamParser.removeListener("data", reporter);

package/dist/pnpx.cjs

@@ -68474,9 +68474,7 @@ var require_lib33 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.resolve = exports2.isAbsolute = void 0;
     var crypto_1 = __importDefault2(require("crypto"));
-    var path_1 = __importDefault2(require("path"));
     var encode_registry_1 = __importDefault2(require_encode_registry());
-    var normalize_path_1 = __importDefault2(require_normalize_path());
     var semver_12 = __importDefault2(require_semver2());
     function isAbsolute(dependencyPath) {
       return dependencyPath[0] !== "/";
@@ -68586,15 +68584,15 @@ var require_lib33 = __commonJS({
       };
     }
     exports2.parse = parse;
-    function depPathToFilename(depPath, lockfileDir) {
-      const filename = depPathToFilenameUnescaped(depPath, lockfileDir).replace(/\//g, "+");
-      if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("local+")) {
+    function depPathToFilename(depPath) {
+      const filename = depPathToFilenameUnescaped(depPath).replace(/\//g, "+");
+      if (filename.length > 120 || filename !== filename.toLowerCase() && !filename.startsWith("file+")) {
         return `${filename.substring(0, 50)}_${crypto_1.default.createHash("md5").update(filename).digest("hex")}`;
       }
       return filename;
     }
     exports2.depPathToFilename = depPathToFilename;
-    function depPathToFilenameUnescaped(depPath, lockfileDir) {
+    function depPathToFilenameUnescaped(depPath) {
       if (depPath.indexOf("file:") !== 0) {
         if (depPath.startsWith("/")) {
           depPath = depPath.substring(1);
@@ -68602,8 +68600,7 @@ var require_lib33 = __commonJS({
         const index = depPath.lastIndexOf("/");
         return `${depPath.substring(0, index)}@${depPath.substr(index + 1)}`;
       }
-      const absolutePath = (0, normalize_path_1.default)(path_1.default.join(lockfileDir, depPath.slice(5)));
-      return `local+${absolutePath.replace(":", "+")}`;
+      return depPath.replace(":", "+");
     }
   }
 });
@@ -69431,7 +69428,7 @@ var require_packageRequester = __commonJS({
       if (!opts.pkg.name) {
         opts.fetchRawManifest = true;
       }
-      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id, opts.lockfileDir);
+      const targetRelative = (0, dependency_path_1.depPathToFilename)(opts.pkg.id);
       const target = path_1.default.join(ctx.storeDir, targetRelative);
       if (!ctx.fetchingLocker.has(opts.pkg.id)) {
         const bundledManifest = (0, p_defer_1.default)();
@@ -80353,6 +80350,7 @@ var require_pickPackage = __commonJS({
           pickedPackage: (0, pickPackageFromMeta_1.default)(spec, opts.preferredVersionSelectors, meta)
         };
       } catch (err) {
+        err.spec = spec;
         const meta = await loadMeta(pkgMirror);
         if (meta == null)
           throw err;
@@ -82121,7 +82119,7 @@ var require_extendProjectsWithTargetDirs = __commonJS({
     var dependency_path_1 = require_lib33();
     var fromPairs_1 = __importDefault2(require_fromPairs());
     function extendProjectsWithTargetDirs(projects, lockfile, ctx) {
-      const getLocalLocation = ctx.pkgLocationByDepPath != null ? (depPath) => ctx.pkgLocationByDepPath[depPath] : (depPath, pkgName) => path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.lockfileDir), "node_modules", pkgName);
+      const getLocalLocation = ctx.pkgLocationByDepPath != null ? (depPath) => ctx.pkgLocationByDepPath[depPath] : (depPath, pkgName) => path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath), "node_modules", pkgName);
       const projectsById = (0, fromPairs_1.default)(projects.map((project) => [project.id, { ...project, targetDirs: [] }]));
       Object.entries(lockfile.packages ?? {}).forEach(([depPath, pkg]) => {
         if (pkg.resolution?.["type"] !== "directory")
@@ -104084,9 +104082,9 @@ var require_implementation4 = __commonJS({
       const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath)).map((depPath) => async () => {
         const pkgSnapshot = pkgSnapshots[depPath];
         const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-        const pkgRoot = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules", pkgInfo.name);
+        const pkgRoot = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules", pkgInfo.name);
         try {
-          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+          const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
           const binPath = path_1.default.join(pkgRoot, "node_modules", ".bin");
           await (0, link_bins_1.default)(modules, binPath, { warn });
           await (0, lifecycle_1.runPostinstallHooks)({
@@ -104122,7 +104120,7 @@ var require_implementation4 = __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, opts.lockfileDir), "node_modules");
+        const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
         const binPath = path_1.default.join(modules, pkgInfo.name, "node_modules", ".bin");
         return (0, link_bins_1.default)(modules, binPath, { warn });
       })));
@@ -105410,12 +105408,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, opts.lockfileDir)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
+          await Promise.all(orphanDepPaths.map((orphanDepPath) => (0, dependency_path_1.depPathToFilename)(orphanDepPath)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
           const neededPkgs = /* @__PURE__ */ new Set();
           for (const depPath of Object.keys(opts.wantedLockfile.packages ?? {})) {
             if (opts.skipped.has(depPath))
               continue;
-            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath, opts.lockfileDir));
+            neededPkgs.add((0, dependency_path_1.depPathToFilename)(depPath));
           }
           const availablePkgs = await readVirtualStoreDir(opts.virtualStoreDir, opts.lockfileDir);
           await Promise.all(availablePkgs.filter((availablePkg) => !neededPkgs.has(availablePkg)).map(async (orphanDepPath) => _tryRemovePkg(orphanDepPath)));
@@ -106417,7 +106415,6 @@ var require_lib89 = __commonJS({
       });
       await symlinkHoistedDependencies(hoistedDependencies, {
         lockfile: opts.lockfile,
-        lockfileDir: opts.lockfileDir,
         privateHoistedModulesDir: opts.privateHoistedModulesDir,
         publicHoistedModulesDir: opts.publicHoistedModulesDir,
         virtualStoreDir: opts.virtualStoreDir
@@ -106504,7 +106501,7 @@ var require_lib89 = __commonJS({
           return;
         }
         const pkgName = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot).name;
-        const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+        const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
         const depLocation = path_1.default.join(modules, pkgName);
         await Promise.all(Object.entries(pkgAliases).map(async ([pkgAlias, hoistType]) => {
           const targetDir = hoistType === "public" ? opts.publicHoistedModulesDir : opts.privateHoistedModulesDir;
@@ -109072,7 +109069,7 @@ var require_lib91 = __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, opts.lockfileDir), "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), "node_modules", name)));
         if (!packageLocation.startsWith("../")) {
           packageLocation = `./${packageLocation}`;
         }
@@ -109437,7 +109434,7 @@ var require_lockfileToDepGraph = __commonJS({
             return;
           const pkgSnapshot = lockfile.packages[depPath];
           const { name: pkgName, version: pkgVersion } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
-          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath, opts.lockfileDir), "node_modules");
+          const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), "node_modules");
           const packageId = (0, lockfile_utils_1.packageIdFromSnapshot)(depPath, pkgSnapshot, opts.registries);
           const pkg = {
             name: pkgName,
@@ -109560,7 +109557,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, ctx.lockfileDir), "node_modules", pkgName);
+          children[alias] = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(childRelDepPath), "node_modules", pkgName);
         } else if (allDeps[alias].indexOf("file:") === 0) {
           children[alias] = path_1.default.resolve(ctx.lockfileDir, allDeps[alias].substr(5));
         } else if (!ctx.skipped.has(childRelDepPath) && (peerDeps == null || !peerDeps.has(alias))) {
@@ -110850,7 +110847,6 @@ var require_lib93 = __commonJS({
           newHoistedDependencies = await (0, hoist_1.default)({
             lockfile: hoistLockfile,
             importerIds,
-            lockfileDir,
             privateHoistedModulesDir: hoistedModulesDir,
             privateHoistPattern: opts.hoistPattern ?? [],
             publicHoistedModulesDir,
@@ -110916,7 +110912,6 @@ var require_lib93 = __commonJS({
         });
       }
       const projectsToBeBuilt = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(opts.projects, wantedLockfile, {
-        lockfileDir: opts.lockfileDir,
         pkgLocationByDepPath,
         virtualStoreDir
       });
@@ -111752,7 +111747,7 @@ var require_resolveDependencies = __commonJS({
     async function resolveDependency(wantedDependency, ctx, options) {
       const currentPkg = options.currentPkg ?? {};
       const currentLockfileContainsTheDep = currentPkg.depPath ? Boolean(ctx.currentLockfile.packages?.[currentPkg.depPath]) : void 0;
-      const depIsLinked = Boolean(currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath, ctx.prefix), "node_modules", currentPkg.name, "package.json")));
+      const depIsLinked = Boolean(currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath), "node_modules", currentPkg.name, "package.json")));
       if (!options.update && !options.proceed && currentPkg.resolution != null && depIsLinked) {
         return null;
       }
@@ -112910,7 +112905,7 @@ var require_resolvePeers = __commonJS({
         const peersFolderSuffix = createPeersFolderSuffix(Object.keys(allResolvedPeers).map((alias) => ctx.dependenciesTree[allResolvedPeers[alias]].resolvedPackage).map(({ name, version }) => ({ name, version })));
         depPath = `${resolvedPackage.depPath}${peersFolderSuffix}`;
       }
-      const localLocation = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath, ctx.lockfileDir));
+      const localLocation = path_1.default.join(ctx.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(depPath));
       const modules = path_1.default.join(localLocation, "node_modules");
       const isPure = (0, isEmpty_1.default)(allResolvedPeers) && allMissingPeers.length === 0;
       if (isPure) {
@@ -114476,7 +114471,7 @@ var require_extendInstallOptions = __commonJS({
         preferFrozenLockfile: true,
         preferWorkspacePackages: false,
         preserveWorkspaceProtocol: true,
-        pruneLockfileImporters: false,
+        pruneLockfileImporters: true,
         pruneStore: false,
         rawConfig: {},
         registries: normalize_registries_1.DEFAULT_REGISTRIES,
@@ -114778,7 +114773,6 @@ var require_link2 = __commonJS({
         newHoistedDependencies = await (0, hoist_1.default)({
           lockfile: hoistLockfile,
           importerIds: projectIds,
-          lockfileDir: opts.lockfileDir,
           privateHoistedModulesDir: opts.hoistedModulesDir,
           privateHoistPattern: opts.hoistPattern ?? [],
           publicHoistedModulesDir: opts.rootModulesDir,
@@ -168522,7 +168516,7 @@ var require_lib108 = __commonJS({
         isPeer: Boolean(opts.peers?.has(opts.alias)),
         isSkipped,
         name,
-        path: depPath ? path_1.default.join(opts.modulesDir, ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath, opts.lockfileDir)) : path_1.default.join(opts.modulesDir, "..", opts.ref.substr(5)),
+        path: depPath ? path_1.default.join(opts.modulesDir, ".pnpm", (0, dependency_path_1.depPathToFilename)(depPath)) : path_1.default.join(opts.modulesDir, "..", opts.ref.substr(5)),
         version
       };
       if (resolved) {
@@ -172786,9 +172780,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, cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id, opts.dir), "integrity.json");
+        const pkgIndexFilePath = integrity ? (0, cafs_1.getFilePathInCafs)(cafsDir, integrity, "index") : path_1.default.join(storeDir, dp.depPathToFilename(id), "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, opts.dir), "node_modules", name), files) === false;
+        return await dint_1.default.check(path_1.default.join(virtualStoreDir, dp.depPathToFilename(depPath), "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": "7.0.0-beta.0",
+  "version": "7.0.0-beta.1",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -21,46 +21,46 @@
   "__devDependencies": {
     "@pnpm/assert-project": "workspace:*",
     "@pnpm/byline": "^1.0.0",
-    "@pnpm/cli-meta": "workspace:2.0.2",
-    "@pnpm/cli-utils": "workspace:0.6.50",
-    "@pnpm/client": "workspace:6.1.3",
-    "@pnpm/command": "workspace:2.0.0",
-    "@pnpm/common-cli-options-help": "workspace:0.8.0",
-    "@pnpm/config": "workspace:13.13.2",
-    "@pnpm/constants": "workspace:5.0.0",
-    "@pnpm/core-loggers": "workspace:6.1.4",
-    "@pnpm/default-reporter": "workspace:8.5.13",
-    "@pnpm/file-reporter": "workspace:2.0.0",
-    "@pnpm/filter-workspace-packages": "workspace:4.4.22",
-    "@pnpm/find-workspace-dir": "workspace:3.0.2",
-    "@pnpm/find-workspace-packages": "workspace:3.1.42",
-    "@pnpm/lockfile-types": "workspace:3.2.0",
+    "@pnpm/cli-meta": "workspace:3.0.0",
+    "@pnpm/cli-utils": "workspace:0.7.0",
+    "@pnpm/client": "workspace:7.0.0",
+    "@pnpm/command": "workspace:3.0.0",
+    "@pnpm/common-cli-options-help": "workspace:0.9.0",
+    "@pnpm/config": "workspace:14.0.0",
+    "@pnpm/constants": "workspace:6.0.0",
+    "@pnpm/core-loggers": "workspace:7.0.0",
+    "@pnpm/default-reporter": "workspace:9.0.0",
+    "@pnpm/file-reporter": "workspace:3.0.0",
+    "@pnpm/filter-workspace-packages": "workspace:5.0.0",
+    "@pnpm/find-workspace-dir": "workspace:4.0.0",
+    "@pnpm/find-workspace-packages": "workspace:4.0.0",
+    "@pnpm/lockfile-types": "workspace:4.0.0",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/modules-yaml": "workspace:9.1.1",
+    "@pnpm/modules-yaml": "workspace:10.0.0",
     "@pnpm/nopt": "^0.2.1",
-    "@pnpm/parse-cli-args": "workspace:4.4.1",
-    "@pnpm/pick-registry-for-package": "workspace:2.0.11",
-    "@pnpm/plugin-commands-audit": "workspace:5.1.42",
-    "@pnpm/plugin-commands-env": "workspace:1.4.14",
-    "@pnpm/plugin-commands-init": "workspace:0.0.0",
-    "@pnpm/plugin-commands-installation": "workspace:8.4.4",
-    "@pnpm/plugin-commands-listing": "workspace:4.1.11",
-    "@pnpm/plugin-commands-outdated": "workspace:5.1.10",
-    "@pnpm/plugin-commands-publishing": "workspace:4.5.2",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.4.14",
-    "@pnpm/plugin-commands-script-runners": "workspace:4.6.2",
-    "@pnpm/plugin-commands-server": "workspace:3.0.70",
-    "@pnpm/plugin-commands-setup": "workspace:1.1.35",
-    "@pnpm/plugin-commands-store": "workspace:4.1.13",
+    "@pnpm/parse-cli-args": "workspace:5.0.0",
+    "@pnpm/pick-registry-for-package": "workspace:3.0.0",
+    "@pnpm/plugin-commands-audit": "workspace:6.0.0",
+    "@pnpm/plugin-commands-env": "workspace:2.0.0",
+    "@pnpm/plugin-commands-init": "workspace:1.0.0",
+    "@pnpm/plugin-commands-installation": "workspace:9.0.0",
+    "@pnpm/plugin-commands-listing": "workspace:5.0.0",
+    "@pnpm/plugin-commands-outdated": "workspace:6.0.0",
+    "@pnpm/plugin-commands-publishing": "workspace:5.0.0",
+    "@pnpm/plugin-commands-rebuild": "workspace:6.0.0",
+    "@pnpm/plugin-commands-script-runners": "workspace:5.0.0",
+    "@pnpm/plugin-commands-server": "workspace:4.0.0",
+    "@pnpm/plugin-commands-setup": "workspace:2.0.0",
+    "@pnpm/plugin-commands-store": "workspace:5.0.0",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/read-package-json": "workspace:5.0.12",
-    "@pnpm/read-project-manifest": "workspace:2.0.13",
+    "@pnpm/read-package-json": "workspace:6.0.0",
+    "@pnpm/read-project-manifest": "workspace:3.0.0",
     "@pnpm/registry-mock": "2.15.1",
-    "@pnpm/run-npm": "workspace:3.1.0",
+    "@pnpm/run-npm": "workspace:4.0.0",
     "@pnpm/tabtab": "^0.1.2",
     "@pnpm/ts-execution-runtime": "workspace:*",
-    "@pnpm/types": "workspace:7.10.0",
-    "@pnpm/write-project-manifest": "workspace:2.0.11",
+    "@pnpm/types": "workspace:8.0.0",
+    "@pnpm/write-project-manifest": "workspace:3.0.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/is-ci": "^3.0.0",
     "@types/is-windows": "^1.0.0",
@@ -89,7 +89,7 @@
     "p-defer": "^3.0.0",
     "path-exists": "^4.0.0",
     "path-name": "^1.0.0",
-    "pkgs-graph": "workspace:6.1.3",
+    "pkgs-graph": "workspace:7.0.0",
     "ps-list": "^7.2.0",
     "ramda": "^0.27.1",
     "read-yaml-file": "^2.1.0",