From b8a68fc9c14b5b583348aa3b8b8e1af75ba54b39 Mon Sep 17 00:00:00 2001
From: ElsaOOo <yjjjng0901@126.com>
Date: Fri, 26 Nov 2021 21:59:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7husky,=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4=E6=97=B6lint=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/.eslintrc.js               | 30 +++++++++----------
 packages/devui-vue/.husky/commit-msg          |  4 +++
 packages/devui-vue/.husky/pre-commit          |  4 +++
 .../devui/back-top/src/hooks/index.ts         |  2 +-
 ...eventListener.ts => use-event-listener.ts} |  0
 .../comment/src/{getSlot.ts => get-slot.ts}   |  0
 packages/devui-vue/package.json               | 11 ++-----
 7 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100755 packages/devui-vue/.husky/commit-msg
 create mode 100755 packages/devui-vue/.husky/pre-commit
 rename packages/devui-vue/devui/back-top/src/hooks/{use-eventListener.ts => use-event-listener.ts} (100%)
 rename packages/devui-vue/devui/comment/src/{getSlot.ts => get-slot.ts} (100%)

diff --git a/packages/devui-vue/.eslintrc.js b/packages/devui-vue/.eslintrc.js
index 34ce586d..89aa0110 100644
--- a/packages/devui-vue/.eslintrc.js
+++ b/packages/devui-vue/.eslintrc.js
@@ -1,33 +1,29 @@
 module.exports = {
-  parser: 'vue-eslint-parser',
+  root: true,
+  parser: '@typescript-eslint/parser',
   parserOptions: {
-    parser: '@typescript-eslint/parser',
     sourceType: 'module',
     ecmaVersion: 6,
     ecmaFeatures: {
       jsx: true,
-      tsx: true,
-    },
+      tsx: true
+    }
   },
   env: {
     browser: true,
     node: true,
     jest: true,
-    es6: true,
+    es6: true
   },
   plugins: ['@typescript-eslint'],
   extends: [
     'plugin:@typescript-eslint/recommended',
     'plugin:vue/vue3-recommended',
     'plugin:import/recommended',
-    'plugin:import/typescript',
+    'plugin:import/typescript'
   ],
   rules: {
-    quotes: [
-      'error',
-      'single',
-      { avoidEscape: true, allowTemplateLiterals: true },
-    ],
+    quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }],
     'no-undef': 2,
     'vue/max-attributes-per-line': 'off',
     'vue/no-multiple-template-root': 'off',
@@ -38,13 +34,15 @@ module.exports = {
       {
         multiline: {
           delimiter: 'none',
-          requireLast: false,
+          requireLast: false
         },
         singleline: {
           delimiter: 'semi',
-          requireLast: true,
-        },
-      },
+          requireLast: true
+        }
+      }
     ],
-  },
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error']
+  }
 }
diff --git a/packages/devui-vue/.husky/commit-msg b/packages/devui-vue/.husky/commit-msg
new file mode 100755
index 00000000..80e240c9
--- /dev/null
+++ b/packages/devui-vue/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/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
new file mode 100755
index 00000000..9a45e99d
--- /dev/null
+++ b/packages/devui-vue/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd ./packages/devui-vue && npx  @ls-lint/ls-lint  && npx lint-staged
diff --git a/packages/devui-vue/devui/back-top/src/hooks/index.ts b/packages/devui-vue/devui/back-top/src/hooks/index.ts
index 4ae94650..b9fd2b4d 100644
--- a/packages/devui-vue/devui/back-top/src/hooks/index.ts
+++ b/packages/devui-vue/devui/back-top/src/hooks/index.ts
@@ -1,7 +1,7 @@
 import usePosition from './use-position.ts'
 import useTarget from './use-target.ts'
 import useVisibility from './use-visibility.ts'
-import useEventListener from './use-eventListener.ts'
+import useEventListener from './use-event-listener.ts'
 import useThrottle from './use-throttle.ts'
 
 export { usePosition, useTarget, useVisibility, useEventListener, useThrottle }
diff --git a/packages/devui-vue/devui/back-top/src/hooks/use-eventListener.ts b/packages/devui-vue/devui/back-top/src/hooks/use-event-listener.ts
similarity index 100%
rename from packages/devui-vue/devui/back-top/src/hooks/use-eventListener.ts
rename to packages/devui-vue/devui/back-top/src/hooks/use-event-listener.ts
diff --git a/packages/devui-vue/devui/comment/src/getSlot.ts b/packages/devui-vue/devui/comment/src/get-slot.ts
similarity index 100%
rename from packages/devui-vue/devui/comment/src/getSlot.ts
rename to packages/devui-vue/devui/comment/src/get-slot.ts
diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json
index 6d4a5953..4a44e5b5 100644
--- a/packages/devui-vue/package.json
+++ b/packages/devui-vue/package.json
@@ -40,7 +40,8 @@
     "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"
+    "prebuild": "node ./devui-cli/index.js create -t vue-devui --ignore-parse-error",
+    "prepare": "cd ../.. && husky install packages/devui-vue/.husky"
   },
   "dependencies": {
     "@devui-design/icons": "^1.3.0",
@@ -79,7 +80,7 @@
     "eslint": "^7.28.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-vue": "^7.11.1",
-    "husky": "^4.3.7",
+    "husky": "^7.0.4",
     "inquirer": "^8.1.2",
     "jest": "^27.0.4",
     "lint-staged": "^11.0.0",
@@ -100,12 +101,6 @@
     "vue-tsc": "^0.2.2",
     "yarn": "^1.22.11"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "ls-lint && lint-staged",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
-  },
   "lint-staged": {
     "{src,devui}/**/*.{js,ts,jsx,tsx,vue}": "eslint --fix",
     "{src,devui}/**/*.{scss,css}": "stylelint --fix"
-- 
Gitee