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: resolve override conflicts and apply correct versions #8089

Merged
merged 53 commits into from
Feb 26, 2025

Conversation

owlstronaut
Copy link
Contributor

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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…e edges out

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
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
Contributor 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

This comment was marked as resolved.

…st coverage
…D' for edge override set inconsistencies
@@ -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
Contributor 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
Contributor Author

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

@wraithgar
Copy link
Member

Thanks to everyone who worked on this! Fingers crossed we can do a cli release today and this should be included in it.

@wraithgar wraithgar changed the title fix: issue-5850 - Settle override conflicts between edges and propagate changes fix: resolve override conflicts and apply correct versions Feb 26, 2025
@wraithgar wraithgar merged commit b9225e5 into latest Feb 26, 2025
17 checks passed
@wraithgar wraithgar deleted the owlstronaut/fix-overrides branch February 26, 2025 17:12
@github-actions github-actions bot mentioned this pull request Feb 26, 2025
@jdalton
Copy link
Contributor

jdalton commented Feb 26, 2025

Thank you @owlstronaut! Will sync these up with our wrapper. I'll report back if anything funky happens.

@AlonNavon
Copy link

Hey @owlstronaut @wraithgar,
So happy to see this PR get over the line!
In what npm version is it / will it be available?

@jdalton
Copy link
Contributor

jdalton commented Mar 2, 2025

@AlonNavon

Hey @owlstronaut @wraithgar, So happy to see this PR get over the line! In what npm version is it / will it be available?

11.2.0 -> #8074

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.

None yet

4 participants