Merge branch 'ee-webpack-autoinclude' into 'master'

Webpack auto include for EE imports

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

app/assets/javascripts/dispatcher.js

@@ -62,11 +62,6 @@ var Dispatcher;
         case 'projects:blame:show':
           shortcut_handler = true;
           break;
-        case 'projects:edit':
-          import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:tree:show':
           import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/tree/show')
             .then(callDefault)

config/webpack.config.js

@@ -29,13 +29,19 @@ var pageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'ap
 var dispatcher = fs.readFileSync(path.join(ROOT_PATH, 'app/assets/javascripts/dispatcher.js')).toString();
 var dispatcherChunks = dispatcher.match(/(?!import\(')\.\/pages\/[^']+/g);
 
-pageEntries.forEach(( path ) => {
-  let chunkPath = path.replace(/\/index\.js$/, '');
-  if (!dispatcherChunks.includes('./' + chunkPath)) {
-    let chunkName = chunkPath.replace(/\//g, '.');
-    autoEntries[chunkName] = './' + path;
+function generateAutoEntries(path, prefix = '.') {
+  const chunkPath = path.replace(/\/index\.js$/, '');
+  if (!dispatcherChunks.includes(`${prefix}/${chunkPath}`)) {
+    const chunkName = chunkPath.replace(/\//g, '.');
+    autoEntries[chunkName] = `${prefix}/${path}`;
   }
-});
+}
+
+pageEntries.forEach(( path ) => generateAutoEntries(path));
+
+// add and replace any ce entries with ee entries
+const eePageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'ee/app/assets/javascripts') });
+eePageEntries.forEach(( path ) => generateAutoEntries(path, 'ee'));
 
 // report our auto-generated bundle count
 var autoEntriesCount = Object.keys(autoEntries).length;

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

+import '~/pages/projects/blame/show/index';
 import initBlob from '../../shared/init_blob';
 
 export default () => initBlob();

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

+import '~/pages/projects/blob/show/index';
 import initBlob from '../../shared/init_blob';
 
-export default () => initBlob();
+export default initBlob;

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

@@ -5,11 +5,11 @@ import UserCallout from '~/user_callout';
 import groupsSelect from '~/groups_select';
 import ApproversSelect from 'ee/approvers_select';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new UsersSelect();
   groupsSelect();
 
   new UserCallout({ className: 'js-service-desk-callout' });
   new UserCallout({ className: 'js-mr-approval-callout' });
   new ApproversSelect();
-};
+});

ee/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js

+import '~/pages/projects/merge_requests/creations/new/index';
 import UserCallout from '~/user_callout';
 import initForm from '../../shared/init_form';
 

ee/app/assets/javascripts/pages/projects/merge_requests/edit/index.js

+import '~/pages/projects/merge_requests/edit/index';
 import initForm from '../shared/init_form';
 
 export default () => initForm();

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

+import '~/pages/projects/milestones/show/index';
 import UserCallout from '~/user_callout';
 
 export default () => new UserCallout();

ee/app/assets/javascripts/pages/projects/settings/repository/show/index.js

+import '~/pages/projects/settings/repository/show/index';
 import UsersSelect from '~/users_select';
 import UserCallout from '~/user_callout';
 

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

+import '~/pages/projects/show/index';
 import initGeoInfoModal from '../../../init_geo_info_modal';
 
 export default () => initGeoInfoModal();

ee/app/assets/javascripts/pages/search/show/index.js

+import '~/pages/search/show/index';
 import UserCallout from '~/user_callout';
 
 export default () => new UserCallout();