require order corrections

ModuleLoader · Mar 7, 2015 · e23ad7e · e23ad7e
1 parent 180852b
commit e23ad7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/index-traceur.js b/lib/index-traceur.js
@@ -1,8 +1,6 @@
-require('traceur');
-
 var System = require('../dist/es6-module-loader.src');
 
-System.parser = 'traceur';
+System.transpiler = 'traceur';
 
 module.exports = {
   Loader: global.LoaderPolyfill,

diff --git a/src/transpiler.js b/src/transpiler.js
@@ -16,7 +16,12 @@
         transpilerModule = transpilerModule['default'];
       }
       else {
-        transpilerModule = __global[this.transpiler] || typeof require != 'undefined' && require(this.transpiler == 'babel' ? 'babel-core' : 'traceur');
+        transpilerModule = __global[this.transpiler];
+        if (!transpilerModule && typeof require != 'undefined') {
+          var curSystem = __global.System;
+          transpilerModule = require(this.transpiler == 'babel' ? 'babel-core' : 'traceur');
+          __global.System = curSystem;
+        }
         if (!transpilerModule)
           throw new TypeError('Include Traceur or Babel for module syntax support.');
         this.set('@' + this.transpiler, this.newModule({ 'default': transpilerModule, __useDefault: true }));