Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correctly install dependencies when resolution-mode is lowest-di… #7824

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/good-radios-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@pnpm/npm-resolver": patch
---

fix: correctly install dependencies when resolution-mode is lowest-direct or time-based
37 changes: 37 additions & 0 deletions pkg-manager/core/test/install/resolutionMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,40 @@ test('the lowest version of a direct dependency is installed when resolution mod
'@pnpm.e2e/pkg-with-1-dep': '^100.1.0',
})
})

test('the lowest version of a direct dependency is installed when resolution mode is lowest-direct and already installed other version ', async () => {
const project = prepareEmpty()

await addDependenciesToPackage(
{},
['@pnpm.e2e/bravo'],
testDefaults({ resolutionMode: 'time-based' })
)

const lockfile = project.readLockfile()
expect(lockfile.packages['@pnpm.e2e/bravo-dep@1.0.1']).toBeTruthy()
await install(
{
dependencies: {
'@pnpm.e2e/bravo-dep': '^1.0.0',
},
},
testDefaults({ resolutionMode: 'lowest-direct' })
)

{
const lockfile = project.readLockfile()
expect(lockfile.packages['@pnpm.e2e/bravo-dep@1.0.0']).toBeTruthy()
}

await install({
dependencies: {
'@pnpm.e2e/bravo-dep': '^1.1.0',
},
}, testDefaults({ resolutionMode: 'lowest-direct' }))

{
const lockfile = project.readLockfile()
expect(lockfile.packages['@pnpm.e2e/bravo-dep@1.1.0']).toBeTruthy()
}
})
11 changes: 10 additions & 1 deletion resolving/npm-resolver/src/pickPackageFromMeta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,16 @@ export function pickLowestVersionByVersionRange (
preferredVerSels?: VersionSelectors
) {
if (preferredVerSels != null && Object.keys(preferredVerSels).length > 0) {
const prioritizedPreferredVersions = prioritizePreferredVersions(meta, versionRange, preferredVerSels)
// ignore the subdependencies
// {'^1.0.0': { selectorType: 'range', weight: 1000 }, '1.0.1': 'version'} would be [1.0.1, 1.0.0] if sorted by weight
let lowestPreferredVerSels: VersionSelectors | null = null
Object.entries(preferredVerSels).forEach(([key, value]) => {
if (value !== null && typeof value === 'object') {
if (!lowestPreferredVerSels) lowestPreferredVerSels = {}
lowestPreferredVerSels[key] = value
}
})
const prioritizedPreferredVersions = prioritizePreferredVersions(meta, versionRange, lowestPreferredVerSels ?? preferredVerSels)
for (const preferredVersions of prioritizedPreferredVersions) {
const preferredVersion = semver.minSatisfying(preferredVersions, versionRange, true)
if (preferredVersion) {
Expand Down