Move javascript files

app/assets/javascripts/boards/components/modal/index.js

 /* global ListIssue */
 
 import Vue from 'vue';
-import queryData from '../../utils/query_data';
-import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
+import queryData from '~/boards/utils/query_data';
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import './header';
 import './list';
 import './footer';

app/assets/javascripts/issuable/related_issues/components/add_issuable_form.vue

 <script>
 import GfmAutoComplete from '~/gfm_auto_complete';
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import eventHub from '../event_hub';
 import issueToken from './issue_token.vue';
-import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
 
 export default {
   name: 'AddIssuableForm',

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

 <script>
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
 import eventHub from '../event_hub';
-import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
-import tooltip from '../../../vue_shared/directives/tooltip';
 import issueToken from './issue_token.vue';
 import addIssuableForm from './add_issuable_form.vue';
 

app/assets/javascripts/pipelines/components/graph/graph_component.vue

 <script>
+  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
   import linkedPipelinesColumn from './linked_pipelines_column.vue';
   import stageColumnComponent from './stage_column_component.vue';
-  import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
 
   export default {
     props: {

app/assets/javascripts/vue_merge_request_widget/dependencies.js

 /**
  * This file is the centerpiece of an attempt to reduce potential conflicts
  * between the CE and EE versions of the MR widget. EE additions to the MR widget should
- * be contained in the ./vue_merge_request_widget/ee directory, and should **extend**
+ * be contained in the ee/vue_merge_request_widget directory, and should **extend**
  * rather than mutate CE MR Widget code.
  *
  * This file should be the only source of conflicts between EE and CE. EE-only components should
@@ -26,7 +26,7 @@ export { default as ConflictsState } from './components/states/mr_widget_conflic
 export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
 export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
 export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
-export { default as ReadyToMergeState } from './ee/components/states/mr_widget_ready_to_merge';
+export { default as ReadyToMergeState } from 'ee/vue_merge_request_widget/components/states/mr_widget_ready_to_merge';
 export { default as SHAMismatchState } from './components/states/mr_widget_sha_mismatch';
 export { default as UnresolvedDiscussionsState } from './components/states/mr_widget_unresolved_discussions';
 export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked';
@@ -34,11 +34,11 @@ export { default as PipelineFailedState } from './components/states/mr_widget_pi
 export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds';
 export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed';
 export { default as CheckingState } from './components/states/mr_widget_checking';
-export { default as MRWidgetStore } from './ee/stores/mr_widget_store';
-export { default as MRWidgetService } from './ee/services/mr_widget_service';
+export { default as MRWidgetStore } from 'ee/vue_merge_request_widget/stores/mr_widget_store';
+export { default as MRWidgetService } from 'ee/vue_merge_request_widget/services/mr_widget_service';
 export { default as eventHub } from './event_hub';
-export { default as getStateKey } from './ee/stores/get_state_key';
-export { default as mrWidgetOptions } from './ee/mr_widget_options';
-export { default as stateMaps } from './ee/stores/state_maps';
-export { default as SquashBeforeMerge } from './ee/components/states/mr_widget_squash_before_merge';
+export { default as getStateKey } from 'ee/vue_merge_request_widget/stores/get_state_key';
+export { default as mrWidgetOptions } from 'ee/vue_merge_request_widget/mr_widget_options';
+export { default as stateMaps } from 'ee/vue_merge_request_widget/stores/state_maps';
+export { default as SquashBeforeMerge } from 'ee/vue_merge_request_widget/components/states/mr_widget_squash_before_merge';
 export { default as notify } from '../lib/utils/notify';

config/webpack.config.js

@@ -61,9 +61,9 @@ var config = {
     profile:              './profile/profile_bundle.js',
     prometheus_metrics:   './prometheus_metrics',
     protected_branches:   './protected_branches',
-    ee_protected_branches: './protected_branches/ee',
+    ee_protected_branches: 'ee/protected_branches',
     protected_tags:       './protected_tags',
-    ee_protected_tags:    './protected_tags/ee',
+    ee_protected_tags:    'ee/protected_tags',
     service_desk:         './projects/settings_service_desk/service_desk_bundle.js',
     sidebar:              './sidebar/sidebar_bundle.js',
     schedule_form:        './pipeline_schedules/pipeline_schedule_form_bundle.js',
@@ -208,6 +208,7 @@ var config = {
   resolve: {
     extensions: ['.js'],
     alias: {
+      'ee':             path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
       'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
       'empty_states':   path.join(ROOT_PATH, 'app/views/shared/empty_states'),

app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_body.js → ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js

 /* global Flash */
-import MRWidgetAuthor from '../../../components/mr_widget_author';
-import eventHub from '../../../event_hub';
+import MRWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author';
+import eventHub from '~/vue_merge_request_widget/event_hub';
 
 export default {
   name: 'approvals-body',

app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js → ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js

 /* global Flash */
 import LinkToMemberAvatar from '~/vue_shared/components/link_to_member_avatar';
-import eventHub from '../../../event_hub';
+import eventHub from '~/vue_merge_request_widget/event_hub';
 
 export default {
   name: 'approvals-footer',

app/assets/javascripts/vue_merge_request_widget/ee/components/mr_widget_code_quality.vue → ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue

 <script>
 import successIcon from 'icons/_icon_status_success.svg';
 import errorIcon from 'icons/_icon_status_failed.svg';
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
+import '~/lib/utils/text_utility';
 import issuesBlock from './mr_widget_code_quality_issues.vue';
-import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
-import '../../../lib/utils/text_utility';
 
 export default {
   name: 'MRWidgetCodeQuality',

app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_ready_to_merge.js → ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js

-import eventHub from '../../../event_hub';
-import ReadyToMergeState from '../../../components/states/mr_widget_ready_to_merge';
+import eventHub from '~/vue_merge_request_widget/event_hub';
+import ReadyToMergeState from '~/vue_merge_request_widget/components/states/mr_widget_ready_to_merge';
 import SquashBeforeMerge from './mr_widget_squash_before_merge';
 
 export default {

app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js → ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.js

 /* global Flash */
 
 import simplePoll from '~/lib/utils/simple_poll';
-import eventHub from '../../../event_hub';
+import eventHub from '~/vue_merge_request_widget/event_hub';
 
 export default {
   props: {

app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_squash_before_merge.js → ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js

-import eventHub from '../../../event_hub';
-import CESquashBeforeMerge from '../../components/states/mr_widget_squash_before_merge';
+import eventHub from '~/vue_merge_request_widget/event_hub';
+import CESquashBeforeMerge from '~/vue_merge_request_widget/components/states/mr_widget_squash_before_merge';
 
 export default {
   extends: CESquashBeforeMerge,

app/assets/javascripts/vue_merge_request_widget/ee/mr_widget_options.js → ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js

-import CEWidgetOptions from '../mr_widget_options';
+import CEWidgetOptions from '~/vue_merge_request_widget/mr_widget_options';
 import WidgetApprovals from './components/approvals/mr_widget_approvals';
 import GeoSecondaryNode from './components/states/mr_widget_secondary_geo_node';
 import RebaseState from './components/states/mr_widget_rebase';

app/assets/javascripts/vue_merge_request_widget/ee/services/mr_widget_service.js → ee/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js

 import Vue from 'vue';
 
-import CEWidgetService from '../../services/mr_widget_service';
+import CEWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 
 export default class MRWidgetService extends CEWidgetService {
   constructor(mr) {

app/assets/javascripts/vue_merge_request_widget/ee/stores/get_state_key.js → ee/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js

-import CEGetStateKey from '../../stores/get_state_key';
+import CEGetStateKey from '~/vue_merge_request_widget/stores/get_state_key';
 
 export default function (data) {
   if (this.isGeoSecondaryNode) {

app/assets/javascripts/vue_merge_request_widget/ee/stores/mr_widget_store.js → ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

-import CEMergeRequestStore from '../../stores/mr_widget_store';
+import CEMergeRequestStore from '~/vue_merge_request_widget/stores/mr_widget_store';
 
 export default class MergeRequestStore extends CEMergeRequestStore {
   constructor(data) {

app/assets/javascripts/vue_merge_request_widget/ee/stores/state_maps.js → ee/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js

-import stateMaps from '../../stores/state_maps';
+import stateMaps from '~/vue_merge_request_widget/stores/state_maps';
 
 stateMaps.stateToComponentMap.geoSecondaryNode = 'mr-widget-geo-secondary-node';
 stateMaps.stateToComponentMap.rebase = 'mr-widget-rebase';

spec/javascripts/approvals/approvals_body_spec.js

 import Vue from 'vue';
 
-import ApprovalsBody from '~/vue_merge_request_widget/ee/components/approvals/approvals_body';
+import ApprovalsBody from 'ee/vue_merge_request_widget/components/approvals/approvals_body';
 
 (() => {
   gl.ApprovalsStore = {

spec/javascripts/approvals/approvals_footer_spec.js

 import Vue from 'vue';
 
 import pendingAvatarSvg from 'icons/_icon_dotted_circle.svg';
-import ApprovalsFooter from '~/vue_merge_request_widget/ee/components/approvals/approvals_footer';
+import ApprovalsFooter from 'ee/vue_merge_request_widget/components/approvals/approvals_footer';
 
 (() => {
   gl.ApprovalsStore = {

spec/javascripts/vue_mr_widget/components/mr_widget_code_quality_issues_spec.js

 import Vue from 'vue';
-import mrWidgetCodeQualityIssues from '~/vue_merge_request_widget/ee/components/mr_widget_code_quality_issues.vue';
+import mrWidgetCodeQualityIssues from 'ee/vue_merge_request_widget/components/mr_widget_code_quality_issues.vue';
 
 describe('Merge Request Code Quality Issues', () => {
   let vm;

spec/javascripts/vue_mr_widget/components/mr_widget_code_quality_spec.js

 import Vue from 'vue';
-import mrWidgetCodeQuality from '~/vue_merge_request_widget/ee/components/mr_widget_code_quality.vue';
-import Store from '~/vue_merge_request_widget/ee/stores/mr_widget_store';
-import Service from '~/vue_merge_request_widget/ee/services/mr_widget_service';
+import mrWidgetCodeQuality from 'ee/vue_merge_request_widget/components/mr_widget_code_quality.vue';
+import Store from 'ee/vue_merge_request_widget/stores/mr_widget_store';
+import Service from 'ee/vue_merge_request_widget/services/mr_widget_service';
 import mockData, { baseIssues, headIssues } from '../mock_data';
 
 describe('Merge Request Code Quality', () => {

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

-import MergeRequestStore from '~/vue_merge_request_widget/ee/stores/mr_widget_store';
+import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
 import mockData, { headIssues, baseIssues } from '../mock_data';
 
 describe('MergeRequestStore', () => {