Merge remote-tracking branch 'origin/master' into feature/prettier_fo…

…r_config_react # Conflicts: # eslint-config-react/package-lock.json # eslint-config-react/package.json
mate-academy · Feb 14, 2024 · df68af1 · df68af1
2 parents 1dc95a3 + 02f768e
commit df68af1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 55 deletions.
diff --git a/eslint-config-react-typescript/index.js b/eslint-config-react-typescript/index.js
@@ -9,7 +9,6 @@ module.exports = {
     'airbnb-typescript',
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
-    "plugin:prettier/recommended"
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
@@ -24,7 +23,6 @@ module.exports = {
     'react',
     'react-hooks',
     '@typescript-eslint',
-    'prettier'
   ],
   rules: {
     // JS

diff --git a/eslint-config-react-typescript/package-lock.json b/eslint-config-react-typescript/package-lock.json
diff --git a/eslint-config-react-typescript/package.json b/eslint-config-react-typescript/package.json
@@ -13,10 +13,8 @@
     "eslint-config-airbnb-typescript": "^12.3.1",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.27.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "prettier": "^3.2.5"
+    "eslint-plugin-react-hooks": "^4.2.0"
   },
   "repository": {
     "type": "git",

diff --git a/eslint-config-react/package.json b/eslint-config-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mate-academy/eslint-config-react",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "React config for Mate academy students based on airbnb",
   "main": "index.js",
   "scripts": {