From e4121e828f1f6d411a7284067fae208468ffc6d1 Mon Sep 17 00:00:00 2001
From: luoxue <luoxue@zhuanzhuan.com>
Date: Mon, 23 Dec 2019 19:00:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(commitlint):=20=E6=B7=BB=E5=8A=A0commitlint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 commitlint.config.js              |  4 +--
 package-lock.json                 |  4 +--
 package.json                      | 49 ++++++++++++++++---------------
 packages/webpack-box/package.json |  1 -
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8ad9749..d7481292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
  demo | 修改demo | [86da5a4](https://github.com/luoxue-victor/learn_webpack/commit/86da5a4)
  gitignore | 增加dist | [d723459](https://github.com/luoxue-victor/learn_webpack/commit/d723459)
  husky | 添加 husky | [6ba2389](https://github.com/luoxue-victor/learn_webpack/commit/6ba2389)
+ lint-staged | lint-staged | [7f4ac87](https://github.com/luoxue-victor/learn_webpack/commit/7f4ac87)
  lints | 修复lints bug | [c0696ff](https://github.com/luoxue-victor/learn_webpack/commit/c0696ff)
  merge | 合并master | [6886aef](https://github.com/luoxue-victor/learn_webpack/commit/6886aef)
  react | 重新提交react | [97be6d3](https://github.com/luoxue-victor/learn_webpack/commit/97be6d3)
diff --git a/commitlint.config.js b/commitlint.config.js
index 1c929b0f..611b0b8d 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  extends: ['./node_modules/vue-cli-plugin-commitlint/lib/lint', '@commitlint/config-conventional']
-}
+  extends: ['./node_modules/vue-cli-plugin-commitlint/lib/lint']
+};
diff --git a/package-lock.json b/package-lock.json
index 78217e94..f0d7dc2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20478,8 +20478,8 @@
     },
     "vue-cli-plugin-commitlint": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/vue-cli-plugin-commitlint/-/vue-cli-plugin-commitlint-1.0.10.tgz",
-      "integrity": "sha512-KzdgIe/VfQOovfjGx9qKf7LvnbRLV5+xpoZKCH3U8CKfVKqEr2zQ0DYj93E8bYe1ecJLtcn9Gb1MEopXgtUXew==",
+      "resolved": "https://registry.npm.taobao.org/vue-cli-plugin-commitlint/download/vue-cli-plugin-commitlint-1.0.10.tgz",
+      "integrity": "sha1-B84jA0IYQw8WaQVergO+IisLSuU=",
       "dev": true
     },
     "vue-eslint-parser": {
diff --git a/package.json b/package.json
index 231e2f6c..68a3a05d 100644
--- a/package.json
+++ b/package.json
@@ -3,33 +3,17 @@
   "version": "1.0.9",
   "private": true,
   "description": "webpack打包器",
-  "main": "index.js",
-  "workspaces": [
-    "packages/cli",
-    "packages/shared-utils",
-    "packages/webpack-box",
-    "packages/react"
-  ],
+  "author": "jijiang",
   "scripts": {
-    "dev": "webpack-box dev",
     "build": "webpack-box build",
-    "info": "pk info",
+    "cr": "node tools/readme",
+    "cz": "npm run log && git add . && git cz",
+    "dev": "webpack-box dev",
     "dev:dash": "webpack-dashboard -- webpack-box dev",
-    "log": "conventional-changelog --config ./node_modules/vue-cli-plugin-commitlint/lib/log -i CHANGELOG.md -s -r 0",
-    "cz": "npm run cr && npm run log && git add . && git cz",
-    "cr": "node tools/readme"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/luoxue-victor/learn_webpack.git"
-  },
-  "author": "jijiang",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/luoxue-victor/learn_webpack/issues"
+    "info": "pk info",
+    "log": "conventional-changelog --config ./node_modules/vue-cli-plugin-commitlint/lib/log -i CHANGELOG.md -s -r 0"
   },
-  "sideEffects": true,
-  "homepage": "https://github.com/luoxue-victor/learn_webpack#readme",
+  "main": "index.js",
   "devDependencies": {
     "@commitlint/config-conventional": "^8.2.0",
     "commitizen": "^4.0.3",
@@ -39,19 +23,25 @@
     "lerna": "^3.15.0",
     "lint-staged": "^9.5.0",
     "pk-cli-plugin-react": "^1.0.1",
+    "vue-cli-plugin-commitlint": "^1.0.10",
     "webpack-box": "^1.1.2"
   },
+  "bugs": {
+    "url": "https://github.com/luoxue-victor/learn_webpack/issues"
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/vue-cli-plugin-commitlint/lib/cz"
     }
   },
+  "homepage": "https://github.com/luoxue-victor/learn_webpack#readme",
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
+  "license": "ISC",
   "lint-staged": {
     "*.{vue,htm,html,css,sss,less,scss}": [
       "webpack-box lint stylelint",
@@ -65,5 +55,16 @@
       "webpack-box lint eslint",
       "git add"
     ]
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/luoxue-victor/learn_webpack.git"
+  },
+  "sideEffects": true,
+  "workspaces": [
+    "packages/cli",
+    "packages/shared-utils",
+    "packages/webpack-box",
+    "packages/react"
+  ]
 }
diff --git a/packages/webpack-box/package.json b/packages/webpack-box/package.json
index c68e9f58..4f5c3544 100644
--- a/packages/webpack-box/package.json
+++ b/packages/webpack-box/package.json
@@ -102,7 +102,6 @@
     "tslint": "^5.20.1",
     "typescript": "^3.7.2",
     "url-loader": "^3.0.0",
-    "vue-cli-plugin-commitlint": "^1.0.10",
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.41.2",
     "webpack-bundle-analyzer": "^3.6.0",