Extend FastBoot.config to read other provided config as well.

Author: kratiahuja

src/ember-app.js

@@ -37,10 +37,20 @@ class EmberApp {
     this.vendorFilePaths = config.vendorFiles;
     this.moduleWhitelist = config.moduleWhitelist;
     this.hostWhitelist = config.hostWhitelist;
-    this.appConfig = config.appConfig;
+    this.config = config.config;
+    this.appName = config.appName;
 
     if (process.env.APP_CONFIG) {
-      this.appConfig = JSON.parse(process.env.APP_CONFIG);
+      let appConfig = JSON.parse(process.env.APP_CONFIG);
+      let appConfigKey = this.appName;
+      if (!appConfig.hasOwnProperty(appConfigKey)) {
+        this.config[appConfigKey] = appConfig;
+      }
+    }
+
+    if (process.env.ALL_CONFIG) {
+      let allConfig = JSON.parse(process.env.ALL_CONFIG);
+      this.config = allConfig;
     }
 
     this.html = fs.readFileSync(config.htmlFile, 'utf8');
@@ -60,17 +70,27 @@ class EmberApp {
    */
   buildSandbox(distPath, sandboxClass, sandboxGlobals) {
     let sandboxRequire = this.buildWhitelistedRequire(this.moduleWhitelist, distPath);
-    let config = this.appConfig;
-    function appConfig() {
-      return { default: config };
+    const config = this.config;
+    const appName = this.appName;
+    function fastbootConfig(key) {
+      if (!key) {
+        // default to app key
+        key = appName;
+      }
+
+      if (config) {
+        return { default: config[key] };
+      } else {
+        return { default: undefined };
+      }
     }
 
     // add any additional user provided variables or override the default globals in the sandbox
     let globals = {
       najax,
       FastBoot: {
         require: sandboxRequire,
-        config: appConfig
+        config: fastbootConfig
       }
     };
 
@@ -357,6 +377,17 @@ class EmberApp {
       manifest = this.transformManifestFiles(manifest);
     }
 
+    let config = pkg.fastboot.config;
+    let appName = pkg.fastboot.appName;
+    if (schemaVersion < FastBootSchemaVersions.configExtension) {
+      // read from the appConfig tree
+      if (pkg.fastboot.appConfig) {
+        appName = pkg.fastboot.appConfig.modulePrefix;
+        config = {};
+        config[appName] = pkg.fastboot.appConfig;
+      }
+    }
+
     debug("reading array of app file paths from manifest");
     var appFiles = manifest.appFiles.map(function(appFile) {
       return path.join(distPath, appFile);
@@ -373,7 +404,8 @@ class EmberApp {
       htmlFile: path.join(distPath, manifest.htmlFile),
       moduleWhitelist: pkg.fastboot.moduleWhitelist,
       hostWhitelist: pkg.fastboot.hostWhitelist,
-      appConfig: pkg.fastboot.appConfig
+      config: config,
+      appName: appName,
     };
   }
 

src/fastboot-schema-versions.js

@@ -7,9 +7,10 @@
  * should be added in fastboot lib) everytime fastboot addon schema version is bumped.
  */
 const FastBootSchemaVersions = {
-  'latest': 2, // latest schema version supported by fastboot library
+  'latest': 3, // latest schema version supported by fastboot library
   'base': 1, // first schema version supported by fastboot library
-  'manifestFileArrays': 2 // schema version when app and vendor in manifest supported an array of files
+  'manifestFileArrays': 2, // schema version when app and vendor in manifest supported an array of files
+  'configExtension': 3 // schema version when FastBoot.config can read arbitrary indexed config
 };
 
 module.exports = FastBootSchemaVersions;

test/fastboot-test.js

@@ -365,4 +365,17 @@ describe("FastBoot", function() {
       });
   });
 
+  it("can read multiple configs", function() {
+    var fastboot = new FastBoot({
+      distPath: fixture('app-with-multiple-config')
+    });
+
+    return fastboot.visit('/')
+    .then(r => r.html())
+    .then(html => {
+      expect(html).to.match(/App Name: app-with-multiple-configs/);
+      expect(html).to.match(/Other Config {"default":"bar"}/);
+    });
+  });
+
 });

test/fixtures/app-with-multiple-config/assets/app-with-multiple-configs-fastboot.js

@@ -0,0 +1,75 @@
+define('app-with-multiple-configs/initializers/ajax', ['exports'], function (exports) {
+  'use strict';
+
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  var get = Ember.get;
+
+
+  var nodeAjax = function nodeAjax(options) {
+    var httpRegex = /^https?:\/\//;
+    var protocolRelativeRegex = /^\/\//;
+    var protocol = get(this, 'fastboot.request.protocol');
+
+    if (protocolRelativeRegex.test(options.url)) {
+      options.url = protocol + options.url;
+    } else if (!httpRegex.test(options.url)) {
+      try {
+        options.url = protocol + '//' + get(this, 'fastboot.request.host') + options.url;
+      } catch (fbError) {
+        throw new Error('You are using Ember Data with no host defined in your adapter. This will attempt to use the host of the FastBoot request, which is not configured for the current host of this request. Please set the hostWhitelist property for in your environment.js. FastBoot Error: ' + fbError.message);
+      }
+    }
+
+    if (najax) {
+      najax(options);
+    } else {
+      throw new Error('najax does not seem to be defined in your app. Did you override it via `addOrOverrideSandboxGlobals` in the fastboot server?');
+    }
+  };
+
+  exports.default = {
+    name: 'ajax-service',
+
+    initialize: function initialize(application) {
+      application.register('ajax:node', nodeAjax, { instantiate: false });
+      application.inject('adapter', '_ajaxRequest', 'ajax:node');
+      application.inject('adapter', 'fastboot', 'service:fastboot');
+    }
+  };
+});
+define('app-with-multiple-configs/initializers/cat', ['exports'], function (exports) {
+  'use strict';
+
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.default = {
+    name: 'cat',
+
+    initialize: function initialize(application) {
+      console.log('I got a cat');
+    }
+  };
+});
+define('app-with-multiple-configs/initializers/error-handler', ['exports'], function (exports) {
+  'use strict';
+
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.default = {
+    name: 'error-handler',
+
+    initialize: function initialize(application) {
+      if (!Ember.onerror) {
+        // if no onerror handler is defined, define one for fastboot environments
+        Ember.onerror = function (err) {
+          var errorMessage = 'There was an error running your app in fastboot. More info about the error: \n ' + (err.stack || err);
+          Ember.Logger.error(errorMessage);
+        };
+      }
+    }
+  };
+});//# sourceMappingURL=app-with-multiple-configs-fastboot.map