From 0928c4d03052369be23ef7d9f8652b1f641c460c Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Fri, 29 Jan 2021 00:29:27 +0100
Subject: [PATCH] chore: some eslint fixes (#9178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add `eslint-plugin-prettier` so that eslint can format code too
* fixed eslint config file:
   - wrong “prettier” extend
   - added config for eslint/prettier
* allow eslint/prettier to format JSON files except package.json files (which are formatted by npm)
---
 .eslintrc.json  | 10 ++++++++--
 .prettierignore |  2 +-
 package.json    |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 8d58bdb49..016b587d0 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,9 +7,15 @@
 		"project": ["packages/core/tsconfig.json", "packages/webpack/tsconfig.json"]
 	},
 	"ignorePatterns": ["**/*"],
-	"plugins": ["@typescript-eslint", "@nrwl/nx"],
-	"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "prettier/@typescript-eslint"],
+	"plugins": ["prettier", "@typescript-eslint", "@nrwl/nx"],
+	"extends": [
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended",
+		"prettier/@typescript-eslint",
+		"plugin:prettier/recommended"
+	],
 	"rules": {
+		"prettier/prettier": "warn",
 		"@typescript-eslint/explicit-member-accessibility": "off",
 		"@typescript-eslint/explicit-function-return-type": "off",
 		"@typescript-eslint/no-parameter-properties": "off",
diff --git a/.prettierignore b/.prettierignore
index 59def97b7..ab6e626ad 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -16,7 +16,7 @@ packages/ui-mobile-base
 tools/assets/App_Resources
 *.cmd
 *.md
-*.json
+package.json
 *.js
 *.map
 *.css
diff --git a/package.json b/package.json
index b1890ff2e..33fd7d7fb 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
 		"dotenv": "~8.2.0",
 		"eslint": "~7.10.0",
 		"eslint-config-prettier": "~6.11.0",
+		"eslint-plugin-prettier": "^3.3.1",
 		"gonzales": "^1.0.7",
 		"husky": "^4.2.5",
 		"jest": "~26.2.2",