Skip to content
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

fix: issue-5850 - Settle override conflicts between edges and propagate changes #8089

Open
wants to merge 53 commits into
base: latest
Choose a base branch
from

Conversation

owlstronaut
Copy link

This PR is to help get #7025 over the line. The community member did a great job the fixes in - this'll be an attempt to get it over the line

References

Related:
#7025 #5850

@jdalton
Copy link
Contributor

jdalton commented Feb 7, 2025

@AlonNavon 🎉 🕺

@jdalton
Copy link
Contributor

jdalton commented Feb 7, 2025

Thank you @owlstronaut!

@owlstronaut
Copy link
Author

@jdalton Yep, working on it! I'm brand new to the team/space, so I'm just starting to learn all about this. Happy to accept any help and direction 😄 Going will be slow 😆

Comment on lines +97 to +98
// rawSpec can be undefined, so we need to use the fallback value of spec if it is.
let spec = npa(`${edge.name}@${edge.rawSpec || edge.spec}`)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm making an assumption here that we can fallback

@@ -2932,7 +3018,7 @@ t.test('overrides', (t) => {
],
})

t.equal(original.canReplaceWith(badReplacement), false, 'different overrides fails')
t.equal(original.canReplaceWith(equivalentReplacement), true, 'different overrides passes')
Copy link
Author

@owlstronaut owlstronaut Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

behavior change, equivalent can now override

@owlstronaut owlstronaut marked this pull request as ready for review February 21, 2025 01:06
@owlstronaut owlstronaut requested a review from a team as a code owner February 21, 2025 01:06
@owlstronaut
Copy link
Author

@jdalton I'm feeling pretty good about this. Any chance you guys have some capacity to take a look?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants