[FEATURE set-component-template] #18158
Merged
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
chancancode
force-pushed
the
set-component-template
branch
from
dad92ae to
8423694
Compare
chancancode
force-pushed
the
set-component-template
branch
from
8423694 to
4b4ab3e
Compare
Co-authored-by: Robert Jackson <[email protected]>
We explicitly added `| undefined` to the return type in the previous commit Co-authored-by: Robert Jackson <[email protected]>
rwjblue
force-pushed
the
set-component-template
branch
from
4b4ab3e to
6c3ac7c
Compare
|
Fixed merge conflicts |
pzuraq
approved these changes
Jun 28, 2019
|
|
||
| function lookupComponent(owner: Owner, name: string, options: LookupOptions): Option<LookupResult> { | ||
| if (options.source || options.namespace) { | ||
| if (EMBER_MODULE_UNIFICATION) { |
There was a problem hiding this comment.
Do we need these? I thought we'd removed them
There was a problem hiding this comment.
@pzuraq - We disabled the flag (though when we did that @chancancode and I had already done the work here to support it) because it was impossible to test either colocation or MU (we only test with all optionals or none) and some aspects of the feature conflicts with MU.
tldr; we haven't removed the MU feature flagged code yet, and just in case we need to salvage parts of it (who knows why) we wanted to leave things roughly in the same basic state before/after this PR
This was referenced Jun 30, 2019
10 tasks
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.
Implements the Ember side of RFC #481.