[DO NOT MERGE] Rebase #6516 on top of #6449 #6611
Closed
Conversation
This file contains 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
nathanhammond
force-pushed
the
addon-templates-pre-post-process
branch
from
b613406
to
66ade40
Compare
nathanhammond
changed the title
|
☔ The latest upstream changes (presumably #6627) made this pull request unmergeable. Please resolve the merge conflicts. |
nathanhammond
force-pushed
the
addon-templates-pre-post-process
branch
from
66ade40
to
360d675
Compare
6 tasks
|
☔ The latest upstream changes (presumably #6629) made this pull request unmergeable. Please resolve the merge conflicts. |
nathanhammond
force-pushed
the
addon-templates-pre-post-process
branch
from
360d675
to
a2e25e5
Compare
This fixes an oversight that prevented addons from properly invoking the same `preprocessTree` / `postprocessTree` hooks that were added for apps. The implementations for `_addonPreprocessTree` and `_addonPostprocessTree` should be extracted and shared from `lib/broccoli/ember-app.js`.
nathanhammond
force-pushed
the
addon-templates-pre-post-process
branch
from
a2e25e5
to
787cc6b
Compare
|
☔ The latest upstream changes (presumably #6516) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
We have the test tools we wanted for testing #6516 now (composable programmatic fixtures). We shouldn't land this, this is simply for testing.