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

Draft
wants to merge 49 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

@@ -2753,6 +2755,7 @@ t.test('overrides', (t) => {
name: 'baz',
version: '1.0.0',
pkg: {
version: '1.0.0',
Copy link
Author

Choose a reason for hiding this comment

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

the package comparison here made me do this. Does the version belong in the pkg? Or the outer part? Or both? https://github.com/npm/cli/pull/8089/files#diff-4e00e62cbcb655399ea5f1c3869d23ca15b59e69fccf95e16a60a9075f6de2deR363

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