diff --git a/frontend/.gitignore b/frontend/.gitignore index a547bf3..44da05a 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -14,6 +14,7 @@ dist-ssr # Editor directories and files .vscode/* +!.vscode/settings.json !.vscode/extensions.json .idea .DS_Store diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json new file mode 100644 index 0000000..fd82e45 --- /dev/null +++ b/frontend/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "editor.tabSize": 4, + "editor.insertSpaces": true, + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" +} diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js index 107b983..0072a4a 100644 --- a/frontend/eslint.config.js +++ b/frontend/eslint.config.js @@ -3,11 +3,13 @@ import globals from 'globals' import reactHooks from 'eslint-plugin-react-hooks' import reactRefresh from 'eslint-plugin-react-refresh' import tseslint from 'typescript-eslint' -import { defineConfig, globalIgnores } from 'eslint/config' -import eslintConfigPrettier from 'eslint-config-prettier/flat' +import { defineConfig } from 'eslint/config' +import eslintConfigPrettier from 'eslint-config-prettier' export default defineConfig([ - globalIgnores(['dist']), + { + ignores: ['dist'], + }, { files: ['**/*.{ts,tsx}'], extends: [ @@ -15,12 +17,11 @@ export default defineConfig([ tseslint.configs.recommended, reactHooks.configs['recommended-latest'], reactRefresh.configs.vite, - prettier, + eslintConfigPrettier, ], languageOptions: { ecmaVersion: 2020, globals: globals.browser, }, }, - eslintConfigPrettier, ]) diff --git a/frontend/package.json b/frontend/package.json index ad287e4..3cb66aa 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -2,6 +2,7 @@ "name": "shop", "private": true, "version": "0.0.0", + "description": "Game Shop", "type": "module", "scripts": { "dev": "vite", @@ -48,6 +49,12 @@ "vite": "^7.1.7" }, "lint-staged": { - "**/*": "prettier --write --ignore-unknown" + "*.{js,mjs,cjs,jsx,ts,tsx}": [ + "prettier --write", + "eslint --fix" + ], + "*.{css,json,md,html,js.flow}": [ + "prettier --write" + ] } }