Merge branch '32486-update-eslint-plugin-import-to-2.18.2-ee-app-m-z' into 'master'

Update eslint-plugin-import from 2.16.0 to 2.18.2 (/ee/app/assets/javascripts/[m-z]*)

See merge request gitlab-org/gitlab!20998

ee/app/assets/javascripts/monitoring/components/alert_widget_form.vue

 <script>
-import { __, s__ } from '~/locale';
 import _ from 'underscore';
 import Vue from 'vue';
-import Translate from '~/vue_shared/translate';
-import { alertsValidator, queriesValidator } from '../validators';
 import {
   GlButton,
   GlButtonGroup,
@@ -14,6 +11,9 @@ import {
   GlModal,
   GlTooltipDirective,
 } from '@gitlab/ui';
+import { __, s__ } from '~/locale';
+import Translate from '~/vue_shared/translate';
+import { alertsValidator, queriesValidator } from '../validators';
 import Icon from '~/vue_shared/components/icon.vue';
 
 Vue.use(Translate);

ee/app/assets/javascripts/monitoring/components/dashboard.vue

 <script>
+import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
 import CeDashboard from '~/monitoring/components/dashboard.vue';
 import AlertWidget from './alert_widget.vue';
-import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/monitoring/components/panel_type.vue

 <script>
+import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
 import CePanelType from '~/monitoring/components/panel_type.vue';
 import AlertWidget from './alert_widget.vue';
-import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/mr_notes/stores/index.js

 import Vue from 'vue';
 import Vuex from 'vuex';
+import batchCommentsModule from 'ee/batch_comments/stores/modules/batch_comments';
 import notesModule from '~/notes/stores/modules';
 import diffsModule from '~/diffs/store/modules';
 import mrPageModule from '~/mr_notes/stores/modules';
-import batchCommentsModule from 'ee/batch_comments/stores/modules/batch_comments';
 
 Vue.use(Vuex);
 

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

 import { mapActions, mapGetters, mapState } from 'vuex';
-import { TEXT_DIFF_POSITION_TYPE, IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants';
 import { getDraftReplyFormData, getDraftFormData } from 'ee/batch_comments/utils';
+import { TEXT_DIFF_POSITION_TYPE, IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
 import { clearDraft } from '~/lib/utils/autosave';

ee/app/assets/javascripts/onboarding/onboarding_helper/components/onboarding_helper.vue

 <script>
-import { __, s__, sprintf } from '~/locale';
 import { GlLink, GlProgressBar, GlButton, GlLoadingIcon } from '@gitlab/ui';
+import { __, s__, sprintf } from '~/locale';
 import userAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import HelpContentPopover from './help_content_popover.vue';

ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue

 <script>
-import { __ } from '~/locale';
 import { GlLink } from '@gitlab/ui';
+import { __ } from '~/locale';
 import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
 import HelpContentPopover from './../../onboarding_helper/components/help_content_popover.vue';
 import ActionPopover from './../../onboarding_helper/components/action_popover.vue';

ee/app/assets/javascripts/operations/components/dashboard/project.vue

@@ -2,15 +2,15 @@
 import { mapActions } from 'vuex';
 import _ from 'underscore';
 import { GlTooltip } from '@gitlab/ui';
+import Alerts from 'ee/vue_shared/dashboards/components/alerts.vue';
+import TimeAgo from 'ee/vue_shared/dashboards/components/time_ago.vue';
+import ProjectPipeline from 'ee/vue_shared/dashboards/components/project_pipeline.vue';
+import { STATUS_FAILED, STATUS_RUNNING } from 'ee/vue_shared/dashboards/constants';
 import { __, sprintf } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import Commit from '~/vue_shared/components/commit.vue';
-import Alerts from 'ee/vue_shared/dashboards/components/alerts.vue';
-import TimeAgo from 'ee/vue_shared/dashboards/components/time_ago.vue';
-import ProjectPipeline from 'ee/vue_shared/dashboards/components/project_pipeline.vue';
-import { STATUS_FAILED, STATUS_RUNNING } from 'ee/vue_shared/dashboards/constants';
 import ProjectHeader from './project_header.vue';
 
 export default {

ee/app/assets/javascripts/operations/components/dashboard/project_header.vue

 <script>
+import { GlButton, GlLink, GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
-import { GlButton, GlLink, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 
 export default {

ee/app/assets/javascripts/protected_branches/protected_branch_create.js

 import $ from 'jquery';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import AccessorUtilities from '~/lib/utils/accessor';
 import Flash from '~/flash';
 import CreateItemDropdown from '~/create_item_dropdown';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 import { __ } from '~/locale';
 

ee/app/assets/javascripts/protected_branches/protected_branch_edit.js

 import _ from 'underscore';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import Flash from '~/flash';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 import { __ } from '~/locale';
 

ee/app/assets/javascripts/protected_environments/protected_environment_create.js

 import $ from 'jquery';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import AccessorUtilities from '~/lib/utils/accessor';
 import Flash from '~/flash';
 import CreateItemDropdown from '~/create_item_dropdown';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 import { __ } from '~/locale';
 

ee/app/assets/javascripts/protected_environments/protected_environment_edit.js

 import $ from 'jquery';
 import _ from 'underscore';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import Flash from '~/flash';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 import { __ } from '~/locale';
 

ee/app/assets/javascripts/protected_tags/protected_tag_create.js

 import $ from 'jquery';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import CreateItemDropdown from '~/create_item_dropdown';
 import { s__, __ } from '~/locale';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 
 export default class ProtectedTagCreate {

ee/app/assets/javascripts/protected_tags/protected_tag_edit.js

 import $ from 'jquery';
 import _ from 'underscore';
+import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
-import AccessDropdown from 'ee/projects/settings/access_dropdown';
 import { ACCESS_LEVELS, LEVEL_TYPES } from './constants';
 
 export default class ProtectedTagEdit {

ee/app/assets/javascripts/related_issues/components/related_issues_block.vue

 <script>
-import { __ } from '~/locale';
 import Sortable from 'sortablejs';
+import IssueWeight from 'ee/boards/components/issue_card_weight.vue';
+import sortableConfig from 'ee/sortable/sortable_config';
+import { GlLoadingIcon } from '@gitlab/ui';
+import { __ } from '~/locale';
 import tooltip from '~/vue_shared/directives/tooltip';
 import Icon from '~/vue_shared/components/icon.vue';
 import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue';
-import IssueWeight from 'ee/boards/components/issue_card_weight.vue';
 import IssueDueDate from '~/boards/components/issue_due_date.vue';
-import sortableConfig from 'ee/sortable/sortable_config';
-import { GlLoadingIcon } from '@gitlab/ui';
 import AddIssuableForm from './add_issuable_form.vue';
 import { issuableIconMap, issuableQaClassMap } from '../constants';
 

ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue

@@ -3,13 +3,13 @@ import { mapState, mapActions } from 'vuex';
 import { GlTooltipDirective, GlModalDirective, GlLink, GlButton } from '@gitlab/ui';
 import _ from 'underscore';
 
+import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
 import { __ } from '~/locale';
 
 import Icon from '~/vue_shared/components/icon.vue';
 import ItemMilestone from '~/vue_shared/components/issue/issue_milestone.vue';
 import ItemAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
 import ItemDueDate from '~/boards/components/issue_due_date.vue';
-import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
 
 import StateTooltip from './state_tooltip.vue';
 

ee/app/assets/javascripts/related_items_tree/store/actions.js

-import flash from '~/flash';
-import { s__ } from '~/locale';
 import Api from 'ee/api';
-import axios from '~/lib/utils/axios_utils';
-import httpStatusCodes from '~/lib/utils/http_status';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-
 import {
   issuableTypesMap,
   itemAddFailureTypesMap,
   pathIndeterminateErrorMap,
   relatedIssuesRemoveErrorMap,
 } from 'ee/related_issues/constants';
+import flash from '~/flash';
+import { s__ } from '~/locale';
+import axios from '~/lib/utils/axios_utils';
+import httpStatusCodes from '~/lib/utils/http_status';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
 import { processQueryResponse, formatChildItem, gqClient } from '../utils/epic_utils';
 import { ChildType, ChildState } from '../constants';

ee/app/assets/javascripts/reports/components/issue_body.js

-import {
-  components as componentsCE,
-  componentNames as componentNamesCE,
-} from '~/reports/components/issue_body';
 import PerformanceIssueBody from 'ee/vue_merge_request_widget/components/performance_issue_body.vue';
 import CodequalityIssueBody from 'ee/vue_merge_request_widget/components/codequality_issue_body.vue';
 import BlockingMergeRequestsBody from 'ee/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_request_body.vue';
@@ -10,6 +6,10 @@ import SastIssueBody from 'ee/vue_shared/security_reports/components/sast_issue_
 import SastContainerIssueBody from 'ee/vue_shared/security_reports/components/sast_container_issue_body.vue';
 import DastIssueBody from 'ee/vue_shared/security_reports/components/dast_issue_body.vue';
 import MetricsReportsIssueBody from 'ee/vue_shared/metrics_reports/components/metrics_reports_issue_body.vue';
+import {
+  components as componentsCE,
+  componentNames as componentNamesCE,
+} from '~/reports/components/issue_body';
 
 export const components = {
   ...componentsCE,

ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue

 <script>
 import { mapActions } from 'vuex';
 import { GlButton, GlSkeletonLoading } from '@gitlab/ui';
-import Icon from '~/vue_shared/components/icon.vue';
 import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 import VulnerabilityActionButtons from './vulnerability_action_buttons.vue';
 import VulnerabilityIssueLink from './vulnerability_issue_link.vue';
 

ee/app/assets/javascripts/security_dashboard/components/vulnerability_issue_link.vue

 <script>
-import Icon from '~/vue_shared/components/icon.vue';
 import { GlTooltipDirective } from '@gitlab/ui';
+import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   name: 'VulnerabilityIssueLink',

ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js

 import $ from 'jquery';
-import axios from '~/lib/utils/axios_utils';
 import downloadPatchHelper from 'ee/vue_shared/security_reports/store/utils/download_patch_helper';
+import axios from '~/lib/utils/axios_utils';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import { s__, sprintf } from '~/locale';
 import createFlash from '~/flash';

ee/app/assets/javascripts/sidebar/components/sidebar_item_epics_select.vue

 <script>
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { noneEpic } from 'ee/vue_shared/constants';
 import EpicsSelect from 'ee/vue_shared/components/sidebar/epics_select/base.vue';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
 export default {
   components: {

ee/app/assets/javascripts/sidebar/components/weight/weight.vue

 <script>
 import $ from 'jquery';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import Tracking from '~/tracking';
 import eventHub from '~/sidebar/event_hub';
 import tooltip from '~/vue_shared/directives/tooltip';
 import icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab/ui';
 
 export default {
   components: {

ee/app/assets/javascripts/sidebar/sidebar_mediator.js

-import CESidebarMediator from '~/sidebar/sidebar_mediator';
 import Store from 'ee/sidebar/stores/sidebar_store';
+import CESidebarMediator from '~/sidebar/sidebar_mediator';
 
 export default class SidebarMediator extends CESidebarMediator {
   initSingleton(options) {

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue

 <script>
 import _ from 'underscore';
-import { sprintf, __ } from '~/locale';
-import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import ApprovalCheckRulePopover from 'ee/approvals/components/approval_check_rule_popover.vue';
 import EmptyRuleName from 'ee/approvals/components/empty_rule_name.vue';
 import { RULE_TYPE_CODE_OWNER, RULE_TYPE_ANY_APPROVER } from 'ee/approvals/constants';
+import { sprintf, __ } from '~/locale';
+import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import ApprovedIcon from './approved_icon.vue';
 
 export default {

ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue

 <script>
-import ReportSection from '~/reports/components/report_section.vue';
 import { componentNames } from 'ee/reports/components/issue_body';
+import ReportSection from '~/reports/components/report_section.vue';
 import { status as reportStatus } from '~/reports/constants';
 import { n__ } from '~/locale';
 

ee/app/assets/javascripts/vue_merge_request_widget/components/visual_review_app_link.vue

 <script>
+import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
-import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
 
 export default {

ee/app/assets/javascripts/vue_merge_request_widget/mappers.js

 import _ from 'underscore';
-import { __ } from '~/locale';
 import {
   RULE_TYPE_REGULAR,
   RULE_TYPE_FALLBACK,
   RULE_TYPE_CODE_OWNER,
   RULE_TYPE_REPORT_APPROVER,
 } from 'ee/approvals/constants';
+import { __ } from '~/locale';
 
 function mapApprovalRule(rule, settings) {
   if (rule.rule_type === RULE_TYPE_FALLBACK) {

ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

 <script>
 import _ from 'underscore';
-import ReportSection from '~/reports/components/report_section.vue';
 import GroupedSecurityReportsApp from 'ee/vue_shared/security_reports/grouped_security_reports_app.vue';
 import GroupedMetricsReportsApp from 'ee/vue_shared/metrics_reports/grouped_metrics_reports_app.vue';
 import reportsMixin from 'ee/vue_shared/security_reports/mixins/reports_mixin';
 import { componentNames } from 'ee/reports/components/issue_body';
 import MrWidgetLicenses from 'ee/vue_shared/license_management/mr_widget_license_report.vue';
+import ReportSection from '~/reports/components/report_section.vue';
 import BlockingMergeRequestsReport from './components/blocking_merge_requests/blocking_merge_requests_report.vue';
 
 import { n__, s__, __, sprintf } from '~/locale';