Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading