From 41c21d2b3b1e3b8cd72385edfac335d4de4d24c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@parity.io>
Date: Mon, 12 Mar 2018 22:24:59 +0100
Subject: [PATCH] Fix common CSS.

---
 js/webpack/app.js    | 186 ++++++++++++++++++++++---------------------
 js/webpack/shared.js |   9 +--
 2 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/js/webpack/app.js b/js/webpack/app.js
index fa32ca0ca..c082cd83d 100644
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -19,6 +19,7 @@ const fs = require('fs');
 const path = require('path');
 const rimraf = require('rimraf');
 const flatten = require('lodash.flatten');
+const webpack = require('webpack');
 // const ReactIntlAggregatePlugin = require('react-intl-aggregate-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const WebpackErrorNotificationPlugin = require('webpack-error-notification');
@@ -165,96 +166,103 @@ module.exports = {
   },
 
   plugins: (function () {
-    let plugins = Shared.getPlugins(isProd, true).concat(
-      new WebpackErrorNotificationPlugin(),
-      new ExtractTextPlugin({
-        filename: 'bundle.css',
-        allChunks: true
-      }),
-    );
-
-    plugins = [].concat(
-      plugins,
-
-      new HtmlWebpackPlugin({
-        title: 'Parity Bar',
-        filename: 'embed.html',
-        template: './index.parity.ejs',
-        favicon: FAVICON,
-        chunks: ['commons', 'embed']
-      }),
-
-      new HtmlWebpackPlugin({
-        title: 'Parity',
-        filename: 'index.html',
-        template: './index.parity.ejs',
-        favicon: FAVICON,
-        chunks: ['commons', 'bundle']
-      }),
-
-      new CopyWebpackPlugin(
-        flatten([
-          {
-            from: path.join(__dirname, '../src/dev.web3.html'),
-            to: 'dev.web3/index.html'
-          },
-          {
-            from: path.join(__dirname, '../src/dev.parity.html'),
-            to: 'dev.parity/index.html'
-          },
-          {
-            from: path.join(__dirname, '../src/error_pages.css'),
-            to: 'styles.css'
-          },
-          {
-            from: path.join(__dirname, '../src/index.electron.js'),
-            to: 'electron.js'
-          },
-          {
-            from: path.join(__dirname, '../package.electron.json'),
-            to: 'package.json'
-          },
-          flatten(
-            DAPPS_ALL
-              .map((dapp) => {
-                const dir = path.join(__dirname, '../node_modules', dapp.package);
-
-                if (!fs.existsSync(dir)) {
-                  return null;
-                }
-
-                if (!fs.existsSync(path.join(dir, 'dist'))) {
-                  rimraf.sync(path.join(dir, 'node_modules'));
-
-                  return {
-                    from: path.join(dir),
-                    to: `dapps/${dapp.id}/`
-                  };
-                }
-
-                return [
-                  'icon.png', 'index.html', 'dist.css', 'dist.js',
-                  isProd ? null : 'dist.css.map',
-                  isProd ? null : 'dist.js.map'
-                ]
-                  .filter((file) => file)
-                  .map((file) => path.join(dir, file))
-                  .filter((from) => fs.existsSync(from))
-                  .map((from) => ({
-                    from,
-                    to: `dapps/${dapp.id}/`
-                  }))
-                  .concat({
-                    from: path.join(dir, 'dist'),
-                    to: `dapps/${dapp.id}/dist/`
-                  });
-              })
-              .filter((copy) => copy)
-          )
-        ]),
-        {}
+    let plugins = []
+      .concat(Shared.getPlugins(isProd, true))
+      .concat(
+        new WebpackErrorNotificationPlugin(),
+        new ExtractTextPlugin({
+          filename: '[name].css',
+          allChunks: true
+        })
       )
-    );
+      .concat(
+        new HtmlWebpackPlugin({
+          title: 'Parity Bar',
+          filename: 'embed.html',
+          template: './index.parity.ejs',
+          favicon: FAVICON,
+          chunks: ['commons', 'embed']
+        }),
+
+        new HtmlWebpackPlugin({
+          title: 'Parity',
+          filename: 'index.html',
+          template: './index.parity.ejs',
+          favicon: FAVICON,
+          chunks: ['commons', 'bundle']
+        }),
+
+        new CopyWebpackPlugin(
+          flatten([
+            {
+              from: path.join(__dirname, '../src/dev.web3.html'),
+              to: 'dev.web3/index.html'
+            },
+            {
+              from: path.join(__dirname, '../src/dev.parity.html'),
+              to: 'dev.parity/index.html'
+            },
+            {
+              from: path.join(__dirname, '../src/error_pages.css'),
+              to: 'styles.css'
+            },
+            {
+              from: path.join(__dirname, '../src/index.electron.js'),
+              to: 'electron.js'
+            },
+            {
+              from: path.join(__dirname, '../package.electron.json'),
+              to: 'package.json'
+            },
+            flatten(
+              DAPPS_ALL
+                .map((dapp) => {
+                  const dir = path.join(__dirname, '../node_modules', dapp.package);
+
+                  if (!fs.existsSync(dir)) {
+                    return null;
+                  }
+
+                  if (!fs.existsSync(path.join(dir, 'dist'))) {
+                    rimraf.sync(path.join(dir, 'node_modules'));
+
+                    return {
+                      from: path.join(dir),
+                      to: `dapps/${dapp.id}/`
+                    };
+                  }
+
+                  return [
+                    'icon.png', 'index.html', 'dist.css', 'dist.js',
+                    isProd ? null : 'dist.css.map',
+                    isProd ? null : 'dist.js.map'
+                  ]
+                    .filter((file) => file)
+                    .map((file) => path.join(dir, file))
+                    .filter((from) => fs.existsSync(from))
+                    .map((from) => ({
+                      from,
+                      to: `dapps/${dapp.id}/`
+                    }))
+                    .concat({
+                      from: path.join(dir, 'dist'),
+                      to: `dapps/${dapp.id}/dist/`
+                    });
+                })
+                .filter((copy) => copy)
+            )
+          ]),
+          {}
+        )
+      );
+
+    if (isProd) {
+      plugins.unshift(
+        new webpack.optimize.CommonsChunkPlugin({
+          name: 'commons'
+        })
+      );
+    }
 
     return plugins;
   }())
diff --git a/js/webpack/shared.js b/js/webpack/shared.js
index d2af20ab8..2834ea922 100644
--- a/js/webpack/shared.js
+++ b/js/webpack/shared.js
@@ -33,7 +33,7 @@ const UI_VERSION = PackageJson
   })
   .join('.');
 
-function getPlugins (_isProd = isProd, withCommons = false) {
+function getPlugins (_isProd = isProd) {
   const plugins = [
     new webpack.DefinePlugin({
       'process.env': {
@@ -53,13 +53,6 @@ function getPlugins (_isProd = isProd, withCommons = false) {
   ];
 
   if (_isProd) {
-    if (withCommons) {
-      plugins.push(
-        new webpack.optimize.CommonsChunkPlugin({
-          name: 'commons'
-        })
-      )
-    }
     plugins.push(
       new webpack.optimize.ModuleConcatenationPlugin(),
       new webpack.optimize.UglifyJsPlugin({