Update Ember CLI

.editorconfig

@@ -4,6 +4,7 @@
 
 root = true
 
+
 [*]
 end_of_line = lf
 charset = utf-8

.travis.yml

@@ -7,14 +7,17 @@ sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
@@ -23,9 +26,8 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
   - phantomjs --version
 
 install:
@@ -35,4 +37,4 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

bower.json

@@ -1,8 +1,4 @@
 {
   "name": "ember-sbe-tooling",
-  "dependencies": {
-    "ember": "~2.7.0",
-    "ember-cli-shims": "0.1.1",
-    "ember-qunit-notifications": "0.1.0"
-  }
+  "dependencies": {}
 }

package.json

@@ -2,12 +2,16 @@
   "name": "ember-sbe-tooling",
   "version": "1.1.0",
   "description": "Common tooling setup for all Showbie Ember projects",
+  "keywords": [
+    "ember-addon"
+  ],
   "bugs": {
     "url": "https://github.com/showbie/ember-sbe-tooling/issues"
   },
   "homepage": "https://github.com/showbie/ember-sbe-tooling#readme",
   "main": "index.js",
   "directories": {
+    "doc": "doc",
     "test": "tests"
   },
   "scripts": {
@@ -19,48 +23,48 @@
     "type": "git",
     "url": "git+https://github.com/showbie/ember-sbe-tooling.git"
   },
-  "engines": {
-    "node": ">= 0.12.0"
+  "dependencies": {
+    "ember-cli-babel": "^5.1.7"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.7.0",
-    "ember-cli-app-version": "^1.0.0",
+    "broccoli-asset-rev": "^2.4.5",
+    "ember-ajax": "^2.4.1",
+    "ember-cli": "2.11.1",
+    "ember-cli-app-version": "^2.0.0",
     "ember-cli-code-coverage": "0.3.11",
-    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "3.0.2",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-qunit": "^2.0.0",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.7.0",
+    "ember-data": "^2.11.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
+    "ember-source": "~2.11.0",
+    "ember-welcome-page": "^2.0.2",
     "eslint-plugin-ember-suave": "1.0.0",
-    "loader.js": "^4.0.1",
+    "loader.js": "^4.0.10",
     "lodash.samplesize": "4.2.0",
     "node-slack": "0.0.7"
   },
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "ember-cli-babel": "^5.1.6"
+  "engines": {
+    "node": ">= 0.12.0"
   },
   "ember-addon": {
     "defaultBlueprint": "showbie-tooling",
     "configPath": "tests/dummy/config",
     "versionCompatibility": {
-      "ember": ">1.13.0 <=2.10.0"
+      "ember": ">1.13.0 <=2.11.0"
     }
   }
 }

tests/dummy/app/templates/application.hbs

@@ -1,3 +1,5 @@
-<h2 id="title">Welcome to Ember</h2>
+{{!-- The following component displays Ember's default welcome message. --}}
+{{welcome-page}}
+{{!-- Feel free to remove this! --}}
 
 {{outlet}}

tests/dummy/config/environment.js

@@ -1,14 +1,19 @@
 /* eslint-env node */
+
 module.exports = function(environment) {
   let ENV = {
-    environment,
     modulePrefix: 'dummy',
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 

tests/helpers/module-for-acceptance.js

@@ -1,4 +1,3 @@
-// jscs:disable requireSpread
 import { module } from 'qunit';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';

tests/index.html

@@ -21,7 +21,7 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="{{rootURL}}testem.js" integrity=""></script>
+    <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>