From 4a2e74c8a28200d5d945a73c3d16702511c2d8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B8=CC=86=20=D0=91=D0=BE=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D0=B8=D1=87?= Date: Thu, 6 Nov 2025 17:55:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.gitignore | 1 + frontend/.vscode/settings.json | 6 ++++++ frontend/eslint.config.js | 11 ++++++----- frontend/package.json | 9 ++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 frontend/.vscode/settings.json 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" + ] } }