Update ember-cli to the latest version 🚀 (#1672)

* chore(package): update ember-cli to version 2.18.0

* Cleanup lint errors, update code based on latest ember-cli blueprint

Author: greenkeeper[bot]

.eslintrc.js

@@ -21,5 +21,31 @@ module.exports = {
   globals: {
     'server': true,
     '$': true
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      }
+    },
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.travis.yml

@@ -25,4 +25,5 @@ install:
   - yarn install --non-interactive
 
 script:
+  - yarn lint:js
   - yarn test

config/deploy.js

@@ -1,16 +1,16 @@
-var VALID_DEPLOY_TARGETS = [ //update these to match what you call your deployment targets
+let VALID_DEPLOY_TARGETS = [ // update these to match what you call your deployment targets
   'development-postbuild',
   'staging',
   'production'
 ];
 
 module.exports = function(deployTarget) {
-  var ENV = {
+  let ENV = {
     build: {}
   };
 
   if (VALID_DEPLOY_TARGETS.indexOf(deployTarget) === -1) {
-    throw new Error('Invalid deployTarget ' + deployTarget);
+    throw new Error(`Invalid deployTarget ${deployTarget}`);
   }
 
   if (deployTarget === 'development-postbuild') {
@@ -23,48 +23,50 @@ module.exports = function(deployTarget) {
     ENV.s3 = {
       accessKeyId: process.env.AWS_ACCESS_KEY_ID,
       secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
-    }
+    };
+
     ENV['s3-index'] = {
       accessKeyId: process.env.AWS_ACCESS_KEY_ID,
       secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
-    }
+    };
+
     ENV.slack = {
       webhookURL: 'https://hooks.slack.com/services/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',
       username: 'ember-cli-deploy',
-      iconEmoji: ':rocket:',
-    }
+      iconEmoji: ':rocket:'
+    };
   }
 
   if (deployTarget === 'staging') {
     ENV.build.environment = 'staging';
     ENV.s3.bucket = process.env.STAGING_S3_BUCKET;
     ENV.s3.region = process.env.STAGING_S3_REGION;
-    ENV['s3-index']['bucket'] = process.env.STAGING_S3_INDEX_BUCKET;
-    ENV['s3-index']['region'] = process.env.STAGING_S3_INDEX_REGION;
+    ENV['s3-index'].bucket = process.env.STAGING_S3_INDEX_BUCKET;
+    ENV['s3-index'].region = process.env.STAGING_S3_INDEX_REGION;
 
     ENV.sentry = {
       publicUrl: process.env.STAGING_SENTRY_SITE_URL,
       sentryUrl: process.env.SENTRY_BASE_URL,
       sentryOrganizationSlug: process.env.STAGING_SENTRY_ORGANIZATION_SLUG,
       sentryProjectSlug: process.env.STAGING_SENTRY_PROJECT_SLUG,
-      sentryApiKey: process.env.STAGING_SENTRY_API_KEY,
-    }
+      sentryApiKey: process.env.STAGING_SENTRY_API_KEY
+    };
   }
 
   if (deployTarget === 'production') {
     ENV.build.environment = 'production';
     ENV.s3.bucket = process.env.PRODUCTION_S3_BUCKET;
     ENV.s3.region = process.env.PRODUCTION_S3_REGION;
-    ENV['s3-index']['bucket'] = process.env.PRODUCTION_S3_INDEX_BUCKET;
-    ENV['s3-index']['region'] = process.env.PRODUCTION_S3_INDEX_REGION;
+    ENV['s3-index'].bucket = process.env.PRODUCTION_S3_INDEX_BUCKET;
+    ENV['s3-index'].region = process.env.PRODUCTION_S3_INDEX_REGION;
 
     ENV.sentry = {
       publicUrl: process.env.PRODUCTION_SENTRY_SITE_URL,
       sentryUrl: process.env.SENTRY_BASE_URL,
       sentryOrganizationSlug: process.env.PRODUCTION_SENTRY_ORGANIZATION_SLUG,
       sentryProjectSlug: process.env.PRODUCTION_SENTRY_PROJECT_SLUG,
-      sentryApiKey: process.env.PRODUCTION_SENTRY_API_KEY,
-    }
+      sentryApiKey: process.env.PRODUCTION_SENTRY_API_KEY
+    };
   }
 
   // Note: if you need to build some configuration asynchronously,ou can return

