0.16.1

ModuleLoader · Mar 26, 2015 · 8b3edbc · 8b3edbc
1 parent 4028693
commit 8b3edbc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 37 deletions.
diff --git a/dist/es6-module-loader-sans-promises.js b/dist/es6-module-loader-sans-promises.js
diff --git a/dist/es6-module-loader-sans-promises.js.map b/dist/es6-module-loader-sans-promises.js.map
diff --git a/dist/es6-module-loader-sans-promises.src.js b/dist/es6-module-loader-sans-promises.src.js
@@ -1150,21 +1150,25 @@ function logloads(loads) {
   };
 
   Loader.prototype.instantiate = function(load) {
-    // load transpiler as a global (avoiding System clobbering)
-    if (load.name === this.transpiler) {      
-      var self = this;
-      return {
-        deps: [],
-        execute: function() {
-          var curSystem = g.System;
-          var curLoader = g.Reflect.Loader;
-          __eval('(function(require,exports,module){' + load.source + '})();', g, load);
-          g.System = curSystem;
-          g.Reflect.Loader = curLoader;
-          return getTranspilerModule(self, load.name);
-        }
-      };
-    }
+    var self = this;
+    return Promise.resolve(self.normalize(self.transpiler))
+    .then(function(transpilerNormalized) {
+      // load transpiler as a global (avoiding System clobbering)
+      if (load.name === transpilerNormalized) {
+        return {
+          deps: [],
+          execute: function() {
+            var curSystem = g.System;
+            var curLoader = g.Reflect.Loader;
+            // ensure not detected as CommonJS
+            __eval('(function(require,exports,module){' + load.source + '})();', g, load);
+            g.System = curSystem;
+            g.Reflect.Loader = curLoader;
+            return getTranspilerModule(self, load.name);
+          }
+        };
+      }
+    });
   };
 
   function traceurTranspile(load, traceur) {

diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
diff --git a/dist/es6-module-loader.js.map b/dist/es6-module-loader.js.map
diff --git a/dist/es6-module-loader.src.js b/dist/es6-module-loader.src.js
@@ -2420,21 +2420,25 @@ function logloads(loads) {
   };
 
   Loader.prototype.instantiate = function(load) {
-    // load transpiler as a global (avoiding System clobbering)
-    if (load.name === this.transpiler) {      
-      var self = this;
-      return {
-        deps: [],
-        execute: function() {
-          var curSystem = g.System;
-          var curLoader = g.Reflect.Loader;
-          __eval('(function(require,exports,module){' + load.source + '})();', g, load);
-          g.System = curSystem;
-          g.Reflect.Loader = curLoader;
-          return getTranspilerModule(self, load.name);
-        }
-      };
-    }
+    var self = this;
+    return Promise.resolve(self.normalize(self.transpiler))
+    .then(function(transpilerNormalized) {
+      // load transpiler as a global (avoiding System clobbering)
+      if (load.name === transpilerNormalized) {
+        return {
+          deps: [],
+          execute: function() {
+            var curSystem = g.System;
+            var curLoader = g.Reflect.Loader;
+            // ensure not detected as CommonJS
+            __eval('(function(require,exports,module){' + load.source + '})();', g, load);
+            g.System = curSystem;
+            g.Reflect.Loader = curLoader;
+            return getTranspilerModule(self, load.name);
+          }
+        };
+      }
+    });
   };
 
   function traceurTranspile(load, traceur) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",