Merge branch 'remove-issues-ee-bundles' into 'master'

Remove "issues" webpack bundles

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

app/views/groups/issues.html.haml

@@ -4,7 +4,6 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'issues'
 
 - if group_issues_count(state: 'all').zero?
   = render 'shared/empty_states/issues', project_select_button: true

app/views/projects/issues/index.html.haml

@@ -6,7 +6,6 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'issues'
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")

app/views/projects/issues/show.html.haml

@@ -7,9 +7,6 @@
 
 - can_update_issue = can?(current_user, :update_issue, @issue)
 - can_report_spam = @issue.submittable_as_spam_by?(current_user)
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')
-  = webpack_bundle_tag('issuable')
 
 .detail-page-header
   .detail-page-header-body

app/views/projects/merge_requests/show.html.haml

@@ -5,14 +5,8 @@
 - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
 - page_description @merge_request.description
 - page_card_attributes @merge_request.card_attributes
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('common_vue')
-  = webpack_bundle_tag('issuable')
-
-  - if has_vue_discussions_cookie?
-    = webpack_bundle_tag('mr_notes')
-
-  - if has_vue_discussions_cookie?
+- if has_vue_discussions_cookie?
+  - content_for :page_specific_javascripts do
     = webpack_bundle_tag('mr_notes')
 
 .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }

config/webpack.config.js

@@ -69,8 +69,6 @@ function generateEntries() {
     add_gitlab_slack_application: 'ee/add_gitlab_slack_application/index.js',
     burndown_chart:       'ee/burndown_chart/index.js',
     geo_nodes:            'ee/geo_nodes',
-    issuable:             'ee/issuable/issuable_bundle.js',
-    issues:               'ee/issues/issues_bundle.js',
     ldap_group_links:     'ee/groups/ldap_group_links.js',
     mirrors:              'ee/mirrors',
     ee_protected_branches: 'ee/protected_branches',

ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue

 <script>
   /* eslint-disable vue/require-default-prop */
   import issuableApp from '~/issue_show/components/app.vue';
-  import relatedIssuesRoot from 'ee/issuable/related_issues/components/related_issues_root.vue';
+  import relatedIssuesRoot from 'ee/related_issues/components/related_issues_root.vue';
   import issuableAppEventHub from '~/issue_show/event_hub';
   import epicHeader from './epic_header.vue';
   import epicSidebar from '../../sidebar/components/sidebar_app.vue';

ee/app/assets/javascripts/issues/export_csv_modal.js

-/* eslint-disable no-new */
-
-$(() => {
-  class ExportCSVModal {
-    constructor() {
-      this.$modal = $('.issues-export-modal');
-      this.$downloadBtn = $('.csv_download_link');
-      this.$closeBtn = $('.modal-header .close');
-      this.init();
-    }
-
-    init() {
-      this.$modal.modal({ show: false });
-      this.$downloadBtn.on('click', () => this.$modal.modal('show'));
-      this.$closeBtn.on('click', () => this.$modal.modal('hide'));
-    }
-  }
-
-  new ExportCSVModal();
-});

ee/app/assets/javascripts/issues/issues_bundle.js

-import './export_csv_modal';

ee/app/assets/javascripts/pages/projects/issues/index/export_csv_modal.js

+export default function initExportCSVModal() {
+  const $modal = $('.issues-export-modal');
+  const $downloadBtn = $('.csv_download_link');
+  const $closeBtn = $('.modal-header .close');
+
+  $modal.modal({ show: false });
+  $downloadBtn.on('click', () => $modal.modal('show'));
+  $closeBtn.on('click', () => $modal.modal('hide'));
+}

ee/app/assets/javascripts/pages/projects/issues/index/index.js

+import '~/pages/projects/issues/index/index';
+import initExportCSVModal from './export_csv_modal';
+
+document.addEventListener('DOMContentLoaded', initExportCSVModal);

ee/app/assets/javascripts/pages/projects/issues/show/index.js

 import initShow from '~/pages/projects/issues/show';
 import initSidebarBundle from 'ee/sidebar/sidebar_bundle';
+import initRelatedIssues from 'ee/related_issues';
 
 document.addEventListener('DOMContentLoaded', () => {
   initShow();
   initSidebarBundle();
+  initRelatedIssues();
 });

ee/app/assets/javascripts/issuable/issuable_bundle.js → ee/app/assets/javascripts/related_issues/index.js

 import Vue from 'vue';
 import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
-import RelatedIssuesRoot from './related_issues/components/related_issues_root.vue';
+import RelatedIssuesRoot from './components/related_issues_root.vue';
 
-document.addEventListener('DOMContentLoaded', () => {
+export default function initRelatedIssues() {
   const relatedIssuesRootElement = document.querySelector('.js-related-issues-root');
   if (relatedIssuesRootElement) {
     // eslint-disable-next-line no-new
@@ -22,4 +22,4 @@ document.addEventListener('DOMContentLoaded', () => {
       }),
     });
   }
-});
+}

