Refresh dependencies

Author: dfreeman

.eslintrc.js

@@ -4,12 +4,60 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
     'no-unused-vars': ["error", { "args": "none" }],
-    'no-console': ["error", { allow: ["warn", "error"] }]
-  }
+    'no-console': ["error", { allow: ["warn", "error"] }],
+
+    // ember-keyboard uses events
+    'ember/no-on-calls-in-components': 'off',
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'lib/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };

.gitignore

@@ -14,5 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
-package-lock.json
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -11,17 +11,14 @@ addons:
 
 cache:
   yarn: true
-  directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
 
 env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
   matrix:
-    - EMBER_TRY_SCENARIO=ember-lts-2.8
     - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary
@@ -38,9 +35,10 @@ before_install:
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - yarn install --no-lockfile
+  - yarn install --no-lockfile --non-interactive
 
 script:
+  - yarn lint:js
   # We need to cleanup, since our deploy depends on the git repo's status
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
 

addon/components/docs-viewer/component.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
 import $ from 'jquery';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import layout from './template';
 import { EKMixin, keyDown } from 'ember-keyboard';
+import { on } from '@ember/object/evented';
 
 export default Component.extend(EKMixin, {
   layout,
@@ -27,19 +27,19 @@ export default Component.extend(EKMixin, {
     this.get('docsRoutes').resetState();
   },
 
-  nextPage: Ember.on(keyDown('KeyL'), keyDown('ArrowRight'), function() {
+  nextPage: on(keyDown('KeyL'), keyDown('ArrowRight'), function() {
     if (this.searchIsNotFocused() && this.get('docsRoutes.nextRoute')) {
       this.get('router').transitionTo(...this.get('docsRoutes.nextRoute'));
     }
   }),
 
-  previousPage: Ember.on(keyDown('KeyH'), keyDown('ArrowLeft'), function() {
+  previousPage: on(keyDown('KeyH'), keyDown('ArrowLeft'), function() {
     if (this.searchIsNotFocused() && this.get('docsRoutes.previousRoute')) {
       this.get('router').transitionTo(...this.get('docsRoutes.previousRoute'));
     }
   }),
 
-  pageDown: Ember.on(keyDown('KeyJ'), function() {
+  pageDown: on(keyDown('KeyJ'), function() {
     if (this.searchIsNotFocused()) {
       let $el = $("#docs-viewer__scroll-body");
 
@@ -52,7 +52,7 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  halfPageDown: Ember.on(keyDown('ctrl+KeyJ'), function() {
+  halfPageDown: on(keyDown('ctrl+KeyJ'), function() {
     if (this.searchIsNotFocused()) {
       let $el = $("#docs-viewer__scroll-body");
 
@@ -65,7 +65,7 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  pageUp: Ember.on(keyDown('KeyK'), function() {
+  pageUp: on(keyDown('KeyK'), function() {
     if (this.searchIsNotFocused()) {
       let $el = $("#docs-viewer__scroll-body");
 
@@ -78,7 +78,7 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  halfPageUp: Ember.on(keyDown('ctrl+KeyK'), function() {
+  halfPageUp: on(keyDown('ctrl+KeyK'), function() {
     if (this.searchIsNotFocused()) {
       let $el = $("#docs-viewer__scroll-body");
 

addon/components/docs-viewer/x-search/component.js

@@ -1,9 +1,10 @@
-import Ember from 'ember';
 import { inject as service } from '@ember/service';
 import { debounce } from '@ember/runloop';
 import Component from '@ember/component';
 import layout from './template';
 import { EKMixin, keyUp, keyDown } from 'ember-keyboard';
+import { on } from '@ember/object/evented';
+import { computed } from '@ember/object';
 
 export default Component.extend(EKMixin, {
   layout,
@@ -42,7 +43,7 @@ export default Component.extend(EKMixin, {
     }
   },
 
-  searchResults: Ember.computed('rawSearchResults.[]', function() {
+  searchResults: computed('rawSearchResults.[]', function() {
     let rawSearchResults = this.get('rawSearchResults');
 
     if (rawSearchResults) {
@@ -59,7 +60,7 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  gotoSelectedItem: Ember.on(keyUp('Enter'), function() {
+  gotoSelectedItem: on(keyUp('Enter'), function() {
     if (this.get('selectedIndex') !== null) {
       let selectedResult = this.get('searchResults')[this.get('selectedIndex')];
       if (selectedResult.document.type === 'template') {
@@ -72,7 +73,7 @@ export default Component.extend(EKMixin, {
     this.clearSearch();
   }),
 
-  nextSearchResult: Ember.on(keyDown('ctrl+KeyN'), function() {
+  nextSearchResult: on(keyDown('ctrl+KeyN'), function() {
     let hasSearchResults = this.get('searchResults.length');
     let lastResultIsSelected = (this.get('selectedIndex') + 1 === this.get('searchResults.length'));
 
@@ -81,7 +82,7 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  previousSearchResult: Ember.on(keyDown('ctrl+KeyP'), function() {
+  previousSearchResult: on(keyDown('ctrl+KeyP'), function() {
     let hasSearchResults = this.get('searchResults.length');
     let firstResultIsSelected = (this.get('selectedIndex') === 0);
 
@@ -90,11 +91,11 @@ export default Component.extend(EKMixin, {
     }
   }),
 
-  focusSearch: Ember.on(keyUp('Slash'), keyUp('KeyS'), function() {
+  focusSearch: on(keyUp('Slash'), keyUp('KeyS'), function() {
     this.$('.docs-viewer-search__input').focus();
   }),
 
-  unfocusSearch: Ember.on(keyUp('Escape'), function() {
+  unfocusSearch: on(keyUp('Escape'), function() {
     this.setProperties({
       rawSearchResults: null,
       didSearch: false

addon/controllers/application.js

@@ -1,38 +1,39 @@
-import Ember from 'ember';
 import Controller from '@ember/controller';
 import { EKMixin, keyUp } from 'ember-keyboard';
 import { inject as service } from '@ember/service';
+import { on } from '@ember/object/evented';
+import { later } from '@ember/runloop';
 
 export default Controller.extend(EKMixin, {
 
   router: service(),
 
   isShowingKeyboardShortcuts: false,
 
-  activateKeyboard: Ember.on('init', function() {
+  activateKeyboard: on('init', function() {
     this.set('keyboardActivated', true);
   }),
 
-  goto: Ember.on(keyUp('KeyG'), function() {
+  goto: on(keyUp('KeyG'), function() {
     this.set('isGoingTo', true);
-    Ember.run.later(() => {
+    later(() => {
       this.set('isGoingTo', false);
     }, 500);
   }),
 
-  gotoDocs: Ember.on(keyUp('KeyD'), function() {
+  gotoDocs: on(keyUp('KeyD'), function() {
     if (this.get('isGoingTo')) {
       this.get('router').transitionTo('docs');
     }
   }),
 
-  gotoHome: Ember.on(keyUp('KeyH'), function() {
+  gotoHome: on(keyUp('KeyH'), function() {
     if (this.get('isGoingTo')) {
       this.get('router').transitionTo('index');
     }
   }),
 
-  toggleKeyboardShortcuts: Ember.on(keyUp('shift+Slash'), function() {
+  toggleKeyboardShortcuts: on(keyUp('shift+Slash'), function() {
     this.toggleProperty('isShowingKeyboardShortcuts');
   }),
 

addon/models/project-version.js

@@ -11,9 +11,6 @@ export default DS.Model.extend({
   modules: hasMany('module', { async: false }),
   classes: hasMany('class', { async: false }),
 
-  classesSorting: ['name'],
+  classesSorting: ['name'], // eslint-disable-line ember/avoid-leaking-state-in-ember-objects
   sortedClasses: sort('classes', 'classesSorting'),
-
-
-
 });

app/components/modal-dialog.js

@@ -1,18 +1,19 @@
 import ModalDialog from 'ember-modal-dialog/components/modal-dialog';
-import Ember from 'ember';
+import { on } from '@ember/object/evented';
+import $ from 'jquery';
 
 export default ModalDialog.extend({
 
-  setup: Ember.on('didInsertElement', function() {
-    Ember.$('body').on('keyup.modal-dialog', (e) => {
+  setup: on('didInsertElement', function() {
+    $('body').on('keyup.modal-dialog', (e) => {
       if (e.keyCode === 27) {
-        this.sendAction('onClose');
+        this.sendAction('onClose'); // eslint-disable-line ember/closure-actions
       }
     });
   }),
 
-  teardown: Ember.on('willDestroyElement', function() {
-    Ember.$('body').off('keyup.modal-dialog');
+  teardown: on('willDestroyElement', function() {
+    $('body').off('keyup.modal-dialog');
   })
 
 });

blueprints/.eslintrc.js

@@ -1,28 +1,19 @@
-/* eslint-env node */
 module.exports = {
   useYarn: true,
   scenarios: [
     {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
-        },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.12.0'
         }
       }
     },
     {
-      name: 'ember-lts-2.12',
+      name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0'
+          'ember-source': '~2.16.0'
         }
       }
     },

config/ember-try.js

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

config/environment.js

@@ -1,4 +1,5 @@
-/* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {

ember-cli-build.js

@@ -1,12 +1,11 @@
-/* eslint-env node */
 'use strict';
 
 const fs = require('fs');
 const path = require('path');
 const resolve = require('resolve');
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
-const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+const EmberApp = require('ember-cli/lib/broccoli/ember-app'); // eslint-disable-line node/no-unpublished-require
 
 module.exports = {
   name: 'ember-cli-addon-docs',