Merge pull request #1 from fs-jun24-team-3/bugfix/master

Bugfix/master
fs-jun24-team-3 · Sep 13, 2024 · 3ff4165 · 3ff4165
2 parents 71cd46f + da7f097
commit 3ff4165
Show file tree

Hide file tree

Showing 7 changed files with 530 additions and 16 deletions.
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -3,23 +3,26 @@ name: ESLint Check
 on:
   push:
     branches:
-      - main   # Запускати на кожен push в гілку main
-      - master # або гілку master
+      - main
+      - master
       - develop
+      - bugfix/master
+
   pull_request:
     branches:
       - main
       - master
       - develop
+      - bugfix/master
+
 
 jobs:
   lint:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        
+
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -30,3 +33,4 @@ jobs:
 
       - name: Run ESLint
         run: npm run lint
+
diff --git a/eslint.config.js b/eslint.config.js
@@ -26,9 +26,14 @@ export default [
   {
     rules: {
       'react/react-in-jsx-scope': 'off',
-      'react/jsx-uses-react': 'off', // Повторне вимкнення правила
+      'react/jsx-uses-react': 'off',
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
     },
   },
   {ignores: ['build/', 'dist/assets/index-CnMgUSrV.js', 'node_modules']},
+];
 
-];