ember-cli 3.18, some lint fixes (#475)

Author: RobbieTheWagner

.eslintrc.js

@@ -30,7 +30,11 @@ module.exports = {
     'ember/require-return-from-computed': 'off',
     'ember/no-jquery': 'error',
     // ember-keyboard uses events
-    'ember/no-on-calls-in-components': 'off'
+    'ember/no-on-calls-in-components': 'off',
+
+    // TODO: enable these rules
+    'ember/no-get': 'off',
+    'ember/no-private-routing-service': 'off'
   },
   overrides: [
     // node files

addon/adapters/-addon-docs.js

@@ -1,8 +1,8 @@
-import DS from 'ember-data';
+import Adapter from '@ember-data/adapter';
 import config from 'ember-get-config';
 import { inject as service } from '@ember/service';
 
-export default DS.Adapter.extend({
+export default Adapter.extend({
   defaultSerializer: '-addon-docs',
   namespace: `${config.rootURL.replace(/\/$/, '')}/docs`,
   docsFetch: service(),
@@ -17,7 +17,7 @@ export default DS.Adapter.extend({
 
   findRecord(store, modelClass, id, snapshot) {
     if (modelClass.modelName === 'project') {
-      return this.get('docsFetch').fetch({ url: `${this.namespace}/${id}.json` }).json();
+      return this.docsFetch.fetch({ url: `${this.namespace}/${id}.json` }).json();
     } else {
       return store.peekRecord(modelClass.modelName, id);
     }

addon/components/api/x-class/component.js

@@ -33,7 +33,7 @@ export default Component.extend({
 
   hasContents: computed('class', {
     get() {
-      let klass = this.get('class');
+      let klass = this.class;
 
       return klass.get('allFields.length') > 0
         || klass.get('allAccessors.length') > 0

addon/components/api/x-component/component.js

@@ -33,7 +33,7 @@ export default Component.extend({
 
   hasContents: computed('component', {
     get() {
-      let component = this.get('component');
+      let component = this.component;
 
       return component.get('overloadedYields.length') > 0
         || component.get('arguments.length') > 0

addon/components/docs-demo/component.js

@@ -55,9 +55,9 @@ export default Component.extend({
     @readOnly
    */
   snippets: computed('activeSnippet', 'snippetRegistrations.[]', function() {
-    let activeSnippet = this.get('activeSnippet');
+    let activeSnippet = this.activeSnippet;
 
-    return this.get('snippetRegistrations')
+    return this.snippetRegistrations
       .map(({ name, label, language }) => {
         let defaults = this.defaultsFromName(name);
         return {
@@ -113,7 +113,7 @@ export default Component.extend({
       @param {Object} snippet
     */
     registerSnippet(snippet) {
-      this.get('snippetRegistrations').pushObject(snippet);
+      this.snippetRegistrations.pushObject(snippet);
 
       if (this.get('snippetRegistrations.length') === 1) {
         this.set('activeSnippet', snippet.name);

addon/components/docs-demo/x-example/component.js

@@ -8,6 +8,6 @@ export default Component.extend({
 
   init() {
     this._super(...arguments);
-    this.set('elementId', 'example-' + this.get('name'));
+    this.set('elementId', 'example-' + this.name);
   }
 });

addon/components/docs-header/component.js

@@ -41,7 +41,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    this.get('projectVersion').loadAvailableVersions();
+    this.projectVersion.loadAvailableVersions();
   },
 
   logo: classify(addonLogo(projectName)),

addon/components/docs-header/link/component.js

@@ -11,7 +11,7 @@ export default Component.extend({
 
   isActive: computed('router.currentRouteName', 'route', function() {
     // Naive isActive check. Replace with router service when updated.
-    return this.get('router.currentRouteName').indexOf(this.get('route')) === 0;
+    return this.get('router.currentRouteName').indexOf(this.route) === 0;
   })
 
 }).reopenClass({

addon/components/docs-header/search-box/component.js

@@ -22,7 +22,7 @@ export default Component.extend(EKMixin, {
   didInsertElement() {
     this._super();
 
-    this.get('fetchProject').perform();
+    this.fetchProject.perform();
   },
 
   // TODO: The searchbox doesn't work without the project being fetched.
@@ -31,7 +31,7 @@ export default Component.extend(EKMixin, {
   // I think it's fine if our Docs-* components assume there is a single global
   // project.
   fetchProject: task(function*() {
-    yield this.get('store').findRecord('project', projectName);
+    yield this.store.findRecord('project', projectName);
   }),
 
   focusSearch: on(keyUp('Slash'), function() {

addon/components/docs-header/search-result/component.js

@@ -10,7 +10,7 @@ export default Component.extend({
   onClick() {},
   onMouseEnter() {},
 
-  linkArgs: computed('result.document', function() {
+  linkArgs: computed('result.document.{route,type}', 'result.model.routingId', function() {
     let args = [];
     let type = this.get('result.document.type');
     if (type === 'template') {
@@ -23,21 +23,21 @@ export default Component.extend({
     return args;
   }),
 
-  icon: computed(function() {
+  icon: computed('result.document.type', function() {
     if (this.get('result.document.type') === 'template') {
       return 'guide';
     } else {
       return 'api-item';
     }
   }),
 
-  matches: computed(function() {
+  matches: computed('query', 'result.document.{keywords,text}', 'result.resultInfo.matchData.metadata', function() {
     let metadata = this.get('result.resultInfo.matchData.metadata');
 
     return Object.keys(metadata)
       .reduce((matches, term) => {
         let match = metadata[term];
-        let query = this.get('query');
+        let query = this.query;
         let normalizedQuery = query.toLowerCase();
         Object.keys(match).forEach((key) => {
           if (key === 'text') {
@@ -78,7 +78,7 @@ export default Component.extend({
     return this.matches[0];
   }),
 
-  highlightedTitle: computed('result.document.title', 'query', function() {
+  highlightedTitle: computed('query.length', 'result.document.title', function() {
     let title = this.result.document.title || '';
     let match = title.match(new RegExp(this.query, 'i'));