Merge pull request #7618 from kellyselden/getDefaultEmberCliBabelOptions

simplify babel options fallback
ember-cli · Feb 10, 2018 · 7359c18 · 7359c18
2 parents 67c639d + b33fd25
commit 7359c18
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/models/addon.js b/lib/models/addon.js
@@ -1062,15 +1062,15 @@ let addonProto = {
     }
 
     let emberCLIBabelConfigKey = this._emberCLIBabelConfigKey();
-    if (!this.options[emberCLIBabelConfigKey] || !this.options[emberCLIBabelConfigKey].compileModules) {
+    if (!this.options[emberCLIBabelConfigKey]) {
       this._warn(
         `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.`
+        `\`${this.name}\` (found at \`${this.root}\`) has overridden the \`this.options.${emberCLIBabelConfigKey}\` ` +
+        `options which conflicts with the addons ability to transpile its \`addon/\` files properly. ` +
+        `Falling back to default babel configuration options.`
       );
 
-      this.options[emberCLIBabelConfigKey] = this.options[emberCLIBabelConfigKey] || {};
-      this.options[emberCLIBabelConfigKey].compileModules = true;
+      this.options[emberCLIBabelConfigKey] = this.__originalOptions[emberCLIBabelConfigKey];
     }
 
     let addonJs = this.processedAddonJsFiles(tree);