From 619a42053f6c4f64b50badc321beda6e60119cba Mon Sep 17 00:00:00 2001
From: olOwOlo <26087907+olOwOlo@users.noreply.github.com>
Date: Mon, 9 Jul 2018 15:12:02 +0800
Subject: [PATCH] chore(build): yarn & webpack 4 & path & assets.json
---
.babelrc | 5 +
.gitignore | 4 +-
data/even/assets.json | 6 +
layouts/partials/head.html | 4 +-
layouts/partials/scripts.html | 4 +-
package.json | 32 +
src/postcss.config.js => postcss.config.js | 2 +-
src/.babelrc | 10 -
src/package.json | 31 -
src/webpack.config.js | 54 -
static/dist/even.1029e815.min.js | 2 +
static/dist/even.1029e815.min.js.map | 1 +
static/dist/even.e06a665f.min.css | 4 +
static/dist/even.e06a665f.min.css.map | 1 +
static/dist/even.min.css | 4 -
static/dist/even.min.css.map | 1 -
static/dist/even.min.js | 2 -
static/dist/even.min.js.map | 1 -
.../fonts/chancery/apple-chancery-webfont.eot | Bin
.../fonts/chancery/apple-chancery-webfont.svg | 0
.../fonts/chancery/apple-chancery-webfont.ttf | Bin
.../chancery/apple-chancery-webfont.woff | Bin
.../chancery/apple-chancery-webfont.woff2 | Bin
.../{ => src}/fonts/iconfont/iconfont.eot | Bin
.../{ => src}/fonts/iconfont/iconfont.svg | 0
.../{ => src}/fonts/iconfont/iconfont.ttf | Bin
.../{ => src}/fonts/iconfont/iconfont.woff | Bin
webpack.config.js | 87 +
yarn.lock | 4819 +++++++++++++++++
29 files changed, 4964 insertions(+), 110 deletions(-)
create mode 100644 .babelrc
create mode 100644 data/even/assets.json
create mode 100644 package.json
rename src/postcss.config.js => postcss.config.js (98%)
delete mode 100644 src/.babelrc
delete mode 100644 src/package.json
delete mode 100644 src/webpack.config.js
create mode 100644 static/dist/even.1029e815.min.js
create mode 100644 static/dist/even.1029e815.min.js.map
create mode 100644 static/dist/even.e06a665f.min.css
create mode 100644 static/dist/even.e06a665f.min.css.map
delete mode 100644 static/dist/even.min.css
delete mode 100644 static/dist/even.min.css.map
delete mode 100644 static/dist/even.min.js
delete mode 100644 static/dist/even.min.js.map
rename static/dist/{ => src}/fonts/chancery/apple-chancery-webfont.eot (100%)
rename static/dist/{ => src}/fonts/chancery/apple-chancery-webfont.svg (100%)
rename static/dist/{ => src}/fonts/chancery/apple-chancery-webfont.ttf (100%)
rename static/dist/{ => src}/fonts/chancery/apple-chancery-webfont.woff (100%)
rename static/dist/{ => src}/fonts/chancery/apple-chancery-webfont.woff2 (100%)
rename static/dist/{ => src}/fonts/iconfont/iconfont.eot (100%)
rename static/dist/{ => src}/fonts/iconfont/iconfont.svg (100%)
rename static/dist/{ => src}/fonts/iconfont/iconfont.ttf (100%)
rename static/dist/{ => src}/fonts/iconfont/iconfont.woff (100%)
create mode 100644 webpack.config.js
create mode 100644 yarn.lock
diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..54e2cb5
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,5 @@
+{
+ "presets": ["env", "stage-3"],
+ "plugins": ["transform-runtime"],
+ "ignore": []
+}
diff --git a/.gitignore b/.gitignore
index 6d8cd9d..78f2710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/src/node_modules/
-/.idea/
+node_modules/
+.idea/
diff --git a/data/even/assets.json b/data/even/assets.json
new file mode 100644
index 0000000..380e032
--- /dev/null
+++ b/data/even/assets.json
@@ -0,0 +1,6 @@
+{
+ "even": {
+ "css": "even.e06a665f.min.css",
+ "js": "even.1029e815.min.js"
+ }
+}
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 19c000c..9b5c840 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,7 +33,7 @@
{{ with .Site.Params.googleVerification }}{{ end }}
-
+
@@ -61,7 +61,7 @@
{{- end }}
-
+
{{ if .Site.Params.publicCDN.enable -}}
{{ if .Site.Params.fancybox }}{{ .Site.Params.publicCDN.fancyboxCSS | safeHTML }}{{ end }}
{{- else -}}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 47df69b..fb6285b 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -36,7 +36,7 @@
{{- end -}}
{{- if .Site.Params.publicCDN.enable -}}
- {{ .Site.Params.publicCDN.flowchartDiagrams | safeHTML }}
+ {{ .Site.Params.publicCDN.flowchartDiagramsJS | safeHTML }}
{{- else -}}
@@ -63,7 +63,7 @@
{{- end -}}
{{- end }}
-
+
{{- if and (or .Params.mathjax (and .Site.Params.mathjax (ne .Params.mathjax false))) (or .IsPage .IsHome) }}