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

Upgrade @gitlab/eslint-config to v2.1.1

See merge request gitlab-org/gitlab!24099

app/assets/javascripts/diff_notes/models/discussion.js

-/* eslint-disable camelcase, guard-for-in, no-restricted-syntax */
+/* eslint-disable guard-for-in, no-restricted-syntax */
 /* global NoteModel */
 
 import $ from 'jquery';
@@ -40,13 +40,13 @@ class DiscussionModel {
     return true;
   }
 
-  resolveAllNotes(resolved_by) {
+  resolveAllNotes(resolvedBy) {
     for (const noteId in this.notes) {
       const note = this.notes[noteId];
 
       if (!note.resolved) {
         note.resolved = true;
-        note.resolved_by = resolved_by;
+        note.resolved_by = resolvedBy;
       }
     }
   }

app/assets/javascripts/diff_notes/stores/comments.js

-/* eslint-disable camelcase, no-restricted-syntax, guard-for-in */
+/* eslint-disable no-restricted-syntax, guard-for-in */
 /* global DiscussionModel */
 
 import Vue from 'vue';
@@ -26,11 +26,11 @@ window.CommentsStore = {
 
     discussion.createNote(noteObj);
   },
-  update(discussionId, noteId, resolved, resolved_by) {
+  update(discussionId, noteId, resolved, resolvedBy) {
     const discussion = this.state[discussionId];
     const note = discussion.getNote(noteId);
     note.resolved = resolved;
-    note.resolved_by = resolved_by;
+    note.resolved_by = resolvedBy;
   },
   delete(discussionId, noteId) {
     const discussion = this.state[discussionId];

app/assets/javascripts/helpers/diffs_helper.js

 export function hasInlineLines(diffFile) {
-  return diffFile?.highlighted_diff_lines?.length > 0; /* eslint-disable-line camelcase */
+  return diffFile?.highlighted_diff_lines?.length > 0;
 }
 
 export function hasParallelLines(diffFile) {
-  return diffFile?.parallel_diff_lines?.length > 0; /* eslint-disable-line camelcase */
+  return diffFile?.parallel_diff_lines?.length > 0;
 }
 
 export function isSingleViewStyle(diffFile) {
@@ -11,9 +11,5 @@ export function isSingleViewStyle(diffFile) {
 }
 
 export function hasDiff(diffFile) {
-  return (
-    hasInlineLines(diffFile) ||
-    hasParallelLines(diffFile) ||
-    !diffFile?.blob?.readable_text /* eslint-disable-line camelcase */
-  );
+  return hasInlineLines(diffFile) || hasParallelLines(diffFile) || !diffFile?.blob?.readable_text;
 }

app/assets/javascripts/ide/stores/actions/project.js

@@ -133,9 +133,9 @@ export const loadBranch = ({ dispatch, getters }, { projectId, branchId }) =>
         ref: branch.commit.id,
       });
     })
