Merge pull request #14 from rwjblue/use-content-for

Honor other addon's content-for hooks.

index.js

@@ -8,5 +8,14 @@ module.exports = {
     return {
       fastboot: require('./lib/commands/fastboot')
     };
+  },
+
+  contentFor: function(type, config) {
+    // do nothing unless running `ember fastboot` command
+    if (!process.env.EMBER_CLI_FASTBOOT) { return; }
+
+    if (type === 'body') {
+      return "<!-- EMBER_CLI_FASTBOOT_BODY -->";
+    }
   }
 };

lib/commands/fastboot.js

@@ -75,11 +75,9 @@ function findHTMLFile() {
   var fs = require('fs');
   if (fs.existsSync('app/fastboot.html')) {
     return 'app/fastboot.html';
-  } else if (fs.existsSync('app/index.html')) {
-    return 'app/index.html';
   }
 
-  assert("Could not find either app/fastboot.html or app/index.html. Please provide an HTML file to serve FastBoot contents in.", false);
+  return findFile('html', 'dist/index*.html');
 }
 
 function findFile(name, globPath) {

lib/models/server.js

@@ -21,11 +21,8 @@ FastBootServer.prototype.log = function(statusCode, message) {
   this.ui.writeLine(chalk[color](statusCode) + " " + message);
 };
 
-var contentForRegex = /\{\{content-for ['"](.+)["']\}\}/g;
-
 FastBootServer.prototype.insertIntoIndexHTML = function(body) {
-  var html = this.html.replace("{{content-for 'body'}}", body);
-  html = html.replace(contentForRegex, '');
+  var html = this.html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", body);
 
   return html;
 };