From b5983a700e66b4fa3ab2f419d4b21a4536443a3d Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Sun, 6 May 2018 01:19:04 -0500
Subject: consolidate main bootstrap entries

---
 app/assets/javascripts/main.js | 16 ++++++++--------
 config/webpack.config.js       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ba3ec86d9fd..247aeb481c6 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -1,22 +1,19 @@
-/* eslint-disable import/first */
 /* global $ */
 
 import jQuery from 'jquery';
 import Cookies from 'js-cookie';
 import svg4everybody from 'svg4everybody';
 
-// expose common libraries as globals (TODO: remove these)
-window.jQuery = jQuery;
-window.$ = jQuery;
+// bootstrap webpack, common libs, polyfills, and behaviors
+import './webpack';
+import './commons';
+import './behaviors';
 
 // lib/utils
 import { handleLocationHash, addSelectOnFocusBehaviour } from './lib/utils/common_utils';
 import { localTimeAgo } from './lib/utils/datetime_utility';
 import { getLocationHash, visitUrl } from './lib/utils/url_utility';
 
-// behaviors
-import './behaviors/';
-
 // everything else
 import loadAwardsHandler from './awards_handler';
 import bp from './breakpoints';
@@ -31,9 +28,12 @@ import initLogoAnimation from './logo';
 import './milestone_select';
 import './projects_dropdown';
 import initBreadcrumbs from './breadcrumb';
-
 import initDispatcher from './dispatcher';
 
+// expose jQuery as global (TODO: remove these)
+window.jQuery = jQuery;
+window.$ = jQuery;
+
 // inject test utilities if necessary
 if (process.env.NODE_ENV !== 'production' && gon && gon.test_env) {
   $.fx.off = true;
diff --git a/config/webpack.config.js b/config/webpack.config.js
index a2a527f25d2..5096f35e808 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -18,7 +18,7 @@ const NO_COMPRESSION = process.env.NO_COMPRESSION;
 
 let autoEntriesCount = 0;
 let watchAutoEntries = [];
-const defaultEntries = ['./webpack', './commons', './main'];
+const defaultEntries = ['./main'];
 
 function generateEntries() {
   // generate automatic entry points
-- 
cgit v1.2.1