From 3c2aa37967d6ee9deabddad84736ac0058cf90fd Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 4 Aug 2018 10:22:16 +0800
Subject: [PATCH] Optimize webpack build

---
 package.json                      |  1 +
 resources/assets/src/js/notify.js |  3 ++-
 webpack.config.js                 | 10 ++++++++--
 yarn.lock                         |  9 ++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 96c0a09e..266969bc 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "copy-webpack-plugin": "^4.5.2",
     "css-loader": "^1.0.0",
     "cssnano": "^4.0.4",
+    "csso-loader": "^0.3.1",
     "eslint": "^5.2.0",
     "eslint-formatter-beauty": "^3.0.0-beta.2",
     "eslint-plugin-vue": "^5.0.0-beta.1",
diff --git a/resources/assets/src/js/notify.js b/resources/assets/src/js/notify.js
index 83726cf9..b70d5025 100644
--- a/resources/assets/src/js/notify.js
+++ b/resources/assets/src/js/notify.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import sweetalert2 from 'sweetalert2';
+import sweetalert2 from 'sweetalert2/dist/sweetalert2.min';
 import { trans } from './i18n';
 
 /**
@@ -73,6 +73,7 @@ export function showModal(msg, title = 'Message', type = 'default', options = {}
     }).modal(options);
 }
 
+/** @type {typeof import('sweetalert2').default} */
 export const swal = sweetalert2.mixin({
     confirmButtonText: trans('general.confirm'),
     cancelButtonText: trans('general.cancel')
diff --git a/webpack.config.js b/webpack.config.js
index e1f0cbf3..adce63e1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,6 +19,7 @@ module.exports = [{
             'font-awesome/css/font-awesome.min.css',
             'icheck/skins/square/blue.css',
             'toastr/build/toastr.min.css',
+            'sweetalert2/dist/sweetalert2.min.css',
             './resources/assets/src/stylus/common.styl',
         ]
     },
@@ -58,13 +59,18 @@ module.exports = [{
             },
             {
                 test: /node_modules.*\.css$/,
-                use: [MiniCssExtractPlugin.loader, 'css-loader']
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    { loader: 'css-loader', options: { importLoaders: 1 } },
+                    'csso-loader?-comments',
+                ]
             },
             {
                 test: /common\.styl$/,
                 use: [
                     MiniCssExtractPlugin.loader,
-                    { loader: 'css-loader', options: { importLoaders: 2 } },
+                    { loader: 'css-loader', options: { importLoaders: 3 } },
+                    'csso-loader',
                     'postcss-loader',
                     'stylus-loader'
                 ]
diff --git a/yarn.lock b/yarn.lock
index b8f5d92e..4f24f39e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2472,7 +2472,14 @@ cssnano@^4.0.4:
     is-resolvable "^1.0.0"
     postcss "^6.0.0"
 
-csso@^3.5.0:
+csso-loader@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.npmjs.org/csso-loader/-/csso-loader-0.3.1.tgz#2401a8c825a079ec243e2654e355562201a8a6d4"
+  dependencies:
+    csso "^3.0.1"
+    loader-utils "^1.1.0"
+
+csso@^3.0.1, csso@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
   dependencies: