ensure module this is not global

Author: guybedford

src/transpiler.js

@@ -23,8 +23,9 @@ var transpile = (function() {
       else
         transpileFunction = babelTranspile;
 
-      return 'var __moduleName = "' + load.name + '", __moduleAddress = "' + load.address + '";'
+      return '(function(__moduleName, __moduleAddress) {'
           + transpileFunction.call(self, load, transpiler)
+          + '\n}).call({}, "' + load.name + '", "' + load.address + '");'
           + '\n//# sourceURL=' + load.address + '!eval';
 
       // sourceURL and sourceMappingURL:

test/custom-loader.spec.js

@@ -44,39 +44,39 @@ describe('Custom Loader', function () {
       it('should make the normalize throw', function (done) {
         customLoader.import('test/loader/error1-parent.js')
           .then(supposeToFail, function (e) {
-            expect(e.toString()).to.contain('Error loading "' + base + 'error1-parent.js" at ' + base + 'error1-parent\.js');
+            expect(e.toString()).to.contain('Error loading ' + base + 'error1-parent.js');
           })
           .then(done, done);
       });
 
       it('should make the locate throw', function (done) {
         customLoader.import('test/loader/error2')
           .then(supposeToFail, function (e) {
-            expect(e.toString()).to.be.contain('Error loading "' + base + 'error2" at ' + base + 'error2');
+            expect(e.toString()).to.be.contain('Error loading ' + base + 'error2');
           })
           .then(done, done);
       });
 
       it('should make the fetch throw', function (done) {
         customLoader.import('test/loader/error3')
           .then(supposeToFail, function (e) {
-            expect(e.toString()).to.be.contain('Error loading "' + base + 'error3" at ' + base + 'error3');
+            expect(e.toString()).to.be.contain('Error loading ' + base + 'error3');
           })
           .then(done, done);
       });
 
       it('should make the translate throw', function (done) {
         customLoader.import('test/loader/error4')
           .then(supposeToFail, function (e) {
-            expect(e.toString()).to.be.contain('Error loading "' + base + 'error4" at ' + base + 'error4');
+            expect(e.toString()).to.be.contain('Error loading ' + base + 'error4');
           })
           .then(done, done);
       });
 
       it('should make the instantiate throw', function (done) {
         customLoader.import('test/loader/error5')
           .then(supposeToFail, function (e) {
-            expect(e.toString()).to.be.contain('Error loading "' + base + 'error5" at ' + base + 'error5');
+            expect(e.toString()).to.be.contain('Error loading ' + base + 'error5');
           })
           .then(done, done);
       });

test/system.spec.js

@@ -227,7 +227,7 @@ describe('System', function () {
         System.import('test/loads/load-non-existent.js')
           .then(supposedToFail)
           .catch(function (e) {
-            expect(e).to.be.match(/Error loading "\S+" at \S+/);
+            expect(e).to.be.match(/Error loading \S+/);
           })
           .then(done, done);
       });