From 37530f6c24a5816036746d541198bf6a0a0fa191 Mon Sep 17 00:00:00 2001
From: Margatroid <351652632@qq.com>
Date: Wed, 26 Dec 2018 13:31:32 +0800
Subject: [PATCH] feat: add minify tasks to CI build scripts

---
 .travis.yml              |  1 +
 gulpfile.js              |  4 +--
 package-lock.json        | 72 ------------------------------------------------
 package.json             |  3 +-
 scripts/netlify_build.sh |  2 ++
 5 files changed, 5 insertions(+), 77 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42785339..adeec0e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ script:
   - chmod +x ./scripts/build.sh && ./scripts/build.sh
   - mkdocs build -v
   - find ./site -type f -name '*.html' -exec node --max_old_space_size=512 ./scripts/render_math.js {} \;
+  - npx gulp minify
   - docker build -t oi-wiki:latest .
   - set +e
 deploy:
diff --git a/gulpfile.js b/gulpfile.js
index a3119cdd..c6b94be2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -40,6 +40,4 @@ gulp.task('minify:image', () => {
     .pipe(gulp.dest('site'))
 })
 
-gulp.task('minify', cb => {
-  run('minify:image', ['minify:html', 'minify:css'], cb)
-})
+gulp.task('minify', gulp.series('minify:html', 'minify:css', 'minify:image'))
diff --git a/package-lock.json b/package-lock.json
index 70240a22..982612f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,14 +71,6 @@
         "ansi-wrap": "^0.1.0"
       }
     },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/ansi-cyan/download/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "http://registry.npm.taobao.org/ansi-gray/download/ansi-gray-0.1.1.tgz",
@@ -87,14 +79,6 @@
         "ansi-wrap": "0.1.0"
       }
     },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/ansi-red/download/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
     "ansi-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -6804,62 +6788,6 @@
         "glob": "^7.0.5"
       }
     },
-    "run-sequence": {
-      "version": "2.2.1",
-      "resolved": "http://registry.npm.taobao.org/run-sequence/download/run-sequence-2.2.1.tgz",
-      "integrity": "sha1-HOZD2jb9jH6n4akynaM/wriJhJU=",
-      "requires": {
-        "chalk": "^1.1.3",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^0.1.2"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "http://registry.npm.taobao.org/arr-diff/download/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "http://registry.npm.taobao.org/arr-union/download/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0="
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "http://registry.npm.taobao.org/array-slice/download/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU="
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ="
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "http://registry.npm.taobao.org/plugin-error/download/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        }
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
diff --git a/package.json b/package.json
index 6dfbde0c..32152865 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
     "remark-lint-no-tabs": "^1.0.2",
     "remark-math": "^1.0.5",
     "remark-pangu": "^1.0.1",
-    "remark-preset-lint-markdown-style-guide": "^2.1.2",
-    "run-sequence": "^2.2.1"
+    "remark-preset-lint-markdown-style-guide": "^2.1.2"
   }
 }
diff --git a/scripts/netlify_build.sh b/scripts/netlify_build.sh
index 85a1303a..f52fd687 100755
--- a/scripts/netlify_build.sh
+++ b/scripts/netlify_build.sh
@@ -23,3 +23,5 @@ cp ./static/extra.js docs/_static/js/extra.js
 mkdocs build -v
 
 find ./site -type f -name '*.html' -exec node --max_old_space_size=512 ./scripts/render_math.js {} \;
+
+npx gulp minify
-- 
2.11.0