Merge pull request #187 from ember-fastboot/meta

Support storeConfigInMeta, add config to package.json

Author: tomdale

index.js

@@ -35,17 +35,20 @@ module.exports = {
    */
   included: function(app) {
     patchEmberApp(app);
+  },
 
-    // We serve the index.html from fastboot-dist, so this has to apply to both builds
-    app.options.storeConfigInMeta = false;
+  config: function() {
+    if (this.app && this.app.options.__is_building_fastboot__) {
+      return { APP: { autoboot: false } };
+    }
   },
 
   /**
    * Inserts placeholders into index.html that are used by the FastBoot server
    * to insert the rendered content into the right spot. Also injects a module
    * for FastBoot application boot.
    */
-  contentFor: function(type, config) {
+  contentFor: function(type, config, contents) {
     if (type === 'body') {
       return "<!-- EMBER_CLI_FASTBOOT_BODY -->";
     }
@@ -57,6 +60,17 @@ module.exports = {
     if (type === 'app-boot') {
       return fastbootAppModule(config.modulePrefix);
     }
+
+    if (type === 'config-module' && this.app.options.__is_building_fastboot__) {
+      var linesToRemove = contents.length;
+      while(linesToRemove) {
+        // Clear out the default config from ember-cli
+        contents.pop();
+        linesToRemove--;
+      }
+
+      return 'return FastBoot.config();';
+    }
   },
 
   /**

lib/broccoli/fastboot-build.js

@@ -106,6 +106,8 @@ FastBootBuild.prototype.appOptions = function() {
 FastBootBuild.prototype.buildConfigTree = function(tree) {
   var FastBootConfig = require('./fastboot-config');
   var env = this.app.env;
+  var config = this.project.config(env);
+  var fastbootConfig = config.fastboot;
 
   // Create a new Broccoli tree that writes the FastBoot app's
   // `package.json`.
@@ -115,7 +117,8 @@ FastBootBuild.prototype.buildConfigTree = function(tree) {
     assetMapPath: this.assetMapPath,
     outputPaths: this.app.options.outputPaths,
     ui: this.ui,
-    fastbootAppConfig: this.project.config(env).fastboot
+    fastbootAppConfig: fastbootConfig,
+    appConfig: config
   });
 };
 
@@ -131,16 +134,8 @@ FastBootBuild.prototype.buildFastBootProject = function() {
   var Project = require('ember-cli/lib/models/project');
   var oldProject = this.project;
   var project = new Project(oldProject.root, oldProject.pkg, oldProject.ui, oldProject.cli);
-  project.config = function config() {
-    var config = Object.getPrototypeOf(this).config.apply(this, arguments);
 
-    config.APP = config.APP || {};
-    config.APP.autoboot = false;
-
-    return config;
-  };
-
-  return project;
+  return this.project = project;
 };
 
 module.exports = FastBootBuild;

lib/broccoli/fastboot-config.js

@@ -14,6 +14,7 @@ function FastBootConfig(inputNode, options) {
   this.ui = options.ui;
   this.fastbootAppConfig = options.fastbootAppConfig;
   this.outputPaths = options.outputPaths;
+  this.appConfig = options.appConfig;
 }
 
 FastBootConfig.prototype = Object.create(Plugin.prototype);
@@ -135,7 +136,8 @@ FastBootConfig.prototype.toJSONString = function() {
     fastboot: {
       moduleWhitelist: this.moduleWhitelist,
       manifest: this.manifest,
-      hostWhitelist: this.normalizeHostWhitelist()
+      hostWhitelist: this.normalizeHostWhitelist(),
+      appConfig: this.appConfig
     }
   }, null, 2);
 };

package.json

@@ -62,7 +62,7 @@
     "broccoli-merge-trees": "^1.1.1",
     "broccoli-plugin": "^1.2.1",
     "broccoli-stew": "^1.2.0",
-    "ember-fastboot-server": "^0.7.2",
+    "ember-fastboot-server": "^0.7.3",
     "express": "^4.8.5",
     "fastboot-filter-initializers": "0.0.2",
     "lodash.clonedeep": "^4.3.1",

tests/acceptance/package-json-test.js

@@ -74,6 +74,20 @@ describe('generating package.json', function() {
       ]);
     });
 
+    it("contains the application config", function() {
+      var pkg = fs.readJsonSync(app.filePath('dist/package.json'));
+
+      expect(pkg.fastboot.appConfig).to.deep.equal({
+        modulePrefix: 'module-whitelist',
+        environment: 'development',
+        baseURL: '/',
+        locationType: 'auto',
+        EmberENV: { FEATURES: {} },
+        APP: { name: 'module-whitelist', version: '0.0.0+', autoboot: false },
+        fastboot: { hostWhitelist: [ 'example.com', 'subdomain.example.com', {} ] },
+        exportApplicationGlobal: true
+      });
+    });
   });
 
   describe('with production FastBoot builds', function() {