General cleanup; ES<latest>ification.

There are no intentional semantic changes here, just cleanup of syntax
while reviewing.

Author: Robert Jackson

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
     },
     'extends': ['eslint:recommended', 'plugin:node/recommended'],
     'parserOptions': {
-        'ecmaVersion': 6
+        'ecmaVersion': 2017
     },
     'rules': {
         'no-console': ['error', { 'allow': ['warn', 'error']}],
@@ -19,4 +19,4 @@ module.exports = {
             'always'
         ]
     }
-};
+};

src/ember-app.js

@@ -71,9 +71,10 @@ class EmberApp {
    * @param {Object} [sandboxGlobals={}] any additional variables to expose in the sandbox or override existing in the sandbox
    */
   buildSandbox(distPath, sandboxClass, sandboxGlobals) {
+    const { config, appName } = this;
+
     let sandboxRequire = this.buildWhitelistedRequire(this.moduleWhitelist, distPath);
-    const config = this.config;
-    const appName = this.appName;
+
     function fastbootConfig(key) {
       if (!key) {
         // default to app key
@@ -93,6 +94,7 @@ class EmberApp {
       FastBoot: {
         require: sandboxRequire,
         config: fastbootConfig,
+
         get distPath() {
           return distPath;
         }
@@ -422,12 +424,12 @@ class EmberApp {
     }
 
     debug("reading array of app file paths from manifest");
-    var appFiles = manifest.appFiles.map(function(appFile) {
+    let appFiles = manifest.appFiles.map(function(appFile) {
       return path.join(distPath, appFile);
     });
 
     debug("reading array of vendor file paths from manifest");
-    var vendorFiles = manifest.vendorFiles.map(function(vendorFile) {
+    let vendorFiles = manifest.vendorFiles.map(function(vendorFile) {
       return path.join(distPath, vendorFile);
     });
 

src/fastboot-headers.js

@@ -6,7 +6,7 @@ class FastBootHeaders {
     headers = headers || {};
     this.headers = {};
 
-    for (var header in headers) {
+    for (let header in headers) {
       let value = headers[header];
 
       // Express gives us either a string
@@ -36,11 +36,11 @@ class FastBootHeaders {
   }
 
   entries() {
-    var entries = [];
+    let entries = [];
 
-    for(var key in this.headers) {
-      var values = this.headers[key];
-      for(var index = 0; index < values.length; ++index ) {
+    for(let key in this.headers) {
+      let values = this.headers[key];
+      for(let index = 0; index < values.length; ++index ) {
         entries.push([key, values[index]]);
       }
     }
@@ -61,11 +61,11 @@ class FastBootHeaders {
   }
 
   keys() {
-    var entries = [];
+    let entries = [];
 
-    for(var key in this.headers) {
-      var values = this.headers[key];
-      for(var index = 0; index < values.length; ++index ) {
+    for(let key in this.headers) {
+      let values = this.headers[key];
+      for(let index = 0; index < values.length; ++index ) {
         entries.push(key);
       }
     }
@@ -79,11 +79,11 @@ class FastBootHeaders {
   }
 
   values() {
-    var entries = [];
+    let entries = [];
 
-    for(var key in this.headers) {
-      var values = this.headers[key];
-      for(var index = 0; index < values.length; ++index ) {
+    for(let key in this.headers) {
+      let values = this.headers[key];
+      for(let index = 0; index < values.length; ++index ) {
         entries.push(values[index]);
       }
     }

src/fastboot-info.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const RSVP = require('rsvp');
 const FastBootRequest = require('./fastboot-request');
 const FastBootResponse = require('./fastboot-response');
 
@@ -15,11 +14,11 @@ const FastBootResponse = require('./fastboot-response');
  * @param {Array} [options.hostWhitelist] expected hosts in your application
  * @param {Object} [options.metaData] per request meta data
  */
-class FastBootInfo {
+module.exports = class FastBootInfo {
   constructor(request, response, options) {
-    this.deferredPromise = RSVP.resolve();
-    let hostWhitelist = options.hostWhitelist;
-    let metadata = options.metadata;
+    this.deferredPromise = Promise.resolve();
+    let { hostWhitelist, metadata } = options;
+
     if (request) {
       this.request = new FastBootRequest(request, hostWhitelist);
     }
@@ -29,9 +28,7 @@ class FastBootInfo {
   }
 
   deferRendering(promise) {
-    this.deferredPromise = this.deferredPromise.then(function() {
-      return promise;
-    });
+    this.deferredPromise = Promise.all(this.deferredPromise, promise);
   }
 
   /*
@@ -43,7 +40,4 @@ class FastBootInfo {
     instance.register('info:-fastboot', this, { instantiate: false });
     instance.inject('service:fastboot', '_fastbootInfo', 'info:-fastboot');
   }
-}
-
-
-module.exports = FastBootInfo;
+};

src/index.js

@@ -41,13 +41,14 @@ class FastBoot {
    * @param {Sandbox} [options.sandbox=VMSandbox] the sandbox to use
    * @param {Object} [options.sandboxGlobals={}] any additional sandbox variables that an app server wants to override and/or add in the sandbox
    */
-  constructor(options) {
-    options = options || {};
+  constructor(options = {}) {
+    let { distPath, sandbox, sandboxGlobals } = options;
 
-    this.distPath = options.distPath;
-    this.sandbox = options.sandbox || require('./vm-sandbox');
-    this.sandboxGlobals = options.sandboxGlobals || {};
-    this.resilient = !!options.resilient || false;
+    this.resilient = 'resilient' in options ? Boolean(options.resilient) : false;
+
+    this.distPath = distPath;
+    this.sandbox = sandbox || require('./vm-sandbox');
+    this.sandboxGlobals = sandboxGlobals || {};
 
     this._buildEmberApp(this.distPath, this.sandbox, this.sandboxGlobals);
   }
@@ -67,39 +68,27 @@ class FastBoot {
    * @param {Integer} [options.destroyAppInstanceInMs] whether to destroy the instance in the given number of ms. This is a failure mechanism to not wedge the Node process (See: https://github.com/ember-fastboot/fastboot/issues/90)
    * @returns {Promise<Result>} result
    */
-  visit(path, options) {
-    options = options || {};
+  async visit(path, options = {}) {
+    let resilient = 'resilient' in options ? options.resilient : this.resilient;
 
-    let resilient = options.resilient;
+    let result = await this._app.visit(path, options);
 
-    if (resilient === undefined) {
-      resilient = this.resilient;
+    if (!resilient && result.error) {
+      throw result.error;
+    } else {
+      return result;
     }
-
-    return this._app.visit(path, options)
-      .then(result => {
-        if (!resilient && result.error) {
-          throw result.error;
-        } else {
-          return result;
-        }
-      });
   }
 
-  reload(options) {
+  reload({ distPath }) {
     if (this._app) {
       this._app.destroy();
     }
 
-    options = options || {};
-    this._buildEmberApp(options.distPath || null);
+    this._buildEmberApp(distPath);
   }
 
-  _buildEmberApp(distPath, sandbox, sandboxGlobals) {
-    distPath = distPath || this.distPath;
-    sandbox = sandbox || this.sandbox;
-    sandboxGlobals = sandboxGlobals || this.sandboxGlobals;
-
+  _buildEmberApp(distPath = this.distPath, sandbox = this.sandbox, sandboxGlobals = this.sandboxGlobals) {
     if (!distPath) {
       throw new Error('You must instantiate FastBoot with a distPath ' +
                       'option that contains a path to a dist directory ' +
@@ -111,10 +100,11 @@ class FastBoot {
     }
 
     this.distPath = distPath;
+
     this._app = new EmberApp({
-      distPath: distPath,
-      sandbox: sandbox,
-      sandboxGlobals: sandboxGlobals
+      distPath,
+      sandbox,
+      sandboxGlobals,
     });
   }
 

src/install-source-map-support.js

@@ -1,9 +1,7 @@
 const sourceMapSupport = require('source-map-support');
 
 function prepareStackTrace(error, stack) {
-  return error + stack.map(function(frame) {
-    return '\n    at ' + sourceMapSupport.wrapCallSite(frame);
-  }).join('');
+  return error + stack.map((frame) => '\n    at ' + sourceMapSupport.wrapCallSite(frame)).join('');
 }
 
 function install(errorClass) {
@@ -18,5 +16,5 @@ function install(errorClass) {
 }
 
 module.exports = {
-  install: install
+  install
 };

src/result.js

@@ -12,11 +12,14 @@ const HTML_HEAD_REGEX = /^([\s\S]*<\/head>)([\s\S]*)/;
  * method.
  */
 class Result {
-  constructor(options) {
+  constructor(options = {}) {
+    let { doc, html, fastbootInfo } = options;
+
     this._instanceDestroyed = false;
-    this._doc = options.doc;
-    this._html = options.html;
-    this._fastbootInfo = options.fastbootInfo;
+
+    this._doc = doc;
+    this._html = html;
+    this._fastbootInfo = fastbootInfo;
   }
 
   /**
@@ -66,22 +69,19 @@ class Result {
         return [html];
       }
 
-      let head = docParts[1];
-      let body = docParts[2];
+      let [, head, body] = docParts;
 
       if (!head || !body) {
         throw new Error('Could not idenfity head and body of the document! Make sure the document is well formed.');
       }
 
-      let chunks = [head];
-      let bodyParts = body.split(SHOEBOX_TAG_PATTERN);
-      let plainBody = bodyParts[0];
-      chunks.push(plainBody);
+      let [ plainBody, ...shoeboxes ] = body.split(SHOEBOX_TAG_PATTERN);
 
-      let shoeboxes = bodyParts.splice(1);
-      shoeboxes.forEach((shoebox) => {
-        chunks.push(`${SHOEBOX_TAG_PATTERN}${shoebox}`);
-      });
+      let chunks = [
+        head,
+        plainBody
+      ]
+        .concat(shoeboxes.map(shoebox => `${SHOEBOX_TAG_PATTERN}${shoebox}`));
 
       return chunks;
     });
@@ -114,7 +114,7 @@ class Result {
 
     // Grab some metadata from the sandboxed application instance
     // and copy it to this Result object.
-    let instance = this.instance;
+    let { instance } = this;
     if (instance) {
       this._finalizeMetadata(instance);
     }
@@ -130,7 +130,7 @@ class Result {
       this.url = instance.getURL();
     }
 
-    let response = this._fastbootInfo.response;
+    let { response } = this._fastbootInfo;
 
     if (response) {
       this.headers = response.headers;
@@ -142,8 +142,10 @@ class Result {
     if (this.instance && !this._instanceDestroyed) {
       this._instanceDestroyed = true;
       this.instance.destroy();
+
       return true;
     }
+
     return false;
   }
 
@@ -178,10 +180,10 @@ class Result {
 }
 
 function missingTag(tag) {
-  return Promise.reject(new Error(`Fastboot was not able to find ${tag} in base HTML. It could not replace the contents.`));
+  throw new Error(`Fastboot was not able to find ${tag} in base HTML. It could not replace the contents.`);
 }
 
-function insertIntoIndexHTML(html, htmlAttributes, head, body, bodyAttributes) {
+async function insertIntoIndexHTML(html, htmlAttributes, head, body, bodyAttributes) {
   if (!html) { return Promise.resolve(html); }
   let isBodyReplaced = false;
   let isHeadReplaced = false;
@@ -210,13 +212,13 @@ function insertIntoIndexHTML(html, htmlAttributes, head, body, bodyAttributes) {
   }
 
   if (head && !isHeadReplaced) {
-    return missingTag('<!--EMBER_CLI_FASTBOOT_HEAD-->');
+    missingTag('<!--EMBER_CLI_FASTBOOT_HEAD-->');
   }
   if (body && !isBodyReplaced) {
-    return missingTag('<!--EMBER_CLI_FASTBOOT_BODY-->');
+    missingTag('<!--EMBER_CLI_FASTBOOT_BODY-->');
   }
 
-  return Promise.resolve(html);
+  return html;
 }
 
 module.exports = Result;