From 167bb669394f0226f2ac7d7bd619f61ed00db33a Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Mon, 3 Jun 2024 10:36:42 +0200
Subject: [PATCH] Merge pull request #18656 from overleaf/jpa-fix-double-lint

[web] eslint with multiple --ignore-pattern is broken

GitOrigin-RevId: eef4bdd2e43c6f576ee5997f8e9a2bd9f385ab48
---
 services/web/Makefile | 53 +++----------------------------------------
 1 file changed, 3 insertions(+), 50 deletions(-)

diff --git a/services/web/Makefile b/services/web/Makefile
index 88c58f7e49..f7c24f4aec 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -393,56 +393,9 @@ WITH_NODE_MODULES_PATH = \
 
 $(WITH_NODE_MODULES_PATH): export PATH=$(NODE_MODULES_PATH)
 
-lint: lint_backend
-lint_backend:
-	npx eslint \
-		'app.{js,jsx,mjs,ts,tsx}' \
-		'app/**/*.{js,jsx,mjs,ts,tsx}' \
-		'modules/*/index.{js,jsx,mjs,ts,tsx}' \
-		'modules/*/app/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
-
-lint: lint_frontend
-lint_frontend:
-	npx eslint \
-		'frontend/**/*.{js,jsx,mjs,ts,tsx}' \
-		'modules/**/frontend/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
-
-lint: lint_test
-lint_test: lint_test_app
-lint_test_app: lint_test_app_unit
-lint_test_app_unit:
-	npx eslint \
-		'test/unit/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
-
-lint_test_app: lint_test_app_rest
-lint_test_app_rest:
-	npx eslint \
-		'test/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'test/unit/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
-
-lint_test: lint_test_modules
-lint_test_modules:
-	npx eslint \
-		'modules/*/test/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
-
-lint: lint_misc
-# migrations, scripts, webpack config
-lint_misc:
-	npx eslint . \
-		--ignore-pattern 'app.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'app/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'modules/*/app/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'modules/*/index.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'frontend/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'modules/**/frontend/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'test/**/*.{js,jsx,mjs,ts,tsx}' \
-		--ignore-pattern 'modules/*/test/**/*.{js,jsx,mjs,ts,tsx}' \
-		--max-warnings=0
+lint: lint_eslint
+lint_eslint:
+	npm run lint
 
 lint: lint_pug
 lint_pug: