Properly call preprocessTree / postprocessTree for addons.
#6516
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
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
2 times, most recently
from
28f67eb
to
dd427a4
Compare
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
from
dd427a4
to
919bbac
Compare
|
@rwjblue can you confirm that master...nathanhammond:addon-templates-pre-post-process is a valid rebase of this PR? If so I'mma force push to your branch... |
|
Ya, looks good.
|
nathanhammond
force-pushed
the
addon-templates-pre-post-process
branch
3 times, most recently
from
4a1c398
to
53524ba
Compare
|
☔ The latest upstream changes (presumably #6627) made this pull request unmergeable. Please resolve the merge conflicts. |
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
from
53524ba
to
3355697
Compare
|
Rebased, will get some basic tests added tomorrow morning. And then we will follow up with much better tests when #6449 lands. |
|
I'm pretty sure that this is not doing exactly what we want it to do. Here is the log of the output after this change given the test setup in #6449. My linking bug is why my test in #6611 passed originally. Before ChangeAfter Change |
|
☔ The latest upstream changes (presumably #6629) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@nathanhammond - Ya, I noticed the same while working on the basic tests within the current system. Its just a boneheaded mistake, will push the update shortly. |
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
2 times, most recently
from
78208f7
to
7614746
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`.
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
from
7614746
to
8952331
Compare
rwjblue
changed the title
preprocessTree / postprocessTree for addons.preprocessTree / postprocessTree for addons.
rwjblue
force-pushed
the
addon-templates-pre-post-process
branch
from
8952331
to
e68ea12
Compare
|
OK, finally got this rebased and updated with old school tests. I added the tests to the previously existing I believe this is in a good state to land... |
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Jan 5, 2017
|
What I've done:
|
nathanhammond
approved these changes
Jan 5, 2017
| @@ -597,8 +591,7 @@ EmberApp.prototype.addonPostprocessTree = function(type, tree) { | |||
| @return {Tree} Processed tree | |||
| */ | |||
| EmberApp.prototype.addonPreprocessTree = function(type, tree) { | |||
| return this.project.addons.reduce((workingTree, addon) => | |||
| (addon.preprocessTree ? addon.preprocessTree(type, workingTree) : workingTree), tree); | |||
There was a problem hiding this comment.
I'm glad this ternary is gone.
|
@homu r+ |
|
📌 Commit e561248 has been approved by |
homu
added a commit
that referenced
this pull request
Jan 5, 2017
…hanhammond Properly call `preprocessTree` / `postprocessTree` for addons. This fixes an oversight that prevented addons from properly invoking the same `preprocessTree` / `postprocessTree` hooks that were added for apps. TODO: - [x] The implementations for `_addonPreprocessTree` and `_addonPostprocessTree` should be extracted to a util shared with `lib/broccoli/ember-app.js`. - [x] Types - [x] `js` (run for `this.treePaths['addon']`) - [x] `css` (run for `this.treePaths['addon-styles']`) - [X] `template` (run for `this.treePaths['addon-templates']`) - [x] Tests for all types.
|
☀️ Test successful - status |
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Jan 5, 2017
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Jan 6, 2017
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Jan 7, 2017
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Jan 11, 2017
nathanhammond
added a commit
to nathanhammond/ember-cli
that referenced
this pull request
Feb 4, 2017
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.
This fixes an oversight that prevented addons from properly invoking the same
preprocessTree/postprocessTreehooks that were added for apps.TODO:
_addonPreprocessTreeand_addonPostprocessTreeshould be extracted to a util shared withlib/broccoli/ember-app.js.js(run forthis.treePaths['addon'])css(run forthis.treePaths['addon-styles'])template(run forthis.treePaths['addon-templates'])