Merge pull request #207 from ember-learn/build-order-agnostic

Build order agnostic

Author: dfreeman

index.js

@@ -123,7 +123,7 @@ module.exports = {
       let TemplateCompiler = require('./lib/preprocessors/markdown-template-compiler');
       let ContentExtractor = require('./lib/preprocessors/hbs-content-extractor');
       registry.add('template', new TemplateCompiler());
-      registry.add('template', this.contentExtractor = new ContentExtractor());
+      registry.add('template', new ContentExtractor(this.getBroccoliBridge()));
     }
   },
 
@@ -197,7 +197,7 @@ module.exports = {
 
     let docsTree = new MergeTrees(docsTrees);
 
-    let templateContentsTree = this.contentExtractor.getTemplateContentsTree();
+    let templateContentsTree = this.getBroccoliBridge().placeholderFor('template-contents');
     let searchIndexTree = new SearchIndexer(new MergeTrees([docsTree, templateContentsTree]), {
       outputFile: 'ember-cli-addon-docs/search-index.json',
       config: this.project.config(EmberApp.env())
@@ -206,6 +206,14 @@ module.exports = {
     return new MergeTrees([ defaultTree, docsTree, searchIndexTree ]);
   },
 
+  getBroccoliBridge() {
+    if (!this._broccoliBridge) {
+      const Bridge = require('broccoli-bridge');
+      this._broccoliBridge = new Bridge();
+    }
+    return this._broccoliBridge;
+  },
+
   _lunrTree() {
     return new Funnel(path.dirname(require.resolve('lunr/package.json')), { destDir: 'lunr' });
   },

lib/preprocessors/hbs-content-extractor.js

@@ -3,21 +3,15 @@
 const HBSContentFilter = require('../broccoli/hbs-content-filter');
 
 module.exports = class HBSContentExtractor {
-  constructor() {
+  constructor(bridge) {
     this.name = 'hbs-content-extractor';
     this.ext = ['hbs'];
-    this._contentsTree = null;
-  }
-
-  getTemplateContentsTree() {
-    if (!this._contentsTree) {
-      throw new Error(`Templates contents haven't been extracted yet`);
-    }
-    return this._contentsTree;
+    this._bridge = bridge;
   }
 
   toTree(tree) {
-    this._contentsTree = new HBSContentFilter(tree);
+    let contentsTree = new HBSContentFilter(tree);
+    this._bridge.fulfill('template-contents', contentsTree);
     return tree;
   }
 };

package.json

@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@glimmer/syntax": "^0.30.5",
+    "broccoli-bridge": "^1.0.0",
     "broccoli-caching-writer": "^3.0.3",
     "broccoli-filter": "^1.2.4",
     "broccoli-funnel": "^2.0.1",

yarn.lock

@@ -1361,6 +1361,14 @@ broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@^6.4.2:
     rsvp "^4.8.2"
     workerpool "^2.3.0"
 
+broccoli-bridge@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-bridge/-/broccoli-bridge-1.0.0.tgz#6223fd64b62062c31333539f0f3c42d0acd92fb1"
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    fs-extra "^7.0.0"
+    symlink-or-copy "^1.2.0"
+
 broccoli-builder@^0.18.8:
   version "0.18.11"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.11.tgz#a42393c7b10bb0380df255a616307945f5e26efb"
@@ -4446,6 +4454,14 @@ fs-extra@^5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.7.tgz#315e2b098d5fe7f622880ac965b1b051868ac871"
@@ -8620,7 +8636,7 @@ [email protected]:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"