Merge pull request #7634 from kellyselden/mergedTreesForType

Addon._treeFor optimization
ember-cli · Feb 25, 2018 · 6601551 · 6601551
2 parents fdffdad + 2ec95ae
commit 6601551
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -611,7 +611,7 @@ class EmberApp {
     return this.project.addons.reduce((sum, addon) => {
       if (addon.treeFor) {
         let tree = addon.treeFor(type);
-        if (tree) {
+        if (tree && !mergeTrees.isEmptyTree(tree)) {
           sum.push({
             name: addon.name,
             tree,

diff --git a/lib/broccoli/merge-trees.js b/lib/broccoli/merge-trees.js
@@ -94,5 +94,9 @@ module.exports = function mergeTrees(_inputTrees, options) {
   }
 };
 
+module.exports.isEmptyTree = function isEmptyTree(tree) {
+  return tree === EMPTY_MERGE_TREE;
+};
+
 module.exports._overrideEmptyTree = overrideEmptyTree;
 module.exports._upstreamMergeTrees = upstreamMergeTrees;