-    .catch(() => {
+    .catch(err => {
       dispatch('showBranchNotFoundError', branchId);
-      return Promise.reject();
+      throw err;
     });
 
 export const openBranch = ({ dispatch, state, getters }, { projectId, branchId, basePath }) => {

app/assets/javascripts/lib/utils/webpack.js

@@ -8,7 +8,7 @@ export function resetServiceWorkersPublicPath() {
   // see: https://webpack.js.org/guides/public-path/
   const relativeRootPath = (gon && gon.relative_url_root) || '';
   const webpackAssetPath = joinPaths(relativeRootPath, '/assets/webpack/');
-  __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase
+  __webpack_public_path__ = webpackAssetPath; // eslint-disable-line babel/camelcase
 
   // monaco-editor-webpack-plugin currently (incorrectly) references the
   // public path as a property of `window`.  Once this is fixed upstream we

app/assets/javascripts/merge_conflicts/merge_conflict_store.js

-/* eslint-disable no-param-reassign, camelcase, no-nested-ternary, no-continue */
+/* eslint-disable no-param-reassign, babel/camelcase, no-nested-ternary, no-continue */
 
 import $ from 'jquery';
 import Vue from 'vue';

app/assets/javascripts/network/branch_graph.js

-/* eslint-disable func-names, consistent-return, camelcase */
+/* eslint-disable func-names, consistent-return */
 
 import $ from 'jquery';
 import { __ } from '../locale';
@@ -270,14 +270,14 @@ export default class BranchGraph {
       stroke: 'none',
     });
 
-    const avatar_box_x = this.offsetX + this.unitSpace * this.mspace + 10;
-    const avatar_box_y = y - 10;
+    const avatarBoxX = this.offsetX + this.unitSpace * this.mspace + 10;
+    const avatarBoxY = y - 10;
 
-    r.rect(avatar_box_x, avatar_box_y, 20, 20).attr({
+    r.rect(avatarBoxX, avatarBoxY, 20, 20).attr({
       stroke: this.colors[commit.space],
       'stroke-width': 2,
     });
-    r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20);
+    r.image(commit.author.icon, avatarBoxX, avatarBoxY, 20, 20);
     return r
       .text(this.offsetX + this.unitSpace * this.mspace + 35, y, commit.message.split('\n')[0])
       .attr({

app/assets/javascripts/notes.js

-/* eslint-disable no-restricted-properties, camelcase,
+/* eslint-disable no-restricted-properties, babel/camelcase,
 no-unused-expressions, default-case,
 consistent-return, no-alert, no-param-reassign, no-else-return,
 no-shadow, no-useless-escape,

app/assets/javascripts/users_select.js

-/* eslint-disable func-names, prefer-rest-params, consistent-return, no-shadow, no-else-return, no-self-compare, no-unused-expressions, yoda, prefer-spread, camelcase, no-param-reassign */
+/* eslint-disable func-names, prefer-rest-params, consistent-return, no-shadow, no-else-return, no-self-compare, no-unused-expressions, yoda, prefer-spread, babel/camelcase, no-param-reassign */
 /* global Issuable */
 /* global emitSidebarEvent */
 

app/assets/javascripts/webpack.js

@@ -5,5 +5,5 @@
  */
 
 if (gon && gon.webpack_public_path) {
-  __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase
+  __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line babel/camelcase
 }

app/assets/javascripts/zen_mode.js

-/* eslint-disable consistent-return, camelcase, class-methods-use-this */
+/* eslint-disable consistent-return, class-methods-use-this */
 
 // Zen Mode (full screen) textarea
 //
@@ -91,8 +91,8 @@ export default class ZenMode {
     }
   }
 
-  scrollTo(zen_area) {
-    return $.scrollTo(zen_area, 0, {
+  scrollTo(zenArea) {
+    return $.scrollTo(zenArea, 0, {
       offset: -150,
     });
   }

ee/app/assets/javascripts/ide/stores/modules/terminal_sync/actions.js

@@ -36,6 +36,6 @@ export const start = ({ rootState, commit }) => {
     })
     .catch(err => {
       commit(types.SET_ERROR, err);
-      return Promise.reject(err);
+      throw err;
     });
 };

ee/app/assets/javascripts/notes/mixins/diff_line_note_form.js

@@ -62,7 +62,6 @@ export default {
         ...this.diffFileCommentForm,
       });
 
-      // eslint-disable-next-line camelcase
       const diffFileHeadSha = this.commit && this?.diffFile?.diff_refs?.head_sha;
 
       postData.data.note.commit_id = diffFileHeadSha || null;

ee/app/assets/javascripts/packages/details/store/getters.js

 export default ({ packageEntity }) => {
-  // eslint-disable-next-line camelcase
   if (packageEntity?.build_info?.pipeline_id) {
     return true;
   }

ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue

@@ -202,7 +202,6 @@ export default {
     this.setCanCreateIssuePermission(this.canCreateIssue);
     this.setCanCreateFeedbackPermission(this.canCreateFeedback);
 
-    // eslint-disable-next-line camelcase
     const sastDiffEndpoint = gl?.mrWidgetData?.sast_comparison_path;
 
     if (sastDiffEndpoint && this.hasSastReports) {
@@ -210,7 +209,6 @@ export default {
       this.fetchSastDiff();
     }
 
-    // eslint-disable-next-line camelcase
     const containerScanningDiffEndpoint = gl?.mrWidgetData?.container_scanning_comparison_path;
 
     if (containerScanningDiffEndpoint && this.hasContainerScanningReports) {
@@ -218,7 +216,6 @@ export default {
       this.fetchContainerScanningDiff();
     }
 
-    // eslint-disable-next-line camelcase
     const dastDiffEndpoint = gl?.mrWidgetData?.dast_comparison_path;
 
     if (dastDiffEndpoint && this.hasDastReports) {
@@ -226,7 +223,6 @@ export default {
       this.fetchDastDiff();
     }
 
-    // eslint-disable-next-line camelcase
     const dependencyScanningDiffEndpoint = gl?.mrWidgetData?.dependency_scanning_comparison_path;
 
     if (dependencyScanningDiffEndpoint && this.hasDependencyScanningReports) {

ee/spec/frontend/dependencies/components/paginated_dependencies_table_spec.js

@@ -4,7 +4,7 @@ import DependenciesTable from 'ee/dependencies/components/dependencies_table.vue
 import PaginatedDependenciesTable from 'ee/dependencies/components/paginated_dependencies_table.vue';
 import { DEPENDENCY_LIST_TYPES } from 'ee/dependencies/store/constants';
 import Pagination from '~/vue_shared/components/pagination_links.vue';
-import mockDependenciesResponse from '../store/modules/list/data/mock_dependencies';
+import mockDependenciesResponse from '../store/modules/list/data/mock_dependencies.json';
 
 describe('PaginatedDependenciesTable component', () => {
   let store;

ee/spec/frontend/dependencies/store/modules/list/actions_spec.js

@@ -13,7 +13,7 @@ import {
 } from 'ee/dependencies/store/modules/list/constants';
 import createFlash from '~/flash';
 
-import mockDependenciesResponse from './data/mock_dependencies';
+import mockDependenciesResponse from './data/mock_dependencies.json';
 
 jest.mock('~/flash', () => jest.fn());
 

ee/spec/frontend/feature_flags/components/feature_flags_spec.js

@@ -6,7 +6,7 @@ import FeatureFlagsComponent from 'ee/feature_flags/components/feature_flags.vue
 import FeatureFlagsTable from 'ee/feature_flags/components/feature_flags_table.vue';
 import ConfigureFeatureFlagsModal from 'ee/feature_flags/components/configure_feature_flags_modal.vue';
 import { TEST_HOST } from 'spec/test_constants';
-import NavigationTabs from '~/vue_shared/components/navigation_tabs';
+import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
 import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
 import axios from '~/lib/utils/axios_utils';
 import { getRequestData } from '../mock_data';

ee/spec/frontend/project_licenses/components/paginated_licenses_table_spec.js

@@ -5,7 +5,7 @@ import { toLicenseObject } from 'ee/project_licenses/utils/mappers';
 import { LICENSE_LIST } from 'ee/project_licenses/store/constants';
 import PaginatedLicensesTable from 'ee/project_licenses/components/paginated_licenses_table.vue';
 import Pagination from '~/vue_shared/components/pagination_links.vue';
-import mockLicensesResponse from '../store/modules/list/data/mock_licenses';
+import mockLicensesResponse from '../store/modules/list/data/mock_licenses.json';
 
 jest.mock('underscore', () => ({
   uniqueId: () => 'fakeUniqueId',

ee/spec/frontend/project_licenses/store/modules/list/actions_spec.js

@@ -9,7 +9,7 @@ import getInitialState from 'ee/project_licenses/store/modules/list/state';
 import { FETCH_ERROR_MESSAGE } from 'ee/project_licenses/store/modules/list/constants';
 import createFlash from '~/flash';
 
-import mockLicensesResponse from './data/mock_licenses';
+import mockLicensesResponse from './data/mock_licenses.json';
 
 jest.mock('~/flash', () => jest.fn());
 

package.json

@@ -146,7 +146,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@gitlab/eslint-config": "^2.0.0",
+    "@gitlab/eslint-config": "^2.1.1",
     "@gitlab/eslint-plugin-i18n": "^1.1.0",
     "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
     "@vue/test-utils": "^1.0.0-beta.30",

spec/frontend/ide/components/ide_status_list_spec.js

 import Vuex from 'vuex';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import IdeStatusList from '~/ide/components/ide_status_list';
+import IdeStatusList from '~/ide/components/ide_status_list.vue';
 
 const TEST_FILE = {
   name: 'lorem.md',

spec/frontend/mr_popover/mr_popover_spec.js

 import { shallowMount } from '@vue/test-utils';
-import MRPopover from '~/mr_popover/components/mr_popover';
+import MRPopover from '~/mr_popover/components/mr_popover.vue';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 
 describe('MR Popover', () => {

spec/frontend/releases/detail/components/app_spec.js

 import Vuex from 'vuex';
 import { mount } from '@vue/test-utils';
-import ReleaseDetailApp from '~/releases/detail/components/app';
+import ReleaseDetailApp from '~/releases/detail/components/app.vue';
 import { release } from '../../mock_data';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 

spec/frontend/sidebar/confidential_issue_sidebar_spec.js

@@ -4,7 +4,7 @@ import ConfidentialIssueSidebar from '~/sidebar/components/confidential/confiden
 import EditForm from '~/sidebar/components/confidential/edit_form.vue';
 import SidebarService from '~/sidebar/services/sidebar_service';
 import createFlash from '~/flash';
-import RecaptchaModal from '~/vue_shared/components/recaptcha_modal';
+import RecaptchaModal from '~/vue_shared/components/recaptcha_modal.vue';
 
 jest.mock('~/flash');
 jest.mock('~/sidebar/services/sidebar_service');

spec/frontend/vue_shared/components/recaptcha_modal_spec.js

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 
 import { eventHub } from '~/vue_shared/components/recaptcha_eventhub';
 
-import RecaptchaModal from '~/vue_shared/components/recaptcha_modal';
+import RecaptchaModal from '~/vue_shared/components/recaptcha_modal.vue';
 
 describe('RecaptchaModal', () => {
   const recaptchaFormId = 'recaptcha-form';

spec/frontend/vue_shared/components/slot_switch_spec.js

 import { shallowMount } from '@vue/test-utils';
 
-import SlotSwitch from '~/vue_shared/components/slot_switch';
+import SlotSwitch from '~/vue_shared/components/slot_switch.vue';
 
 describe('SlotSwitch', () => {
   const slots = {