Merge pull request #21 from HeskeyBaozi/dev

Dev
HeskeyBaozi · Dec 22, 2017 · 0311bda · 0311bda
2 parents b9d318e + 59a6005
commit 0311bda
Show file tree

Hide file tree

Showing 33 changed files with 80 additions and 9,932 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -80,6 +80,10 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
+      },
+      {
+        test: /\.html$/,
+        loader: 'html-loader'
       }
     ]
   },

diff --git a/config/index.js b/config/index.js
@@ -56,7 +56,7 @@ module.exports = {
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, '../layout/index.html'),
+    index: path.resolve(__dirname, '../layout/index.ejs'),
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../source'),

diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
   <meta name="viewport"
         content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Loading...</title>
+  <title><%= config && config.title || 'Loading...' %></title>
 </head>
 <body>
 <div id="app"></div>

diff --git a/layout/index.ejs b/layout/index.ejs
@@ -0,0 +1 @@
+<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title><%= config && config.title || 'Loading...' %></title><link href=/static/css/app.3333935152c7ed744b8487831c6aefcf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a095cb50aa04d00a4e84.js></script><script type=text/javascript src=/static/js/vendor.9a148fcb89f1ff8802b7.js></script><script type=text/javascript src=/static/js/app.719480d1d356efe7f86c.js></script></body></html>
diff --git a/layout/index.html b/layout/index.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lite-fe",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Hexo Theme Lite FE",
   "author": "HeskeyBaozi <[email protected]>",
   "scripts": {
@@ -40,6 +40,7 @@
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-loader": "^0.5.1",
     "html-webpack-plugin": "^2.30.1",
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
@@ -83,7 +84,7 @@
     "out": "./src/styles/theme",
     "config": "./element-variables.scss",
     "theme": "element-theme-chalk",
-    "minimize": false,
+    "minimize": true,
     "components": [
       "Pagination",
       "Dialog",

diff --git a/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css b/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css
diff --git a/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css.gz b/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css.gz
diff --git a/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css.map b/source/static/css/app.3333935152c7ed744b8487831c6aefcf.css.map
diff --git a/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css b/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css
diff --git a/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css.gz b/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css.gz
diff --git a/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css.map b/source/static/css/app.6697455b575fd361f55cc52d29be06e5.css.map
diff --git a/source/static/js/0.2003b7cca41a19d8aef1.js.gz b/source/static/js/0.2003b7cca41a19d8aef1.js.gz
diff --git a/source/static/js/0.2003b7cca41a19d8aef1.js → source/static/js/0.8d0e6a674d0bafa37a31.js b/source/static/js/0.2003b7cca41a19d8aef1.js → source/static/js/0.8d0e6a674d0bafa37a31.js
diff --git a/source/static/js/0.8d0e6a674d0bafa37a31.js.gz b/source/static/js/0.8d0e6a674d0bafa37a31.js.gz
diff --git a/...e/static/js/0.2003b7cca41a19d8aef1.js.map → ...e/static/js/0.8d0e6a674d0bafa37a31.js.map b/...e/static/js/0.2003b7cca41a19d8aef1.js.map → ...e/static/js/0.8d0e6a674d0bafa37a31.js.map
diff --git a/...tatic/js/manifest.1200666a1ca7a3dd2dfa.js → ...tatic/js/manifest.a095cb50aa04d00a4e84.js b/...tatic/js/manifest.1200666a1ca7a3dd2dfa.js → ...tatic/js/manifest.a095cb50aa04d00a4e84.js
diff --git a/...c/js/manifest.1200666a1ca7a3dd2dfa.js.map → ...c/js/manifest.a095cb50aa04d00a4e84.js.map b/...c/js/manifest.1200666a1ca7a3dd2dfa.js.map → ...c/js/manifest.a095cb50aa04d00a4e84.js.map
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title><%= config && config.title \|\| 'Loading...' %></title><link href=/static/css/app.3333935152c7ed744b8487831c6aefcf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a095cb50aa04d00a4e84.js></script><script type=text/javascript src=/static/js/vendor.9a148fcb89f1ff8802b7.js></script><script type=text/javascript src=/static/js/app.719480d1d356efe7f86c.js></script></body></html>