Use latest eslintrc & fix errors

cyk · Jun 16, 2018 · 64cc7b6 · 64cc7b6
1 parent bda1643
commit 64cc7b6
Show file tree

Hide file tree

Showing 17 changed files with 57 additions and 80 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,61 +4,40 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  plugins: ['ember'],
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
-    'browser': true
-  },
-  globals: {
-    'heimdall': true,
-    'FastBoot': true
+    browser: true
   },
   rules: {
     'ember/no-jquery': 'off',
-    'no-unused-vars': ['error', {
-      'args': 'none',
-    }],
-
-    // from JSHint
-    'no-cond-assign': ['error', 'except-parens'],
-    'eqeqeq': 'error',
-    'no-eval': 'error',
-    'new-cap': ['error', {
-      'capIsNew': false,
-    }],
-    'no-caller': 'error',
-    'no-irregular-whitespace': 'error',
-    'no-undef': 'error',
-    'no-eq-null': 'error',
-
-    // from JSCS
-    'array-bracket-spacing': ['error', 'never'],
-    'comma-style': ['error', 'last'],
-    'brace-style': ['error', '1tbs', {
-      'allowSingleLine': true,
-    }],
-    'no-spaced-func': 'error',
-    'no-empty': 'error',
-    'curly': ['error', 'all'],
-    'eol-last': 'error',
-    'no-trailing-spaces': 'error',
-    'comma-dangle': ['error', 'never'],
-    'space-before-blocks': ['error', 'always'],
-    'indent': ['error', 2, {
-      'SwitchCase': 1,
-    }],
-    'keyword-spacing': ['error', {
-      'overrides': {
-        'else': {
-          'before': true,
-        },
-        'while': {
-          'before': true,
-        },
-        'catch': {
-          'before': true,
-        },
+    'no-console': 'off',
+    'ember/avoid-leaking-state-in-ember-objects': 1
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'lib/**/*.js',
+        'bin/*',
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
       },
-    }],
-  }
+      env: {
+        browser: false,
+        node: true
+      }
+    }
+  ]
 };
