Skip to content

Schematics scoped tree fixes#19903

Merged
alan-agius4 merged 2 commits intoangular:masterfrom
clydin:schematics-subtree-fixes
Feb 1, 2021
Merged

Schematics scoped tree fixes#19903
alan-agius4 merged 2 commits intoangular:masterfrom
clydin:schematics-subtree-fixes

Conversation

@clydin
Copy link
Copy Markdown
Member

@clydin clydin commented Jan 29, 2021

This corrects several underlying schematics Tree issues encountered when using the applyToSubtree rule.

Fixes #16082

@clydin clydin added the target: patch This PR is targeted for the next patch release label Jan 29, 2021
@google-cla google-cla bot added the cla: yes label Jan 29, 2021
@clydin clydin changed the title Schematics subtree fixes Schematics scoped tree fixes Jan 29, 2021
…coped trees

This change ensures correct merge behavior when a `HostTree` is wrapped in a `ScopedTree` or `DelegateTree`.  Previously the ancestry of the HostTree was not available to the merge.
…ution

When an `externalSchematic` rule was used, the input tree was branched but never merged back into the input tree.  This resulted in a different tree instance being returned from the rule.  The `externalSchematic` rule now behaves like the `schematic` rule which merges the trees.
@clydin clydin force-pushed the schematics-subtree-fixes branch from 6aad392 to e7aff81 Compare January 30, 2021 01:42
@clydin clydin requested a review from alan-agius4 January 30, 2021 01:58
@alan-agius4 alan-agius4 added the action: merge The PR is ready for merge by the caretaker label Feb 1, 2021
@alan-agius4 alan-agius4 merged commit 495459a into angular:master Feb 1, 2021
@clydin clydin deleted the schematics-subtree-fixes branch February 1, 2021 12:55
@angular-automatic-lock-bot
Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Mar 4, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Library schematic conflicts with itself when used with applyToSubtree

2 participants