Bump to Ember-CLI 2.14

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+    'no-console': 0
+  }
+};

.gitignore

@@ -14,7 +14,13 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
 
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
+
 .env
 .env.*

.travis.yml

@@ -1,24 +1,21 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+  yarn: true
 
 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 --non-interactive
 
 script:
-  - npm test
+  - yarn test

app/app.js

@@ -3,11 +3,7 @@ import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/resolver.js

@@ -1 +1,3 @@
-export { default } from 'ember-resolver';
+import Resolver from 'ember-resolver';
+
+export default Resolver;

app/transitions.js

@@ -1,7 +1,7 @@
 const opts = { duration: 300, delay: 100, easing: 'easeInOutQuart' };
 
 // Only animate between page results if the distance between the pages is one.
-// This avoids animations occuring when the distance between pages is possibly more 
+// This avoids animations occuring when the distance between pages is possibly more
 // that one (i.e. clicking the logo).
 
 export default function(){
@@ -20,4 +20,4 @@ export default function(){
     }),
     this.use('toRight', opts)
   );
-};
+}

config/environment.js

@@ -1,13 +1,14 @@
-/* jshint node: true */
+/* eslint-env node */
+'use strict';
 
-var parseFlag = require('./parse-flag');
-var AIRPLANE_MODE = parseFlag('AIRPLANE_MODE', false);
+let parseFlag = require('./parse-flag');
+let AIRPLANE_MODE = parseFlag('AIRPLANE_MODE', false);
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     host: AIRPLANE_MODE ? '/assets' : 'https://io-builtwithember-addons-data.s3.amazonaws.com',
     modulePrefix: 'ember-addons-website',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {

config/targets.js

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

ember-cli-build.js

@@ -1,11 +1,12 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-var parseFlag = require('./config/parse-flag');
-var env = EmberApp.env();
-
-var AIRPLANE_MODE    = parseFlag('AIRPLANE_MODE', false);
-var GOOGLE_ANALYTICS = !AIRPLANE_MODE && parseFlag('GOOGLE_ANALYTICS', env === 'production');
+/* eslint-env node */
+'use strict';
+
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+const parseFlag = require('./config/parse-flag');
+const env = EmberApp.env();
+
+const AIRPLANE_MODE    = parseFlag('AIRPLANE_MODE', false);
+const GOOGLE_ANALYTICS = !AIRPLANE_MODE && parseFlag('GOOGLE_ANALYTICS', env === 'production');
 
 module.exports = function(defaults) {
   var options = {

package.json

@@ -2,9 +2,8 @@
   "name": "ember-addons-website",
   "version": "1.1.0",
   "description": "Search hundreds of modules that extend ember-cli.",
-  "private": false,
-  "author": "",
   "license": "MIT",
+  "author": "",
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -16,50 +15,51 @@
     "test": "ember test",
     "deploy": "ember deploy production"
   },
-  "engines": {
-    "node": ">= 0.10.0"
-  },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.12.0-beta.2",
-    "ember-cli-app-version": "^2.0.0",
-    "ember-cli-babel": "^5.1.7",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "~2.14.2",
+    "ember-cli-app-version": "^3.0.0",
+    "ember-cli-babel": "^6.8.1",
     "ember-cli-clipboard": "0.5.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-deploy": "^1.0.0",
     "ember-cli-deploy-aws-pack": "0.4.0",
     "ember-cli-deprecation-workflow": "^0.2.3",
-    "ember-cli-filter-by-query": "1.0.3",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-filter-by-query": "1.2.0",
     "ember-cli-font-awesome": "1.3.0",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-inline-content": "^0.4.0",
     "ember-cli-moment-shim": "3.0.1",
-    "ember-cli-qunit": "^3.0.1",
+    "ember-cli-qunit": "^4.0.0",
     "ember-cli-release": "^0.2.9",
-    "ember-cli-shims": "^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-concurrency": "0.7.19",
-    "ember-data": "^2.12.0-beta.4",
-    "ember-export-application-global": "^1.0.5",
+    "ember-data": "^2.14.10",
+    "ember-export-application-global": "^2.0.0",
     "ember-load": "0.0.11",
-    "ember-load-initializers": "^0.6.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-moment": "7.3.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "2.12.0-beta.2",
-    "eslint-config-blimp": "^4.0.1",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.14.1",
     "liquid-fire": "^0.27.1",
-    "loader.js": "^4.0.10"
+    "loader.js": "^4.2.3"
   },
   "dependencies": {
     "ember-cli-deploy-build": "^0.1.1",
     "ember-cli-deploy-cloudfront": "^0.2.8",
     "ember-cli-deploy-gzip": "^0.2.4",
     "ember-cli-deploy-manifest": "^0.1.2",
     "ember-cli-deploy-s3": "^0.4.0"
-  }
+  },
+  "engines": {
+    "node": "^4.5 || 6.* || >= 7.*"
+  },
+  "private": false
 }

testem.js

@@ -1,13 +1,12 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'PhantomJS'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+  launch_in_dev: [
+    'PhantomJS',
+    'Chrome'
   ]
 };

tests/.eslintrc.js

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

tests/helpers/module-for-acceptance.js

@@ -3,7 +3,7 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
+const { RSVP: { resolve } } = Ember;
 
 export default function(name, options = {}) {
   module(name, {
@@ -16,8 +16,8 @@ export default function(name, options = {}) {
     },
 
     afterEach() {
-      let afterEach =  options.afterEach && options.afterEach.apply(this, arguments);
-      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }

tests/helpers/start-app.js

@@ -3,16 +3,13 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let application;
-
   let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(() => {
-    application = Application.create(attributes);
+  return Ember.run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }

tests/index.html

@@ -28,7 +28,6 @@
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/ember-addons-website.js"></script>
     <script src="{{rootURL}}assets/tests.js"></script>
-    <script src="{{rootURL}}assets/test-loader.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}

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();

tests/unit/components/em-pkg-test.js

@@ -3,7 +3,7 @@ import { test, moduleForComponent } from 'ember-qunit';
 moduleForComponent('em-pkg', 'Unit | Component | em pkg', {
   // Specify the other units that are required for this test
   needs: [
-  	'service:moment',
+    'service:moment',
     'helper:split-prefix',
     'helper:moment-from-now',
     'component:observer-score',