diff --git a/app/components/api-index.js b/app/components/api-index.js
@@ -3,7 +3,7 @@ import Component from '@ember/component';
 
 export default Component.extend({
 
-  sections: computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
+  sections: computed('itemData.{methods,properties,events}', function () {
     return [
       {
         title: 'Methods',

diff --git a/app/components/class-field-description.js b/app/components/class-field-description.js
@@ -5,7 +5,7 @@ import { computed } from '@ember/object';
 export default Component.extend({
   legacyModuleMappings: service(),
 
-  hasImportExample: computed('field.name', 'field.class', function () {
+  hasImportExample: computed('field.{name,class}', function () {
     return this.get('legacyModuleMappings').hasFunctionMapping(this.get('field.name'), this.get('field.class'));
   }),
 
@@ -15,5 +15,5 @@ export default Component.extend({
    * @method updateAnchor
    * @method fieldName String The name representing the field that was clicked.
    */
-  updateAnchor(fieldName) {}
+  updateAnchor() {}
 });
diff --git a/app/components/search-input.js b/app/components/search-input.js
@@ -3,8 +3,8 @@ import { A } from '@ember/array';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
-import get from 'ember-metal/get';
-import set from 'ember-metal/set';
+import { get } from '@ember/object';
+import { set } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 
 const SEARCH_DEBOUNCE_PERIOD = 300;

diff --git a/app/controllers/project-version/index.js b/app/controllers/project-version/index.js
diff --git a/app/helpers/better-get.js b/app/helpers/better-get.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 /**
  * gives a similar functionality to the get helper, but it supports dot separated
@@ -8,4 +8,4 @@ export function betterGet(params/*, hash*/) {
   return params[0][params[1]];
 }
 
-export default Ember.Helper.helper(betterGet);
+export default helper(betterGet);
diff --git a/app/helpers/version-lt.js b/app/helpers/version-lt.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
-/**
- * Converts a compact version string like '2.16' into an int array [2, 16]
- */
+/** Converts a compact version string like '2.16' into an int array [2, 16] */
 function toIntArray(versionStr) {
   let versionStrArray = versionStr.split('.');
   return versionStrArray.map(item => parseInt(item))
@@ -24,5 +22,5 @@ export function versionLt(params/*, hash*/) {
      minor(currentVersionArray) < minor(compareToVersionArray));
 }
 
-export default Ember.Helper.helper(versionLt);
+export default helper(versionLt);
 
diff --git a/app/mixins/hash-redirect.js b/app/mixins/hash-redirect.js
@@ -3,7 +3,7 @@ import { hasRedirectableHash, hashToUrl } from '../utils/hash-to-url';
 
 export default Mixin.create({
 
-  afterModel(model, transition) {
+  afterModel() {
     this._super(...arguments);
     if (hasRedirectableHash(window)) {
       this.transitionTo(hashToUrl(window));

diff --git a/app/routes/application.js b/app/routes/application.js
@@ -20,7 +20,7 @@ export default Route.extend({
     }
     return '';
   },
-  afterModel(resolvedModel, transition) {
+  afterModel() {
     set(this, 'headData.cdnDomain', ENV.API_HOST);
     return this._super(...arguments);
   }

diff --git a/app/serializers/application.js b/app/serializers/application.js
@@ -5,7 +5,7 @@ export default DS.JSONAPISerializer.extend({
 
   metaStore: service(),
 
-  normalizeFindRecordResponse(store, primaryModelClass, payload, id, requestType) {
+  normalizeFindRecordResponse(store, primaryModelClass, payload, id) {
     let normalizedDocument = this._super(...arguments);
 
     // We do this because ember data doesn't handle meta data in accordance to json-api spec yet

diff --git a/app/services/legacy-module-mappings.js b/app/services/legacy-module-mappings.js
@@ -1,15 +1,15 @@
-import Ember from 'ember';
 import fetch from 'fetch';
 import { task } from 'ember-concurrency';
 import config from 'ember-api-docs/config/environment';
+import Service from '@ember/service';
 
 const LOCALNAME_CONVERSIONS = {
   Object: 'EmberObject',
   Array: 'EmberArray',
   Error: 'EmberError'
 };
 
-export default Ember.Service.extend({
+export default Service.extend({
 
   init() {
     this.get('initMappings').perform();
@@ -95,7 +95,7 @@ export default Ember.Service.extend({
     return filtered.length > 0;
   },
 
-  hasClassMapping(name, module) {
+  hasClassMapping(name) {
     if (!this.get('initMappings.isIdle')) {
       return false;
     }

diff --git a/app/services/meta-store.js b/app/services/meta-store.js
@@ -41,7 +41,7 @@ export default Service.extend({
 
   getFullVersion(projectName, compactProjVersion) {
     const availProjVersions = this.get(`availableProjectVersions.${projectName}`);
-    let filtered = availProjVersions.filter((v, index) => getCompactVersion(v) === getCompactVersion(compactProjVersion));
+    let filtered = availProjVersions.filter((v) => getCompactVersion(v) === getCompactVersion(compactProjVersion));
     // since there can be multiple full versions that match the compact version, use the most recent one.
     return filtered.reduce((accumulator, current) => accumulator.split('.')[2] < current.split('.')[2] ? current : accumulator);
   }

diff --git a/bin/ember-fastboot b/bin/ember-fastboot
@@ -36,7 +36,7 @@ const httpServer = new ExpressHTTPServer(serverOptions);
 const app = httpServer.app;
 
 app.use(express.static(distPath, {
-  setHeaders(res, path, stat) {
+  setHeaders(res) {
     res.setHeader('Cache-Control', 'public, max-age=365000000, immutable');
     res.removeHeader('X-Powered-By');
   }
@@ -46,7 +46,7 @@ app.use(express.static(distPath, {
 app.use(function(req, res, next) {
   const originalSendFn = res.send;
 
-  res.send = function(data) {
+  res.send = function() {
     if (res.hasHeader('location')) {
       let originalLocation = res.getHeader('location');
 

diff --git a/config/environment.js b/config/environment.js
@@ -28,7 +28,7 @@ module.exports = function(environment) {
     },
 
     fastboot: {
-      hostWhitelist: [/^[\w\-]+\.herokuapp\.com$/, /^localhost:\d+$/, /^127\.0\.0\.1:\d+$/, /^[\w\-]+\.fastly\.net$/]
+      hostWhitelist: [/^[\w-]+\.herokuapp\.com$/, /^localhost:\d+$/, /^127\.0\.0\.1:\d+$/, /^[\w-]+\.fastly\.net$/]
     },
     'ember-algolia': {
       algoliaId: ALGOLIA_APP_ID,

diff --git a/lib/hash-to-query/index.js b/lib/hash-to-query/index.js
@@ -8,7 +8,7 @@ module.exports = {
     return true;
   },
 
-  contentFor (type, config) {
+  contentFor (type) {
     if (type === 'body') {
       return `
 <script type='text/javascript'>

diff --git a/tests/acceptance/analytics-page-tracking-test.js b/tests/acceptance/analytics-page-tracking-test.js
@@ -15,7 +15,7 @@ test('checking that trackPage gets called on transitions', async function(assert
 
   // extend the method to add assertion in it
   let oldTrackPage = analyticsService.trackPage;
-  analyticsService.trackPage = (page, title) => {
+  analyticsService.trackPage = (page) => {
     run(() => {
       oldTrackPage.apply(analyticsService, ...arguments).then(() => assert.equal(page, pagesClone.shift()));
     });

diff --git a/tests/unit/controllers/project-version-test.js b/tests/unit/controllers/project-version-test.js
@@ -34,7 +34,7 @@ moduleFor('controller:project-version', 'Unit | Controller | project version', {
 
 test('should render module names', function(assert) {
   let controller = this.subject({
-    getRelations(relationship) {
+    getRelations() {
       return moduleIds;
     }
   });