Turn on rehydration based on config

packages/ember-cli-fastboot/index.js

@@ -336,8 +336,13 @@ module.exports = {
             this.fastboot = new FastBoot(fastbootOptions);
           }
 
+          let appConfig = this._getHostAppConfig();
+
           let fastbootMiddleware = FastBootExpressMiddleware({
-            fastboot: this.fastboot
+            fastboot: this.fastboot,
+            visitOptions: {
+              renderMode: appConfig.fastboot.renderMode
+            }
           });
 
           fastbootMiddleware(req, resp, next);

packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js

@@ -32,6 +32,10 @@ module.exports = class FastBootConfig extends Plugin {
     this.fastbootConfig[appConfigModule] = options.appConfig;
     this._fileToChecksumMap = {};
 
+    if (options.appConfig.fastboot) {
+      this.renderMode = options.appConfig.fastboot.renderMode;
+    }
+
     if (this.fastbootAppConfig && this.fastbootAppConfig.htmlFile) {
       this.htmlFile = this.fastbootAppConfig.htmlFile;
     } else {
@@ -174,6 +178,7 @@ module.exports = class FastBootConfig extends Plugin {
         schemaVersion: LATEST_SCHEMA_VERSION,
         manifest: this.manifest,
         hostWhitelist: this.normalizeHostWhitelist(),
+        renderMode: this.renderMode,
         config: this.fastbootConfig,
         appName: this.appName,
       }

packages/ember-cli-fastboot/test/fastboot-rendermode-config-test.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const expect = require('chai').use(require('chai-string')).expect;
+const RSVP = require('rsvp');
+const request = RSVP.denodeify(require('request'));
+
+const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
+
+describe('FastBoot renderMode config', function() {
+  this.timeout(400000);
+
+  let app;
+
+  before(function() {
+    app = new AddonTestApp();
+
+    return app.create('fastboot-rendermode-config', { emberVersion: 'latest'})
+      .then(function() {
+        return app.startServer({
+          command: 'serve'
+        });
+      });
+  });
+
+  after(function() {
+    return app.stopServer();
+  });
+
+  it('uses rehydration when rendermode is serialize', function() {
+    return request({
+      url: 'http://localhost:49741/dynamic',
+      headers: {
+        'Accept': 'text/html'
+      }
+    })
+      .then(function(response) {
+        expect(response.statusCode).to.equal(200);
+        expect(response.headers['content-type']).to.equalIgnoreCase('text/html; charset=utf-8');
+        expect(response.body).to.contain('<!--%+b:7%-->magic<!--%-b:7%-->');
+      });
+  });
+});

packages/ember-cli-fastboot/test/fixtures/fastboot-rendermode-config/app/router.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+let Router = Ember.Router;
+
+Router.map(function() {
+  this.route('dynamic');
+});
+
+export default Router;

packages/ember-cli-fastboot/test/fixtures/fastboot-rendermode-config/app/routes/dynamic.js

@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  model() {
+    return 'magic';
+  }
+});

packages/ember-cli-fastboot/test/fixtures/fastboot-rendermode-config/app/templates/dynamic.hbs

@@ -0,0 +1,3 @@
+<h1>This should be a dynamic page!</h1>
+
+<p>And the most dynamic word is: {{@model}}</p>

packages/ember-cli-fastboot/test/fixtures/fastboot-rendermode-config/config/environment.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = function(environment) {
+  var ENV = {
+    rootURL: '/',
+    locationType: 'auto',
+    environment: environment,
+    modulePrefix: 'fastboot-rendermode-config',
+    fastboot: {
+      hostWhitelist: [/localhost:\d+/],
+      renderMode: 'serialize',
+    }
+  };
+
+  return ENV;
+};

packages/fastboot/src/ember-app.js

@@ -40,6 +40,7 @@ class EmberApp {
     this.appName = config.appName;
     this.html = config.html;
     this.sandboxRequire = config.sandboxRequire;
+    this.renderMode = config.renderMode;
 
     if (process.env.APP_CONFIG) {
       let appConfig = JSON.parse(process.env.APP_CONFIG);
@@ -298,7 +299,10 @@ class EmberApp {
     let buildSandboxPerVisit = options.buildSandboxPerVisit || false;
 
     let shouldRender = options.shouldRender !== undefined ? options.shouldRender : true;
-    let bootOptions = buildBootOptions(shouldRender);
+    let renderMode = process.env.EXPERIMENTAL_RENDER_MODE_SERIALIZE
+      ? 'serialize'
+      : options.renderMode || this.renderMode;
+    let bootOptions = buildBootOptions(shouldRender, renderMode);
     let fastbootInfo = new FastBootInfo(req, res, {
       hostWhitelist: this.hostWhitelist,
       metadata: options.metadata,
@@ -355,17 +359,16 @@ class EmberApp {
  * Builds an object with the options required to boot an ApplicationInstance in
  * FastBoot mode.
  */
-function buildBootOptions(shouldRender) {
+function buildBootOptions(shouldRender, renderMode) {
   let doc = new SimpleDOM.Document();
   let rootElement = doc.body;
-  let _renderMode = process.env.EXPERIMENTAL_RENDER_MODE_SERIALIZE ? 'serialize' : undefined;
 
   return {
     isBrowser: false,
     document: doc,
     rootElement,
     shouldRender,
-    _renderMode,
+    _renderMode: renderMode,
   };
 }
 

packages/fastboot/src/fastboot-schema.js

@@ -92,6 +92,7 @@ function loadConfig(distPath) {
     scripts,
     html,
     hostWhitelist: pkg.fastboot.hostWhitelist,
+    renderMode: pkg.fastboot.renderMode,
     config,
     appName,
     sandboxRequire,