Skip to content

Commit

Permalink
chore: 升级代码规范风格相关库至最新 (#736)
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxian521 authored Sep 17, 2023
1 parent 64ea088 commit 4415f12
Show file tree
Hide file tree
Showing 18 changed files with 2,906 additions and 6,376 deletions.
4 changes: 4 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
> 1%
last 2 versions
not dead
not ie 11
4 changes: 3 additions & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
# shellcheck source=./_/husky.sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
PATH="/usr/local/bin:$PATH"

npx --no-install commitlint --edit "$1"
8 changes: 0 additions & 8 deletions .husky/lintstagedrc.js

This file was deleted.

6 changes: 3 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[ -n "$CI" ] && exit 0

# Format and submit code according to lintstagedrc.js configuration
npm run lint:lint-staged
PATH="/usr/local/bin:$PATH"

npm run lint:pretty
# Perform lint check on files in the staging area through .lintstagedrc configuration
pnpm exec lint-staged
16 changes: 16 additions & 0 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"*.{js,jsx,ts,tsx}": [
"prettier --cache --ignore-unknown --write",
"eslint --cache --fix"
],
"{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
"prettier --cache --write--parser json"
],
"package.json": ["prettier --cache --write"],
"*.vue": ["prettier --write", "eslint --cache --fix", "stylelint --fix"],
"*.{css,scss,html}": [
"prettier --cache --ignore-unknown --write",
"stylelint --fix"
],
"*.md": ["prettier --cache --ignore-unknown --write"]
}
69 changes: 41 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@
"name": "vue-pure-admin",
"version": "4.5.0",
"private": true,
"keywords": [
"vue-pure-admin",
"element-plus",
"tailwindcss",
"pure-admin",
"typescript",
"pinia",
"vue3",
"vite"
],
"homepage": "https://github.com/pure-admin/vue-pure-admin",
"bugs": {
"url": "https://github.com/pure-admin/vue-pure-admin/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/pure-admin/vue-pure-admin.git"
},
"license": "MIT",
"author": {
"name": "xiaoxian521",
"email": "[email protected]",
"url": "https://github.com/xiaoxian521"
},
"scripts": {
"dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
"serve": "pnpm dev",
Expand All @@ -13,21 +37,14 @@
"typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
"svgo": "svgo -f src/assets/svg -o src/assets/svg",
"cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
"clean:cache": "rimraf node_modules && rimraf .eslintcache && pnpm install",
"clean:cache": "rimraf .eslintcache && rimraf node_modules && pnpm install",
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"",
"lint:stylelint": "stylelint --cache --fix \"**/*.{html,vue,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
"lint:pretty": "pretty-quick --staged",
"lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint",
"prepare": "husky install",
"preinstall": "npx only-allow pnpm"
},
"browserslist": [
"> 1%",
"not ie 11",
"not op_mini all"
],
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.0.9",
Expand All @@ -44,7 +61,7 @@
"animate.css": "^4.1.1",
"axios": "^1.5.0",
"china-area-data": "^5.0.1",
"cropperjs": "^1.6.0",
"cropperjs": "^1.6.1",
"dayjs": "^1.11.9",
"echarts": "^5.4.3",
"el-table-infinite-scroll": "^3.0.1",
Expand Down Expand Up @@ -90,7 +107,7 @@
"@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10",
"@iconify/vue": "^4.1.1",
"@intlify/unplugin-vue-i18n": "^0.11.0",
"@intlify/unplugin-vue-i18n": "^1.2.0",
"@pureadmin/theme": "^3.1.0",
"@types/intro.js": "^5.1.1",
"@types/js-cookie": "^3.0.4",
Expand All @@ -100,46 +117,45 @@
"@types/qrcode": "^1.5.2",
"@types/qs": "^6.9.8",
"@types/sortablejs": "^1.15.2",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"autoprefixer": "^10.4.15",
"cloc": "^2.11.0",
"cssnano": "^6.0.1",
"eslint": "^8.49.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"husky": "^8.0.3",
"lint-staged": "^13.3.0",
"lint-staged": "^14.0.1",
"picocolors": "^1.0.0",
"postcss": "^8.4.29",
"postcss-html": "^1.5.0",
"postcss-import": "^15.1.0",
"postcss-scss": "^4.0.8",
"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.67.0",
"sass-loader": "^13.3.2",
"stylelint": "^15.10.3",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recess-order": "^4.3.0",
"stylelint-config-recommended": "^12.0.0",
"stylelint-config-recommended-scss": "^12.0.0",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-recommended-scss": "^13.0.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^33.0.0",
"stylelint-config-standard-scss": "^9.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"stylelint-order": "^6.0.3",
"stylelint-prettier": "^3.0.0",
"stylelint-prettier": "^4.0.2",
"stylelint-scss": "^5.2.1",
"svgo": "^3.0.2",
"tailwindcss": "^3.3.3",
"terser": "^5.19.4",
"typescript": "5.0.4",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1",
Expand All @@ -162,8 +178,5 @@
"w3c-hr-time": "*",
"stable": "*"
}
},
"repository": "[email protected]:pure-admin/vue-pure-admin.git",
"author": "xiaoxian521",
"license": "MIT"
}
}
Loading

1 comment on commit 4415f12

@xiaoxian521
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

主要修改如下:

  1. prettier升级到v3版本,使用lint-staged替换pretty-quick 替换原因
  2. typescript升级到最新版

Please sign in to comment.