fix(rush): skip injected dep hash updates for devDeps#5703
Open
aramissennyeydd wants to merge 3 commits intomicrosoft:mainfrom
Open
fix(rush): skip injected dep hash updates for devDeps#5703aramissennyeydd wants to merge 3 commits intomicrosoft:mainfrom
aramissennyeydd wants to merge 3 commits intomicrosoft:mainfrom
Conversation
Signed-off-by: Aramis Sennyey <aramissennyeydd@users.noreply.github.com>
Signed-off-by: Aramis Sennyey <aramissennyeydd@users.noreply.github.com>
aramissennyeydd
requested review from
apostolisms,
bmiddha,
dmichon-msft,
iclanton,
jxanthony and
octogonz
as code owners
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
This fixes a bug where devDependencies were part of the hash for injected dependency changes causing excessive churn for the repo-state.json file. Locally, we expect this to prevent 50% of merge conflicts to that file we're seeing.
Details
From the comment in this section, this hash should capture what would show up in the lockfile -
devDependenciesfor injected dependencies explicitly don't end up in the lockfile for an injected dep. Similar to registry-installed packages, only prod/option/peer deps matter. This will cause the repo-state.json hash to change on bumping to this newer Rush version but it improves conflicts going forward.How it was tested
Added a unit test and verified in the repo that changes to
rush-libdev dependencies didn't triggerImpacted documentation
No docs should need to be updated.