diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 8821985..a84367b 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -27,7 +27,7 @@ module.exports = { indent: ['error', 4, { SwitchCase: 1 }], //代码缩进2个空格 semi: ['error', 'always'], //行尾需要有分号 quotes: ['error', 'single'], //强制使用一致的反勾号、双引号或单引号 - 'linebreak-style': ['error', 'unix'], //强制使用一致的换行风格,"unix"：\n 表示 LF , "windows"：\r\n 表示 CRLF + 'linebreak-style': ['error', 'windows'], //强制使用一致的换行风格,"unix"：\n 表示 LF , "windows"：\r\n 表示 CRLF eqeqeq: ['error', 'always', { null: 'ignore' }], //比较时强制使用 === 或者 !==,但对null作比较时可以不用全等 'no-unused-vars': 'off', '@typescript-eslint/no-unused-vars': [ @@ -43,6 +43,8 @@ module.exports = { 'vue/singleline-html-element-content-newline': 'off', //要求在单行元素的内容之前和之后有一个换行符 'vue/max-attributes-per-line': 'off', //执行每行的最大属性数(被 prettier 最大单行控制了暂off) 'vue/multi-word-component-names': 'off', //要求组件名称始终为多字 + 'vue/html-self-closing': 'off', //执行自我封闭式 + 'no-undef': 'off', //禁用未声明的变量，除非它们在 /*global */ 注释中被提到 '@typescript-eslint/ban-ts-comment': 'off', // 不允许@ts-<指令>评论或要求指令后的描述 '@typescript-eslint/ban-types': 'off', // 不允许某些类型 '@typescript-eslint/no-non-null-assertion': 'off', // 不允许使用！后缀操作符的非空断言 diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100644 index 0000000..10cb551 --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +pnpm commitlint --edit "$1" diff --git a/.husky/lintstagedrc.cjs b/.husky/lintstagedrc.cjs new file mode 100644 index 0000000..b1cec8e --- /dev/null +++ b/.husky/lintstagedrc.cjs @@ -0,0 +1,9 @@ +module.exports = { + '*.{js,jsx,ts,tsx}': ['eslint --fix', 'prettier --write'], + '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': ['prettier --write--parser json'], + 'package.json': ['prettier --write'], + '*.vue': ['prettier --write'], + '*.{scss,less,styl,css,html}': ['prettier --write'], + '*.md': ['prettier --write'], + '*.hbs': ['prettier --write'], +}; diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af219..29b6b29 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,7 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -npx lint-staged +[ -n "$CI" ] && exit 0 + +# 根据./lintsstagedrc.cjs配置格式化并提交代码 +npm run lint:lint-staged diff --git a/.vscode/.prettierignore b/.prettierignore similarity index 85% rename from .vscode/.prettierignore rename to .prettierignore index 4686357..98c4b0f 100644 --- a/.vscode/.prettierignore +++ b/.prettierignore @@ -12,4 +12,5 @@ **/*.min.css **/*.tsbuildinfo /src/manifest.json -.eslintcache \ No newline at end of file +.eslintcache +pnpm-lock.yaml \ No newline at end of file diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 0000000..9dc4181 --- /dev/null +++ b/.prettierrc.cjs @@ -0,0 +1,17 @@ +////////////////////////////////////////////////////////////////// +// 官网参考：https://prettier.io/docs/en/options.html#tab-width // +//////////////////////////////////////////////////////////////// +module.exports = { + /**.pellerrc 的架构 */ + $schema: 'https://json.schemastore.org/prettierrc', + /**在所有代码语句的末尾添加分号 */ + semi: true, + /**使用 4 个空格缩进 */ + tabWidth: 4, + /**每行最多 160 字符 */ + printWidth: 160, + /**指定文件的结尾换行符 */ + endOfLine: 'auto', + /**使用单引号代替双引号 */ + singleQuote: true, +}; diff --git a/.vscode/settings.json b/.vscode/settings.json index 611d1f5..f08f0ba 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,7 +13,7 @@ "source.fixAll.eslint": true, "source.fixAll.stylelint": true }, - "files.eol": "\n", + "files.eol": "auto", "eslint.enable": true, ////////////////////////////////////////////////////////////////// @@ -23,6 +23,7 @@ "prettier.semi": true, "prettier.tabWidth": 4, "prettier.printWidth": 160, + "prettier.endOfLine": "auto", "prettier.singleQuote": true, - "prettier.ignorePath": "./.vscode/prettierignore" + "prettier.ignorePath": ".prettierignore" } diff --git a/commitlint.config.cjs b/commitlint.config.cjs new file mode 100644 index 0000000..13f4e39 --- /dev/null +++ b/commitlint.config.cjs @@ -0,0 +1,37 @@ +// https://github.com/conventional-changelog/commitlint/#what-is-commitlint + +// 例：feat: 增加功能 + +module.exports = { + extends: ['@commitlint/config-conventional'], + rules: { + 'type-enum': [ + 2, + 'always', + [ + 'feat', // 新功能(feature) + 'fix', // 修补bug + 'docs', // 文档(documentation) + 'style', // 格式、样式(不影响代码运行的变动) + 'refactor', // 代码重构 + 'perf', // 性能改进 + 'test', // 添加测试 + 'ci', // 持续集成 + 'chore', // 构建过程或辅助工具的变动 + 'revert', // 回滚到上一个版本 + 'workflow', // 工作流改进 + 'mod', // 不确定分类的修改 + 'wip', // 开发中 + 'types', // 类型修改 + 'release', // 版本发布 + 'resolve a conflict', // 解决冲突 + 'merge branch', // 合并分支 + 'dependencies', // 依赖项修改 + 'devDependencies', // 开发依赖修改 + 'strengthen', // 加强，巩固 + ], + ], + 'subject-full-stop': [0, 'never'], + 'subject-case': [0, 'never'], + }, +}; diff --git a/package.json b/package.json index 57df935..1d2b91c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,10 @@ "build:quickapp-webview": "uni build -p quickapp-webview", "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei", "build:quickapp-webview-union": "uni build -p quickapp-webview-union", - "eslint": "eslint --max-warnings 0 \"src/**/*.{vue,js,jsx,cjs,mjs,ts,tsx,cts,mts}\" --fix", + "lint": "pnpm lint:format & pnpm lint:eslint", + "lint:eslint": "eslint --max-warnings 0 --fix --ext .js,.cjs,.mjs,.jsx,.ts,.cts,.mts,.tsx,.vue ./src", + "lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,vue,html,md}\"", + "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.cjs", "prepare": "husky install" }, "dependencies": { @@ -58,6 +61,8 @@ "vue": "^3.2.47" }, "devDependencies": { + "@commitlint/cli": "^17.4.4", + "@commitlint/config-conventional": "^17.4.4", "@dcloudio/types": "^3.2.11", "@dcloudio/uni-automator": "3.0.0-alpha-3070620230227001", "@dcloudio/uni-cli-shared": "3.0.0-alpha-3070620230227001", @@ -75,8 +80,7 @@ "eslint": "^8.35.0", "eslint-plugin-vue": "^9.9.0", "husky": "^8.0.3", - "lint-staged": "^13.1.2", - "mrm": "^4.1.13", + "lint-staged": "^13.2.0", "postcss": "^8.4.21", "prettier": "^2.8.4", "sass": "^1.58.3", @@ -84,16 +88,5 @@ "unocss": "^0.46.5", "unocss-preset-weapp": "^0.2.5", "vite": "^4.1.4" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "*.{js,jsx,vue,ts,tsx}": [ - "eslint --max-warnings 0 --fix", - "git add" - ] } } diff --git a/src/components/Navbar/index.vue b/src/components/Navbar/index.vue index 73a7234..bfa0561 100644 --- a/src/components/Navbar/index.vue +++ b/src/components/Navbar/index.vue @@ -70,10 +70,20 @@ const onBackHome = () => { diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index c2b23ae..7ebfed5 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -40,7 +40,7 @@ request.interceptors.request.use( } return options; }, - (options) => Promise.reject(options), + (options) => Promise.reject(options) ); /** @@ -59,7 +59,7 @@ request.interceptors.response.use( (response) => // 请求错误做点什么。可以使用async await 做异步操作 // error('Request Error!'); - Promise.reject(response), + Promise.reject(response) ); export { request }; diff --git a/tsconfig.json b/tsconfig.json index 22206c3..6464fae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "vite.config.*", "vitest.config.*", "cypress.config.*"], // 指定要包含在编译中的文件匹配列表 + "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "vite.config.*"], // 指定要包含在编译中的文件匹配列表 "exclude": [], // 指定要从编译中排除的文件列表 "compilerOptions": { "baseUrl": "./", // 指定基目录以解析非相对模块名 @@ -14,7 +14,7 @@ "removeComments": true, // 删除注释 "paths": { "@/*": ["./src/*"] }, //指定一组条目，它们将导入重新映射到其他查找位置 "pretty": true, // 在输出中启用颜色和格式，使编译器错误更容易阅读 - "newLine": "lf", // 设置发出文件的换行符 + "newLine": "crlf", // 设置发出文件的换行符 // "sourceMap": true, //为发出的JavaScript文件创建源映射文件。 // "declaration": true, // 从项目中的TypeScript和JavaScript文件生成.d.ts文件 // "declarationMap": true, // 为d.ts文件创建源地图