Remove esperanto

lib/broccoli/ember-app.js

@@ -24,7 +24,7 @@ var preprocessTemplates = p.preprocessTemplates;
 
 var preprocessMinifyCss = p.preprocessMinifyCss;
 
-var ES6Modules  = require('broccoli-es6modules');
+var Babel  = require('broccoli-babel-transpiler');
 var concatFilesWithSourcemaps = require('broccoli-sourcemap-concat');
 
 var configLoader  = require('./broccoli-config-loader');
@@ -751,16 +751,9 @@ EmberApp.prototype._addonTree = function _addonTree() {
     description: 'Funnel: Addon Re-exports'
   });
 
-  // if (!this._addonInstalled('ember-cli-babel')) {
-    transpiledAddonTree = new ES6Modules(addonES6, {
-      description: 'ES6: Addon Trees',
-      esperantoOptions: {
-        absolutePaths: true,
-        strict: true,
-        _evilES3SafeReExports: this.options.es3Safe
-      }
-    });
-  // }
+  transpiledAddonTree = new Babel(addonES6, merge({
+    description: 'ES6: Addon Trees',
+  }, this._prunedBabelOptions()));
 
   var reexportsAndTranspiledAddonTree = mergeTrees([
     transpiledAddonTree,
@@ -987,6 +980,18 @@ EmberApp.prototype._addonInstalled = function(addonName) {
   return !!this.registry.availablePlugins[addonName];
 };
 
+/**
+ * @private
+ *
+ * Prunes ember-cli-babel options
+ * @return {Object} The pruned babel-options
+ */
+EmberApp.prototype._prunedBabelOptions = function() {
+  var babelOptions = merge({}, this.options.babel);
+  delete babelOptions.compileModules;
+  return babelOptions;
+};
+
 /**
   Returns the tree for javascript files
 
@@ -1002,20 +1007,14 @@ EmberApp.prototype.javascript = function() {
 
   // Note: If ember-cli-babel is installed we have already performed the transpilation at this point
   if (!this._addonInstalled('ember-cli-babel')) {
-    appJs = new ES6Modules(
+    appJs = new Babel(
       new Funnel(applicationJs, {
         include: [escapeRegExp(this.name + '/') + '**/*.js'],
         description: 'Funnel: App JS Files'
       }),
-
-      {
-        description: 'ES6: App Tree',
-        esperantoOptions: {
-          absolutePaths: true,
-          strict: true,
-          _evilES3SafeReExports: this.options.es3Safe
-        }
-      }
+      merge({
+        description: 'ES6: App Tree'
+      }, this._prunedBabelOptions())
     );
   }
 

package.json

@@ -75,10 +75,10 @@
     "bower-config": "0.6.1",
     "bower-endpoint-parser": "0.2.2",
     "broccoli": "0.16.5",
+    "broccoli-babel-transpiler": "^5.4.5",
     "broccoli-caching-writer": "^1.1.0",
     "broccoli-clean-css": "0.2.0",
     "broccoli-es3-safe-recast": "^2.0.0",
-    "broccoli-es6modules": "^1.0.1",
     "broccoli-filter": "0.1.14",
     "broccoli-funnel": "0.2.8",
     "broccoli-kitchen-sink-helpers": "0.2.7",

tests/runner.js

@@ -10,8 +10,8 @@ if (process.env.EOLNEWLINE) {
   require('os').EOL = '\n';
 }
 
-// rimraf.sync('.node_modules-tmp');
-// rimraf.sync('.bower_components-tmp');
+rimraf.sync('.node_modules-tmp');
+rimraf.sync('.bower_components-tmp');
 
 var root = 'tests/{unit,acceptance}';
 var _checkOnlyInTests = RSVP.denodeify(mochaOnlyDetector.checkFolder.bind(null, root + '/**/*{-test,-slow}.js'));