Merge branch 'winh-ee-switch-ee' into 'master'

Use ee_else_ce alias to resolve merge request widget files (EE-port)

See merge request gitlab-org/gitlab-ee!8135

app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js

-import MRWidgetOptions from 'ee/vue_merge_request_widget/mr_widget_options.vue';
-
-export default MRWidgetOptions;

app/assets/javascripts/vue_merge_request_widget/index.js

 import Vue from 'vue';
-import MrWidgetOptions from './ee_switch_mr_widget_options';
+import MrWidgetOptions from 'ee_else_ce/vue_merge_request_widget/mr_widget_options.vue';
 import Translate from '../vue_shared/translate';
 
 Vue.use(Translate);

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

@@ -3,6 +3,9 @@ import _ from 'underscore';
 import { __ } from '~/locale';
 import Project from '~/pages/projects/project';
 import SmartInterval from '~/smart_interval';
+import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store';
+import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service';
+import stateMaps from 'ee_else_ce/vue_merge_request_widget/stores/state_maps';
 import createFlash from '../flash';
 import WidgetHeader from './components/mr_widget_header.vue';
 import WidgetMergeHelp from './components/mr_widget_merge_help.vue';
@@ -28,10 +31,7 @@ import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue';
 import MergeWhenPipelineSucceedsState from './components/states/mr_widget_merge_when_pipeline_succeeds.vue';
 import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue';
 import CheckingState from './components/states/mr_widget_checking.vue';
-import MRWidgetStore from './stores/ee_switch_mr_widget_store';
-import MRWidgetService from './services/ee_switch_mr_widget_service';
 import eventHub from './event_hub';
-import stateMaps from './stores/ee_switch_state_maps';
 import notify from '~/lib/utils/notify';
 import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue';
 import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue';

app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js

-import MRWidgetService from 'ee/vue_merge_request_widget/services/mr_widget_service';
-
-export default MRWidgetService;

app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js

-import getStateKey from 'ee/vue_merge_request_widget/stores/get_state_key';
-
-export default getStateKey;

app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js

-import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
-
-export default MergeRequestStore;

app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js

-import stateMaps from 'ee/vue_merge_request_widget/stores/state_maps';
-
-export default stateMaps;

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

 import Timeago from 'timeago.js';
-import getStateKey from './ee_switch_get_state_key';
+import getStateKey from 'ee_else_ce/vue_merge_request_widget/stores/get_state_key';
 import { stateKey } from './state_maps';
 import { formatDate } from '../../lib/utils/datetime_utility';
 

config/webpack.config.js

@@ -102,12 +102,16 @@ module.exports = {
       vue$: 'vue/dist/vue.esm.js',
       spec: path.join(ROOT_PATH, 'spec/javascripts'),
 
-      // EE-only
+      // EE-only start
       ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
       ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
       ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
       ee_spec: path.join(ROOT_PATH, 'ee/spec/javascripts'),
+      // EE-only end
+
+      // the following resolves files which are different between CE and EE
+      ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
     },
   },