Skip to content

Commit a160fb3

Browse files
authored
Merge pull request #206 from bschlenk/master
fall back to version in package-lock
2 parents bc92d4f + 011dfa1 commit a160fb3

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/getPackageResolution.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ export function getPackageResolution({
5454

5555
if (new Set(resolutions).size !== 1) {
5656
console.warn(
57-
`Ambigious lockfile entries for ${
58-
packageDetails.pathSpecifier
59-
}. Using version ${installedVersion}`,
57+
`Ambigious lockfile entries for ${packageDetails.pathSpecifier}. Using version ${installedVersion}`,
6058
)
6159
return installedVersion
6260
}
@@ -91,10 +89,8 @@ export function getPackageResolution({
9189
const relevantStackEntry = lockFileStack.find(
9290
entry => entry.dependencies && packageDetails.name in entry.dependencies,
9391
)
94-
return (
95-
relevantStackEntry.dependencies[packageDetails.name].resolved ||
96-
relevantStackEntry.dependencies[packageDetails.name].from
97-
)
92+
const pkg = relevantStackEntry.dependencies[packageDetails.name]
93+
return pkg.resolved || pkg.from || pkg.version
9894
}
9995
}
10096

0 commit comments

Comments
 (0)