Merge pull request #566 from cibernox/update-to-latest-cli-and-ember

Update to Ember & Ember-cli 2.18.0

Author: rwjblue

.eslintrc.js

@@ -4,10 +4,54 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js',
+        'lib/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.npmignore

@@ -1,4 +1,5 @@
 /bower_components
+/config/ember-try.js
 /dist
 /test
 /tests
@@ -7,10 +8,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

addon/instance-initializers/clear-double-boot.js

@@ -0,0 +1,28 @@
+// When using `ember serve` when fastboot addon is installed the application 
+// output will already be rendered to the DOM when the actual JavaScript 
+// loads. Ember does not automatically clear its `rootElement` so this 
+// leads to the "double" applications being visible at once (only the 
+// "bottom" one is running via JS and is interactive).
+//
+// This removes any pre-rendered ember-view elements, so that the booting
+// application will replace the pre-rendered output
+
+export default {
+  name: "clear-double-boot",
+
+  initialize: function(instance) {
+    if (typeof FastBoot === 'undefined') {
+      var originalDidCreateRootView = instance.didCreateRootView;
+
+      instance.didCreateRootView = function() {
+        let elements = document.querySelectorAll(instance.rootElement + ' .ember-view');
+        for (let i = 0; i < elements.length; i++) {
+          let element = elements[i];
+          element.parentNode.removeChild(element);
+        }
+
+        originalDidCreateRootView.apply(instance, arguments);
+      };
+    }
+  }
+}

addon/locations/none.js

@@ -0,0 +1,53 @@
+import { computed, get } from '@ember/object';
+import { bool, readOnly } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { getOwner } from '@ember/application'
+import NoneLocation from '@ember/routing/none-location'
+
+const TEMPORARY_REDIRECT_CODE = 307;
+
+export default NoneLocation.extend({
+  implementation: 'fastboot',
+  fastboot: service(),
+
+  _config: computed(function () {
+    return getOwner(this).resolveRegistration('config:environment');
+  }),
+
+  _fastbootHeadersEnabled: bool('_config.fastboot.fastbootHeaders'),
+
+  _redirectCode: computed(function () {
+    return get(this, '_config.fastboot.redirectCode') || TEMPORARY_REDIRECT_CODE;
+  }),
+
+  _response: readOnly('fastboot.response'),
+  _request: readOnly('fastboot.request'),
+
+  setURL(path) {
+    if (get(this, 'fastboot.isFastBoot')) {
+      let response = get(this, '_response');
+      let currentPath = get(this, 'path');
+      let isInitialPath = !currentPath || currentPath.length === 0;
+
+      if (!isInitialPath) {
+        path = this.formatURL(path);
+        let isTransitioning = currentPath !== path;
+
+        if (isTransitioning) {
+          let host = get(this, '_request.host');
+          let redirectURL = `//${host}${path}`;
+
+          response.statusCode = this.get('_redirectCode');
+          response.headers.set('location', redirectURL);
+        }
+      }
+
+      // for testing and debugging
+      if (get(this, '_fastbootHeadersEnabled')) {
+        response.headers.set('x-fastboot-path', path);
+      }
+    }
+
+    this._super(...arguments);
+  }
+});

addon/services/fastboot.js

