From a0f49a7eaeca88286f8a4488ab9d7671e43a0e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rialland?= <wiinxt@gmail.com>
Date: Mon, 4 Apr 2022 15:49:00 +0200
Subject: [PATCH] Formatage eslint lors de la sauvegarde

---
 .vscode/settings.json | 8 ++++++--
 package.json          | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f8dcb5e3b..e4116c589 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,12 +1,16 @@
 {
-	"editor.formatOnSave": true,
 	"spellright.language": ["fr", "en"],
 	"spellright.documentTypes": ["yaml", "git-commit", "markdown"],
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"editor.tabSize": 2,
-	"eslint.enable": true,
 	"cSpell.words": ["mycompanyinfrance", "smarttag"],
 	"search.exclude": {
 		"**/dist": true
+	},
+	"eslint.enable": true,
+	"eslint.format.enable": true,
+	"editor.formatOnSave": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": true
 	}
 }
diff --git a/package.json b/package.json
index b1d12a9c9..05eabe02f 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
 		"lint:eslint:fix": "yarn lint:eslint --fix",
 		"lint:prettier": "yarn run prettier --check \"**/*.{js,jsx,ts,tsx,yaml,yml}\"",
 		"lint:prettier:fix": "yarn lint:prettier --write",
-		"lint:fix": "yarn lint:eslint:fix && yarn lint:prettier:fix",
+		"lint:fix": "yarn lint:eslint:fix ; yarn lint:prettier:fix",
 		"lint": "yarn lint:eslintrc && yarn lint:eslint && yarn lint:prettier",
 		"postinstall": "yarn workspaces foreach -piv --exclude site run prepack",
 		"test": "yarn workspaces foreach run test",