Merge pull request #214 from mykhalenych/feature/prettier_for_eslint-…

…config-react-typescript Feature/prettier
mate-academy · Feb 14, 2024 · 7dd9ffa · 7dd9ffa
2 parents 02f768e + e733dce
commit 7dd9ffa
Show file tree

Hide file tree

Showing 6 changed files with 1,270 additions and 698 deletions.
diff --git a/eslint-config-react-typescript/index.js b/eslint-config-react-typescript/index.js
@@ -9,6 +9,7 @@ module.exports = {
     'airbnb-typescript',
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended'
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
@@ -23,6 +24,7 @@ module.exports = {
     'react',
     'react-hooks',
     '@typescript-eslint',
+    'prettier'
   ],
   rules: {
     // JS
@@ -49,6 +51,7 @@ module.exports = {
       { blankLine: 'always', prev: 'directive', next: '*' },
       { blankLine: 'always', prev: 'block-like', next: '*' },
     ],
+    'implicit-arrow-linebreak:': 0,
 
     // React
     'react/prop-types': 0,

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
@@ -1,6 +1,6 @@
 {
   "name": "@mate-academy/eslint-config-react-typescript",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "React config for Mate academy students based on airbnb with Typescript",
   "main": "index.js",
   "scripts": {
@@ -13,8 +13,10 @@
     "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"
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "prettier": "^3.2.5"
   },
   "repository": {
     "type": "git",

diff --git a/eslint-config-react/index.js b/eslint-config-react/index.js
@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = {
-  "extends": ["airbnb", "@mate-academy/eslint-config"],
+  "extends": ["airbnb", "plugin:prettier/recommended", "@mate-academy/eslint-config"],
   "env": {
     "es6": true,
     "browser": true
@@ -16,6 +16,7 @@ module.exports = {
   },
   "plugins": [
     "react",
+    "prettier"
   ],
   rules: {
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
@@ -41,6 +42,7 @@ module.exports = {
       {"blankLine": "always", "prev": "directive", "next": "*"},
       {"blankLine": "always", "prev": "block-like", "next": "*"},
     ],
-    "import/prefer-default-export": 0
+    "import/prefer-default-export": 0,
+    "implicit-arrow-linebreak": 0
   }
 };