[BUGFIX release] don't load "app" code when loading globals files #4063
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
| } | ||
|
|
||
| return this._super.treeForApp.apply(this, arguments); | ||
| } |
There was a problem hiding this comment.
missing comma here causing a JS parsing error (and the Travis failure)
fivetanley
force-pushed
the
globals-fixes
branch
3 times, most recently
from
7901cae to
a9ffe7f
Compare
The code that gets compiled for the globals build is in a closure with its own instance of `loader.js`, so the entries for ember-data don't end up in ember-cli's instance of `loader.js`. The ember-data code does include shims that end up in the app's instance of loader.js, so we exclude the app code from running in this case.
fivetanley
force-pushed
the
globals-fixes
branch
from
a9ffe7f to
1a861bb
Compare
fivetanley
added a commit
that referenced
this pull request
Jan 12, 2016
[BUGFIX release] don't load "app" code when loading globals files
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.
The code that gets compiled for the globals build is in a closure with
its own instance of
loader.js, so the entries for ember-data don't endup in ember-cli's instance of
loader.js. The ember-data code doesinclude shims that end up in the app's instance of loader.js, so we
exclude the app code from running in this case.