config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(environment) {
@@ -68,7 +67,7 @@ module.exports = function(environment) {
         config: {
           key: 'Nz7hL2eY2yHzuIwUbExfDanbJp2q0IO0'
         }
-      },
+      }
     ],
 
     moment: {
@@ -77,7 +76,7 @@ module.exports = function(environment) {
 
     pageTitle: {
       prepend: true,
-      separator: " — "
+      separator: ' — '
     },
 
     sentry: {
@@ -113,39 +112,39 @@ module.exports = function(environment) {
     ENV.contentSecurityPolicy = {
       'default-src': "'none'",
       'script-src': [
-        "'self'",
+        "'self'"
       ],
       // Allow fonts to be loaded from http://fonts.gstatic.com
       'font-src': [
         "'self'",
-        "data:",
-        "https://fonts.gstatic.com",
-        "https://d3pgew4wbk2vb1.cloudfront.net",
-        "https://dawxes9syhrgg.cloudfront.net"
+        'data:',
+        'https://fonts.gstatic.com',
+        'https://d3pgew4wbk2vb1.cloudfront.net',
+        'https://dawxes9syhrgg.cloudfront.net'
       ],
       // Allow data (ajax/websocket) from api.lvh.me:4000
       'connect-src': [
         "'self'",
-        "http://api.lvh.me:4000"
+        'http://api.lvh.me:4000'
       ],
       // Allow images from the origin itself (i.e. current domain), and data
       'img-src': [
         "'self'",
-        "data:",
-        "https://d3pgew4wbk2vb1.cloudfront.net",
-        "https://dawxes9syhrgg.cloudfront.net",
-        "http://lorempixel.com",
-        "https://s3.amazonaws.com",
+        'data:',
+        'https://d3pgew4wbk2vb1.cloudfront.net',
+        'https://dawxes9syhrgg.cloudfront.net',
+        'http://lorempixel.com',
+        'https://s3.amazonaws.com'
       ],
       // Allow inline styles and loaded CSS from http://fonts.googleapis.com
       'style-src': [
         "'self'",
-        "'unsafe-inline'",
+        "'unsafe-inline'"
       ],
       // `media-src` will be omitted from policy
       // Browser will fallback to default-src for media resources (which is to deny, see above).
       'media-src': null
-    }
+    };
   }
 
   if (environment === 'remote-development') {
@@ -192,6 +191,8 @@ module.exports = function(environment) {
     // Testem prefers this...
     ENV.locationType = 'none';
 
+    ENV.APP.autoboot = false;
+
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
     ENV.APP.LOG_VIEW_LOOKUPS = false;
@@ -229,9 +230,9 @@ module.exports = function(environment) {
   }
 
   ENV['ember-simple-auth-token'] = {
-    serverTokenEndpoint: ENV.API_BASE_URL + '/token',
-    serverTokenRefreshEndpoint: ENV.API_BASE_URL + '/token/refresh',
-    refreshLeeway: 300, // 5 minutes before expiry
+    serverTokenEndpoint: `${ENV.API_BASE_URL}/token`,
+    serverTokenRefreshEndpoint: `${ENV.API_BASE_URL}/token/refresh`,
+    refreshLeeway: 300 // 5 minutes before expiry
   };
 
   return ENV;

config/targets.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   browsers: [
     'ie 9',

ember-cli-build.js

@@ -1,27 +1,26 @@
-/* eslint-env node */
 'use strict';
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
-  var env = EmberApp.env() || 'development';
-  var isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1;
+  let env = EmberApp.env() || 'development';
+  let isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1;
 
-  var fingerprintOptions = {
+  let fingerprintOptions = {
     enabled: true,
     extensions: ['js', 'css', 'png', 'jpg', 'gif']
   };
 
   switch (env) {
     case 'development':
       fingerprintOptions.prepend = 'http://localhost:4200/';
-    break;
+      break;
     case 'staging':
       fingerprintOptions.prepend = 'https://d3onq9263d8on4.cloudfront.net/';
-    break;
+      break;
     case 'production':
       fingerprintOptions.prepend = 'https://d3pgew4wbk2vb1.cloudfront.net/';
-    break;
+      break;
   }
 
   let app = new EmberApp(defaults, {
@@ -41,7 +40,7 @@ module.exports = function(defaults) {
       // To see errors in Sentry, this is needed;
       // Our app is open source, so deal with it.
       enabled: true,
-      extensions: ['js'],
+      extensions: ['js']
     },
     minifyCSS: { enabled: isProductionLikeBuild },
     minifyJS: { enabled: isProductionLikeBuild },

package.json

@@ -11,6 +11,7 @@
   },
   "scripts": {
     "build": "ember build",
+    "lint:js": "eslint ./*.js app config lib server tests",
     "start": "ember serve",
     "test": "ember try:one default"
   },
@@ -21,13 +22,13 @@
     "ember-auto-focus": "^2.0.1",
     "ember-autoresize": "1.0.0",
     "ember-can": "^0.8.4",
-    "ember-cli": "~2.17.0",
+    "ember-cli": "~2.18.0",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-autoprefixer": "0.8.1",
     "ember-cli-babel": "^6.6.0",
     "ember-cli-bourbon": "2.0.0-beta.1",
     "ember-cli-code-coverage": "^0.4.1",
-    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-dependency-checker": "^2.1.0",
     "ember-cli-deploy": "1.0.2",
     "ember-cli-deploy-build": "1.1.1",
     "ember-cli-deploy-display-revisions": "1.0.0",
@@ -62,7 +63,7 @@
     "ember-click-outside": "^0.1.10",
     "ember-composable-helpers": "2.1.0",
     "ember-concurrency": "^0.8.1",
-    "ember-data": "~2.17",
+    "ember-data": "~2.18.0",
     "ember-deferred-content": "0.2.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-dragula": "1.9.3",
@@ -93,7 +94,7 @@
     "ember-simple-auth": "^1.2.1",
     "ember-simple-auth-token": "^2.1.0",
     "ember-sinon": "1.0.1",
-    "ember-source": "~2.17.0",
+    "ember-source": "~2.18.0",
     "ember-stripe-elements": "^0.3.0",
     "ember-stripe-service": "7.0.0",
     "ember-test-selectors": "^0.3.4",

tests/helpers/start-app.js

@@ -6,6 +6,7 @@ import './responsive';
 
 export default function startApp(attrs) {
   let attributes = merge({}, config.APP);
+  attributes.autoboot = true;
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {

tests/test-helper.js

@@ -1,14 +1,12 @@
 import Application from '../app';
+import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 import { run } from '@ember/runloop';
 import loadEmberExam from 'ember-exam/test-support/load';
 import './helpers/flash-message';
 
 loadEmberExam();
-
 run.later = run.next;
-
-setApplication(Application.create({ autoboot: false }));
-
+setApplication(Application.create(config.APP));
 start();