Merge branch 'vs-eslint-enable-import-order' into 'master'

[ESLint] Enable imports order rule

See merge request gitlab-org/gitlab!39804

.eslintrc.yml

@@ -27,7 +27,6 @@ rules:
     - ignore:
         # https://gitlab.com/gitlab-org/gitlab/issues/38226
         - '^ee_component/'
-  import/order: off
   # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
   no-else-return:
     - error

app/assets/javascripts/badges/components/badge_settings.vue

 <script>
 import { mapState, mapActions } from 'vuex';
+import { GlSprintf } from '@gitlab/ui';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
 import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
 import Badge from './badge.vue';
 import BadgeForm from './badge_form.vue';
 import BadgeList from './badge_list.vue';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   name: 'BadgeSettings',

app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue

 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
-import { s__ } from '~/locale';
 import { GlSprintf, GlLink } from '@gitlab/ui';
+import { s__ } from '~/locale';
 
 import gkeDropdownMixin from './gke_dropdown_mixin';
 

app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue

 <script>
+import { GlSprintf } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
 import { s__, sprintf } from '~/locale';
 import { visitUrl } from '~/lib/utils/url_utility';
 import eventHub from '../event_hub';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   components: {

app/assets/javascripts/sidebar/components/confidential/edit_form.vue

 <script>
+import { GlSprintf } from '@gitlab/ui';
 import editFormButtons from './edit_form_buttons.vue';
 import { __ } from '../../../locale';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   components: {

app/assets/javascripts/sidebar/components/lock/edit_form.vue

 <script>
-import editFormButtons from './edit_form_buttons.vue';
 import { GlSprintf } from '@gitlab/ui';
+import editFormButtons from './edit_form_buttons.vue';
 
 export default {
   components: {

app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue

 <script>
+import { GlSprintf } from '@gitlab/ui';
 import tooltip from '../../vue_shared/directives/tooltip';
 import { __ } from '../../locale';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   i18n: {

ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue

 <script>
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { mapState, mapActions } from 'vuex';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { n__, sprintf } from '~/locale';
 import { RULE_TYPE_ANY_APPROVER, RULE_TYPE_REGULAR } from '../../constants';
 

ee/app/assets/javascripts/approvals/components/rule_form.vue

 <script>
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { mapState, mapActions } from 'vuex';
 import { groupBy, isNumber } from 'lodash';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { sprintf, __ } from '~/locale';
 import ApproversList from './approvers_list.vue';
 import ApproversSelect from './approvers_select.vue';

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

 import Vuex from 'vuex';
-import modalModule from '~/vuex_shared/modules/modal';
 import securityConfigurationModule from 'ee/security_configuration/modules/configuration';
+import modalModule from '~/vuex_shared/modules/modal';
 import state from './state';
 
 export const createStoreOptions = (approvalsModule, settings) => ({

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

 <script>
 import { componentNames } from 'ee/reports/components/issue_body';
+import { GlSprintf } from '@gitlab/ui';
 import ReportSection from '~/reports/components/report_section.vue';
 import { status as reportStatus } from '~/reports/constants';
 import { n__, sprintf } from '~/locale';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   name: 'BlockingMergeRequestsReport',

ee/spec/frontend/approvals/components/project_settings/project_rules_spec.js

@@ -4,8 +4,8 @@ import { createStoreOptions } from 'ee/approvals/stores';
 import projectSettingsModule from 'ee/approvals/stores/modules/project_settings';
 import ProjectRules from 'ee/approvals/components/project_settings/project_rules.vue';
 import RuleInput from 'ee/approvals/components/mr_edit/rule_input.vue';
-import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import UnconfiguredSecurityRules from 'ee/approvals/components/security_configuration/unconfigured_security_rules.vue';
+import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import { createProjectRules } from '../../mocks';
 
 const TEST_RULES = createProjectRules();

ee/spec/frontend/compliance_dashboard/components/merge_requests/grid_spec.js

 import { shallowMount } from '@vue/test-utils';
 
-import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-
 import Approvers from 'ee/compliance_dashboard/components/merge_requests/approvers.vue';
 import BranchDetails from 'ee/compliance_dashboard/components/merge_requests/branch_details.vue';
 import MergeRequestsGrid from 'ee/compliance_dashboard/components/merge_requests/grid.vue';
 import Status from 'ee/compliance_dashboard/components/merge_requests/status.vue';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 
 import { createMergeRequests, mergedAt } from '../../mock_data';
 

spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js

 import { shallowMount } from '@vue/test-utils';
-import CustomizeHomepageBanner from '~/pages/dashboard/projects/index/components/customize_homepage_banner.vue';
 import { GlBanner } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
+import CustomizeHomepageBanner from '~/pages/dashboard/projects/index/components/customize_homepage_banner.vue';
 import axios from '~/lib/utils/axios_utils';
 
 const svgPath = '/illustrations/background';

spec/frontend/snippets/components/snippet_blob_edit_spec.js

@@ -2,13 +2,13 @@ import { GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
 import waitForPromises from 'helpers/wait_for_promises';
+import { TEST_HOST } from 'helpers/test_constants';
 import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue';
 import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue';
 import BlobContentEdit from '~/blob/components/blob_edit_content.vue';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths } from '~/lib/utils/url_utility';
 import createFlash from '~/flash';
-import { TEST_HOST } from 'helpers/test_constants';
 
 jest.mock('~/flash');