Update extract-text-webpack-plugin to version 3.0.2 (#5584)

1 files changed, 15 insertions, 18 deletions

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 5ff267fc5..50fa48175 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -12,27 +12,24 @@ const localePackPaths = require('./generateLocalePacks');
 const extensionGlob = `**/*{${settings.extensions.join(',')}}*`;
 const entryPath = join(settings.source_path, settings.source_entry_path);
 const packPaths = sync(join(entryPath, extensionGlob));
-const entryPacks = [...packPaths, ...localePackPaths].filter(path => path !== join(entryPath, 'custom.js'));
-
-const themePaths = Object.keys(themes).reduce(
-  (themePaths, name) => {
-    themePaths[name] = resolve(join(settings.source_path, themes[name]));
-    return themePaths;
-  }, {});
 
 module.exports = {
   entry: Object.assign(
-    entryPacks.reduce(
-      (map, entry) => {
-        const localMap = map;
-        let namespace = relative(join(entryPath), dirname(entry));
-        if (namespace === join('..', '..', '..', 'tmp', 'packs')) {
-          namespace = ''; // generated by generateLocalePacks.js
-        }
-        localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
-        return localMap;
-      }, {}
-    ), themePaths
+    packPaths.reduce((map, entry) => {
+      const localMap = map;
+      const namespace = relative(join(entryPath), dirname(entry));
+      localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
+      return localMap;
+    }, {}),
+    localePackPaths.reduce((map, entry) => {
+      const localMap = map;
+      localMap[basename(entry, extname(entry, extname(entry)))] = resolve(entry);
+      return localMap;
+    }, {}),
+    Object.keys(themes).reduce((themePaths, name) => {
+      themePaths[name] = resolve(join(settings.source_path, themes[name]));
+      return themePaths;
+    }, {})
   ),
 
   output: {