From 90c01475c7c64e344d24fe71dad79a6bf8738c42 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Mon, 4 Jul 2022 17:39:26 +0200
Subject: [PATCH] merge eslint config

---
 services/idp/.eslintrc.json.old | 13 -------------
 services/idp/package.json       | 13 +++++++++++--
 2 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 services/idp/.eslintrc.json.old

diff --git a/services/idp/.eslintrc.json.old b/services/idp/.eslintrc.json.old
deleted file mode 100644
index 036267fa32..0000000000
--- a/services/idp/.eslintrc.json.old
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"plugins": [],
-	"extends": ["plugin:react/recommended", "plugin:jest/recommended"],
-	"settings": {
-		"react": {
-			"version": "detect"
-		}
-	},
-	"parser": "babel-eslint",
-	"rules": {
-		"react/display-name": "off"
-	}
-}
diff --git a/services/idp/package.json b/services/idp/package.json
index 218fb45fcb..b915563fcd 100644
--- a/services/idp/package.json
+++ b/services/idp/package.json
@@ -39,8 +39,16 @@
     "extends": [
       "react-app",
       "react-app/jest",
-      "plugin:i18next/recommended"
+      "plugin:i18next/recommended",
+      "plugin:react/recommended",
+      "plugin:jest/recommended"
     ],
+    "settings": {
+      "react": {
+        "version": "detect"
+      }
+    },
+    "parser": "babel-eslint",
     "rules": {
       "no-unused-vars": "off",
       "no-use-before-define": "off",
@@ -55,7 +63,8 @@
         {
           "markupOnly": true
         }
-      ]
+      ],
+      "react/display-name": "off"
     }
   },
   "jest": {