Move packages/**/lib/main.js to packages/**/lib/index.js.
#12648
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
|
@stefanpenner - Can you double check the loader.js changes here? One of the next tasks is to unify and just use the version in ember-cli/loader.js, but this change lets us move on for now... |
| var mod = registry[name]; | ||
|
|
||
| if (!mod) { | ||
| mod = registry[name + '/index']; |
There was a problem hiding this comment.
small nit-pick
name = name + '/index';
mode = registry[name];
rwjblue
force-pushed
the
move-main-exports
branch
2 times, most recently
from
6a53fd3
to
86636f3
Compare
|
☔ The latest upstream changes (presumably #12647) made this pull request unmergeable. Please resolve the merge conflicts. |
| @@ -13,13 +13,13 @@ import 'ember-routing-views'; | |||
| import Ember from 'ember-metal/core'; | |||
| import { runLoadHooks } from 'ember-runtime/system/lazy_load'; | |||
|
|
|||
| if (Ember.__loader.registry['ember-template-compiler']) { | |||
| if (Ember.__loader.registry['ember-template-compiler/index']) { | |||
There was a problem hiding this comment.
import require from 'require'
There was a problem hiding this comment.
Ya, I'll update the requireModule part but I don't think require exposed the registry itself (though we could do that).
rwjblue
force-pushed
the
move-main-exports
branch
from
8bbb192
to
f2474b9
Compare
rwjblue
force-pushed
the
move-main-exports
branch
from
f2474b9
to
89f0516
Compare
|
@stefanpenner - Updated for latest round of feedback (which has removed all usage of |
rwjblue
added a commit
that referenced
this pull request
Nov 29, 2015
Move `packages/**/lib/main.js` to `packages/**/lib/index.js`.
This was referenced Nov 29, 2015
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 follows suit with changes required by Glimmer, and changes upstream in ember-cli/[email protected].
packages/loader/lib/main.jswas not moved because it is not an ES6 module (it is manually concatenated to the output). We can tweak this after the next round of updates to emberjs-build.