diff --git a/.husky/pre-commit b/.husky/pre-commit index 5d9040a163db55ceb539a4516ba48264526a24cd..1bf519316d47f706580871c338fcb5dea7855f10 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -PATH="/usr/local/bin:$PATH" -pnpm lint +pnpm lint \ No newline at end of file diff --git a/.prettierrc.js b/.prettierrc.js index b29443061457a40d38e55208a3d82d85f6b4eb69..b3d9a25c2e20c226646b7abd86f28ed157bf7968 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,5 +1,5 @@ module.exports = { - printWidth: 120, + printWidth: 80, useTabs: false, singleQuote: true, tabWidth: 2, diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 3dc5b08bcdc96b1536eec0cff46a39d54235aa12..0000000000000000000000000000000000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["johnsoncodehk.volar"] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c88a2e752c0d29b73b151b18539dc9c75495cfe8..0000000000000000000000000000000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "eslint.validate": ["javascript", "javascriptreact", "vue"] -} diff --git a/package.json b/package.json index af6fb3ecf0e768fbcc906ba68e69b918b1868c46..440fdaea23e4220cf1db777255734b36aaf084cb 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "dev": "vite", "build": "vite build", "preview": "vite preview", - "lint": "eslint --ext .js,.vue src" + "lint": "eslint --ext .js,.vue src", + "prepare": "husky install" }, "repository": { "type": "git", @@ -27,14 +28,14 @@ "@vitejs/plugin-vue": "^2.0.0", "@vue/eslint-config-prettier": "^7.0.0", "eslint": "^8.8.0", - "eslint-config-prettier": "^8.3.0", + "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-vue": "^8.4.1", - "husky": "^7.0.0", "prettier": "^2.5.1", "sass": "^1.49.7", "unplugin-auto-import": "^0.5.11", "unplugin-vue-components": "^0.17.18", "vite": "^2.7.2", - "vite-plugin-svg-icons": "^2.0.1" + "vite-plugin-svg-icons": "^2.0.1", + "husky": "^7.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71adda4913637ed7136b430fd5abcabeb1e581b5..d2c96da223dc4f6e179302625d886e33befc53e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,7 @@ specifiers: echarts: ^5.3.0 element-plus: ^2.0.1 eslint: ^8.8.0 - eslint-config-prettier: ^8.3.0 + eslint-plugin-prettier: ^4.0.0 eslint-plugin-vue: ^8.4.1 husky: ^7.0.0 normalize.css: ^8.0.1 @@ -34,7 +34,7 @@ devDependencies: '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/2.1.0_vite@2.7.13+vue@3.2.29 '@vue/eslint-config-prettier': registry.npmmirror.com/@vue/eslint-config-prettier/7.0.0_eslint@8.8.0+prettier@2.5.1 eslint: registry.npmmirror.com/eslint/8.8.0 - eslint-config-prettier: registry.npmmirror.com/eslint-config-prettier/8.3.0_eslint@8.8.0 + eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.0.0_eslint@8.8.0+prettier@2.5.1 eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/8.4.1_eslint@8.8.0 husky: registry.npmmirror.com/husky/7.0.4 prettier: registry.npmmirror.com/prettier/2.5.1 @@ -1217,6 +1217,25 @@ packages: prettier-linter-helpers: registry.npmmirror.com/prettier-linter-helpers/1.0.0 dev: true + registry.npmmirror.com/eslint-plugin-prettier/4.0.0_eslint@8.8.0+prettier@2.5.1: + resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz} + id: registry.npmmirror.com/eslint-plugin-prettier/4.0.0 + name: eslint-plugin-prettier + version: 4.0.0 + engines: {node: '>=6.0.0'} + peerDependencies: + eslint: '>=7.28.0' + eslint-config-prettier: '*' + prettier: '>=2.0.0' + peerDependenciesMeta: + eslint-config-prettier: + optional: true + dependencies: + eslint: registry.npmmirror.com/eslint/8.8.0 + prettier: registry.npmmirror.com/prettier/2.5.1 + prettier-linter-helpers: registry.npmmirror.com/prettier-linter-helpers/1.0.0 + dev: true + registry.npmmirror.com/eslint-plugin-vue/8.4.1_eslint@8.8.0: resolution: {integrity: sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz} id: registry.npmmirror.com/eslint-plugin-vue/8.4.1 diff --git a/src/App.vue b/src/App.vue index edba34313d9f2f47f39506e19181246366ab358b..41847ed63e3e7a531ea5e9da4cdcc42328b83f70 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,10 +1,14 @@