Merge pull request #570 from toddjordan/upgrade-ember

Upgrade ember to 2.18

Author: sivakumar-kailasam

.eslintrc.js

@@ -38,6 +38,15 @@ module.exports = {
         browser: false,
         node: true
       }
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
     }
   ]
 };

.gitignore

@@ -17,6 +17,7 @@ terraform.tfstate.backup
 /bower_components
 
 # misc
+/.projectile
 /.sass-cache
 /connect.lock
 /coverage/*

.travis.yml

@@ -12,6 +12,11 @@ addons:
 cache:
   yarn: true
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
   - export PATH=$HOME/.yarn/bin:$PATH

app/components/search-input/dropdown-result.js

@@ -22,6 +22,7 @@ export default Component.extend({
     const { groupName, groupPosition } = this.getProperties('groupName', 'groupPosition');
     return groupPosition === 0? groupName : '';
   }),
-  isSecondary: gt('groupPosition', 0),
+  isSecondary: gt('groupPosition', 0)
+
 
 });

app/controllers/project-version.js

@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
+import { alias, readOnly } from '@ember/object/computed';
 import { A } from '@ember/array';
 import { inject as service } from '@ember/service';
 import values from 'npm:lodash.values';
@@ -16,7 +16,7 @@ export default Controller.extend({
 
   project: service(),
 
-  showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
+  showPrivateClasses: alias('filterData.sideNav.showPrivate'),
 
   classesIDs: computed('model', function() {
     return this.getRelationshipIDs('classes');
@@ -91,5 +91,5 @@ export default Controller.extend({
     return this.get('projectVersions').filter(pV => pV.id === this.get('model.version'))[0];
   }),
 
-  activeProject: computed.readOnly('model.project.id')
+  activeProject: readOnly('model.project.id')
 });

app/controllers/project-version/modules/module.js

@@ -1,3 +1,4 @@
+import { alias } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import ClassController from '../classes/class';
@@ -6,7 +7,7 @@ import union from 'npm:lodash.union';
 
 export default ClassController.extend({
   filterData: service(),
-  showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
+  showPrivateClasses: alias('filterData.sideNav.showPrivate'),
 
   submodules: computed('model', function() {
     return Object.keys(this.get('model.submodules'));

app/mixins/parent-name.js

@@ -1,11 +1,12 @@
+import { readOnly } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { inject as service } from '@ember/service';
 
 export default Mixin.create({
   router: service('-routing'),
 
-  routeName: computed.readOnly('router.currentRouteName'),
+  routeName: readOnly('router.currentRouteName'),
   parentName: computed('routeName', function() {
     const routeName = this.get('routeName');
     const routes = routeName.split('.');

app/styles/base/_buttons.scss

@@ -1,4 +1,4 @@
-#{$all-button-inputs},
+#{$all-buttons},
 button {
   appearance: none;;
   -webkit-font-smoothing: antialiased;

app/styles/components/_article.scss

@@ -6,7 +6,7 @@ article {
   }
 
   .edit-page {
-    @include size(24px 18px);
+    @include size(24px, 18px);
     color: $brown;
     display: inline-block;
     float: right;

app/styles/components/_highlight.scss

@@ -102,7 +102,7 @@
 
   .ribbon {
     @include position(absolute, 0.33em 0px null null);
-    @include size(52px 20px);
+    @include size(52px, 20px);
     background: 0 0 no-repeat;
     background-size: 52px 20px;
     z-index: 9;

bower.json

@@ -2,7 +2,6 @@
   "name": "ember-api-docs",
   "dependencies": {
     "bitters": "^1.5.0",
-    "bourbon": "^4.2.7",
     "highlightjs": "^9.8.0",
     "neat": "^1.8.0",
     "remarkable": "^1.7.1"

config/environment.js

@@ -1,4 +1,6 @@
 /* eslint-env node */
