From afc5854615c09508abbe9b2338e0ab2e6e2c308f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 28 Mar 2019 10:24:09 +0800
Subject: [PATCH] Tweak build

---
 package.json                      |  1 -
 resources/assets/src/index.js     | 13 ++++++++-----
 resources/lang/en/front-end.js    |  3 ---
 resources/lang/zh_CN/front-end.js |  3 ---
 webpack.config.js                 |  5 +----
 yarn.lock                         |  9 +--------
 6 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 resources/lang/en/front-end.js
 delete mode 100644 resources/lang/zh_CN/front-end.js

diff --git a/package.json b/package.json
index 0abe89ef..909e7355 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "copy-webpack-plugin": "^5.0.1",
     "css-loader": "^2.1.0",
     "cssnano": "^4.1.10",
-    "csso-loader": "^0.3.1",
     "eslint": "^5.14.0",
     "eslint-config-gplane": "^5.1.3",
     "eslint-formatter-beauty": "^3.0.0",
diff --git a/resources/assets/src/index.js b/resources/assets/src/index.js
index 454a9e43..c91d34b2 100644
--- a/resources/assets/src/index.js
+++ b/resources/assets/src/index.js
@@ -5,15 +5,18 @@ import routes from './route'
 
 Vue.config.productionTip = false
 
-if (process.env.NODE_ENV === 'development') {
+loadI18n().then(loadModules)
+
+async function loadI18n() {
   const langs = [
-    { lang: 'en', load: () => import('../../lang/en/front-end') },
-    { lang: 'zh_CN', load: () => import('../../lang/zh_CN/front-end') },
+    { lang: 'en', load: () => import('../../lang/en/front-end.yml') },
+    { lang: 'zh_CN', load: () => import('../../lang/zh_CN/front-end.yml') },
   ]
-  setTimeout(langs.find(({ lang }) => lang === blessing.locale).load, 0)
+  const texts = await langs.find(({ lang }) => lang === blessing.locale).load()
+  blessing.i18n = Object.assign(blessing.i18n || Object.create(null), texts)
 }
 
-{
+function loadModules() {
   const route = routes.find(
     // eslint-disable-next-line no-shadow
     route => (new RegExp(`^${route.path}$`, 'i')).test(blessing.route)
diff --git a/resources/lang/en/front-end.js b/resources/lang/en/front-end.js
deleted file mode 100644
index fac8d532..00000000
--- a/resources/lang/en/front-end.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import lang from './front-end.yml'
-
-blessing.i18n = Object.assign(blessing.i18n || Object.create(null), lang)
diff --git a/resources/lang/zh_CN/front-end.js b/resources/lang/zh_CN/front-end.js
deleted file mode 100644
index fac8d532..00000000
--- a/resources/lang/zh_CN/front-end.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import lang from './front-end.yml'
-
-blessing.i18n = Object.assign(blessing.i18n || Object.create(null), lang)
diff --git a/webpack.config.js b/webpack.config.js
index 17e420ff..c9e44901 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,8 +23,6 @@ const config = {
       './resources/assets/src/stylus/common.styl',
     ],
     setup: './resources/assets/src/stylus/setup.styl',
-    'langs/en': './resources/lang/en/front-end.js',
-    'langs/zh_CN': './resources/lang/zh_CN/front-end.js',
   },
   output: {
     path: `${__dirname}/public/app`,
@@ -65,8 +63,7 @@ const config = {
         test: /(common|home|setup)\.styl$/,
         use: [
           MiniCssExtractPlugin.loader,
-          { loader: 'css-loader', options: { importLoaders: 3 } },
-          'csso-loader',
+          { loader: 'css-loader', options: { importLoaders: 2 } },
           'postcss-loader',
           'stylus-loader',
         ],
diff --git a/yarn.lock b/yarn.lock
index 2bec4f49..04fcdd7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2853,14 +2853,7 @@ cssnano@^4.1.10:
     is-resolvable "^1.0.0"
     postcss "^7.0.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:
+csso@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
   dependencies: