mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-04-28 02:53:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't crash when peer ranges cannot be merged (#4136)

Browse Source 
close #4134
This commit is contained in:
Zoltan Kochan
2021-12-15 20:12:23 +02:00
committed by GitHub
parent 890549b7d8
commit cb1827b9c2
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changeset/spotty-singers-behave.md Normal file
View File

@@ -0,0 +1,6 @@
---
"@pnpm/resolve-dependencies": patch
"pnpm": patch
---
If making an intersection of peer dependency ranges does not succeed, install should not crash [#4134](https://github.com/pnpm/pnpm/issues/4134).

10
packages/resolve-dependencies/src/mergePeers.ts
View File

@@ -10,7 +10,7 @@ export function mergePeers (missingPeers: MissingPeerIssuesByPeerName) {
intersections[peerName] = ranges[0].wantedRange
continue
}
const intersection = intersect(...ranges.map(({ wantedRange }) => wantedRange))
const intersection = safeIntersect(ranges.map(({ wantedRange }) => wantedRange))
if (intersection === null) {
conflicts.push(peerName)
} else {
@@ -19,3 +19,11 @@ export function mergePeers (missingPeers: MissingPeerIssuesByPeerName) {
}
return { conflicts, intersections }
}
function safeIntersect (ranges: string[]): null | string {
try {
return intersect(...ranges)
} catch {
return null
}
}