Merge branch 'master' into 'ee-refactor-protected-branches'

# Conflicts:
#   config/webpack.config.js

app/assets/javascripts/pages/projects/registry/repositories/index.js

+import initRegistryImages from '~/registry/index';
+
+document.addEventListener('DOMContentLoaded', initRegistryImages);

app/assets/javascripts/registry/index.js

@@ -4,7 +4,7 @@ import Translate from '../vue_shared/translate';
 
 Vue.use(Translate);
 
-document.addEventListener('DOMContentLoaded', () => new Vue({
+export default () => new Vue({
   el: '#js-vue-registry-images',
   components: {
     registryApp,
@@ -22,4 +22,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
       },
     });
   },
-}));
+});

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) } }

app/views/projects/registry/repositories/index.html.haml

@@ -15,7 +15,6 @@
       #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } }
 
       = webpack_bundle_tag('common_vue')
-      = webpack_bundle_tag('registry_list')
 
   .row.prepend-top-10
     .col-lg-12

config/webpack.config.js

@@ -50,7 +50,6 @@ function generateEntries() {
   const manualEntries = {
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
-    registry_list:        './registry/index.js',
     terminal:             './terminal/terminal_bundle.js',
     two_factor_auth:      './two_factor_auth.js',
 
@@ -67,11 +66,7 @@ function generateEntries() {
     // EE-only
     add_gitlab_slack_application: 'ee/add_gitlab_slack_application/index.js',
     burndown_chart:       'ee/burndown_chart/index.js',
-    epic_show:            'ee/epics/epic_show/epic_show_bundle.js',
-    new_epic:             'ee/epics/new_epic/new_epic_bundle.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',
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',

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/epics/epic_show/epic_show_bundle.js

 import Vue from 'vue';
 import EpicShowApp from './components/epic_show_app.vue';
 
-document.addEventListener('DOMContentLoaded', () => {
+export default () => {
   const el = document.querySelector('#epic-show-app');
   const metaData = JSON.parse(el.dataset.meta);
   const initialData = JSON.parse(el.dataset.initial);
@@ -21,4 +21,4 @@ document.addEventListener('DOMContentLoaded', () => {
       props,
     }),
   });
-});
+};

ee/app/assets/javascripts/epics/new_epic/new_epic_bundle.js

 import Vue from 'vue';
 import NewEpicApp from './components/new_epic.vue';
 
-document.addEventListener('DOMContentLoaded', () => {
+export default () => {
   const el = document.querySelector('#new-epic-app');
-  const props = el.dataset;
 
-  return new Vue({
-    el,
-    components: {
-      'new-epic-app': NewEpicApp,
-    },
-    render: createElement => createElement('new-epic-app', {
-      props,
-    }),
-  });
-});
+  if (el) {
+    const props = el.dataset;
+
+    new Vue({ // eslint-disable-line no-new
+      el,
+      components: {
+        'new-epic-app': NewEpicApp,
+      },
+      render: createElement => createElement('new-epic-app', {
+        props,
+      }),
+    });
+  }
+};

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/groups/epics/index/index.js

 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import FilteredSearchTokenKeysEpics from 'ee/filtered_search/filtered_search_token_keys_epics';
+import initNewEpic from 'ee/epics/new_epic/new_epic_bundle';
 
 document.addEventListener('DOMContentLoaded', () => {
   initFilteredSearch({
@@ -7,4 +8,5 @@ document.addEventListener('DOMContentLoaded', () => {
     filteredSearchTokenKeys: FilteredSearchTokenKeysEpics,
     stateFiltersSelector: '.epics-state-filters',
   });
+  initNewEpic();
 });

ee/app/assets/javascripts/pages/groups/epics/show/index.js

 import ZenMode from '~/zen_mode';
+import initEpicShow from 'ee/epics/epic_show/epic_show_bundle';
 
-document.addEventListener('DOMContentLoaded', () => new ZenMode());
+document.addEventListener('DOMContentLoaded', () => {
+  new ZenMode(); // eslint-disable-line no-new
+  initEpicShow();
+});

ee/app/assets/javascripts/pages/groups/roadmap/show/index.js

+import initNewEpic from 'ee/epics/new_epic/new_epic_bundle';
+
+document.addEventListener('DOMContentLoaded', initNewEpic);

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/assets/javascripts/sidebar/mount_sidebar.js

@@ -25,7 +25,10 @@ function mountWeightComponent(mediator) {
 function mountEpic() {
   const el = document.querySelector('#js-vue-sidebar-item-epic');
 
-  return new Vue({
+  if (!el) return;
+
+  // eslint-disable-next-line no-new
+  new Vue({
     el,
     components: {
       SidebarItemEpic,

ee/app/views/groups/epics/index.html.haml

@@ -4,8 +4,6 @@
   = render 'shared/issuable/epic_nav', type: :epics
   .nav-controls
     - if can?(current_user, :create_epic, @group)
-      - content_for :page_specific_javascripts do
-        = webpack_bundle_tag 'new_epic'
       #new-epic-app{ data: { endpoint: request.url, 'align-right' => true } }
 
 = render 'shared/epic/search_bar', type: :epics

ee/app/views/groups/epics/show.html.haml

@@ -14,6 +14,5 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'epic_show'
 
 #epic-show-app{ data: { initial: issuable_initial_data(@epic).to_json, meta: epic_meta_data } }

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
 

ee/app/views/shared/empty_states/_epics.html.haml

@@ -11,5 +11,4 @@
       - if can?(current_user, :create_epic, @group)
         - content_for :page_specific_javascripts do
           = webpack_bundle_tag 'common_vue'
-          = webpack_bundle_tag 'new_epic'
         #new-epic-app{ data: { endpoint: request.url } }

ee/app/views/shared/empty_states/_roadmap.html.haml

@@ -11,7 +11,6 @@
       - if can?(current_user, :create_epic, @group)
         - content_for :page_specific_javascripts do
           = webpack_bundle_tag 'common_vue'
-          = webpack_bundle_tag 'new_epic'
         #new-epic-app{ data: { endpoint: request.url } }
       = link_to group_epics_path(@group), title: 'List', class: 'btn' do
         %span= _('View epics list')

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';