Upgrade to ember-cli 2.13

.eslintrc.js

@@ -1,12 +1,12 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',
   env: {
-    'browser': true
+    browser: true
   },
   rules: {
     'arrow-parens': ['error', 'always'],

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log

.npmignore

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

.travis.yml

@@ -1,20 +1,23 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
 
 env:
-  - EMBER_TRY_SCENARIO=default
+  # 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-1.13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
@@ -25,8 +28,8 @@ before_install:
   - npm config set spin false
   - npm install -g bower
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - npm install -g phantomjs-prebuilt
+  - phantomjs --version
 
 install:
   - npm install
@@ -35,4 +38,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

README.md

@@ -226,4 +226,4 @@ This project uses [https://github.com/skywinder/github-changelog-generator](http
 
 * `ember build`
 
-For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

bower.json

@@ -1,8 +1,6 @@
 {
   "name": "ember-freestyle",
   "dependencies": {
-    "ember": "~2.8.0",
-    "ember-cli-shims": "0.1.1",
     "remarkable": "1.7.1",
     "highlightjs": "9.1.0"
   }

config/ember-try.js

@@ -1,20 +1,51 @@
-/*eslint-env node*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {
-      name: 'default',
+      name: 'ember-1.13',
       bower: {
-        dependencies: { }
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
-      name: 'ember-1.13',
+      name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          'ember': '~1.13.0'
+          'ember': 'components/ember#lts-2-4'
         },
         resolutions: {
-          'ember': '~1.13.0'
+          'ember': 'lts-2-4'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
@@ -27,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -38,6 +74,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -49,6 +90,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

config/environment.js

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

ember-cli-build.js

@@ -1,5 +1,5 @@
-/*eslint-env node*/
-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, {

index.js

@@ -1,4 +1,4 @@
-/* globals require, module */
+/* eslint-env node */
 'use strict';
 var mergeTrees = require('broccoli-merge-trees');
 var stew = require('broccoli-stew');

package.json

@@ -2,6 +2,12 @@
   "name": "ember-freestyle",
   "version": "0.2.14",
   "description": "Create a living styleguide for your Ember app.",
+  "keywords": [
+    "ember-addon"
+  ],
+  "license": "MIT",
+  "author": "Chris LoPresto",
+  "repository": "https://github.com/chrislopresto/ember-freestyle.git",
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -12,58 +18,51 @@
     "test": "ember try:each",
     "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -"
   },
-  "repository": "https://github.com/chrislopresto/ember-freestyle.git",
-  "engines": {
-    "node": ">= 0.10.0"
+  "dependencies": {
+    "broccoli-flatiron": "0.0.0",
+    "broccoli-funnel": "^1.0.1",
+    "broccoli-merge-trees": "^1.1.1",
+    "broccoli-stew": "^1.2.0",
+    "broccoli-unwatched-tree": "^0.1.1",
+    "broccoli-writer": "^0.1.1",
+    "ember-cli-babel": "^6.0.0",
+    "ember-cli-htmlbars": "^1.3.0",
+    "ember-remarkable": "chrislopresto/ember-remarkable#highlightjs-css-compatibility-3.2.0",
+    "ember-runtime-enumerable-includes-polyfill": "^1.0.4",
+    "ember-truth-helpers": "^1.3.0",
+    "es6-promise": "^3.1.2",
+    "glob": "^6.0.4",
+    "highlight.js": "^9.3.0"
   },
-  "author": "",
-  "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.8.0",
-    "ember-cli-app-version": "^1.0.0",
+    "broccoli-asset-rev": "^2.4.5",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "2.13.0",
     "ember-cli-autoprefixer": "0.6.0",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-eslint": "^3.0.2",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-github-pages": "0.1.2",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
+    "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-page-object": "1.4.0",
-    "ember-cli-qunit": "^2.1.0",
+    "ember-cli-qunit": "^4.0.0-beta.1",
     "ember-cli-release": "v1.0.0-beta.2",
     "ember-cli-sass": "5.3.1",
     "ember-cli-sass-lint": "1.0.2",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-normalize": "1.0.0",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.13.0",
     "eslint-config-ember": "0.3.0",
-    "loader.js": "^4.0.1",
+    "loader.js": "^4.2.3",
     "normalize.css": "4.1.1"
   },
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "broccoli-flatiron": "0.0.0",
-    "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.1",
-    "broccoli-stew": "^1.2.0",
-    "broccoli-unwatched-tree": "^0.1.1",
-    "broccoli-writer": "^0.1.1",
-    "ember-cli-babel": "^5.1.6",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-remarkable": "chrislopresto/ember-remarkable#highlightjs-css-compatibility-3.2.0",
-    "ember-runtime-enumerable-includes-polyfill": "^1.0.4",
-    "ember-truth-helpers": "^1.3.0",
-    "es6-promise": "^3.1.2",
-    "glob": "^6.0.4",
-    "highlight.js": "^9.3.0"
+  "engines": {
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

testem.js

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

tests/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   env: {
-    'embertest': true
+    embertest: true
   }
 };

tests/acceptance/collection-navigation-test.js

@@ -1,4 +1,3 @@
-/* global expect */
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
 import freestyleGuide from '../pages/freestyle-guide';
@@ -13,7 +12,7 @@ moduleForAcceptance('Acceptance | collection navigation', {
 });
 
 test('verifying variantListItem selection', (assert) => {
-  expect(36);
+  assert.expect(36);
 
   let fooCollection = freestyleGuide.content.sections(0).subsections(0).collections(0);
 

tests/acceptance/collection-rendering-test.js

@@ -1,4 +1,3 @@
-/* global expect */
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
 import freestyleGuide from '../pages/freestyle-guide';
@@ -11,7 +10,7 @@ moduleForAcceptance('Acceptance | collection rendering', {
 });
 
 test('verifying freestyle collection', (assert) => {
-  expect(19);
+  assert.expect(19);
   andThen(() => {
     let sectionFooThings = freestyleGuide.content.sections(0);
     assert.equal(sectionFooThings.subsections(0).collections().count, 1);