Prevent running babel twice.

lib/broccoli/ember-app.js

@@ -920,19 +920,12 @@ EmberApp.prototype._addonTree = function _addonTree() {
     annotation: 'TreeMerger (addons)'
   });
 
-  var addonES6 = new Funnel(addonTrees, {
+  var addonTranspiledModules = new Funnel(addonTrees, {
     srcDir: 'modules',
     allowEmpty: true,
     annotation: 'Funnel: Addon JS'
   });
 
-  var transpiledAddonTree = new Babel(addonES6, this._prunedBabelOptions());
-  var trees = [ transpiledAddonTree ];
-
-  var reexportsAndTranspiledAddonTree = mergeTrees(trees, {
-    annotation: 'TreeMerger: (re-exports)'
-  });
-
   return this._cachedAddonTree = [
     this._concatFiles(addonTrees, {
       inputFiles: ['**/*.css'],
@@ -941,7 +934,7 @@ EmberApp.prototype._addonTree = function _addonTree() {
       annotation: 'Concat: Addon CSS'
     }),
 
-    this._concatFiles(reexportsAndTranspiledAddonTree, {
+    this._concatFiles(addonTranspiledModules, {
       inputFiles: ['**/*.js'],
       outputFile: '/addons.js',
       allowNone: true,

lib/models/addon.js

@@ -26,6 +26,15 @@ var mergeTrees = require('../broccoli/merge-trees');
 var Funnel     = require('broccoli-funnel');
 var walkSync   = require('walk-sync');
 var ensurePosixPath = require('ensure-posix-path');
+var defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
+var Babel = require('broccoli-babel-transpiler');
+var findAddonByName = require('../utilities/find-addon-by-name');
+
+var DEFAULT_BABEL_CONFIG = {
+  modules: 'amdStrict',
+  moduleIds: true,
+  resolveModuleSource: require('amd-name-resolver').moduleResolve
+};
 
 function warn(message) {
   if (this.ui) {
@@ -47,6 +56,17 @@ function deprecatedAddonFilters(addon, name, insteadUse, fn) {
   };
 }
 
+function processModulesOnly(tree) {
+  var options = defaultsDeep({}, DEFAULT_BABEL_CONFIG);
+  options.whitelist = ['es6.modules'];
+
+  return new Babel(tree, options);
+}
+
+function registryHasPreprocessor(registry, type) {
+  return registry.load(type).length > 0;
+}
+
 /**
   Root class for an Addon. If your addon module exports an Object this
   will be extended from this base class. If you export a constructor (function),
@@ -126,6 +146,15 @@ var Addon = CoreObject.extend({
     if (!this.name) {
       throw new SilentError('An addon must define a `name` property.');
     }
+
+    this.options = defaultsDeep(this.options, {
+      babel: DEFAULT_BABEL_CONFIG
+    });
+
+    var emberCLIBabelConfigKey = this._emberCLIBabelConfigKey();
+    this.options[emberCLIBabelConfigKey] = defaultsDeep(this.options[emberCLIBabelConfigKey], {
+      compileModules: true
+    });
   },
 
   hintingEnabled: function() {
@@ -307,6 +336,18 @@ var Addon = CoreObject.extend({
    */
   _warn: warn,
 
+  _emberCLIBabelConfigKey: function() {
+    // future versions of ember-cli-babel will be moving the location for its
+    // own configuration options out of `babel` and will be issuing a deprecation
+    // if used in the older way
+    //
+    // see: https://github.com/babel/ember-cli-babel/pull/105
+    var emberCLIBabelInstance = findAddonByName(this.addons, 'ember-cli-babel');
+    var emberCLIBabelConfigKey = (emberCLIBabelInstance && emberCLIBabelInstance.configKey) || 'babel';
+
+    return emberCLIBabelConfigKey;
+  },
+
   /**
     Returns a given type of tree (if present), merged with the
     application tree. For each of the trees available using this
@@ -637,7 +678,7 @@ var Addon = CoreObject.extend({
     @return {Boolean} indicates if templates need to be compiled for this addon
   */
   shouldCompileTemplates: function() {
-    return this._detectTemplateInfo().hasTemplates;
+    return this._fileSystemInfo().hasTemplates;
   },
 
   /**
@@ -651,14 +692,15 @@ var Addon = CoreObject.extend({
      @return {Boolean} indicates if pod based templates need to be compiled for this addon
   */
   _shouldCompilePodTemplates: function() {
-    return this._detectTemplateInfo().hasPodTemplates;
+    return this._fileSystemInfo().hasPodTemplates;
   },
 
-  _detectTemplateInfo: function() {
+  _fileSystemInfo: function() {
     if (this._cachedTemplateInfo) {
       return this._cachedTemplateInfo;
     }
 
+    var jsExtensions = this.registry.extensionsForType('js');
     var templateExtensions = this.registry.extensionsForType('template');
     var addonTreePath = this._treePathFor('addon');
     var addonTemplatesTreePath = this._treePathFor('addon-templates');
@@ -677,6 +719,11 @@ var Addon = CoreObject.extend({
       return file.match(podTemplateMatcher);
     });
 
+    var jsMatcher = new RegExp('(' + jsExtensions.join('|') + ')$');
+    var hasJSFiles = files.some(function(file) {
+      return file.match(jsMatcher);
+    });
+
     if (!addonTemplatesTreeInAddonTree) {
       files = files.concat(this._getAddonTemplatesTreeFiles());
     }
@@ -689,6 +736,7 @@ var Addon = CoreObject.extend({
     });
 
     this._cachedTemplateInfo = {
+      hasJSFiles: hasJSFiles,
       hasTemplates: hasTemplates,
       hasPodTemplates: hasPodTemplates
     };
@@ -730,7 +778,7 @@ var Addon = CoreObject.extend({
     if (addonTemplates) {
       standardTemplates = new Funnel(addonTemplates, {
         srcDir: '/',
-        destDir: 'modules/' + this.name + '/templates'
+        destDir: this.name + '/templates'
       });
 
       trees.push(standardTemplates);
@@ -743,7 +791,7 @@ var Addon = CoreObject.extend({
 
       var podTemplates = new Funnel(tree, {
         include: includePatterns,
-        destDir: 'modules/' + this.name + '/',
+        destDir: this.name + '/',
         annotation: 'Funnel: Addon Pod Templates'
       });
 
@@ -769,20 +817,20 @@ var Addon = CoreObject.extend({
     this._requireBuildPackages();
 
     if (this.shouldCompileTemplates()) {
-      var plugins = this.registry.load('template');
-
-      if (plugins.length === 0) {
+      if (!registryHasPreprocessor(this.registry, 'template')) {
         throw new SilentError('Addon templates were detected, but there ' +
                               'are no template compilers registered for `' + this.name + '`. ' +
                               'Please make sure your template precompiler (commonly `ember-cli-htmlbars`) ' +
                               'is listed in `dependencies` (NOT `devDependencies`) in ' +
                               '`' + this.name + '`\'s `package.json`.');
       }
 
-      return preprocessTemplates(this._addonTemplateFiles(tree), {
+      var processedTemplateTree = preprocessTemplates(this._addonTemplateFiles(tree), {
         annotation: 'compileTemplates(' + this.name + ')',
         registry: this.registry
       });
+
+      return processModulesOnly(processedTemplateTree);
     }
   },
 
@@ -797,16 +845,28 @@ var Addon = CoreObject.extend({
   compileAddon: function(tree) {
     this._requireBuildPackages();
 
-    var reexported;
+    var emberCLIBabelConfigKey = this._emberCLIBabelConfigKey();
+    if (!this.options[emberCLIBabelConfigKey].compileModules) {
+      throw new SilentError(
+        'Ember CLI addons manage their own module transpilation during the `treeForAddon` processing. ' +
+          '`' + this.name + '` (found at `' + this.root + '`) has overridden the `this.options.' + emberCLIBabelConfigKey + '.compileModules` ' +
+          'value which conflicts with the addons ability to transpile its `addon/` files properly.'
+      );
+    }
 
     var addonJs = this.processedAddonJsFiles(tree);
     var templatesTree = this.compileTemplates(tree);
 
-    var trees = [addonJs, templatesTree, reexported].filter(Boolean);
+    var trees = [addonJs, templatesTree].filter(Boolean);
 
-    return mergeTrees(trees, {
+    var combinedJSAndTemplates = mergeTrees(trees, {
       annotation: 'Addon#compileAddon(' + this.name + ') '
     });
+
+    return new Funnel(combinedJSAndTemplates, {
+      destDir: 'modules/',
+      annotation: 'Funnel: compileAddon'
+    });
   },
 
   /**
@@ -852,7 +912,7 @@ var Addon = CoreObject.extend({
     this._requireBuildPackages();
 
     return new Funnel(tree, {
-      destDir: 'modules/' + this.moduleName(),
+      destDir: this.moduleName(),
       description: 'Funnel: Addon JS'
     });
   },
@@ -878,9 +938,22 @@ var Addon = CoreObject.extend({
     @return {Tree} Processed javascript file tree
   */
   processedAddonJsFiles: function(tree) {
-    return this.preprocessJs(this.addonJsFiles(tree), '/', this.name, {
-      registry: this.registry
-    });
+    if (this._fileSystemInfo().hasJSFiles) {
+      var processedJsFiles = this.preprocessJs(this.addonJsFiles(tree), '/', this.name, {
+        registry: this.registry
+      });
+
+      if (!registryHasPreprocessor(this.registry, 'js')) {
+        this._warn('Addon files were detected in `' + this._treePathFor('addon') + '`, but no JavaScript ' +
+                   'preprocessors were found for `' + this.name + '`. Please make sure to add a preprocessor ' +
+                   '(most likely `ember-cli-babel`) to in `dependencies` (NOT `devDependencies`) in ' +
+                   '`' + this.name + '`\'s `package.json`.');
+
+        processedJsFiles = processModulesOnly(processedJsFiles);
+      }
+
+      return processedJsFiles;
+    }
   },
 
   /**

lib/models/project.js

@@ -14,6 +14,7 @@ var logger          = require('heimdalljs-logger')('ember-cli:project');
 var nodeModulesPath = require('node-modules-path');
 var versionUtils    = require('../utilities/version-utils');
 var emberCLIVersion = versionUtils.emberCLIVersion;
+var findAddonByName = require('../utilities/find-addon-by-name');
 
 /**
   The Project model is tied to your package.json. It is instantiated
@@ -524,13 +525,7 @@ Project.prototype.reloadAddons = function() {
 Project.prototype.findAddonByName = function(name) {
   this.initializeAddons();
 
-  function matchAddon(name, addon) {
-    return name === addon.name || (addon.pkg && name === addon.pkg.name);
-  }
-
-  return _.find(this.addons, function(addon) {
-    return matchAddon(name, addon);
-  });
+  return findAddonByName(this.addons, name);
 };
 
 /**

lib/utilities/find-addon-by-name.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var find = require('ember-cli-lodash-subset').find;
+
+module.exports = function findAddonByName(addons, name) {
+  function matchAddon(name, addon) {
+    return name === addon.name || (addon.pkg && name === addon.pkg.name);
+  }
+
+  return find(addons, function(addon) {
+    return matchAddon(name, addon);
+  });
+};

tests/unit/models/addon-test.js

@@ -622,7 +622,7 @@ describe('models/addon.js', function() {
     });
   });
 
-  describe('_detectTemplateInfo', function() {
+  describe('_fileSystemInfo', function() {
     beforeEach(function() {
       projectPath = path.resolve(fixturePath, 'simple');
       var packageContents = require(path.join(projectPath, 'package.json'));
@@ -641,7 +641,7 @@ describe('models/addon.js', function() {
         return [];
       };
 
-      addon._detectTemplateInfo();
+      addon._fileSystemInfo();
 
       expect(wasCalled).to.not.be.ok;
     });
@@ -654,7 +654,7 @@ describe('models/addon.js', function() {
         return [];
       };
 
-      addon._detectTemplateInfo();
+      addon._fileSystemInfo();
 
       expect(wasCalled).to.be.ok;
     });
@@ -668,7 +668,8 @@ describe('models/addon.js', function() {
         ];
       };
 
-      expect(addon._detectTemplateInfo()).to.deep.equal({
+      expect(addon._fileSystemInfo()).to.deep.equal({
+        hasJSFiles: true,
         hasTemplates: true,
         hasPodTemplates: true
       });
@@ -683,7 +684,8 @@ describe('models/addon.js', function() {
         ];
       };
 
-      expect(addon._detectTemplateInfo()).to.deep.equal({
+      expect(addon._fileSystemInfo()).to.deep.equal({
+        hasJSFiles: false,
         hasTemplates: true,
         hasPodTemplates: false
       });
@@ -699,7 +701,8 @@ describe('models/addon.js', function() {
         ];
       };
 
-      expect(addon._detectTemplateInfo()).to.deep.equal({
+      expect(addon._fileSystemInfo()).to.deep.equal({
+        hasJSFiles: false,
         hasTemplates: true,
         hasPodTemplates: false
       });
@@ -715,7 +718,25 @@ describe('models/addon.js', function() {
         ];
       };
 
-      expect(addon._detectTemplateInfo()).to.deep.equal({
+      expect(addon._fileSystemInfo()).to.deep.equal({
+        hasJSFiles: true,
+        hasTemplates: false,
+        hasPodTemplates: false
+      });
+    });
+
+    it('does not hasJSFiles when none found', function() {
+      addon._getAddonTreeFiles = function() {
+        return [
+          'components/',
+          'templates/',
+          'templates/components/',
+          'styles/foo.css'
+        ];
+      };
+
+      expect(addon._fileSystemInfo()).to.deep.equal({
+        hasJSFiles: false,
         hasTemplates: false,
         hasPodTemplates: false
       });