Merge branch 'leipert-upgrade-eslint' into 'master'

Upgrade eslint 3 -> 4 Closes #40476 See merge request gitlab-org/gitlab-ce!19182

Merge branch 'leipert-upgrade-eslint' into 'master'
Upgrade eslint 3 -> 4 Closes #40476 See merge request gitlab-org/gitlab-ce!19182
7d1a9ef3 · Mike Greiling · e1b3a11f · e9c5e57b · e1b3a11f · 7d1a9ef3
Commit 7d1a9ef3 authored May 30, 2018 by Mike Greiling
36 changed files
--- a/.eslintrc
+++ b/.eslintrc
-{
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "extends": [
-    "airbnb-base",
-    "plugin:vue/recommended"
-  ],
-  "globals": {
-    "__webpack_public_path__": true,
-    "gl": false,
-    "gon": false,
-    "localStorage": false
-  },
-  "parserOptions": {
-    "parser": "babel-eslint"
-  },
-  "plugins": [
-    "filenames",
-    "import",
-    "html",
-    "promise"
-  ],
-  "settings": {
-    "html/html-extensions": [".html", ".html.raw"],
-    "import/resolver": {
-      "webpack": {
-        "config": "./config/webpack.config.js"
-      }
-    }
-  },
-  "rules": {
-    "filenames/match-regex": [2, "^[a-z0-9_]+$"],
-    "import/no-commonjs": "error",
-    "no-multiple-empty-lines": ["error", { "max": 1 }],
-    "promise/catch-or-return": "error",
-    "no-underscore-dangle": ["error", { "allow": ["__", "_links"] }],
-    "no-mixed-operators": 0,
-    "space-before-function-paren": 0,
-    "curly": 0,
-    "arrow-parens": 0,
-    "vue/html-self-closing": [
-      "error",
-      {
-        "html": {
-          "void": "always",
-          "normal": "never",
-          "component": "always"
-        },
-        "svg": "always",
-        "math": "always"
-      }
-    ]
-  }
-}
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
+---
+env:
+  browser: true
+  es6: true
+extends:
+  - airbnb-base
+  - plugin:vue/recommended
+globals:
+  __webpack_public_path__: true
+  gl: false
+  gon: false
+  localStorage: false
+parserOptions:
+  parser: babel-eslint
+plugins:
+  - filenames
+  - import
+  - html
+  - promise
+settings:
+  html/html-extensions:
+  - ".html"
+  - ".html.raw"
+  import/resolver:
+    webpack:
+      config: "./config/webpack.config.js"
+rules:
+  filenames/match-regex:
+    - error
+    - "^[a-z0-9_]+$"
+  import/no-commonjs: error
+  no-multiple-empty-lines:
+    - error
+    - max: 1
+  promise/catch-or-return: error
+  no-underscore-dangle:
+    - error
+    - allow:
+      - __
+      - _links
+  no-mixed-operators: off
+  vue/html-self-closing:
+    - error
+    - html:
+        void: always
+        normal: never
+        component: always
+      svg: always
+      math: always
+  ## Conflicting rules with prettier:
+  space-before-function-paren: off
+  curly: off
+  arrow-parens: off
+  function-paren-newline: off
+  object-curly-newline: off
+  padded-blocks: off
+  # Disabled for now, to make the eslint 3 -> eslint 4 update smoother
+  ## Indent rule. We are using the old for now: https://eslint.org/docs/user-guide/migrating-to-4.0.0#indent-rewrite
+  indent: off
+  indent-legacy:
+    - error
+    - 2
+    - SwitchCase: 1
+      VariableDeclarator: 1
+      outerIIFEBody: 1
+      FunctionDeclaration:
+        parameters: 1
+        body: 1
+      FunctionExpression:
+        parameters: 1
+        body: 1
+  ## Destructuring: https://eslint.org/docs/rules/prefer-destructuring
+  prefer-destructuring: off
+  ## no-restricted-globals: https://eslint.org/docs/rules/no-restricted-globals
+  no-restricted-globals: off
+  ## no-multi-assign: https://eslint.org/docs/rules/no-multi-assign
+  no-multi-assign: off
--- a/app/assets/javascripts/boards/components/modal/list.js
+++ b/app/assets/javascripts/boards/components/modal/list.js
-/* global ListIssue */
 import Vue from 'vue';
 import bp from '../../../breakpoints';
 import ModalStore from '../../stores/modal_store';