ee/app/views/projects/issues/service_desk.html.haml

@@ -3,10 +3,6 @@
 
 - page_title "Service Desk"
 
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'issues'
-
 - content_for :breadcrumbs_extra do
   = render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false
 

spec/javascripts/issuable/related_issues/components/add_issuable_form_spec.js

 import Vue from 'vue';
-import eventHub from 'ee/issuable/related_issues/event_hub';
-import addIssuableForm from 'ee/issuable/related_issues/components/add_issuable_form.vue';
+import eventHub from 'ee/related_issues/event_hub';
+import addIssuableForm from 'ee/related_issues/components/add_issuable_form.vue';
 
 const issuable1 = {
   id: 200,

spec/javascripts/issuable/related_issues/components/issue_item_spec.js

 import Vue from 'vue';
-import issueItem from 'ee/issuable/related_issues/components/issue_item.vue';
-import eventHub from 'ee/issuable/related_issues/event_hub';
+import issueItem from 'ee/related_issues/components/issue_item.vue';
+import eventHub from 'ee/related_issues/event_hub';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
 describe('issueItem', () => {

spec/javascripts/issuable/related_issues/components/issue_token_spec.js

 import Vue from 'vue';
-import eventHub from 'ee/issuable/related_issues/event_hub';
-import issueToken from 'ee/issuable/related_issues/components/issue_token.vue';
+import eventHub from 'ee/related_issues/event_hub';
+import issueToken from 'ee/related_issues/components/issue_token.vue';
 
 describe('IssueToken', () => {
   const idKey = 200;

spec/javascripts/issuable/related_issues/components/related_issues_block_spec.js

 import Vue from 'vue';
-import eventHub from 'ee/issuable/related_issues/event_hub';
-import relatedIssuesBlock from 'ee/issuable/related_issues/components/related_issues_block.vue';
+import eventHub from 'ee/related_issues/event_hub';
+import relatedIssuesBlock from 'ee/related_issues/components/related_issues_block.vue';
 
 import { issuable1, issuable2, issuable3, issuable4, issuable5 } from '../mock_data';
 

spec/javascripts/issuable/related_issues/components/related_issues_root_spec.js

 import Vue from 'vue';
 import _ from 'underscore';
-import relatedIssuesRoot from 'ee/issuable/related_issues/components/related_issues_root.vue';
-import relatedIssuesService from 'ee/issuable/related_issues/services/related_issues_service';
+import relatedIssuesRoot from 'ee/related_issues/components/related_issues_root.vue';
+import relatedIssuesService from 'ee/related_issues/services/related_issues_service';
 
 import { defaultProps, issuable1, issuable2 } from '../mock_data';
 

spec/javascripts/issuable/related_issues/stores/related_issues_store_spec.js

-import RelatedIssuesStore from 'ee/issuable/related_issues/stores/related_issues_store';
+import RelatedIssuesStore from 'ee/related_issues/stores/related_issues_store';
 
 import { issuable1, issuable2, issuable3, issuable4, issuable5 } from '../mock_data';