fix: update dependencies to merged versions with tags in bare scope lane merge #10059
Conversation
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
…ane merge When merging main into a lane in bare scope, components being snapped had dependencies pointing to old lane versions instead of newly merged versions. This occurred when diverged components (being snapped) had dependencies on non-diverged components (simply updated). The fix populates snapData.dependencies in snapFromScope, similar to how updateDependents works, and converts hashes to tags using the Component object's tags collection for efficiency.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
When merging main into a lane in bare scope, dependencies in snapped components were not updated correctly:
Solution
Updated
snapFromScopeto populatesnapData.dependenciesfor components being snapped during lane merge, similar to howupdateDependentsworks.The fix:
snapData.dependenciesmechanismExample
Before:
After:
Changes
scopes/component/snapping/snapping.main.runtime.ts: Added logic to update dependencies for merged componentsscopes/component/merging/merging.main.runtime.ts: Removed hash-to-tag conversion logic (now handled in snapFromScope)