@@ -56,8 +54,11 @@ gl.issueBoards.ModalList = Vue.extend({
    scrollHandler() {
      const currentPage = Math.floor(this.issues.length / this.perPage);
-      if ((this.scrollTop() > this.scrollHeight() - 100) && !this.loadingNewPage
+      if (
-        && currentPage === this.page) {
+        this.scrollTop() > this.scrollHeight() - 100 &&
+        !this.loadingNewPage &&
+        currentPage === this.page
+      ) {
        this.loadingNewPage = true;
        this.page += 1;
      }

--- a/app/assets/javascripts/boards/components/project_select.vue
+++ b/app/assets/javascripts/boards/components/project_select.vue
 <script>
-  /* global ListIssue */
+import $ from 'jquery';
+import _ from 'underscore';
+import eventHub from '../eventhub';
+import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import Api from '../../api';
-  import $ from 'jquery';
+export default {
-  import _ from 'underscore';
-  import eventHub from '../eventhub';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import Api from '../../api';
-  export default {
  name: 'BoardProjectSelect',
  components: {
    loadingIcon,
@@ -48,7 +46,7 @@
      selectable: true,
      data: (term, callback) => {
        this.loading = true;
-          return Api.groupProjects(this.groupId, term, (projects) => {
+        return Api.groupProjects(this.groupId, term, projects => {
          this.loading = false;
          callback(projects);
        });
@@ -65,7 +63,7 @@
      text: project => project.name,
    });
  },
-  };
+};
 </script>
 <template>

--- a/app/assets/javascripts/ide/lib/common/model.js
+++ b/app/assets/javascripts/ide/lib/common/model.js
-/* global monaco */
 import Disposable from './disposable';
 import eventHub from '../../eventhub';

--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -84,11 +84,11 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
    });
 };
-export const setFileMrChange = ({ state, commit }, { file, mrChange }) => {
+export const setFileMrChange = ({ commit }, { file, mrChange }) => {
  commit(types.SET_FILE_MERGE_REQUEST_CHANGE, { file, mrChange });
 };
-export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) => {
+export const getRawFileData = ({ state, commit }, { path, baseSha }) => {
  const file = state.entries[path];
  return new Promise((resolve, reject) => {
    service
@@ -156,7 +156,7 @@ export const setEditorPosition = ({ getters, commit }, { editorRow, editorColumn
  }
 };
-export const setFileViewMode = ({ state, commit }, { file, viewMode }) => {
+export const setFileViewMode = ({ commit }, { file, viewMode }) => {
  commit(types.SET_FILE_VIEWMODE, { file, viewMode });
 };

--- a/app/assets/javascripts/ide/stores/actions/merge_request.js
+++ b/app/assets/javascripts/ide/stores/actions/merge_request.js
@@ -3,7 +3,7 @@ import service from '../../services';
 import * as types from '../mutation_types';
 export const getMergeRequestData = (
-  { commit, state, dispatch },
+  { commit, state },
  { projectId, mergeRequestId, force = false } = {},
 ) =>
  new Promise((resolve, reject) => {
@@ -32,7 +32,7 @@ export const getMergeRequestData = (
  });
 export const getMergeRequestChanges = (
-  { commit, state, dispatch },
+  { commit, state },
  { projectId, mergeRequestId, force = false } = {},
 ) =>
  new Promise((resolve, reject) => {
@@ -58,7 +58,7 @@ export const getMergeRequestChanges = (
  });
 export const getMergeRequestVersions = (
-  { commit, state, dispatch },
+  { commit, state },
  { projectId, mergeRequestId, force = false } = {},
 ) =>
  new Promise((resolve, reject) => {

--- a/app/assets/javascripts/ide/stores/actions/project.js
+++ b/app/assets/javascripts/ide/stores/actions/project.js
@@ -7,10 +7,7 @@ import Poll from '../../../lib/utils/poll';
 let eTagPoll;
-export const getProjectData = (
+export const getProjectData = ({ commit, state }, { namespace, projectId, force = false } = {}) =>
-  { commit, state, dispatch },
-  { namespace, projectId, force = false } = {},
-) =>
  new Promise((resolve, reject) => {
    if (!state.projects[`${namespace}/${projectId}`] || force) {
      commit(types.TOGGLE_LOADING, { entry: state });
@@ -40,10 +37,7 @@ export const getProjectData = (
    }
  });
-export const getBranchData = (
+export const getBranchData = ({ commit, state }, { projectId, branchId, force = false } = {}) =>
-  { commit, state, dispatch },
-  { projectId, branchId, force = false } = {},
-) =>
  new Promise((resolve, reject) => {
    if (
      typeof state.projects[`${projectId}`] === 'undefined' ||
@@ -78,7 +72,7 @@ export const getBranchData = (
    }
  });
-export const refreshLastCommitData = ({ commit, state, dispatch }, { projectId, branchId } = {}) =>
+export const refreshLastCommitData = ({ commit }, { projectId, branchId } = {}) =>
  service
    .getBranchData(projectId, branchId)
    .then(({ data }) => {
@@ -92,7 +86,7 @@ export const refreshLastCommitData = ({ commit, state, dispatch }, { projectId,
      flash(__('Error loading last commit.'), 'alert', document, null, false, true);
    });
-export const pollSuccessCallBack = ({ commit, state, dispatch }, { data }) => {
+export const pollSuccessCallBack = ({ commit, state }, { data }) => {
  if (data.pipelines && data.pipelines.length) {
    const lastCommitHash =
      state.projects[state.currentProjectId].branches[state.currentBranchId].commit.id;

--- a/app/assets/javascripts/ide/stores/actions/tree.js
+++ b/app/assets/javascripts/ide/stores/actions/tree.js
@@ -5,7 +5,7 @@ import * as types from '../mutation_types';
 import { findEntry } from '../utils';
 import FilesDecoratorWorker from '../workers/files_decorator_worker';
-export const toggleTreeOpen = ({ commit, dispatch }, path) => {
+export const toggleTreeOpen = ({ commit }, path) => {
  commit(types.TOGGLE_TREE_OPEN, path);
 };
@@ -23,7 +23,7 @@ export const handleTreeEntryAction = ({ commit, dispatch }, row) => {
  }
 };
-export const getLastCommitData = ({ state, commit, dispatch, getters }, tree = state) => {
+export const getLastCommitData = ({ state, commit, dispatch }, tree = state) => {
  if (!tree || tree.lastCommitPath === null || !tree.lastCommitPath) return;
  service
@@ -49,7 +49,7 @@ export const getLastCommitData = ({ state, commit, dispatch, getters }, tree = s
    .catch(() => flash('Error fetching log data.', 'alert', document, null, false, true));
 };
-export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } = {}) =>
+export const getFiles = ({ state, commit }, { projectId, branchId } = {}) =>
  new Promise((resolve, reject) => {
    if (!state.trees[`${projectId}/${branchId}`]) {
      const selectedProject = state.projects[projectId];

--- a/app/assets/javascripts/ide/stores/modules/commit/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js
@@ -31,9 +31,9 @@ export const setLastCommitMessage = ({ rootState, commit }, data) => {
  const currentProject = rootState.projects[rootState.currentProjectId];
  const commitStats = data.stats
    ? sprintf(__('with %{additions} additions, %{deletions} deletions.'), {
-        additions: data.stats.additions, // eslint-disable-line indent
+        additions: data.stats.additions, // eslint-disable-line indent-legacy
-        deletions: data.stats.deletions, // eslint-disable-line indent
+        deletions: data.stats.deletions, // eslint-disable-line indent-legacy
-      }) // eslint-disable-line indent
+      }) // eslint-disable-line indent-legacy
    : '';
  const commitMsg = sprintf(
    __('Your changes have been committed. Commit %{commitId} %{commitStats}'),
@@ -74,10 +74,7 @@ export const checkCommitStatus = ({ rootState }) =>
      ),
    );
-export const updateFilesAfterCommit = (
+export const updateFilesAfterCommit = ({ commit, dispatch, rootState }, { data }) => {
-  { commit, dispatch, state, rootState, rootGetters },
-  { data },
-) => {
  const selectedProject = rootState.projects[rootState.currentProjectId];
  const lastCommit = {
    commit_path: `${selectedProject.web_url}/commit/${data.id}`,

--- a/app/assets/javascripts/job.js
+++ b/app/assets/javascripts/job.js
@@ -84,7 +84,7 @@ export default class Job {
      If the browser does not support position sticky, it returns the position as static.
      If the browser does support sticky, then we allow the browser to handle it, if not
      then we use a polyfill
-    **/
+    */
    if (this.$topBar.css('position') !== 'static') return;
    StickyFill.add(this.$topBar);

--- a/app/assets/javascripts/jobs/job_details_mediator.js
+++ b/app/assets/javascripts/jobs/job_details_mediator.js
-/* global Build */
 import Visibility from 'visibilityjs';
 import Flash from '../flash';
 import Poll from '../lib/utils/poll';
@@ -50,7 +48,8 @@ export default class JobMediator {
  }
  getJob() {
-    return this.service.getJob()
+    return this.service
+      .getJob()
      .then(response => this.successCallback(response))
      .catch(() => this.errorCallback());
  }

--- a/app/assets/javascripts/locale/index.js
+++ b/app/assets/javascripts/locale/index.js
@@ -9,7 +9,7 @@ delete window.translations;
  Translates `text`
  @param text The text to be translated
  @returns {String} The translated text
-**/
+*/
 const gettext = locale.gettext.bind(locale);
 /**
@@ -21,7 +21,7 @@ const gettext = locale.gettext.bind(locale);
  @param pluralText Plural text to translate (eg. '%d days')
  @param count Number to decide which translation to use (eg. 2)
  @returns {String} Translated text with the number replaced (eg. '2 days')
-**/
+*/
 const ngettext = (text, pluralText, count) => {
  const translated = locale.ngettext(text, pluralText, count).replace(/%d/g, count).split('|');
@@ -38,7 +38,7 @@ const ngettext = (text, pluralText, count) => {
                      (eg. 'Context')
  @param key Is the dynamic variable you want to be translated
  @returns {String} Translated context based text
-**/
+*/
 const pgettext = (keyOrContext, key) => {
  const normalizedKey = key ? `${keyOrContext}|${key}` : keyOrContext;
  const translated = gettext(normalizedKey).split('|');

--- a/app/assets/javascripts/locale/sprintf.js
+++ b/app/assets/javascripts/locale/sprintf.js
@@ -10,7 +10,7 @@ import _ from 'underscore';
  @see https://ruby-doc.org/core-2.3.3/Kernel.html#method-i-sprintf
  @see https://gitlab.com/gitlab-org/gitlab-ce/issues/37992
-**/
+*/
 export default (input, parameters, escapeParameters = true) => {
  let output = input;

--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -427,7 +427,7 @@ export default class MergeRequestTabs {
      If the browser does not support position sticky, it returns the position as static.
      If the browser does support sticky, then we allow the browser to handle it, if not
      then we default back to Bootstraps affix
-    **/
+    */
    if ($tabs.css('position') !== 'static') return;
    const $diffTabs = $('#diff-notes-app');

--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -12,20 +12,13 @@ import { isInViewport, scrollToElement } from '../../lib/utils/common_utils';
 let eTagPoll;
-export const setNotesData = ({ commit }, data) =>
+export const setNotesData = ({ commit }, data) => commit(types.SET_NOTES_DATA, data);
-  commit(types.SET_NOTES_DATA, data);
+export const setNoteableData = ({ commit }, data) => commit(types.SET_NOTEABLE_DATA, data);
-export const setNoteableData = ({ commit }, data) =>
+export const setUserData = ({ commit }, data) => commit(types.SET_USER_DATA, data);
-  commit(types.SET_NOTEABLE_DATA, data);
+export const setLastFetchedAt = ({ commit }, data) => commit(types.SET_LAST_FETCHED_AT, data);
-export const setUserData = ({ commit }, data) =>
+export const setInitialNotes = ({ commit }, data) => commit(types.SET_INITIAL_NOTES, data);
-  commit(types.SET_USER_DATA, data);
+export const setTargetNoteHash = ({ commit }, data) => commit(types.SET_TARGET_NOTE_HASH, data);
-export const setLastFetchedAt = ({ commit }, data) =>
+export const toggleDiscussion = ({ commit }, data) => commit(types.TOGGLE_DISCUSSION, data);
-  commit(types.SET_LAST_FETCHED_AT, data);
-export const setInitialNotes = ({ commit }, data) =>
-  commit(types.SET_INITIAL_NOTES, data);
-export const setTargetNoteHash = ({ commit }, data) =>
-  commit(types.SET_TARGET_NOTE_HASH, data);
-export const toggleDiscussion = ({ commit }, data) =>
-  commit(types.TOGGLE_DISCUSSION, data);
 export const fetchNotes = ({ commit }, path) =>
  service
@@ -69,20 +62,14 @@ export const createNewNote = ({ commit }, { endpoint, data }) =>
      return res;
    });
-export const removePlaceholderNotes = ({ commit }) =>
+export const removePlaceholderNotes = ({ commit }) => commit(types.REMOVE_PLACEHOLDER_NOTES);
-  commit(types.REMOVE_PLACEHOLDER_NOTES);
-export const toggleResolveNote = (
+export const toggleResolveNote = ({ commit }, { endpoint, isResolved, discussion }) =>
-  { commit },
-  { endpoint, isResolved, discussion },
-) =>
  service
    .toggleResolveNote(endpoint, isResolved)
    .then(res => res.json())
    .then(res => {
-      const mutationType = discussion
+      const mutationType = discussion ? types.UPDATE_DISCUSSION : types.UPDATE_NOTE;
-        ? types.UPDATE_DISCUSSION
-        : types.UPDATE_NOTE;
      commit(mutationType, res);
    });
@@ -114,7 +101,7 @@ export const reopenIssue = ({ commit, dispatch, state }) => {
 export const toggleStateButtonLoading = ({ commit }, value) =>
  commit(types.TOGGLE_STATE_BUTTON_LOADING, value);
-export const emitStateChangedEvent = ({ commit, getters }, data) => {
+export const emitStateChangedEvent = ({ getters }, data) => {
  const event = new CustomEvent('issuable_vue_app:change', {
    detail: {
      data,
@@ -179,10 +166,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
        loadAwardsHandler()
          .then(awardsHandler => {
-            awardsHandler.addAwardToEmojiBar(
+            awardsHandler.addAwardToEmojiBar(votesBlock, commandsChanges.emoji_award);
-              votesBlock,
-              commandsChanges.emoji_award,
-            );
            awardsHandler.scrollToAwards();
          })
          .catch(() => {
@@ -194,10 +178,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
          });
      }
-      if (
+      if (commandsChanges.spend_time != null || commandsChanges.time_estimate != null) {
-        commandsChanges.spend_time != null ||
-        commandsChanges.time_estimate != null
-      ) {
        sidebarTimeTrackingEventHub.$emit('timeTrackingUpdated', res);
      }
    }
@@ -218,14 +199,8 @@ const pollSuccessCallBack = (resp, commit, state, getters) => {
    resp.notes.forEach(note => {
      if (notesById[note.id]) {
        commit(types.UPDATE_NOTE, note);
-      } else if (
+      } else if (note.type === constants.DISCUSSION_NOTE || note.type === constants.DIFF_NOTE) {
-        note.type === constants.DISCUSSION_NOTE ||
+        const discussion = utils.findNoteObjectById(state.notes, note.discussion_id);
-        note.type === constants.DIFF_NOTE
-      ) {
-        const discussion = utils.findNoteObjectById(
-          state.notes,
-          note.discussion_id,
-        );
        if (discussion) {
          commit(types.ADD_NEW_REPLY_TO_DISCUSSION, note);
@@ -249,11 +224,8 @@ export const poll = ({ commit, state, getters }) => {
    method: 'poll',
    data: state,
    successCallback: resp =>
-      resp
+      resp.json().then(data => pollSuccessCallBack(data, commit, state, getters)),
-        .json()
+    errorCallback: () => Flash('Something went wrong while fetching latest comments.'),
-        .then(data => pollSuccessCallBack(data, commit, state, getters)),
-    errorCallback: () =>
-      Flash('Something went wrong while fetching latest comments.'),
  });
  if (!Visibility.hidden()) {
@@ -292,14 +264,11 @@ export const fetchData = ({ commit, state, getters }) => {
    .catch(() => Flash('Something went wrong while fetching latest comments.'));
 };
-export const toggleAward = (
+export const toggleAward = ({ commit, getters }, { awardName, noteId }) => {
-  { commit, state, getters, dispatch },
-  { awardName, noteId },
-) => {
  commit(types.TOGGLE_AWARD, { awardName, note: getters.notesById[noteId] });
 };
-export const toggleAwardRequest = ({ commit, getters, dispatch }, data) => {
+export const toggleAwardRequest = ({ dispatch }, data) => {
  const { endpoint, awardName } = data;
  return service

--- a/app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
+++ b/app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
@@ -5,7 +5,7 @@ import $ from 'jquery';
 *
 * Toggling this checkbox adds/removes a `remember_me` parameter to the
 * login buttons' href, which is passed on to the omniauth callback.
- **/
+ */
 export default class OAuthRememberMe {
  constructor(opts = {}) {

--- a/app/assets/javascripts/raven/raven_config.js
+++ b/app/assets/javascripts/raven/raven_config.js
--- a/app/assets/javascripts/registry/stores/actions.js
+++ b/app/assets/javascripts/registry/stores/actions.js
@@ -7,9 +7,10 @@ Vue.use(VueResource);
 export const fetchRepos = ({ commit, state }) => {
  commit(types.TOGGLE_MAIN_LOADING);
-  return Vue.http.get(state.endpoint)
+  return Vue.http
+    .get(state.endpoint)
    .then(res => res.json())
-    .then((response) => {
+    .then(response => {
      commit(types.TOGGLE_MAIN_LOADING);
      commit(types.SET_REPOS_LIST, response);
    });
@@ -18,19 +19,20 @@ export const fetchRepos = ({ commit, state }) => {
 export const fetchList = ({ commit }, { repo, page }) => {
  commit(types.TOGGLE_REGISTRY_LIST_LOADING, repo);
-  return Vue.http.get(repo.tagsPath, { params: { page } })
+  return Vue.http.get(repo.tagsPath, { params: { page } }).then(response => {
-    .then((response) => {
    const headers = response.headers;
-      return response.json().then((resp) => {
+    return response.json().then(resp => {
      commit(types.TOGGLE_REGISTRY_LIST_LOADING, repo);
      commit(types.SET_REGISTRY_LIST, { repo, resp, headers });
    });
  });
 };
+// eslint-disable-next-line no-unused-vars
 export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath);
+// eslint-disable-next-line no-unused-vars
 export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath);
 export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data);

--- a/app/assets/javascripts/vue_shared/translate.js
+++ b/app/assets/javascripts/vue_shared/translate.js
@@ -13,7 +13,7 @@ export default (Vue) => {
        @param text The text to be translated
        @returns {String} The translated text
-      **/
+      */
      __,
      /**
        Translate the text with a number
@@ -24,7 +24,7 @@ export default (Vue) => {
        @param pluralText Plural text to translate (eg. '%d days')
        @param count Number to decide which translation to use (eg. 2)
        @returns {String} Translated text with the number replaced (eg. '2 days')
-      **/
+      */
      n__,
      /**
        Translate context based text
@@ -36,7 +36,7 @@ export default (Vue) => {
                            (eg. 'Context')
        @param key Is the dynamic variable you want to be translated
        @returns {String} Translated context based text
-      **/
+      */
      s__,
      sprintf,
    },

--- a/package.json
+++ b/package.json
@@ -100,21 +100,21 @@
  },
  "devDependencies": {
    "axios-mock-adapter": "^1.15.0",
-    "babel-eslint": "^8.0.2",
+    "babel-eslint": "^8.2.3",
    "babel-plugin-istanbul": "^4.1.6",
    "babel-plugin-rewire": "^1.1.0",
    "babel-template": "^6.26.0",
    "babel-types": "^6.26.0",
    "chalk": "^2.4.1",
    "commander": "^2.15.1",
-    "eslint": "^3.18.0",
+    "eslint": "~4.12.1",
-    "eslint-config-airbnb-base": "^10.0.1",
+    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-import-resolver-webpack": "^0.8.3",
+    "eslint-import-resolver-webpack": "^0.10.0",
-    "eslint-plugin-filenames": "^1.1.0",
+    "eslint-plugin-filenames": "^1.2.0",
-    "eslint-plugin-html": "2.0.1",
+    "eslint-plugin-html": "4.0.3",
-    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-import": "^2.12.0",
    "eslint-plugin-jasmine": "^2.1.0",
-    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-promise": "^3.8.0",
    "eslint-plugin-vue": "^4.0.1",
    "ignore": "^3.3.7",
    "istanbul": "^0.4.5",

--- a/spec/javascripts/.eslintrc
+++ b/spec/javascripts/.eslintrc
-{
-  "env": {
-    "jasmine": true
-  },
-  "extends": "plugin:jasmine/recommended",
-  "globals": {
-    "appendLoadFixtures": false,
-    "appendLoadStyleFixtures": false,
-    "appendSetFixtures": false,
-    "appendSetStyleFixtures": false,
-    "getJSONFixture": false,
-    "loadFixtures": false,
-    "loadJSONFixtures": false,
-    "loadStyleFixtures": false,
-    "preloadFixtures": false,
-    "preloadStyleFixtures": false,
-    "readFixtures": false,
-    "sandbox": false,
-    "setFixtures": false,
-    "setStyleFixtures": false,
-    "spyOnDependency": false,
-    "spyOnEvent": false,
-    "ClassSpecHelper": false
-  },
-  "plugins": ["jasmine"],
-  "rules": {
-    "func-names": 0,
-    "jasmine/no-suite-dupes": [1, "branch"],
-    "jasmine/no-spec-dupes": [1, "branch"],
-    "no-console": 0,
-    "prefer-arrow-callback": 0
-  }
-}
--- a/spec/javascripts/.eslintrc.yml
+++ b/spec/javascripts/.eslintrc.yml
+---
+env:
+  jasmine: true
+extends: plugin:jasmine/recommended
+globals:
+  appendLoadFixtures: false
+  appendLoadStyleFixtures: false
+  appendSetFixtures: false
+  appendSetStyleFixtures: false
+  getJSONFixture: false
+  loadFixtures: false
+  loadJSONFixtures: false
+  loadStyleFixtures: false
+  preloadFixtures: false
+  preloadStyleFixtures: false
+  readFixtures: false
+  sandbox: false
+  setFixtures: false
+  setStyleFixtures: false
+  spyOnDependency: false
+  spyOnEvent: false
+  ClassSpecHelper: false
+plugins:
+  - jasmine
+rules:
+  func-names: off
+  jasmine/no-suite-dupes:
+    - warn
+    - branch
+  jasmine/no-spec-dupes:
+    - warn
+    - branch
+  no-console: off
+  prefer-arrow-callback: off
--- a/spec/javascripts/blob/notebook/index_spec.js
+++ b/spec/javascripts/blob/notebook/index_spec.js
@@ -84,9 +84,14 @@ describe('iPython notebook renderer', () => {
  describe('error in JSON response', () => {
    let mock;
-    beforeEach((done) => {
+    beforeEach(done => {
      mock = new MockAdapter(axios);
-      mock.onGet('/test').reply(() => Promise.reject({ status: 200, data: '{ "cells": [{"cell_type": "markdown"} }' }));
+      mock
+        .onGet('/test')
+        .reply(() =>
+          // eslint-disable-next-line prefer-promise-reject-errors
+          Promise.reject({ status: 200, data: '{ "cells": [{"cell_type": "markdown"} }' }),
+        );
      renderNotebook();

--- a/spec/javascripts/boards/board_blank_state_spec.js
+++ b/spec/javascripts/boards/board_blank_state_spec.js
-/* global BoardService */
 import Vue from 'vue';
 import '~/boards/stores/boards_store';
 import BoardBlankState from '~/boards/components/board_blank_state.vue';

--- a/spec/javascripts/boards/board_card_spec.js
+++ b/spec/javascripts/boards/board_card_spec.js
 /* global List */
 /* global ListAssignee */
 /* global ListLabel */
-/* global BoardService */
 import Vue from 'vue';
 import MockAdapter from 'axios-mock-adapter';

--- a/spec/javascripts/boards/board_list_spec.js
+++ b/spec/javascripts/boards/board_list_spec.js
-/* global BoardService */
 /* global List */
 /* global ListIssue */
 import Vue from 'vue';

--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
-/* global BoardService */
 /* global List */
 import Vue from 'vue';

--- a/spec/javascripts/boards/boards_store_spec.js
+++ b/spec/javascripts/boards/boards_store_spec.js
 /* eslint-disable comma-dangle, one-var, no-unused-vars */
-/* global BoardService */
 /* global ListIssue */
 import Vue from 'vue';

--- a/spec/javascripts/boards/issue_spec.js
+++ b/spec/javascripts/boards/issue_spec.js
 /* eslint-disable comma-dangle */
-/* global BoardService */
 /* global ListIssue */
 import Vue from 'vue';

--- a/spec/javascripts/boards/list_spec.js
+++ b/spec/javascripts/boards/list_spec.js
 /* eslint-disable comma-dangle */
-/* global BoardService */
 /* global List */
 /* global ListIssue */

--- a/spec/javascripts/commit/commit_pipeline_status_component_spec.js
+++ b/spec/javascripts/commit/commit_pipeline_status_component_spec.js
@@ -75,10 +75,7 @@ describe('Commit pipeline status component', () => {
  describe('When polling data was not succesful', () => {
    beforeEach(() => {
      mock = new MockAdapter(axios);
-      mock.onGet('/dummy/endpoint').reply(() => {
+      mock.onGet('/dummy/endpoint').reply(502, {});
-        const res = Promise.reject([502, { }]);
-        return res;
-      });
      vm = new Component({
        props: {
          endpoint: '/dummy/endpoint',

--- a/spec/javascripts/helpers/vue_mount_component_helper.js
+++ b/spec/javascripts/helpers/vue_mount_component_helper.js
-import Vue from 'vue';
+const mountComponent = (Component, props = {}, el = null) =>
+  new Component({
-const mountComponent = (Component, props = {}, el = null) => new Component({
    propsData: props,
-}).$mount(el);
+  }).$mount(el);
-export const createComponentWithStore = (Component, store, propsData = {}) => new Component({
+export const createComponentWithStore = (Component, store, propsData = {}) =>
+  new Component({
    store,
    propsData,
-});
-export const createComponentWithMixin = (mixins = [], state = {}, props = {}, template = '<div></div>') => {
-  const Component = Vue.extend({
-    template,
-    mixins,
-    data() {
-      return props;
-    },
  });
-  return mountComponent(Component, props);
-};
 export const mountComponentWithStore = (Component, { el, props, store }) =>
  new Component({
    store,
-    propsData: props || { },
+    propsData: props || {},
  }).$mount(el);
 export default mountComponent;
--- a/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
+++ b/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
@@ -8,10 +8,7 @@ describe('Confidential Issue Sidebar Block', () => {
  beforeEach(() => {
    const Component = Vue.extend(confidentialIssueSidebar);
    const service = {
-      update: () => new Promise((resolve, reject) => {
+      update: () => Promise.resolve(true),
-        resolve(true);
-        reject('failed!');
-      }),
    };
    vm1 = new Component({

--- a/spec/javascripts/u2f/mock_u2f_device.js
+++ b/spec/javascripts/u2f/mock_u2f_device.js
 /* eslint-disable prefer-rest-params, wrap-iife,
-no-unused-expressions, no-return-assign, no-param-reassign*/
+no-unused-expressions, no-return-assign, no-param-reassign */
 export default class MockU2FDevice {
  constructor() {

--- a/yarn.lock
+++ b/yarn.lock