mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-03-24 01:51:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(dependencies-hierarchy): move wanted lockfile loading outside dependenciesHierarchyForPackage (#6757)

Browse Source 
Move loading wantedLockfile outside dependenciesHierarchyForPackage,
preventing OOM crash when loading the same lock file too many times
This commit is contained in:
Bogdan Savluk
2023-07-03 15:34:14 +02:00
committed by GitHub
parent 2f0fe96f0d
commit e334e56709
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/ninety-rats-breathe.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/reviewing.dependencies-hierarchy": patch
---
Move loading `wantedLockfile` outside `dependenciesHierarchyForPackage`, preventing OOM crash when loading the same lock file too many times

9
reviewing/dependencies-hierarchy/src/buildDependenciesHierarchy.ts
View File

@@ -50,6 +50,7 @@ export async function buildDependenciesHierarchy (
...modules?.registries,
})
const currentLockfile = (modules?.virtualStoreDir && await readCurrentLockfile(modules.virtualStoreDir, { ignoreIncompatible: false })) ?? null
const wantedLockfile = await readWantedLockfile(maybeOpts.lockfileDir, { ignoreIncompatible: false })
const result = {} as { [projectDir: string]: DependenciesHierarchy }
@@ -79,7 +80,7 @@ export async function buildDependenciesHierarchy (
await Promise.all(projectPaths.map(async (projectPath) => {
return [
projectPath,
await dependenciesHierarchyForPackage(projectPath, currentLockfile, opts),
await dependenciesHierarchyForPackage(projectPath, currentLockfile, wantedLockfile, opts),
] as [string, DependenciesHierarchy]
}))
).forEach(([projectPath, dependenciesHierarchy]) => {
@@ -91,6 +92,7 @@ export async function buildDependenciesHierarchy (
async function dependenciesHierarchyForPackage (
projectPath: string,
currentLockfile: Lockfile,
wantedLockfile: Lockfile | null,
opts: {
depth: number
include: { [dependenciesField in DependenciesField]: boolean }
@@ -112,7 +114,6 @@ async function dependenciesHierarchyForPackage (
const savedDeps = getAllDirectDependencies(currentLockfile.importers[importerId])
const allDirectDeps = await readModulesDir(modulesDir) ?? []
const unsavedDeps = allDirectDeps.filter((directDep) => !savedDeps[directDep])
const wantedLockfile = await readWantedLockfile(opts.lockfileDir, { ignoreIncompatible: false }) ?? { packages: {} }
const getChildrenTree = getTree.bind(null, {
currentPackages: currentLockfile.packages ?? {},
@@ -126,7 +127,7 @@ async function dependenciesHierarchyForPackage (
registries: opts.registries,
search: opts.search,
skipped: opts.skipped,
wantedPackages: wantedLockfile.packages ?? {},
wantedPackages: wantedLockfile?.packages ?? {},
virtualStoreDir: opts.virtualStoreDir,
})
const parentId: TreeNodeId = { type: 'importer', importerId }
@@ -143,7 +144,7 @@ async function dependenciesHierarchyForPackage (
ref,
registries: opts.registries,
skipped: opts.skipped,
wantedPackages: wantedLockfile.packages ?? {},
wantedPackages: wantedLockfile?.packages ?? {},
virtualStoreDir: opts.virtualStoreDir,
})
let newEntry: PackageNode | null = null