From 4e332163e2b80fb7e119fb213b73dfe3389a7670 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Mon, 9 Jul 2018 12:19:54 +0300
Subject: [PATCH] feature(package) css-loader v1.0.0

---
 .webpack/css.js | 13 +++++++------
 package.json    |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.webpack/css.js b/.webpack/css.js
index d7f3b1ca..280d1107 100644
--- a/.webpack/css.js
+++ b/.webpack/css.js
@@ -11,6 +11,7 @@ const {env} = process;
 const isDev = env.NODE_ENV === 'development';
 
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
 const extractCSS = (a) => new ExtractTextPlugin(`${a}.css`);
 const extractMain = extractCSS('[name]');
@@ -24,19 +25,19 @@ const cssNames = [
 ];
 
 const cssPlugins = cssNames.map(extractCSS);
+const clean = (a) => a.filter(Boolean);
 
-const plugins = [
+const plugins = clean([
     ...cssPlugins,
     extractMain,
-];
-
-const cssLoader = isDev ? 'css-loader' : 'css-loader?minimize';
+    !isDev && new OptimizeCssAssetsPlugin({}),
+]);
 
 const rules = [{
     test: /\.css$/,
     exclude: /css\/(nojs|view|config|terminal|columns.*)\.css/,
     use: extractMain.extract([
-        cssLoader,
+        'css-loader',
     ]),
 },
 ...cssPlugins.map(extract), {
@@ -67,7 +68,7 @@ function extract(extractPlugin) {
     return {
         test: RegExp(`css/${filename}`),
         use: extractPlugin.extract([
-            cssLoader
+            'css-loader',
         ])
     };
 }
diff --git a/package.json b/package.json
index e6d346c6..45a1ba59 100644
--- a/package.json
+++ b/package.json
@@ -169,7 +169,7 @@
     "clear-module": "^2.1.0",
     "codegen.macro": "^3.0.0",
     "coveralls": "^3.0.0",
-    "css-loader": "^0.28.4",
+    "css-loader": "^1.0.0",
     "domtokenlist-shim": "^1.2.0",
     "emitify": "^3.0.2",
     "es6-promise": "^4.0.5",
@@ -192,6 +192,7 @@
     "morgan": "^1.6.1",
     "nodemon": "^1.9.1",
     "nyc": "^12.0.1",
+    "optimize-css-assets-webpack-plugin": "^4.0.3",
     "philip": "^2.0.0",
     "place": "^1.1.4",
     "readjson": "^1.1.3",