From 8d415bf6eab63d492ce1c9d986cd84ee0eddc2c4 Mon Sep 17 00:00:00 2001
From: Takashi Tamura <tamuratak@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:59:23 +0900
Subject: [PATCH] Use parserOptions.projectService

- https://typescript-eslint.io/blog/announcing-typescript-eslint-v8-beta#project-service
---
 eslint.config.mjs           | 20 ++++++++++----------
 tsconfig.eslint.json        | 14 --------------
 tsconfig.eslint.viewer.json | 15 ---------------
 3 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 tsconfig.eslint.json
 delete mode 100644 tsconfig.eslint.viewer.json

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 4f5e69b36..8a71c6684 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -87,10 +87,12 @@ const commonRules = {
 export default tseslint.config(
     {
         ignores: [
+            "eslint.config.mjs",
             "src/lib/await-semaphore/",
             "src/lib/synctexjs/",
             "viewer/viewer.js",
             "viewer/viewer.mjs",
+            "types/**/*.d.ts",
             "data/",
             "dev/",
             "icons/",
@@ -110,16 +112,13 @@ export default tseslint.config(
     ...tseslint.configs.recommended,
     ...tseslint.configs.stylistic,
     {
-        files: [
-            "src/**/*.ts",
-            "test/**/*.ts"
-        ],
         languageOptions: {
-            parser: tseslint.parser,
             ecmaVersion: 2018,
-            sourceType: "commonjs",
             parserOptions: {
-                project: "./tsconfig.eslint.json",
+                projectService: {
+                    defaultProject: "tsconfig.json",
+                },
+                tsconfigRootDir: import.meta.dirname
             },
         },
         rules: {
@@ -146,12 +145,13 @@ export default tseslint.config(
         },
     },
     {
-        files: ["viewer/**/*.ts"],
         languageOptions: {
             ecmaVersion: 2018,
-            sourceType: "script",
             parserOptions: {
-                project: "./tsconfig.eslint.viewer.json",
+                projectService: {
+                    defaultProject: "tsconfig.json",
+                },
+                tsconfigRootDir: import.meta.dirname + "/viewer"
             },
         },
         rules: {
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
deleted file mode 100644
index ffb4b388e..000000000
--- a/tsconfig.eslint.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "include": [
-      "src/**/*.ts",
-      "test/**/*.ts",
-      "dev/**/*.ts",
-      "dev/generate-bailout.js",
-      "dev/latex-md.js"
-    ],
-    "compilerOptions": {
-      "allowJs": true,
-      "checkJs": true
-    }
-}
diff --git a/tsconfig.eslint.viewer.json b/tsconfig.eslint.viewer.json
deleted file mode 100644
index 8bfbe8411..000000000
--- a/tsconfig.eslint.viewer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "extends": "./viewer/tsconfig.json",
-    "include": [
-      "viewer/**/*.ts"
-    ],
-    "exclude": [
-      "src/**",
-      "test/**",
-      "dev/**"
-    ],
-    "compilerOptions": {
-      "allowJs": true,
-      "checkJs": true
-    }
-}