From 755233dcdcdae3cef7822e9f9577f44f3a1a447a Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Fri, 25 Mar 2022 09:31:13 +0000
Subject: [PATCH] [web] Add TypeScript file extensions to ESLint (#7215)

GitOrigin-RevId: 0e7dbc94b304ba0bb17fbbfbc726e31775b97e3d
---
 services/web/Makefile     | 36 ++++++++++++++++++------------------
 services/web/package.json |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/services/web/Makefile b/services/web/Makefile
index f80860fadd..e4f990917f 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -367,17 +367,17 @@ $(WITH_NODE_MODULES_PATH): export PATH=$(NODE_MODULES_PATH)
 lint: lint_backend
 lint_backend:
 	npx eslint \
-		app.js \
-		'app/**/*.js' \
-		'modules/*/index.js' \
-		'modules/*/app/**/*.js' \
+		'app.{js,ts,tsx}' \
+		'app/**/*.{js,ts,tsx}' \
+		'modules/*/index.{js,ts,tsx}' \
+		'modules/*/app/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint: lint_frontend
 lint_frontend:
 	npx eslint \
-		'frontend/**/*.js' \
-		'modules/*/frontend/**/*.js' \
+		'frontend/**/*.{js,ts,tsx}' \
+		'modules/**/frontend/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint: lint_test
@@ -385,34 +385,34 @@ lint_test: lint_test_app
 lint_test_app: lint_test_app_unit
 lint_test_app_unit:
 	npx eslint \
-		'test/unit/**/*.js' \
+		'test/unit/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint_test_app: lint_test_app_rest
 lint_test_app_rest:
 	npx eslint \
-		'test/**/*.js' \
-		--ignore-pattern 'test/unit/**/*.js' \
+		'test/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'test/unit/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint_test: lint_test_modules
 lint_test_modules:
 	npx eslint \
-		'modules/*/test/**/*.js' \
+		'modules/*/test/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint: lint_misc
 # migrations, scripts, webpack config, karma config
 lint_misc:
 	npx eslint . \
-		--ignore-pattern app.js \
-		--ignore-pattern 'app/**/*.js' \
-		--ignore-pattern 'modules/*/app/**/*.js' \
-		--ignore-pattern 'modules/*/index.js' \
-		--ignore-pattern 'frontend/**/*.js' \
-		--ignore-pattern 'modules/*/frontend/**/*.js' \
-		--ignore-pattern 'test/**/*.js' \
-		--ignore-pattern 'modules/*/test/**/*.js' \
+		--ignore-pattern 'app.{js,ts,tsx}' \
+		--ignore-pattern 'app/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'modules/*/app/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'modules/*/index.{js,ts,tsx}' \
+		--ignore-pattern 'frontend/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'modules/**/frontend/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'test/**/*.{js,ts,tsx}' \
+		--ignore-pattern 'modules/*/test/**/*.{js,ts,tsx}' \
 		--max-warnings=0
 
 lint: lint_pug
diff --git a/services/web/package.json b/services/web/package.json
index 1aa64555cb..b2900b251e 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -26,8 +26,8 @@
     "format:fix": "prettier --write $PWD/'**/*.{js,ts,tsx}'",
     "format:styles": "prettier --list-different $PWD/'**/*.less'",
     "format:styles:fix": "prettier --write $PWD/'**/*.less'",
-    "lint": "eslint --max-warnings 0 --format unix .",
-    "lint:fix": "eslint --fix .",
+    "lint": "eslint --max-warnings 0 --format unix --ext .js,.ts,.tsx .",
+    "lint:fix": "eslint --fix --ext .js,.ts,.tsx .",
     "type-check": "tsc --noEmit",
     "extract-translations": "i18next-scanner",
     "migrations": "east",