Skip to content

Commit

Permalink
Merge pull request #14860 from zoltan-nz/master
Browse files Browse the repository at this point in the history 
[BUGFIX beta] Add back mainContext to loader #14859
  • Loading branch information
@rwjblue
rwjblue authored Jan 22, 2017
2 parents 9e24191 + 6ec4747 commit 70a94bb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions packages/loader/lib/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var enifed, requireModule, Ember;
var mainContext = this; // Used in ember-environment/lib/global.js

(function() {
var isNode = typeof window === 'undefined' &&
Expand Down

2 comments on commit 70a94bb

@andyhot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rwjblue @Turbo87 @zoltan-nz @krisselden Apogies for the back and forth on this.
I noticed today that [email protected] was released without including this commit and also that ember-cli-htmlbars was able to compile templates (while grunt-ember-templates fails as per dgeb/grunt-ember-templates#94)

This led me to dgeb/grunt-ember-templates@868b463 which allows grunt-ember-templates to work again. But this could also mean that this commit is no longer required.

So, unless we can come up with a test case that proves that this commit is required, i'd vote to remove it again.

@zoltan-nz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rwjblue @Turbo87 @zoltan-nz @krisselden
Thanks for @andyhot, we released a new patched version from https://github.com/dgeb/grunt-ember-templates so it works now with the latest Ember v2.11.

Please sign in to comment.