From d434c62a83f5fe02f6eff3b9e311cba2eab38bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 26 Feb 2018 19:43:34 +0000
Subject: Move EE-specific JavaScript files to ee/app/assets/javascripts

---
 config/webpack.config.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/webpack.config.js')

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 05389a2a93f..665dbe012dc 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -309,6 +309,7 @@ var config = {
       'images':         path.join(ROOT_PATH, 'app/assets/images'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.esm.js',
+      'spec':           path.join(ROOT_PATH, 'spec/javascripts'),
     }
   }
 }
-- 
cgit v1.2.1


From 7729a0ecc025c1ab8e6f0c8b5770fba8d254d831 Mon Sep 17 00:00:00 2001
From: Clement Ho <clemmakesapps@gmail.com>
Date: Mon, 26 Feb 2018 20:01:05 +0000
Subject: Refactor wildcard dispatcher imports

---
 config/webpack.config.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'config/webpack.config.js')

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 665dbe012dc..2b0c86c5e39 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -25,16 +25,10 @@ var NO_COMPRESSION = process.env.NO_COMPRESSION;
 var autoEntries = {};
 var pageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'app/assets/javascripts') });
 
-// filter out entries currently imported dynamically in dispatcher.js
-var dispatcher = fs.readFileSync(path.join(ROOT_PATH, 'app/assets/javascripts/dispatcher.js')).toString();
-var dispatcherChunks = dispatcher.match(/(?!import\(')\.\/pages\/[^']+/g);
-
 function generateAutoEntries(path, prefix = '.') {
   const chunkPath = path.replace(/\/index\.js$/, '');
-  if (!dispatcherChunks.includes(`${prefix}/${chunkPath}`)) {
-    const chunkName = chunkPath.replace(/\//g, '.');
-    autoEntries[chunkName] = `${prefix}/${path}`;
-  }
+  const chunkName = chunkPath.replace(/\//g, '.');
+  autoEntries[chunkName] = `${prefix}/${path}`;
 }
 
 pageEntries.forEach(( path ) => generateAutoEntries(path));
-- 
cgit v1.2.1