diff --git a/.eslintrc.js b/.eslintrc.js index 244dbbbf..5efe82fd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,6 +8,7 @@ module.exports = defineConfig({ es6: true }, parser: 'vue-eslint-parser', + plugins: ['vue'], parserOptions: { parser: '@typescript-eslint/parser', ecmaVersion: 2020, @@ -17,13 +18,7 @@ module.exports = defineConfig({ jsx: true } }, - extends: [ - 'plugin:vue/vue3-recommended', - 'plugin:@typescript-eslint/recommended', - 'prettier', - 'plugin:prettier/recommended', - './.eslintrc-auto-import.json' - ], + extends: ['plugin:vue/vue3-recommended', 'prettier', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'], rules: { 'vue/script-setup-uses-vars': 'error', 'vue/no-reserved-component-names': 'off', diff --git a/.vscode/settings.json b/.vscode/settings.json index a5c88e54..3a9eccd6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,30 +8,30 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, - "[vue]": { - "editor.defaultFormatter": "Vue.volar" - }, - "[javascript]": { + "[javascriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "[typescriptreact]": { + "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" }, "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[css]": { + "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + }, + "[less]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[scss]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "i18n-ally.localesPaths": ["src/locales"], "i18n-ally.keystyle": "nested", "i18n-ally.sortKeys": true,