Skip to content

Commit

Permalink
fix(resolve-dependencies): prefer versions found in parent packages o…
Browse files Browse the repository at this point in the history
…nly (#6742)

close #6737
  • Loading branch information
zkochan committed Jun 30, 2023
1 parent 5a710e5 commit c06f312
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .changeset/rare-items-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@pnpm/resolve-dependencies": patch
"pnpm": patch
---

Prefer versions found in parent package dependencies only [#6737](https://github.com/pnpm/pnpm/issues/6737).
4 changes: 2 additions & 2 deletions pkg-manager/resolve-dependencies/src/resolveDependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ export async function resolveDependencies (
}
const resolvedPackage = ctx.resolvedPackagesByDepPath[pkgAddress.depPath]
if (!resolvedPackage) continue // This will happen only with linked dependencies
if (!newPreferredVersions[resolvedPackage.name]) {
newPreferredVersions[resolvedPackage.name] = {}
if (!Object.prototype.hasOwnProperty.call(newPreferredVersions, resolvedPackage.name)) {
newPreferredVersions[resolvedPackage.name] = { ...preferredVersions[resolvedPackage.name] }
}
if (!newPreferredVersions[resolvedPackage.name][resolvedPackage.version]) {
newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = 'version'
Expand Down

0 comments on commit c06f312

Please sign in to comment.