Merge branch 'revert-revert-of-webpack-cleanup' into 'master'

De-revert filtered_search webpack changes

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

app/assets/javascripts/filtered_search/filtered_search_bundle.js

-import './dropdown_emoji';
-import './dropdown_hint';
-import './dropdown_non_user';
-import './dropdown_user';
-import './dropdown_utils';
-import './filtered_search_dropdown_manager';
-import './filtered_search_dropdown';
-import './filtered_search_manager';
-import './filtered_search_tokenizer';
-import './filtered_search_visual_tokens';

config/webpack.config.js

@@ -49,7 +49,6 @@ function generateEntries() {
 
   const manualEntries = {
     balsamiq_viewer:      './blob/balsamiq_viewer.js',
-    filtered_search:      './filtered_search/filtered_search_bundle.js',
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
     notebook_viewer:      './blob/notebook_viewer.js',
@@ -83,7 +82,6 @@ function generateEntries() {
     mirrors:              'ee/mirrors',
     ee_protected_branches: 'ee/protected_branches',
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
-    service_desk_issues:  'ee/service_desk_issues/index.js',
     roadmap:              'ee/roadmap',
   };
 

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

-import FilteredSearchManager from '~/filtered_search/filtered_search_manager';
+import initFilteredSearch from '~/pages/search/init_filtered_search';
 import FilteredSearchTokenKeysEpics from 'ee/filtered_search/filtered_search_token_keys_epics';
 
 document.addEventListener('DOMContentLoaded', () => {
-  const filteredSearchEnabled = FilteredSearchManager && document.querySelector('.filtered-search');
-  if (filteredSearchEnabled) {
-    const filteredSearchManager = new FilteredSearchManager({
-      page: 'epics',
-      filteredSearchTokenKeys: FilteredSearchTokenKeysEpics,
-      stateFiltersSelector: '.epics-state-filters',
-    });
-    filteredSearchManager.setup();
-  }
+  initFilteredSearch({
+    page: 'epics',
+    filteredSearchTokenKeys: FilteredSearchTokenKeysEpics,
+    stateFiltersSelector: '.epics-state-filters',
+  });
 });

ee/app/assets/javascripts/service_desk_issues/filtered_search.js → ee/app/assets/javascripts/pages/projects/issues/service_desk/filtered_search.js

@@ -28,4 +28,3 @@ export default class FilteredSearchServiceDesk extends FilteredSearchManager {
     return onlyValidParams;
   }
 }
-

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

 - page_title "Epics"
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'filtered_search'
 
 .top-area
   = render 'shared/issuable/epic_nav', type: :epics

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

@@ -5,8 +5,6 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
-  = webpack_bundle_tag 'filtered_search'
-  = webpack_bundle_tag 'service_desk_issues'
   = webpack_bundle_tag 'issues'
 
 - content_for :breadcrumbs_extra do

spec/javascripts/test_bundle.js

@@ -125,7 +125,6 @@ if (process.env.BABEL_ENV === 'coverage') {
     './diff_notes/components/resolve_count.js',
     './dispatcher.js',
     './environments/environments_bundle.js',
-    './filtered_search/filtered_search_bundle.js',
     './graphs/graphs_bundle.js',
     './issuable/time_tracking/time_tracking_bundle.js',
     './main.js',