Merge pull request #544 from SergeAstapov/recursive-fastbootConfigTree-extend

Allow to extend application FastBoot config via addon hook fastbootConfigTree

Author: rwjblue

lib/broccoli/fastboot-config.js

@@ -2,7 +2,8 @@
 
 const fs     = require('fs');
 const fmt    = require('util').format;
-const uniq   = require('lodash.uniq');
+const uniq   = require('ember-cli-lodash-subset').uniq;
+const merge  = require('ember-cli-lodash-subset').merge;
 const md5Hex = require('md5-hex');
 const path   = require('path');
 const Plugin = require('broccoli-plugin');
@@ -94,7 +95,7 @@ module.exports = class FastBootConfig extends Plugin {
           throw new Error('`fastbootConfigTree` requires a map to be returned');
         }
 
-        Object.assign(this.fastbootConfig, configFromAddon);
+        merge(this.fastbootConfig, configFromAddon);
       }
     });
   }

package.json

@@ -25,12 +25,12 @@
     "broccoli-plugin": "^1.2.1",
     "chalk": "^2.0.1",
     "ember-cli-babel": "^6.7.2",
+    "ember-cli-lodash-subset": "2.0.1",
     "ember-cli-version-checker": "^2.0.0",
     "fastboot": "^1.1.0",
     "fastboot-express-middleware": "^1.1.0",
     "fs-extra": "^4.0.0",
     "json-stable-stringify": "^1.0.1",
-    "lodash.uniq": "^4.2.0",
     "md5-hex": "^2.0.0",
     "silent-error": "^1.0.0"
   },

test/fixtures/fastboot-config/README.md

@@ -0,0 +1 @@
+This fixture app has an addon that implements fastbootConfigTree that extends application config in FastBoot build.

test/fixtures/fastboot-config/config/environment.js

@@ -0,0 +1,51 @@
+/* jshint node: true */
+
+module.exports = function(environment) {
+  var ENV = {
+    modulePrefix: 'fastboot-config',
+    environment: environment,
+    baseURL: '/',
+    locationType: 'auto',
+    EmberENV: {
+      FEATURES: {
+        // Here you can enable experimental features on an ember canary build
+        // e.g. 'with-controller': true
+      }
+    },
+
+    APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
+    },
+
+    fastboot: {
+      hostWhitelist: ['example.com', 'subdomain.example.com', /localhost:\d+/]
+    }
+  };
+
+  if (environment === 'development') {
+    // ENV.APP.LOG_RESOLVER = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_TRANSITIONS = true;
+    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
+  }
+
+  if (environment === 'test') {
+    // Testem prefers this...
+    ENV.baseURL = '/';
+    ENV.locationType = 'none';
+
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
+
+    ENV.APP.rootElement = '#ember-testing';
+  }
+
+  if (environment === 'production') {
+
+  }
+
+  return ENV;
+};

test/fixtures/fastboot-config/ember-cli-build.js

@@ -0,0 +1,6 @@
+module.exports = function(defaults) {
+  var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+  var app = new EmberApp(defaults, {});
+
+  return app.toTree();
+};

test/fixtures/fastboot-config/node_modules/fake-addon-2/index.js

@@ -84,6 +84,12 @@ describe('generating package.json', function() {
       ]);
     });
 
+    it('contains app name', function() {
+      let pkg = fs.readJsonSync(app.filePath('dist/package.json'));
+
+      expect(pkg.fastboot.appName).to.equal('module-whitelist');
+    });
+
     it('contains the application config', function() {
       let pkg = fs.readJsonSync(app.filePath('dist/package.json'));
 
@@ -99,16 +105,45 @@ describe('generating package.json', function() {
       });
     });
 
-    it('contains additional config from addons', function() {
+    it('contains additional config from ember-fastboot-build-example addon', function() {
       let pkg = fs.readJsonSync(app.filePath('dist/package.json'));
 
       expect(pkg.fastboot.config['foo']).to.equal('bar');
     });
 
-    it('contains app name', function() {
-      let pkg = fs.readJsonSync(app.filePath('dist/package.json'));
-      
-      expect(pkg.fastboot.appName).to.equal('module-whitelist');
+    describe('with addon that implements fastbootConfigTree', function() {
+      let app;
+
+      before(function() {
+        app = new AddonTestApp();
+
+        return app.create('fastboot-config', {
+          skipNpm: true
+        })
+          .then(addFastBootDeps)
+          .then(function() {
+            return app.run('npm', 'install');
+          })
+          .then(function() {
+            return app.runEmberCommand('build');
+          });
+      });
+
+      it('it extends the application config', function() {
+        let pkg = fs.readJsonSync(app.filePath('dist/package.json'));
+
+        expect(pkg.fastboot.config['fastboot-config']).to.deep.equal({
+          foo: 'bar',
+          modulePrefix: 'fastboot-config',
+          environment: 'development',
+          baseURL: '/',
+          locationType: 'auto',
+          EmberENV: { FEATURES: {} },
+          APP: { name: 'fastboot-config', version: '0.0.0+', autoboot: false },
+          fastboot: { hostWhitelist: [ 'example.com', 'subdomain.example.com', '/localhost:\\d+/' ] },
+          exportApplicationGlobal: true
+        });
+      });
     });
   });