+'use strict';
+
 module.exports = function(environment) {
   let ALGOLIA_APP_ID = process.env.ALGOLIA_APP_ID || 'Y1OMR4C7MF';
   let ALGOLIA_API_KEY = process.env.ALGOLIA_API_KEY || 'c35425b69b31be1bb4786f0a72146306';
@@ -70,6 +72,7 @@ module.exports = function(environment) {
       defaultBreakpoints: ['mobile', 'desktop']
     };
 
+    ENV.APP.autoboot = false;
   }
 
   ENV.contentSecurityPolicy = {

config/targets.js

@@ -0,0 +1,8 @@
+module.exports = {
+  browsers: [
+    'ie 11',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};

ember-cli-build.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');

package.json

@@ -1,6 +1,7 @@
 {
   "name": "ember-api-docs",
   "version": "0.1.0",
+  "private": true,
   "description": "Small description for ember-api-docs goes here",
   "license": "MIT",
   "author": "Ember Learning Team and contributors",
@@ -14,60 +15,47 @@
   "scripts": {
     "build": "ember build",
     "postinstall": "npm rebuild node-sass",
-    "start": "ember server",
+    "lint:js": "eslint ./*.js app config lib server tests",
+    "start": "ember serve",
     "test": "node run-tests.js"
   },
-  "dependencies": {
-    "algoliasearch": "^3.24.3",
-    "ember-cli-browserstack": "^0.0.6",
-    "ember-rfc176-data": "^0.3.1",
-    "lodash.groupby": "^4.6.0",
-    "lodash.last": "^3.0.0",
-    "lodash.sortby": "^4.7.0",
-    "lodash.union": "^4.6.0",
-    "lodash.uniq": "^4.5.0",
-    "lodash.values": "^4.3.0",
-    "sanitize-html": "^1.18.2",
-    "semver-compare": "^1.0.0",
-    "testem": "^2.2.1"
-  },
   "devDependencies": {
     "broccoli-asset-rev": "^2.5.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^2.0.0",
-    "ember-a11y-testing": "^0.4.3",
-    "ember-algolia": "^0.0.6",
-    "ember-anchor": "~0.1.8",
+    "ember-a11y-testing": "^0.5.4",
+    "ember-algolia": "0.0.10",
+    "ember-anchor": "~0.2.0",
     "ember-browserify": "^1.2.0",
-    "ember-cli": "^2.14.1",
+    "ember-cli": "~2.18.1",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-autoprefixer": "^0.7.0",
     "ember-cli-babel": "^6.6.0",
-    "ember-cli-bourbon": "^1.2.2",
+    "ember-cli-bourbon": "^2.0.1",
     "ember-cli-clipboard": "0.8.1",
     "ember-cli-content-security-policy": "^0.6.1",
     "ember-cli-dependency-checker": "^2.0.1",
     "ember-cli-deploy": "^1.0.1",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-gzip": "^1.0.0",
-    "ember-cli-document-title": "^0.3.3",
-    "ember-cli-eslint": "^4.2.0",
+    "ember-cli-document-title": "^0.4.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-fastboot": "^1.0.1",
     "ember-cli-htmlbars": "^2.0.2",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.7.0",
     "ember-cli-meta-tags": "^5.0.0",
     "ember-cli-qunit": "^4.3.0",
     "ember-cli-sass": "^8.0.1",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-template-lint": "^0.7.1",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-composable-helpers": "^2.0.3",
     "ember-concurrency": "0.8.18",
-    "ember-data": "^2.14.8",
-    "ember-data-fastboot": "0.1.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-exam": "^0.7.0",
+    "ember-data": "~2.18.0",
+    "ember-data-fastboot": "^0.1.2",
+    "ember-disable-proxy-controllers": "^1.0.2",
+    "ember-exam": "^1.0.0",
     "ember-export-application-global": "^2.0.0",
     "ember-fetch": "^3.2.9",
     "ember-inflector": "^2.0.1",
@@ -79,7 +67,7 @@
     "ember-power-select": "^1.9.2",
     "ember-resolver": "^4.3.0",
     "ember-route-action-helper": "^2.0.5",
-    "ember-source": "^2.14.1",
+    "ember-source": "~2.18.0",
     "ember-styleguide": "^2.3.1",
     "ember-svg-jar": "^1.2.2",
     "ember-test-selectors": "^0.3.6",
@@ -99,7 +87,21 @@
     "node": ">= 8",
     "npm": "5"
   },
-  "private": true,
+  "dependencies": {
+    "algoliasearch": "^3.24.3",
+    "bourbon": "5.1.0",
+    "ember-cli-browserstack": "^0.0.6",
+    "ember-rfc176-data": "^0.3.1",
+    "lodash.groupby": "^4.6.0",
+    "lodash.last": "^3.0.0",
+    "lodash.sortby": "^4.7.0",
+    "lodash.union": "^4.6.0",
+    "lodash.uniq": "^4.5.0",
+    "lodash.values": "^4.3.0",
+    "sanitize-html": "^1.18.2",
+    "semver-compare": "^1.0.0",
+    "testem": "^2.2.1"
+  },
   "cacheDirectories": [
     "bower_components",
     "node_modules"

public/crossdomain.xml

@@ -1,6 +1,6 @@
 import moduleForAcceptance from 'ember-api-docs/tests/helpers/module-for-acceptance';
 import { test } from 'qunit';
-import { visit, click, findAll} from 'ember-native-dom-helpers';
+import { visit, click, findAll } from 'ember-native-dom-helpers';
 
 moduleForAcceptance('Acceptance | Creating Anchors');
 

tests/acceptance/anchors-test.js

@@ -1,6 +1,6 @@
 import moduleForAcceptance from 'ember-api-docs/tests/helpers/module-for-acceptance';
 import { test } from 'qunit';
-import { visit, click, findAll} from 'ember-native-dom-helpers';
+import { visit, click, findAll } from 'ember-native-dom-helpers';
 
 moduleForAcceptance('Acceptance | ItemRoutes');
 

tests/acceptance/items-test.js

@@ -9,6 +9,7 @@ registerPowerSelectHelpers();
 
 export default function startApp(attrs) {
   let attributes = merge({}, config.APP);
+  attributes.autoboot = true;
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {

tests/helpers/resolver.js

@@ -1,8 +1,8 @@
-import resolver from './helpers/resolver';
-import { setResolver } from '@ember/test-helpers';
+import Application from '../app';
+import config from '../config/environment';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
 import loadEmberExam from 'ember-exam/test-support/load';
-import { start } from 'ember-cli-qunit';
-
-setResolver(resolver);
 loadEmberExam();
+setApplication(Application.create(config.APP));
 start();