Merge branch 'cngo-shorten-js-import-paths' into 'master'

Shorten JS import paths

See merge request gitlab-org/gitlab!84655

app/assets/javascripts/ide/components/jobs/stage.vue

 <script>
 import { GlLoadingIcon, GlIcon, GlTooltipDirective, GlBadge } from '@gitlab/ui';
-import CiIcon from '../../../vue_shared/components/ci_icon.vue';
+import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import Item from './item.vue';
 
 export default {

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

@@ -2,7 +2,7 @@ import { escape } from 'lodash';
 import createFlash from '~/flash';
 import { __, sprintf } from '~/locale';
 import { logError } from '~/lib/logger';
-import api from '../../../api';
+import api from '~/api';
 import service from '../../services';
 import * as types from '../mutation_types';
 

app/assets/javascripts/pages/projects/network/network.js

 import $ from 'jquery';
-import BranchGraph from '../../../network/branch_graph';
+import BranchGraph from '~/network/branch_graph';
 
 const vph = $(window).height() - 250;
 

app/assets/javascripts/pages/sessions/new/index.js

 import $ from 'jquery';
 import initVueAlerts from '~/vue_alerts';
-import NoEmojiValidator from '../../../emoji/no_emoji_validator';
+import NoEmojiValidator from '~/emoji/no_emoji_validator';
 import LengthValidator from './length_validator';
 import OAuthRememberMe from './oauth_remember_me';
 import preserveUrlFragment from './preserve_url_fragment';

app/assets/javascripts/pages/sessions/new/length_validator.js

-import InputValidator from '../../../validators/input_validator';
+import InputValidator from '~/validators/input_validator';
 
 const errorMessageClass = 'gl-field-error';
 

app/assets/javascripts/pages/shared/wikis/edit.js

@@ -3,8 +3,8 @@ import Vue from 'vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import csrf from '~/lib/utils/csrf';
 import Translate from '~/vue_shared/translate';
-import GLForm from '../../../gl_form';
-import ZenMode from '../../../zen_mode';
+import GLForm from '~/gl_form';
+import ZenMode from '~/zen_mode';
 import deleteWikiModal from './components/delete_wiki_modal.vue';
 import wikiAlert from './components/wiki_alert.vue';
 import wikiForm from './components/wiki_form.vue';

app/assets/javascripts/pipelines/components/jobs_shared/job_name_component.vue

 <script>
-import ciIcon from '../../../vue_shared/components/ci_icon.vue';
+import ciIcon from '~/vue_shared/components/ci_icon.vue';
 
 /**
  * Component that renders both the CI icon status and the job name.

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue

 <script>
 import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests';
 import simplePoll from '~/lib/utils/simple_poll';
-import MergeRequest from '../../../merge_request';
+import MergeRequest from '~/merge_request';
 import eventHub from '../../event_hub';
 import { MERGE_ACTIVE_STATUS_PHRASES, STATE_MACHINE } from '../../constants';
 import statusIcon from '../mr_widget_status_icon.vue';

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -10,7 +10,7 @@ import {
 } from '~/behaviors/shortcuts/keybindings';
 import { getSelectedFragment } from '~/lib/utils/common_utils';
 import { s__, __ } from '~/locale';
-import { CopyAsGFM } from '../../../behaviors/markdown/copy_as_gfm';
+import { CopyAsGFM } from '~/behaviors/markdown/copy_as_gfm';
 import ToolbarButton from './toolbar_button.vue';
 
 export default {

app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_new.vue

@@ -18,7 +18,7 @@
 import { GlTooltip, GlAvatar } from '@gitlab/ui';
 import defaultAvatarUrl from 'images/no_avatar.png';
 import { __ } from '~/locale';
-import { placeholderImage } from '../../../lazy_loader';
+import { placeholderImage } from '~/lazy_loader';
 
 export default {
   name: 'UserAvatarImageNew',

app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_old.vue

@@ -18,7 +18,7 @@
 import { GlTooltip } from '@gitlab/ui';
 import defaultAvatarUrl from 'images/no_avatar.png';
 import { __ } from '~/locale';
-import { placeholderImage } from '../../../lazy_loader';
+import { placeholderImage } from '~/lazy_loader';
 
 export default {
   name: 'UserAvatarImageOld',

app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue

@@ -8,7 +8,7 @@ import {
   GlSprintf,
 } from '@gitlab/ui';
 import UserNameWithStatus from '~/sidebar/components/assignees/user_name_with_status.vue';
-import { glEmojiTag } from '../../../emoji';
+import { glEmojiTag } from '~/emoji';
 import UserAvatarImage from '../user_avatar/user_avatar_image.vue';
 
 const MAX_SKELETON_LINES = 4;

ee/app/assets/javascripts/compliance_dashboard/components/violations/filter.vue

@@ -5,8 +5,8 @@ import ProjectsDropdownFilter from '~/analytics/shared/components/projects_dropd
 import { pikadayToString, parsePikadayDate } from '~/lib/utils/datetime_utility';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { __ } from '~/locale';
+import { CURRENT_DATE } from 'ee/audit_events/constants';
 import getGroupProjects from '../../graphql/violation_group_projects.query.graphql';
-import { CURRENT_DATE } from '../../../audit_events/constants';
 import { convertProjectIdsToGraphQl } from '../../utils';
 
 export default {

ee/app/assets/javascripts/pages/projects/shared/init_blob.js

-import initPathLocks from '../../../path_locks';
+import initPathLocks from 'ee/path_locks';
 
 export default () => {
   const dataEl = document.getElementById('js-file-lock');

ee/spec/frontend/vue_mr_widget/extensions/status_checks/index_spec.js

@@ -11,7 +11,7 @@ import {
   pendingChecks,
   approvedAndPendingChecks,
   pendingAndFailedChecks,
-} from '../../../reports/status_checks_report/mock_data';
+} from 'ee_jest/reports/status_checks_report/mock_data';
 
 describe('Status checks extension', () => {
   let wrapper;

spec/frontend/profile/add_ssh_key_validation_spec.js

-import AddSshKeyValidation from '../../../app/assets/javascripts/profile/add_ssh_key_validation';
+import AddSshKeyValidation from '~/profile/add_ssh_key_validation';
 
 describe('AddSshKeyValidation', () => {
   describe('submit', () => {

spec/frontend/user_lists/store/edit/actions_spec.js

@@ -4,7 +4,7 @@ import { redirectTo } from '~/lib/utils/url_utility';
 import * as actions from '~/user_lists/store/edit/actions';
 import * as types from '~/user_lists/store/edit/mutation_types';
 import createState from '~/user_lists/store/edit/state';
-import { userList } from '../../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 jest.mock('~/lib/utils/url_utility');

spec/frontend/user_lists/store/edit/mutations_spec.js

@@ -2,7 +2,7 @@ import statuses from '~/user_lists/constants/edit';
 import * as types from '~/user_lists/store/edit/mutation_types';
 import mutations from '~/user_lists/store/edit/mutations';
 import createState from '~/user_lists/store/edit/state';
-import { userList } from '../../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 describe('User List Edit Mutations', () => {
   let state;

spec/frontend/user_lists/store/index/actions_spec.js

@@ -12,7 +12,7 @@ import {
 } from '~/user_lists/store/index/actions';
 import * as types from '~/user_lists/store/index/mutation_types';
 import createState from '~/user_lists/store/index/state';
-import { userList } from '../../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api.js');
 

spec/frontend/user_lists/store/index/mutations_spec.js

@@ -2,7 +2,7 @@ import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import * as types from '~/user_lists/store/index/mutation_types';
 import mutations from '~/user_lists/store/index/mutations';
 import createState from '~/user_lists/store/index/state';
-import { userList } from '../../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 describe('~/user_lists/store/index/mutations', () => {
   let state;

spec/frontend/user_lists/store/new/actions_spec.js

@@ -4,7 +4,7 @@ import { redirectTo } from '~/lib/utils/url_utility';
 import * as actions from '~/user_lists/store/new/actions';
 import * as types from '~/user_lists/store/new/mutation_types';
 import createState from '~/user_lists/store/new/state';
-import { userList } from '../../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 jest.mock('~/lib/utils/url_utility');

spec/frontend/vue_mr_widget/extensions/test_report/index_spec.js

@@ -10,12 +10,12 @@ import extensionsContainer from '~/vue_merge_request_widget/components/extension
 import { registerExtension } from '~/vue_merge_request_widget/components/extensions';
 import httpStatusCodes from '~/lib/utils/http_status';
 
-import { failedReport } from '../../../reports/mock_data/mock_data';
-import mixedResultsTestReports from '../../../reports/mock_data/new_and_fixed_failures_report.json';
-import newErrorsTestReports from '../../../reports/mock_data/new_errors_report.json';
-import newFailedTestReports from '../../../reports/mock_data/new_failures_report.json';
-import successTestReports from '../../../reports/mock_data/no_failures_report.json';
-import resolvedFailures from '../../../reports/mock_data/resolved_failures.json';
+import { failedReport } from 'jest/reports/mock_data/mock_data';
+import mixedResultsTestReports from 'jest/reports/mock_data/new_and_fixed_failures_report.json';
+import newErrorsTestReports from 'jest/reports/mock_data/new_errors_report.json';
+import newFailedTestReports from 'jest/reports/mock_data/new_failures_report.json';
+import successTestReports from 'jest/reports/mock_data/no_failures_report.json';
+import resolvedFailures from 'jest/reports/mock_data/resolved_failures.json';
 
 const reportWithParsingErrors = failedReport;
 reportWithParsingErrors.suites[0].suite_errors = {

spec/frontend/vue_shared/components/notes/placeholder_note_spec.js

@@ -3,7 +3,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import IssuePlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
-import { userDataMock } from '../../../notes/mock_data';
+import { userDataMock } from 'jest/notes/mock_data';
 
 Vue.use(Vuex);