-
Notifications
You must be signed in to change notification settings - Fork 918
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
[Maintenance] Removes mimimatch manual resolution
#3019
Merged
+24
−3
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to push this to
3.1.2like before?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need to add a manual resolution in this case since
3.0.8addresses the CVE that necessitated the bump to3.0.5previously. That could have been addressed without a manual resolution by bumping the patch version in the yarn.lock file (remove the version and then re-bootstrap).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tmarkley @miki, not related to this specific PR, but are there reference docs to understand what these changes are and how we need to apply them w.r.t OSD? Since the yarn lock file is an auto generated file and usually automatically managed, I am not too familiar as to why the inital manual resolution was necessary and why we are removing it now. I understand your reasoning for the change @tmarkley but i do not know enough to know:
Having a common understanding of its workings will help others who have to upgrade the dependencies correctly too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ashwin-pc yes, I'm going open a PR to include that kind of information in the SECURITY file for managing CVEs and dependencies. If you look at the commit history/git blame, you can see that the resolution was added in #2640.
Overall, it is correct that the yarn.lock file should not be modified manually, but adding selective dependency resolutions can cause issues with certain libraries due to compatibility issues (e.g. if a library in the package.json depends on an older version of an upstream library that was resolved to a newer version that breaks previous functionality). I think it's best to strive to avoid resolutions whenever possible and only reserve them for situations where we're resolving a CVE and have a longer-term plan to upgrade/remove/change dependencies and then remove the resolution once that work is done.