pnpm 7.16.0 → 7.16.1

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.15.0
+packageManager: pnpm@7.16.0
 pendingBuilds:
   - /node-gyp/9.3.0
   - /encoding/0.1.13
-prunedAt: Mon, 14 Nov 2022 13:32:56 GMT
+prunedAt: Wed, 16 Nov 2022 12:42:34 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3207,7 +3207,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.16.0" != null && true ? "7.16.0" : "0.0.0"
+      version: "7.16.1" != null && true ? "7.16.1" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -91920,7 +91920,8 @@ var require_lib59 = __commonJS({
     var npm_packlist_1 = __importDefault(require_lib58());
     var directoryFetcherLogger = (0, logger_1.logger)("directory-fetcher");
     function createDirectoryFetcher(opts) {
-      const fetchFromDir2 = opts?.includeOnlyPackageFiles ? fetchPackageFilesFromDir : fetchAllFilesFromDir;
+      const readFileStat = opts?.resolveSymlinks === true ? realFileStat : fileStat;
+      const fetchFromDir2 = opts?.includeOnlyPackageFiles ? fetchPackageFilesFromDir : fetchAllFilesFromDir.bind(null, readFileStat);
       const directoryFetcher = (cafs, resolution, opts2) => {
         const dir = path_1.default.join(opts2.lockfileDir, resolution.directory);
         return fetchFromDir2(dir, opts2);
@@ -91934,11 +91935,12 @@ var require_lib59 = __commonJS({
       if (opts.includeOnlyPackageFiles) {
         return fetchPackageFilesFromDir(dir, opts);
       }
-      return fetchAllFilesFromDir(dir, opts);
+      const readFileStat = opts?.resolveSymlinks === true ? realFileStat : fileStat;
+      return fetchAllFilesFromDir(readFileStat, dir, opts);
     }
     exports2.fetchFromDir = fetchFromDir;
-    async function fetchAllFilesFromDir(dir, opts) {
-      const filesIndex = await _fetchAllFilesFromDir(dir);
+    async function fetchAllFilesFromDir(readFileStat, dir, opts) {
+      const filesIndex = await _fetchAllFilesFromDir(readFileStat, dir);
       if (opts.manifest) {
         const manifest = await (0, read_project_manifest_1.safeReadProjectManifestOnly)(dir) ?? {};
         opts.manifest.resolve(manifest);
@@ -91949,24 +91951,16 @@ var require_lib59 = __commonJS({
         packageImportMethod: "hardlink"
       };
     }
-    async function _fetchAllFilesFromDir(dir, relativeDir = "") {
+    async function _fetchAllFilesFromDir(readFileStat, dir, relativeDir = "") {
       const filesIndex = {};
       const files = await fs_1.promises.readdir(dir);
       await Promise.all(files.filter((file) => file !== "node_modules").map(async (file) => {
-        const filePath = path_1.default.join(dir, file);
-        let stat;
-        try {
-          stat = await fs_1.promises.stat(filePath);
-        } catch (err) {
-          if (err.code === "ENOENT") {
-            directoryFetcherLogger.debug({ brokenSymlink: filePath });
-            return;
-          }
-          throw err;
-        }
+        const { filePath, stat } = await readFileStat(path_1.default.join(dir, file));
+        if (!filePath)
+          return;
         const relativeSubdir = `${relativeDir}${relativeDir ? "/" : ""}${file}`;
         if (stat.isDirectory()) {
-          const subFilesIndex = await _fetchAllFilesFromDir(filePath, relativeSubdir);
+          const subFilesIndex = await _fetchAllFilesFromDir(readFileStat, filePath, relativeSubdir);
           Object.assign(filesIndex, subFilesIndex);
         } else {
           filesIndex[relativeSubdir] = filePath;
@@ -91974,6 +91968,37 @@ var require_lib59 = __commonJS({
       }));
       return filesIndex;
     }
+    async function realFileStat(filePath) {
+      let stat = await fs_1.promises.lstat(filePath);
+      if (!stat.isSymbolicLink()) {
+        return { filePath, stat };
+      }
+      try {
+        filePath = await fs_1.promises.realpath(filePath);
+        stat = await fs_1.promises.stat(filePath);
+        return { filePath, stat };
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          directoryFetcherLogger.debug({ brokenSymlink: filePath });
+          return { filePath: null, stat: null };
+        }
+        throw err;
+      }
+    }
+    async function fileStat(filePath) {
+      try {
+        return {
+          filePath,
+          stat: await fs_1.promises.stat(filePath)
+        };
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          directoryFetcherLogger.debug({ brokenSymlink: filePath });
+          return { filePath: null, stat: null };
+        }
+        throw err;
+      }
+    }
     async function fetchPackageFilesFromDir(dir, opts) {
       const files = await (0, npm_packlist_1.default)({ path: dir });
       const filesIndex = (0, fromPairs_1.default)(files.map((file) => [file, path_1.default.join(dir, file)]));
@@ -92208,7 +92233,7 @@ var require_lib62 = __commonJS({
       const defaultFetchers = {
         ...(0, tarball_fetcher_1.createTarballFetcher)(fetchFromRegistry, getAuthHeader, opts),
         ...(0, git_fetcher_1.createGitFetcher)(opts),
-        ...(0, directory_fetcher_1.createDirectoryFetcher)()
+        ...(0, directory_fetcher_1.createDirectoryFetcher)({ resolveSymlinks: opts.resolveSymlinksInInjectedDirs })
       };
       const overwrites = Object.entries(customFetchers ?? {}).reduce((acc, [fetcherName, factory]) => {
         acc[fetcherName] = factory({ defaultFetchers });
@@ -92639,7 +92664,7 @@ var require_extendProjectsWithTargetDirs = __commonJS({
     var dependency_path_1 = require_lib66();
     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), "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), "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")
@@ -92648,8 +92673,8 @@ var require_extendProjectsWithTargetDirs = __commonJS({
         const importerId = pkgId.replace(/^file:/, "");
         if (projectsById[importerId] == null)
           return;
-        const localLocation = getLocalLocation(depPath, pkg.name);
-        projectsById[importerId].targetDirs.push(localLocation);
+        const localLocations = getLocalLocations(depPath, pkg.name);
+        projectsById[importerId].targetDirs.push(...localLocations);
         projectsById[importerId].stages = ["preinstall", "install", "postinstall", "prepare", "prepublishOnly"];
       });
       return Object.values(projectsById);
@@ -107529,7 +107554,8 @@ var require_createNewStoreController = __commonJS({
         timeout: opts.fetchTimeout,
         userAgent: opts.userAgent,
         maxSockets: opts.maxSockets ?? (opts.networkConcurrency != null ? opts.networkConcurrency * 3 : void 0),
-        gitShallowHosts: opts.gitShallowHosts
+        gitShallowHosts: opts.gitShallowHosts,
+        resolveSymlinksInInjectedDirs: opts.resolveSymlinksInInjectedDirs
       });
       await fs_1.promises.mkdir(opts.storeDir, { recursive: true });
       return {
@@ -171285,7 +171311,7 @@ var require_lockfileToHoistedDepGraph = __commonJS({
         ...opts,
         lockfile,
         graph,
-        pkgLocationByDepPath: {}
+        pkgLocationsByDepPath: {}
       };
       const hierarchy = {
         [opts.lockfileDir]: await fetchDeps(fetchDepsOpts, modulesDir, tree.dependencies)
@@ -171312,7 +171338,7 @@ var require_lockfileToHoistedDepGraph = __commonJS({
         directDependenciesByImporterId,
         graph,
         hierarchy,
-        pkgLocationByDepPath: fetchDepsOpts.pkgLocationByDepPath,
+        pkgLocationsByDepPath: fetchDepsOpts.pkgLocationsByDepPath,
         symlinkedDirectDependenciesByImporterId
       };
     }
@@ -171408,13 +171434,16 @@ var require_lockfileToHoistedDepGraph = __commonJS({
           requiresBuild: pkgSnapshot.requiresBuild === true,
           patchFile: opts.patchedDependencies?.[`${pkgName}@${pkgVersion}`]
         };
-        opts.pkgLocationByDepPath[depPath] = dir;
+        if (!opts.pkgLocationsByDepPath[depPath]) {
+          opts.pkgLocationsByDepPath[depPath] = [];
+        }
+        opts.pkgLocationsByDepPath[depPath].push(dir);
         depHierarchy[dir] = await fetchDeps(opts, path_1.default.join(dir, "node_modules"), dep.dependencies);
-        opts.graph[dir].children = getChildren(pkgSnapshot, opts.pkgLocationByDepPath, opts);
+        opts.graph[dir].children = getChildren(pkgSnapshot, opts.pkgLocationsByDepPath, opts);
       }));
       return depHierarchy;
     }
-    function getChildren(pkgSnapshot, pkgLocationByDepPath, opts) {
+    function getChildren(pkgSnapshot, pkgLocationsByDepPath, opts) {
       const allDeps = {
         ...pkgSnapshot.dependencies,
         ...opts.include.optionalDependencies ? pkgSnapshot.optionalDependencies : {}
@@ -171422,8 +171451,8 @@ var require_lockfileToHoistedDepGraph = __commonJS({
       const children = {};
       for (const [childName, childRef] of Object.entries(allDeps)) {
         const childDepPath = dp.refToRelative(childRef, childName);
-        if (childDepPath && pkgLocationByDepPath[childDepPath]) {
-          children[childName] = pkgLocationByDepPath[childDepPath];
+        if (childDepPath && pkgLocationsByDepPath[childDepPath]) {
+          children[childName] = pkgLocationsByDepPath[childDepPath][0];
         }
       }
       return children;
@@ -171611,7 +171640,7 @@ var require_lib116 = __commonJS({
         nodeVersion: opts.currentEngine.nodeVersion,
         pnpmVersion: opts.currentEngine.pnpmVersion
       };
-      const { directDependenciesByImporterId, graph, hierarchy, pkgLocationByDepPath, prevGraph, symlinkedDirectDependenciesByImporterId } = await (opts.nodeLinker === "hoisted" ? (0, lockfileToHoistedDepGraph_1.lockfileToHoistedDepGraph)(filteredLockfile, currentLockfile, lockfileToDepGraphOpts) : (0, lockfileToDepGraph_1.lockfileToDepGraph)(filteredLockfile, opts.force ? null : currentLockfile, lockfileToDepGraphOpts));
+      const { directDependenciesByImporterId, graph, hierarchy, pkgLocationsByDepPath, prevGraph, symlinkedDirectDependenciesByImporterId } = await (opts.nodeLinker === "hoisted" ? (0, lockfileToHoistedDepGraph_1.lockfileToHoistedDepGraph)(filteredLockfile, currentLockfile, lockfileToDepGraphOpts) : (0, lockfileToDepGraph_1.lockfileToDepGraph)(filteredLockfile, opts.force ? null : currentLockfile, lockfileToDepGraphOpts));
       if (opts.enablePnp) {
         const importerNames = (0, fromPairs_1.default)(selectedProjects.map(({ manifest, id }) => [id, manifest.name ?? id]));
         await (0, lockfile_to_pnp_1.writePnpFile)(filteredLockfile, {
@@ -171760,7 +171789,7 @@ var require_lib116 = __commonJS({
         });
       }
       const projectsToBeBuilt = (0, lockfile_utils_1.extendProjectsWithTargetDirs)(selectedProjects, wantedLockfile, {
-        pkgLocationByDepPath,
+        pkgLocationsByDepPath,
         virtualStoreDir
       });
       if (opts.enableModulesDir !== false) {

package/package.json

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