@@ -0,0 +1,103 @@
+/* global FastBoot */
+import { deprecate } from '@ember/application/deprecations';
+import { computed, get } from '@ember/object';
+import { deprecatingAlias, readOnly } from '@ember/object/computed';
+import { assert } from '@ember/debug';
+import EObject from '@ember/object';
+import Service from '@ember/service';
+
+const RequestObject = EObject.extend({
+  init() {
+    this._super(...arguments);
+
+    let request = this.request;
+    delete this.request;
+
+    this.method = request.method;
+    this.body = request.body;
+    this.cookies = request.cookies;
+    this.headers = request.headers;
+    this.queryParams = request.queryParams;
+    this.path = request.path;
+    this.protocol = request.protocol;
+    this._host = function() {
+      return request.host();
+    };
+  },
+
+  host: computed(function() {
+    return this._host();
+  })
+});
+
+const Shoebox = EObject.extend({
+  put(key, value) {
+    assert('shoebox.put is only invoked from the FastBoot rendered application', this.get('fastboot.isFastBoot'));
+    assert('the provided key is a string', typeof key === 'string');
+
+    let fastbootInfo = this.get('fastboot._fastbootInfo');
+    if (!fastbootInfo.shoebox) { fastbootInfo.shoebox = {}; }
+
+    fastbootInfo.shoebox[key] = value;
+  },
+
+  retrieve(key) {
+    if (this.get('fastboot.isFastBoot')) {
+      let shoebox = this.get('fastboot._fastbootInfo.shoebox');
+      if (!shoebox) { return; }
+
+      return shoebox[key];
+    }
+
+    let shoeboxItem = this.get(key);
+    if (shoeboxItem) { return shoeboxItem; }
+
+    let el = document.querySelector(`#shoebox-${key}`);
+    if (!el) { return; }
+    let valueString = el.textContent;
+    if (!valueString) { return; }
+
+    shoeboxItem = JSON.parse(valueString);
+    this.set(key, shoeboxItem);
+
+    return shoeboxItem;
+  }
+});
+
+const FastBootService = Service.extend({
+  cookies: deprecatingAlias('request.cookies', { id: 'fastboot.cookies-to-request', until: '0.9.9' }),
+  headers: deprecatingAlias('request.headers', { id: 'fastboot.headers-to-request', until: '0.9.9' }),
+  isFastBoot: typeof FastBoot !== 'undefined',
+
+  init() {
+    this._super(...arguments);
+
+    let shoebox = Shoebox.create({ fastboot: this });
+    this.set('shoebox', shoebox);
+  },
+
+  host: computed(function() {
+    deprecate(
+      'Usage of fastboot service\'s `host` property is deprecated.  Please use `request.host` instead.',
+      false,
+      { id: 'fastboot.host-to-request', until: '0.9.9' }
+    );
+
+    return this._fastbootInfo.request.host();
+  }),
+
+  response: readOnly('_fastbootInfo.response'),
+  metadata: readOnly('_fastbootInfo.metadata'),
+
+  request: computed(function() {
+    if (!this.isFastBoot) return null;
+    return RequestObject.create({ request: get(this, '_fastbootInfo.request') });
+  }),
+
+  deferRendering(promise) {
+    assert('deferRendering requires a promise or thennable object', typeof promise.then === 'function');
+    this._fastbootInfo.deferRendering(promise);
+  }
+});
+
+export default FastBootService;

app/instance-initializers/clear-double-boot.js

@@ -1,28 +1 @@
-// When using `ember serve` when fastboot addon is installed the application 
-// output will already be rendered to the DOM when the actual JavaScript 
-// loads. Ember does not automatically clear its `rootElement` so this 
-// leads to the "double" applications being visible at once (only the 
-// "bottom" one is running via JS and is interactive).
-//
-// This removes any pre-rendered ember-view elements, so that the booting
-// application will replace the pre-rendered output
-
-export default {
-  name: "clear-double-boot",
-
-  initialize: function(instance) {
-    if (typeof FastBoot === 'undefined') {
-      var originalDidCreateRootView = instance.didCreateRootView;
-
-      instance.didCreateRootView = function() {
-        let elements = document.querySelectorAll(instance.rootElement + ' .ember-view');
-        for (let i = 0; i < elements.length; i++) {
-          let element = elements[i];
-          element.parentNode.removeChild(element);
-        }
-
-        originalDidCreateRootView.apply(instance, arguments);
-      };
-    }
-  }
-}
+export { default } from 'ember-cli-fastboot/instance-initializers/clear-double-boot';

app/locations/none.js

@@ -1,57 +1 @@
-import Ember from 'ember';
-
-const {
-  computed,
-  computed: { bool, readOnly },
-  inject: { service },
-  get,
-  getOwner
-} = Ember;
-
-const TEMPORARY_REDIRECT_CODE = 307;
-
-export default Ember.NoneLocation.extend({
-  implementation: 'fastboot',
-  fastboot: service(),
-
-  _config: computed(function () {
-    return getOwner(this).resolveRegistration('config:environment');
-  }),
-
-  _fastbootHeadersEnabled: bool('_config.fastboot.fastbootHeaders'),
-
-  _redirectCode: computed(function () {
-    return get(this, '_config.fastboot.redirectCode') || TEMPORARY_REDIRECT_CODE;
-  }),
-
-  _response: readOnly('fastboot.response'),
-  _request: readOnly('fastboot.request'),
-
-  setURL(path) {
-    if (get(this, 'fastboot.isFastBoot')) {
-      let response = get(this, '_response');
-      let currentPath = get(this, 'path');
-      let isInitialPath = !currentPath || currentPath.length === 0;
-
-      if (!isInitialPath) {
-        path = this.formatURL(path);
-        let isTransitioning = currentPath !== path;
-
-        if (isTransitioning) {
-          let host = get(this, '_request.host');
-          let redirectURL = `//${host}${path}`;
-
-          response.statusCode = this.get('_redirectCode');
-          response.headers.set('location', redirectURL);
-        }
-      }
-
-      // for testing and debugging
-      if(get(this, '_fastbootHeadersEnabled')) {
-        response.headers.set('x-fastboot-path', path);
-      }
-    }
-
-    this._super(...arguments);
-  }
-});
+export { default } from 'ember-cli-fastboot/locations/none';