From d700af4bc48f4eb8dcb02efde94f400ead725f49 Mon Sep 17 00:00:00 2001 From: chansee97 Date: Thu, 29 Feb 2024 14:41:38 +0800 Subject: [PATCH] chore: simplified deps --- .cz-config.js | 50 ----------------------- .editorconfig | 9 +++++ .env.prod | 2 - .eslintrc.js | 15 ------- .husky/commit-msg | 4 -- .husky/pre-commit | 4 -- .vscode/settings.json | 57 ++++++++++++++++++++++++-- build/plugins/index.ts | 5 --- build/plugins/visualizer.ts | 7 ---- commitlint.config.js | 1 - eslint.config.js | 5 +++ package.json | 81 +++++++++++++++++-------------------- src/typings/env.d.ts | 2 - src/views/login/index.vue | 2 +- 14 files changed, 104 insertions(+), 140 deletions(-) delete mode 100644 .cz-config.js create mode 100644 .editorconfig delete mode 100644 .eslintrc.js delete mode 100644 .husky/commit-msg delete mode 100644 .husky/pre-commit delete mode 100644 build/plugins/visualizer.ts delete mode 100644 commitlint.config.js create mode 100644 eslint.config.js diff --git a/.cz-config.js b/.cz-config.js deleted file mode 100644 index e4d80d7..0000000 --- a/.cz-config.js +++ /dev/null @@ -1,50 +0,0 @@ -module.exports = { - // 可选类型 - types: [ - { value: 'init', name: 'init: 项目初始化' }, - { value: 'feat', name: 'feat: 添加新特性' }, - { value: 'fix', name: 'fix: 修复bug' }, - { value: 'docs', name: 'docs: 仅仅修改文档' }, - { value: 'style', name: 'style: 仅仅修改了空格、格式缩进、逗号等等，不改变代码逻辑' }, - { value: 'refactor', name: 'refactor: 代码重构，没有加新功能或者修复bug' }, - { value: 'perf', name: 'perf: 优化相关，比如提升性能、体验' }, - { value: 'test', name: 'test: 添加测试用例' }, - { value: 'build', name: 'build: 依赖相关的内容' }, - { value: 'ci', name: 'ci: CI配置相关，例如对k8s，docker的配置文件的修改' }, - { value: 'chore', name: 'chore: 改变构建流程、或者增加依赖库、工具等' }, - { value: 'revert', name: 'revert: 回滚到上一个版本' } - ], - scopes: [ - ['projects', '项目搭建'], - ['components', '组件相关'], - ['hooks', 'hook 相关'], - ['utils', 'utils 相关'], - ['types', 'ts类型相关'], - ['styles', '样式相关'], - ['deps', '项目依赖'], - ['auth', '对 auth 修改'], - ['other', '其他修改'], - ['custom', '以上都不是？我要自定义'] - ].map(([value, description]) => { - return { - value, - name: `${value.padEnd(30)} (${description})` - } - }), - // 消息步骤 - messages: { - type: '确保本次提交遵循 Angular 规范！\n选择你要提交的类型：', - scope: '\n选择一个 scope（可选）：', - customScope: '请输入自定义的 scope：', - subject: '填写简短精炼的变更描述：\n', - body: '填写更加详细的变更描述（可选）。使用 "|" 换行：\n', - breaking: '列举非兼容性重大的变更（可选）：\n', - footer: '列举出所有变更的 ISSUES CLOSED（可选）。 例如: #31, #34：\n', - confirmCommit: '确认提交？' - }, - // 跳过问题 - skipQuestions: ['body', 'footer'], - allowBreakingChanges: ['feat', 'fix'], - subjectLimit: 100, - breaklineChar: '|' -} \ No newline at end of file diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..3dce414 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true \ No newline at end of file diff --git a/.env.prod b/.env.prod index 98dff9b..dcfba5c 100644 --- a/.env.prod +++ b/.env.prod @@ -4,5 +4,3 @@ VITE_COMPRESS_OPEN=N # 压缩算法 gzip | brotliCompress | deflate | deflateRaw VITE_COMPRESS_TYPE=gzip -# 是否开启打包依赖分析 -VITE_VISUALIZER=N diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 2f0fe41..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,15 +0,0 @@ -// .eslintrc.js -process.env.ESLINT_TSCONFIG = 'tsconfig.json' - -module.exports = { - extends: '@chansee97/eslint-config-vue', - rules: { - '@typescript-eslint/no-unsafe-call': 'off', - '@typescript-eslint/no-unsafe-assignment': 'off', - '@typescript-eslint/no-unsafe-member-access': 'off', - '@typescript-eslint/no-unsafe-argument': 'off', - '@typescript-eslint/no-unsafe-return': 'off', - '@typescript-eslint/restrict-template-expressions': 'off', - '@typescript-eslint/no-floating-promises': 'off', - }, -} diff --git a/.husky/commit-msg b/.husky/commit-msg deleted file mode 100644 index e8511ea..0000000 --- a/.husky/commit-msg +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no-install commitlint --edit $1 diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100644 index 0312b76..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -npx lint-staged \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 4ec5457..abd048b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,58 @@ { - "editor.tabSize": 2, + // Enable the ESlint flat config support + "eslint.experimental.useFlatConfig": true, + // Disable the default formatter, use eslint instead "prettier.enable": false, - "eslint.format.enable": true, + "editor.formatOnSave": false, + // Auto fix "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit", + "source.organizeImports": "never" }, + // Silent the stylistic rules in you IDE, but still auto fix them + "eslint.rules.customizations": [ + { + "rule": "style/*", + "severity": "off" + }, + { + "rule": "format/*", + "severity": "off" + }, + { + "rule": "*-indent", + "severity": "off" + }, + { + "rule": "*-spacing", + "severity": "off" + }, + { + "rule": "*-spaces", + "severity": "off" + }, + { + "rule": "*-order", + "severity": "off" + }, + { + "rule": "*-dangle", + "severity": "off" + }, + { + "rule": "*-newline", + "severity": "off" + }, + { + "rule": "*quotes", + "severity": "off" + }, + { + "rule": "*semi", + "severity": "off" + } + ], + // Enable eslint for all supported languages "eslint.validate": [ "javascript", "javascriptreact", @@ -15,6 +63,7 @@ "markdown", "json", "jsonc", - "yaml" + "yaml", + "toml" ] } diff --git a/build/plugins/index.ts b/build/plugins/index.ts index 6ee5c6f..d9088f0 100644 --- a/build/plugins/index.ts +++ b/build/plugins/index.ts @@ -2,7 +2,6 @@ import type { PluginOption } from 'vite' import UnoCSS from '@unocss/vite' import vue from './vue' import compress from './compress' -import visualizer from './visualizer' import unplugin from './unplugin' import mock from './mock' @@ -19,9 +18,5 @@ export function setVitePlugins(env: ImportMetaEnv) { if (env.VITE_COMPRESS_OPEN === 'Y') plugins.push(compress(env)) - // 是否依赖分析 - if (env.VITE_VISUALIZER === 'Y') - plugins.push(visualizer as PluginOption) - return plugins } diff --git a/build/plugins/visualizer.ts b/build/plugins/visualizer.ts deleted file mode 100644 index 9f7a117..0000000 --- a/build/plugins/visualizer.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { visualizer } from 'rollup-plugin-visualizer'// https://github.com/btd/rollup-plugin-visualizer - -export default visualizer({ - gzipSize: true, - brotliSize: true, - open: true, -}) diff --git a/commitlint.config.js b/commitlint.config.js deleted file mode 100644 index 4fedde6..0000000 --- a/commitlint.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = { extends: ['@commitlint/config-conventional'] } diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..24d3470 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,5 @@ +// eslint.config.js +import antfu from '@antfu/eslint-config' + +// https://github.com/antfu/eslint-config +export default antfu() diff --git a/package.json b/package.json index d2d3c99..d96e7ec 100644 --- a/package.json +++ b/package.json @@ -44,9 +44,7 @@ "build:test": "vue-tsc --noEmit && vite build --mode test", "preview": "vite preview", "lint": "eslint . --fix", - "prepare": "husky install", - "commit": "cz", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md" + "sizecheck": "npx vite-bundle-visualizer" }, "config": { "commitizen": { @@ -54,58 +52,51 @@ } }, "dependencies": { - "@tinymce/tinymce-vue": "^5.1.0", - "@vueuse/core": "^10.2.0", - "axios": "^1.4.0", - "crypto-js": "^4.1.1", - "echarts": "^5.4.2", - "md-editor-v3": "^4.2.0", - "pinia": "^2.1.4", + "@tinymce/tinymce-vue": "^5.1.1", + "@vueuse/core": "^10.9.0", + "axios": "^1.6.7", + "crypto-js": "^4.2.0", + "echarts": "^5.5.0", + "md-editor-v3": "^4.11.3", + "pinia": "^2.1.7", "pinia-plugin-persist": "^1.0.0", "qs": "^6.11.2", - "vue": "^3.3.4", + "vue": "^3.4.21", "vue-qr": "^4.0.9", - "vue-router": "^4.2.2" + "vue-router": "^4.3.0" }, "devDependencies": { - "@chansee97/eslint-config-vue": "^0.3.5", - "@commitlint/cli": "^17.6.5", - "@commitlint/config-conventional": "^17.6.5", - "@iconify-json/icon-park-outline": "^1.1.11", + "@antfu/eslint-config": "^2.6.4", + "@iconify-json/icon-park-outline": "^1.1.15", "@iconify/vue": "^4.1.1", - "@types/crypto-js": "^4.1.1", - "@types/mockjs": "^1.0.7", - "@types/node": "^20.3.1", - "@types/qs": "^6.9.7", - "@vitejs/plugin-vue": "^4.2.3", - "@vitejs/plugin-vue-jsx": "^3.0.0", - "commitizen": "^4.2.6", - "cz-conventional-changelog": "^3.3.0", - "cz-customizable": "^7.0.0", - "eslint": "^8.43.0", - "husky": "^8.0.3", - "less": "^4.1.3", - "lint-staged": "^13.2.2", + "@types/crypto-js": "^4.2.2", + "@types/mockjs": "^1.0.10", + "@types/node": "^20.11.22", + "@types/qs": "^6.9.12", + "@vitejs/plugin-vue": "^5.0.4", + "@vitejs/plugin-vue-jsx": "^3.1.0", + "eslint": "^8.57.0", + "lint-staged": "^15.2.2", "mockjs": "^1.1.0", - "naive-ui": "^2.34.4", - "rollup-plugin-visualizer": "^5.9.0", - "typescript": "^5.0.0", - "unocss": "^0.53.1", - "unplugin-auto-import": "^0.16.4", - "unplugin-icons": "^0.16.3", - "unplugin-vue-components": "^0.25.1", - "vite": "^4.3.9", + "naive-ui": "^2.38.1", + "sass": "^1.71.1", + "simple-git-hooks": "^2.9.0", + "typescript": "^5.3.3", + "unocss": "^0.58.5", + "unplugin-auto-import": "^0.17.5", + "unplugin-icons": "^0.18.5", + "unplugin-vue-components": "^0.26.0", + "vite": "^5.1.4", + "vite-bundle-visualizer": "^1.0.1", "vite-plugin-compression": "^0.5.1", - "vite-plugin-mock": "^2.9.8", + "vite-plugin-mock": "^3.0.1", "vite-plugin-svg-icons": "^2.0.1", - "vue-tsc": "^1.8.1" + "vue-tsc": "^1.8.27" + }, + "simple-git-hooks": { + "pre-commit": "pnpm lint-staged" }, "lint-staged": { - "*.{js,jsx,mjs,ts,tsx,json,md,yml}": [ - "eslint --fix" - ], - "*.vue": [ - "eslint --fix" - ] + "*": "eslint --fix" } } diff --git a/src/typings/env.d.ts b/src/typings/env.d.ts index 5ac69f1..8946c66 100644 --- a/src/typings/env.d.ts +++ b/src/typings/env.d.ts @@ -20,8 +20,6 @@ interface ImportMetaEnv { readonly VITE_APP_NAME: string /** 开启请求代理 */ readonly VITE_HTTP_PROXY?: 'Y' | 'N' - /** 是否开启打包依赖分析 */ - readonly VITE_VISUALIZER?: 'Y' | 'N' /** 是否开启打包压缩 */ readonly VITE_COMPRESS_OPEN?: 'Y' | 'N' /** 压缩算法类型 */ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ef70583..ea9a7d1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -53,7 +53,7 @@ const formComponets = { -