Upgrade Ember (#690)

* Upgrade Ember

* Upgrade ember-cli-babel

* Upgrade to Ember 2.13

* Proper upgrade to Ember 2.13

* Upgrade yarn.lock

* Readd qunit specific downgrade

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: [

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -6,9 +6,7 @@ node_js:
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+  yarn: true
 
 env:
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
@@ -25,14 +23,13 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - yarn global add phantomjs-prebuilt
   - phantomjs --version
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile
 
 script:
   # Usually, it's ok to finish the test scenario without reverting

config/ember-try.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,9 +1,8 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
     snippetPaths: ['tests/dummy/snippets'],
     snippetSearchPaths: ['tests/dummy/app']

package.json

@@ -22,56 +22,56 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.11.0",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "2.13.1",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-dependency-checker": "^1.4.0",
-    "ember-cli-eslint": "^3.0.3",
-    "ember-cli-fastboot": "1.0.0-beta.16",
+    "ember-cli-eslint": "^3.1.0",
+    "ember-cli-fastboot": "1.0.0-beta.18",
     "ember-cli-github-pages": "^0.1.2",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.0.1",
+    "ember-cli-qunit": "^4.0.0",
     "ember-cli-release": "^0.2.9",
-    "ember-cli-sass": "^6.0.0",
+    "ember-cli-sass": "^6.1.3",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.8.1",
-    "ember-cp-validations": "3.3.0",
-    "ember-data": "^2.11.0",
+    "ember-cp-validations": "3.3.1",
+    "ember-data": "^2.13.1",
     "ember-deferred-content": "0.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^2.0.0",
-    "ember-inflector": "1.11.0",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "^2.11.0",
+    "ember-inflector": "2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.1.0",
+    "ember-source": "^2.13.0",
     "ember-transition-helper": "0.0.6",
     "eslint-plugin-ember-suave": "^1.0.0",
-    "liquid-fire": "0.27.2",
-    "loader.js": "^4.0.10",
+    "liquid-fire": "0.27.3",
+    "loader.js": "^4.4.0",
     "qunitjs": "2.2.1"
   },
   "dependencies": {
     "angular-material-source": "angular/material#v1.0.9",
     "broccoli-autoprefixer": "^4.1.0",
     "broccoli-filter": "^1.2.3",
-    "broccoli-funnel": "^1.0.1",
+    "broccoli-funnel": "^1.2.0",
     "broccoli-merge-trees": "^2.0.0",
     "ember-basic-dropdown": "0.20.0",
-    "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-babel": "^6.1.0",
+    "ember-cli-htmlbars": "^1.3.0",
     "ember-composability-tools": "0.0.8",
-    "ember-css-transitions": "0.1.9",
+    "ember-css-transitions": "0.1.10",
     "ember-power-select": "1.2.0",
     "ember-wormhole": "0.5.1",
     "hammerjs": "^2.0.8",
     "matchmedia-polyfill": "^0.3.0",
     "propagating-hammerjs": "^1.4.6",
-    "resolve": "^1.1.7",
-    "virtual-each": "0.5.0"
+    "resolve": "^1.3.3",
+    "virtual-each": "0.5.1"
   },
   "keywords": [
     "ember-addon",

testem.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [

tests/dummy/config/environment.js

@@ -1,11 +1,11 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function(environment) {
   // jscs:disable requireEnhancedObjectLiterals, validateQuoteMarks, disallowEmptyBlocks, disallowVar
 
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'hash',
     EmberENV: {
@@ -24,7 +24,7 @@ module.exports = function(environment) {
       // when it is created
       rootElement: 'body'
     },
-    
+
     contentSecurityPolicy: {
       'default-src': "'none'",
       'script-src': "'self' 'unsafe-inline' 'unsafe-eval' https://buttons.github.io https://api.github.com",

tests/dummy/config/targets.js

@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};

tests/helpers/module-for-acceptance.js

@@ -1,5 +1,3 @@
-// https://github.com/DockYard/ember-suave/issues/109
-// jscs:disable
 import { module } from 'qunit';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
@@ -22,5 +20,4 @@ export default function(name, options = {}) {
       return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
-}
-// jscs:enable
+}

tests/test-helper.js

@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();