Skip to content

Commit

Permalink
Merge pull request #659 from AurorNZ/revert-658-Stop-using-locked-ver…
Browse files Browse the repository at this point in the history
…sion-because-it-is-lying

Revert "Stop using lockedVersion because it does not work correctly with pnpm"
  • Loading branch information
Obi-Dann committed Jul 6, 2023
2 parents e8812a9 + dfed5d3 commit 9608b75
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
14 changes: 6 additions & 8 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions src/getUpdatedDependencies.ts
Expand Up @@ -60,14 +60,11 @@ export function* getUpdatedDependencies(
manager: managerName,
packageFile: basePackage,
update: {
newValue:
headDependency.currentValue ||
headDependency.currentRawValue ||
'',
newValue: headDependency.currentValue || '',
newVersion:
headDependency.lockedVersion ||
headDependency.currentVersion ||
headDependency.currentValue ||
headDependency.currentRawValue ||
undefined
},
dependency: baseDependency
Expand All @@ -82,9 +79,9 @@ function isSameVersion(
a: PackageDependency<Record<string, unknown>>,
b: PackageDependency<Record<string, unknown>>
): boolean {
if (a.currentValue && b.currentValue) {
return a.currentValue === b.currentValue
if (a.lockedVersion && b.lockedVersion) {
return a.lockedVersion === b.lockedVersion
}

return a.currentRawValue === b.currentRawValue
return a.currentValue === b.currentValue
}

0 comments on commit 9608b75

Please sign in to comment.