Merge pull request #254 from ember-learn/fix-cli-3.4

Use postprocessTree('all') for compatibility with Ember CLI 3.4

Author: dfreeman

index.js

@@ -185,11 +185,17 @@ module.exports = {
     ].filter(Boolean));
   },
 
-  treeForPublic() {
-    let parentAddon = this.parent.findAddonByName(this.parent.name());
-    let defaultTree = this._super.treeForPublic.apply(this, arguments);
+  getBroccoliBridge() {
+    if (!this._broccoliBridge) {
+      const Bridge = require('broccoli-bridge');
+      this._broccoliBridge = new Bridge();
+    }
+    return this._broccoliBridge;
+  },
 
-    if (!parentAddon) { return defaultTree; }
+  postprocessTree(type, tree) {
+    let parentAddon = this.parent.findAddonByName(this.parent.name());
+    if (!parentAddon || type !== 'all') { return tree; }
 
     let PluginRegistry = require('./lib/models/plugin-registry');
     let DocsCompiler = require('./lib/broccoli/docs-compiler');
@@ -227,15 +233,7 @@ module.exports = {
       config: this.project.config(EmberApp.env())
     });
 
-    return new MergeTrees([ defaultTree, docsTree, searchIndexTree ]);
-  },
-
-  getBroccoliBridge() {
-    if (!this._broccoliBridge) {
-      const Bridge = require('broccoli-bridge');
-      this._broccoliBridge = new Bridge();
-    }
-    return this._broccoliBridge;
+    return new MergeTrees([ tree, docsTree, searchIndexTree ]);
   },
 
   _lunrTree() {

package.json

@@ -86,7 +86,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "common-tags": "^1.8.0",
     "ember-classy-page-object": "^0.5.0",
-    "ember-cli": "~3.3.0",
+    "ember-cli": "~3.4.0",
     "ember-cli-addon-docs-esdoc": "^0.2.1",
     "ember-cli-addon-docs-yuidoc": "^0.2.1",
     "ember-cli-dependency-checker": "^3.0.0",