mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-01-11 00:18:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: always add name and version to the index file (#7708)

Browse Source 
close #7115
This commit is contained in:
Zoltan Kochan
2024-02-24 12:54:55 +01:00
committed by GitHub
parent 99ccefd31b
commit 11d9ebd7db
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changeset/heavy-cars-press.md Normal file
View File

@@ -0,0 +1,6 @@
---
"@pnpm/worker": patch
"pnpm": patch
---
Always add a name and version field to the index files in the store [#7115](https://github.com/pnpm/pnpm/issues/7115).

14
worker/src/worker.ts
View File

@@ -136,9 +136,9 @@ function addTarballToStore ({ buffer, cafsDir, integrity, filesIndexFile, pkg, r
cafsCache.set(cafsDir, createCafs(cafsDir))
}
const cafs = cafsCache.get(cafsDir)!
const { filesIndex, manifest } = cafs.addFilesFromTarball(buffer, readManifest)
const { filesIndex, manifest } = cafs.addFilesFromTarball(buffer, Boolean(readManifest) || !pkg?.name || !pkg.version)
const { filesIntegrity, filesMap } = processFilesIndex(filesIndex)
writeFilesIndexFile(filesIndexFile, { pkg: pkg ?? {}, files: filesIntegrity })
writeFilesIndexFile(filesIndexFile, { pkg: pkg ?? manifest ?? {}, files: filesIntegrity })
return { status: 'success', value: { filesIndex: filesMap, manifest } }
}
@@ -147,20 +147,24 @@ function addFilesFromDir ({ dir, cafsDir, filesIndexFile, sideEffectsCacheKey, p
cafsCache.set(cafsDir, createCafs(cafsDir))
}
const cafs = cafsCache.get(cafsDir)!
const { filesIndex, manifest } = cafs.addFilesFromDir(dir, { files, readManifest })
const { filesIndex, manifest } = cafs.addFilesFromDir(dir, {
files,
readManifest: Boolean(readManifest) || !pkg?.name || !pkg.version,
})
const { filesIntegrity, filesMap } = processFilesIndex(filesIndex)
if (sideEffectsCacheKey) {
let filesIndex!: PackageFilesIndex
try {
filesIndex = loadJsonFile<PackageFilesIndex>(filesIndexFile)
} catch {
filesIndex = { files: filesIntegrity }
pkg = pkg ?? manifest
filesIndex = { name: pkg?.name, version: pkg?.version, files: filesIntegrity }
}
filesIndex.sideEffects = filesIndex.sideEffects ?? {}
filesIndex.sideEffects[sideEffectsCacheKey] = filesIntegrity
writeJsonFile(filesIndexFile, filesIndex)
} else {
writeFilesIndexFile(filesIndexFile, { pkg: pkg ?? {}, files: filesIntegrity })
writeFilesIndexFile(filesIndexFile, { pkg: pkg ?? manifest ?? {}, files: filesIntegrity })
}
return { status: 'success', value: { filesIndex: filesMap, manifest } }
}