diff --git a/.eslintrc.js b/.eslintrc.js index df5eaeb..a126598 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,12 +15,12 @@ module.exports = { ecmaVersion: 2020 }, extends: [ - 'plugin:prettier/recommended', // 添加 prettier 插件 'plugin:vue/vue3-recommended', 'plugin:vue/vue3-strongly-recommended', 'plugin:@typescript-eslint/recommended', '@vue/standard', - '@vue/typescript/recommended' + '@vue/typescript/recommended', + 'plugin:prettier/recommended' // 添加 prettier 插件,必须放在数组最后 ], rules: { 'vue/multi-word-component-names': 'off', diff --git a/package.json b/package.json index 308754f..72f801f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ "build:prod": "vue-tsc --noEmit && vite build", "preview:stage": "pnpm build:stage && vite preview", "preview:prod": "pnpm build:prod && vite preview", - "lint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix" + "lint:eslint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix", + "lint:prettier": "prettier --write \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", + "lint": "pnpm lint:eslint && pnpm lint:prettier" }, "dependencies": { "@element-plus/icons-vue": "^1.1.4",