From 48c22216b87ee5a9fc09cb731bb92b3b954cccd1 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Mon, 27 Jul 2020 12:28:33 +0300
Subject: [PATCH] chore(webpack) mini-css-extract-plugin

---
 .webpack/css.js | 32 ++++++++++++++++++++------------
 package.json    |  1 +
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.webpack/css.js b/.webpack/css.js
index df2919b4..931506a5 100644
--- a/.webpack/css.js
+++ b/.webpack/css.js
@@ -10,22 +10,30 @@ const {
 const {env} = process;
 const isDev = env.NODE_ENV === 'development';
 
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
-const extractCSS = (a) => new ExtractTextPlugin(`${a}.css`);
+const extractCSS = (a) => new MiniCssExtractPlugin({
+    filename: `${a}.css`
+});
+
 const extractMain = extractCSS('[name]');
 
-const cssNames = [
+const cssBase = [
     'nojs',
     'view',
     'config',
     'terminal',
     'user-menu',
+];
+
+const cssNames = [
+    ...cssBase,
     ...getCSSList('columns'),
 ];
 
-const cssPlugins = cssNames.map(extractCSS);
+const cssRules = cssNames.map(extract);
+const cssPlugins = cssBase.map(extractCSS);
 const clean = (a) => a.filter(Boolean);
 
 const plugins = clean([
@@ -37,11 +45,12 @@ const plugins = clean([
 const rules = [{
     test: /\.css$/,
     exclude: /css\/(nojs|view|config|terminal|user-menu|columns.*)\.css/,
-    use: extractMain.extract([
+    use: [
+        MiniCssExtractPlugin.loader,
         'css-loader',
-    ]),
+    ],
 },
-...cssPlugins.map(extract), {
+...cssRules, {
     test: /\.(png|gif|svg|woff|woff2|eot|ttf)$/,
     use: {
         loader: 'url-loader',
@@ -68,14 +77,13 @@ function getCSSList(dir) {
         .map(addDir);
 }
 
-function extract(extractPlugin) {
-    const {filename} = extractPlugin;
-    
+function extract(filename) {
     return {
         test: RegExp(`css/${filename}`),
-        use: extractPlugin.extract([
+        use: [
+            MiniCssExtractPlugin.loader,
             'css-loader',
-        ]),
+        ],
     };
 }
 
diff --git a/package.json b/package.json
index 60f0a024..fcde02a6 100644
--- a/package.json
+++ b/package.json
@@ -194,6 +194,7 @@
     "load.js": "^3.0.0",
     "madrun": "^7.0.0",
     "memfs": "^3.0.1",
+    "mini-css-extract-plugin": "^0.9.0",
     "minor": "^1.2.2",
     "mock-require": "^3.0.1",
     "morgan": "^1.6.1",