From d577ce405bdf1a6bdd10ff9a44be3497aaea1911 Mon Sep 17 00:00:00 2001
From: TinsFox <33956589+TinsFox@users.noreply.github.com>
Date: Fri, 17 Dec 2021 23:39:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgit=E9=92=A9=E5=AD=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20(#20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复git钩子校验

* fix: 修复git钩子校验
---
 .../devui-vue/.eslintrc.js => .eslintrc.js    |  0
 .gitignore                                    |  2 +-
 .husky/commit-msg                             |  4 +++
 .husky/pre-commit                             |  4 +++
 .../devui-vue/.ls-lint.yml => .ls-lint.yml    |  0
 .../.stylelintrc.json => .stylelintrc.json    |  0
 ...mmitlint.config.js => commitlint.config.js |  0
 package.json                                  | 27 ++++++++++++++++---
 packages/devui-vue/.husky/commit-msg          |  4 ---
 packages/devui-vue/.husky/pre-commit          |  4 ---
 packages/devui-vue/package.json               | 22 +--------------
 11 files changed, 33 insertions(+), 34 deletions(-)
 rename packages/devui-vue/.eslintrc.js => .eslintrc.js (100%)
 create mode 100755 .husky/commit-msg
 create mode 100755 .husky/pre-commit
 rename packages/devui-vue/.ls-lint.yml => .ls-lint.yml (100%)
 rename packages/devui-vue/.stylelintrc.json => .stylelintrc.json (100%)
 rename packages/devui-vue/commitlint.config.js => commitlint.config.js (100%)
 delete mode 100755 packages/devui-vue/.husky/commit-msg
 delete mode 100755 packages/devui-vue/.husky/pre-commit

diff --git a/packages/devui-vue/.eslintrc.js b/.eslintrc.js
similarity index 100%
rename from packages/devui-vue/.eslintrc.js
rename to .eslintrc.js
diff --git a/.gitignore b/.gitignore
index 399d9de0dc..d8963337f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,4 @@ packages/devui-vue/devui/vue-devui.ts
 packages/devui-vue/devui/theme/theme.scss
 packages/devui-vue/docs/.vitepress/config/sidebar.ts
 packages/devui-vue/docs/.vitepress/config/enSidebar.ts
-
+yarn.lock
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 0000000000..a789998f5e
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit
\ No newline at end of file
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 0000000000..65d5bb7c48
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx  @ls-lint/ls-lint  && npx lint-staged
diff --git a/packages/devui-vue/.ls-lint.yml b/.ls-lint.yml
similarity index 100%
rename from packages/devui-vue/.ls-lint.yml
rename to .ls-lint.yml
diff --git a/packages/devui-vue/.stylelintrc.json b/.stylelintrc.json
similarity index 100%
rename from packages/devui-vue/.stylelintrc.json
rename to .stylelintrc.json
diff --git a/packages/devui-vue/commitlint.config.js b/commitlint.config.js
similarity index 100%
rename from packages/devui-vue/commitlint.config.js
rename to commitlint.config.js
diff --git a/package.json b/package.json
index 17d3c41413..f56d4c26b0 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,31 @@
   "scripts": {
     "dev": "lerna exec --scope vue-devui yarn dev",
     "build": "lerna exec --scope vue-devui yarn build",
-    "build:lib": "lerna exec --scope vue-devui yarn build:lib"
+    "build:lib": "lerna exec --scope vue-devui yarn build:lib",
+    "prepare": "husky install",
+    "precommit": "lint-staged",
+    "lint:fix": "eslint --fix \"{packages}/**/*.{vue,js,ts,jsx,tsx}\"",
+    "stylelint": "stylelint --fix \"{packages}/**/*.{scss,css}\""
   },
   "devDependencies": {
-    "lerna": "^4.0.0"
+    "lerna": "^4.0.0",
+    "husky": "^7.0.4",
+    "@ls-lint/ls-lint": "^1.10.0",
+    "esbuild-register": "^2.6.0",
+    "eslint": "^7.28.0",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-vue": "^7.11.1",
+    "stylelint": "^13.13.1",
+    "stylelint-config-recommended-scss": "^4.3.0",
+    "stylelint-config-standard": "^22.0.0",
+    "stylelint-scss": "^3.20.1",
+    "lint-staged": "^11.0.0"
   },
   "workspaces": [
     "packages/*"
-  ]
-}
\ No newline at end of file
+  ],
+  "lint-staged": {
+    ".{js,ts,jsx,tsx,vue}": "eslint --fix",
+    ".{scss,css}": "stylelint --fix"
+  }
+}
diff --git a/packages/devui-vue/.husky/commit-msg b/packages/devui-vue/.husky/commit-msg
deleted file mode 100755
index 80e240c9df..0000000000
--- a/packages/devui-vue/.husky/commit-msg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-cd ./packages/devui-vue && npx commitlint --edit $1
\ No newline at end of file
diff --git a/packages/devui-vue/.husky/pre-commit b/packages/devui-vue/.husky/pre-commit
deleted file mode 100755
index 9a45e99d4e..0000000000
--- a/packages/devui-vue/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-cd ./packages/devui-vue && npx  @ls-lint/ls-lint  && npx lint-staged
diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json
index 9f70c20c57..560e1d8e0a 100644
--- a/packages/devui-vue/package.json
+++ b/packages/devui-vue/package.json
@@ -29,10 +29,6 @@
     "app:build": "vite build",
     "build:lib": "yarn predev && yarn build:components && yarn copy",
     "test": "jest --config jest.config.js",
