fix(core): ensure correct package name matching when parsing pnpm lock file #17613
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
meeroslav
commented
Jun 15, 2023
| @@ -18,7 +18,7 @@ import { | |||
| ProjectGraph, | |||
| ProjectGraphExternalNode, | |||
| } from '../../../config/project-graph'; | |||
| import { fileHasher, hashArray } from '../../../hasher/file-hasher'; | |||
meeroslav
commented
Jun 15, 2023
| @@ -43,39 +43,40 @@ function addNodes( | |||
| const nodes: Map<string, Map<string, ProjectGraphExternalNode>> = new Map(); | |||
|
|
|||
| Object.entries(data.packages).forEach(([key, snapshot]) => { | |||
| const packageName = findPackageName(key, snapshot, data); | |||
There was a problem hiding this comment.
Instead of single value we return an array
meeroslav
commented
Jun 15, 2023
| } | ||
| } | ||
| return extractNameFromKey(key); | ||
| if (packageNames.size === 0) { | ||
| packageNames.add(originalPackageName); |
There was a problem hiding this comment.
Package can be overridden in the version meta which we don't parse at the moment (version 5.x has this info hashed) so we add this explicitly if not found otherwise:
The following line says that despite dependency is [email protected] we will use 4.8.4 so that would end up being the only installed version:
/@phenomnomnominal/[email protected]([email protected]):
resolution: {integrity: sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ==}
peerDependencies:
typescript: ^3 || ^4
dependencies:
esquery: 1.5.0
typescript: 4.8.2
FrozenPandaz
approved these changes
Jun 21, 2023
|
This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current Behavior
Package name matcher in the
pnpm-parserwill match key to alias name if found, and ignore the potential full name match.The above yaml would match 2 packages:
While skipping the:
Expected Behavior
If same package version is used in the original form and as an alias, both variants should be saved to graph, so that we can track them when finding dependency subgraph and pruning.
Related Issue(s)
Fixes #17492