Upgrade ember-cli & ember

- Pin ember-data to ~2.3.0 until
emberjs/data#4942 is fixed

.eslintrc.js

@@ -1,20 +1,13 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: [
-    'eslint:recommended',
-    'plugin:ember-suave/recommended'
-  ],
+  extends: 'eslint:recommended',
   env: {
     browser: true
   },
   rules: {
-    'ember-suave/no-direct-property-access': 'off',
-    'ember-suave/require-access-in-comments': 'off',
-    'ember-suave/require-const-for-ember-properties': 'off',
-    'new-cap': 'off'
   }
 };

.gitignore

@@ -14,4 +14,10 @@
 /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

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
@@ -12,7 +12,7 @@ cache:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
+  - npm install -g bower
   - bower --version
   - phantomjs --version
 

README.md

@@ -9,10 +9,10 @@ To work on this app, change the proxy to https://www.emberobserver.com
 
 You will need the following things properly installed on your computer.
 
-* [Git](http://git-scm.com/)
-* [Node.js](http://nodejs.org/) (with NPM)
+* [Git](https://git-scm.com/)
+* [Node.js](https://nodejs.org/) (with NPM)
 * [Bower](http://bower.io/)
-* [Ember CLI](http://www.ember-cli.com/)
+* [Ember CLI](https://ember-cli.com/)
 * [PhantomJS](http://phantomjs.org/)
 
 ## Installation
@@ -24,9 +24,13 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember server`
+* `ember serve`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 
+### Code Generators
+
+Make use of the many generators for code, try `ember help generate` for more details
+
 ### Running Tests
 
 * `ember 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/controllers/addons/show.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import sortBy from '../../utils/sort-by';
 import moment from 'moment';
 
 export default Ember.Controller.extend({
@@ -9,20 +8,26 @@ export default Ember.Controller.extend({
   licenseUrl: Ember.computed('addon.license', function() {
     return `https://spdx.org/licenses/${this.get('addon.license')}`;
   }),
-  sortedReviews: sortBy('addon.reviews', 'versionReleased:desc'),
+  sortedReviews: Ember.computed('addon.reviews', function() {
+    return this.get('addon.reviews').sortBy('versionReleased').reverse();
+  }),
   latestReview: Ember.computed.alias('sortedReviews.firstObject'),
   sortedCategories: Ember.computed('model.categories', function() {
     return this.get('model.categories').sortBy('displayName');
   }),
-  isLatestReleaseInLast3Months: Ember.computed('addon.latestVersion.released', function() {
-    if (!this.get('addon.latestVersion.released')) {
+  sortedAddonVersions: Ember.computed('addon.versions', function() {
+    return this.get('addon.versions').sortBy('released').reverse();
+  }),
+  latestVersion: Ember.computed.readOnly('sortedAddonVersions.firstObject'),
+  isLatestReleaseInLast3Months: Ember.computed('latestVersion.released', function() {
+    if (!this.get('latestVersion.released')) {
       return false;
     }
     let threeMonthsAgo = moment().subtract(3, 'months');
-    return moment(this.get('addon.latestVersion.released')).isAfter(threeMonthsAgo);
+    return moment(this.get('latestVersion.released')).isAfter(threeMonthsAgo);
   }),
-  isLatestReviewForLatestVersion: Ember.computed('latestReview.version.version', 'addon.latestVersion.version', function() {
-    return this.get('latestReview.version.version') === this.get('addon.latestVersion.version');
+  isLatestReviewForLatestVersion: Ember.computed('latestReview.version.version', 'latestVersion.version', function() {
+    return this.get('latestReview.version.version') === this.get('latestVersion.version');
   }),
   badgeText: Ember.computed('addon.name', function() {
     return `[![Ember Observer Score](https://emberobserver.com/badges/${this.get('addon.name')}.svg)](https://emberobserver.com/addons/${this.get('addon.name')})`;
@@ -33,8 +38,8 @@ export default Ember.Controller.extend({
   badgeSrc: Ember.computed('addon.name', function() {
     return `https://emberobserver.com/badges/${this.get('addon.name')}.svg`;
   }),
-  isTestResultForLatestVersion: Ember.computed('model.latestTestResult.version', 'addon.latestVersion', function() {
-    return this.get('model.latestTestResult.version.version') === this.get('addon.latestVersion.version');
+  isTestResultForLatestVersion: Ember.computed('model.latestTestResult.version', 'latestVersion', function() {
+    return this.get('model.latestTestResult.version.version') === this.get('latestVersion.version');
   }),
   hasGithubData: Ember.computed('addon.hasInvalidGithubRepo', 'addon.githubStats.firstCommitDate', function() {
     return !this.get('addon.hasInvalidGithubRepo') && this.get('addon.githubStats.firstCommitDate');
@@ -68,7 +73,7 @@ export default Ember.Controller.extend({
     },
     saveReview(newReview) {
       let controller = this;
-      newReview.set('version', this.get('addon.latestVersion'));
+      newReview.set('version', this.get('latestVersion'));
       newReview.save()
       .then(function() {
         // TODO: Fix this once 'latestReview' is put on addon

app/models/addon.js

@@ -2,7 +2,6 @@ import Ember from 'ember';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { hasMany, belongsTo } from 'ember-data/relationships';
-import sortBy from '../utils/sort-by';
 import moment from 'moment';
 
 export default Model.extend({
@@ -35,9 +34,6 @@ export default Model.extend({
   maintainers: hasMany('maintainer', { async: true }),
   reviews: hasMany('review', { async: true }),
   readme: belongsTo('readme', { async: true }),
-  sortedVersions: sortBy('versions', 'released:desc'),
-  latestVersion: Ember.computed.alias('sortedVersions.firstObject'),
-  oldestVersion: Ember.computed.alias('sortedVersions.lastObject'),
   hasMoreThan1Contributor: Ember.computed.gt('githubUsers.length', 1),
   npmUrl: Ember.computed('name', function() {
     return `https://www.npmjs.com/package/${this.get('name')}`;

app/templates/addons/-stats-bar.hbs

@@ -5,7 +5,7 @@
 
 <ul class="stats-list">
   <li class="test-addon-latest-version">
-    <b>{{addon.latestVersion.version}}</b> from {{relative-time date=addon.latestVersionDate}}
+    <b>{{latestVersion.version}}</b> from {{relative-time date=addon.latestVersionDate}}
   </li>
   <li class="test-addon-top-downloaded">
     {{#if addon.isTopDownloaded}}
@@ -69,15 +69,15 @@
   {{/each}}
 </p>
 
-{{#if addon.latestVersion.emberCliVersion}}
+{{#if latestVersion.emberCliVersion}}
   <h6>ember-cli version</h6>
-  <p class="test-addon-ember-cli-version">{{addon.latestVersion.emberCliVersion}}</p>
+  <p class="test-addon-ember-cli-version">{{latestVersion.emberCliVersion}}</p>
 {{/if}}
 
-<h6 class="test-addon-version-count">versions ({{addon.sortedVersions.length}})</h6>
+<h6 class="test-addon-version-count">versions ({{sortedAddonVersions.length}})</h6>
 
 <p>
-  {{addon-version-list versions=addon.sortedVersions}}
+  {{addon-version-list versions=sortedAddonVersions}}
 </p>
 
 <section class="badge test-addon-badge">

config/environment.js

@@ -1,9 +1,12 @@
-var parseFlag = require('./parse-flag');
+/* eslint-env node */
+'use strict';
+
+const parseFlag = require('./parse-flag');
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'ember-observer',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'router-scroll',
     historySupportMiddleware: true,

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();
+/* eslint-env node */
+'use strict';
+
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+const parseFlag = require('./config/parse-flag');
+const env = EmberApp.env();
 
 module.exports = function(defaults) {
-  var options = {
+  let options = {
     inlineContent: {},
     minifyJS: {},
     minifyCSS: {},
@@ -37,7 +38,7 @@ module.exports = function(defaults) {
 
   options.fingerprint.enabled = parseFlag('FINGERPRINT', env === 'production');
 
-  var app = new EmberApp(defaults, options);
+  let app = new EmberApp(defaults, options);
 
   // Use `app.import` to add additional libraries to the generated
   // output files.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ember-observer",
   "version": "0.0.0",
-  "description": "Small description for ember-observer goes here",
+  "description": "Small description for my-app goes here",
   "license": "MIT",
   "author": "",
   "directories": {
@@ -16,10 +16,10 @@
   },
   "devDependencies": {
     "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-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.3.0",
     "ember-cli-code-coverage": "0.3.11",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-deploy": "1.0.0-beta.2",
@@ -29,46 +29,46 @@
     "ember-cli-deploy-with-rsync": "0.0.3",
     "ember-cli-deprecation-workflow": "0.2.3",
     "ember-cli-document-title": "0.3.3",
-    "ember-cli-eslint": "3.0.2",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-eslint": "^3.0.0",
+    "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.1",
-    "ember-cli-mirage": "0.2.6",
+     "ember-cli-mirage": "0.2.6",
     "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-sass": "6.1.1",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-showdown": "2.11.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-template-lint": "0.5.2",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-concurrency": "0.7.19",
-    "ember-data": "^2.11.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
+    "ember-data": "~2.13.0",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-metrics": "0.8.1",
     "ember-moment": "7.3.0",
     "ember-multiselect-checkboxes": "0.10.2",
     "ember-pad": "1.2.2",
     "ember-power-select": "1.5.0-beta.0",
     "ember-power-select-typeahead": "0.5.5",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^4.0.0",
     "ember-router-scroll": "0.1.1",
     "ember-sanitize": "2.0.1",
-    "ember-source": "beta",
+    "ember-source": "~2.14.1",
     "emberx-select": "3.0.0",
     "eslint-plugin-ember-suave": "^1.0.0",
     "glob": "^7.1.1",
     "http-proxy": "^1.15.2",
-    "loader.js": "^4.0.10",
+    "loader.js": "^4.2.3",
     "morgan": "^1.7.0",
     "showdown": "^1.6.4"
   },
   "engines": {
-    "node": ">= 0.12.0"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "private": true
 }

testem.js

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

tests/acceptance/admin-test.js

@@ -130,7 +130,7 @@ test('renewing a review', function(assert) {
 
   andThen(function() {
     let newReview = server.schema.reviews.all().models[server.schema.reviews.all().models.length - 1];
-    assert.equal(newReview.version.id, latestVersion.id);
+    assert.equal(newReview.version.id, latestVersion.id, 'Review should be for the latest version');
     assert.equal(newReview.hasTests, 1);
     assert.equal(newReview.hasReadme, 4);
     assert.equal(newReview.isMoreThanEmptyAddon, 3);