-    "ls-lint": "ls-lint",
-    "lint": "eslint \"{src,devui}/**/*.{vue,js,ts,jsx,tsx}\"",
-    "lint:fix": "eslint --fix \"{src,devui}/**/*.{vue,js,ts,jsx,tsx}\"",
-    "stylelint": "stylelint --fix \"{devui,src}/**/*.{scss,css}\"",
     "build:components": "node ./devui-cli/index.js build",
     "generate:theme": "node ./devui-cli/index.js generate:theme",
     "generate:dts": "node ./devui-cli/index.js generate:dts",
@@ -40,8 +36,7 @@
     "clean:cli": "npm uninstall -g devui-cli & npm uninstall -g vue-devui",
     "cli:create": "node ./devui-cli/index.js create -t component",
     "predev": "node ./devui-cli/index.js create -t vue-devui --ignore-parse-error",
-    "prebuild": "node ./devui-cli/index.js create -t vue-devui --ignore-parse-error",
-    "prepare": "cd ../.. && husky install packages/devui-vue/.husky"
+    "prebuild": "node ./devui-cli/index.js create -t vue-devui --ignore-parse-error"
   },
   "dependencies": {
     "@devui-design/icons": "^1.3.0",
@@ -59,7 +54,6 @@
     "@babel/traverse": "^7.15.4",
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "@ls-lint/ls-lint": "^1.10.0",
     "@types/chalk": "^2.2.0",
     "@types/commander": "^2.12.2",
     "@types/jest": "^26.0.23",
@@ -76,22 +70,12 @@
     "babel-jest": "^27.0.2",
     "chalk": "^4.1.2",
     "commander": "^8.1.0",
-    "esbuild-register": "^2.6.0",
-    "eslint": "^7.28.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-vue": "^7.11.1",
-    "husky": "^7.0.4",
     "inquirer": "^8.1.2",
     "jest": "^27.0.4",
-    "lint-staged": "^11.0.0",
     "ora": "^5.4.1",
     "patch-vue-directive-ssr": "^0.0.1",
     "sass": "^1.32.2",
     "shelljs": "^0.8.4",
-    "stylelint": "^13.13.1",
-    "stylelint-config-recommended-scss": "^4.3.0",
-    "stylelint-config-standard": "^22.0.0",
-    "stylelint-scss": "^3.20.1",
     "typescript": "^4.3.2",
     "vite": "^2.4.4",
     "vite-plugin-md": "^0.6.0",
@@ -100,9 +84,5 @@
     "vitepress-theme-demoblock": "1.3.2",
     "vue-tsc": "^0.2.2",
     "yarn": "^1.22.11"
-  },
-  "lint-staged": {
-    "{src,devui}/**/*.{js,ts,jsx,tsx,vue}": "eslint --fix",
-    "{src,devui}/**/*.{scss,css}": "stylelint --fix"
   }
 }