From 5e312522957759a4877bb9e717690173608c4f02 Mon Sep 17 00:00:00 2001
From: Shadowner <oulieu.lucas@gmail.com>
Date: Sat, 11 Mar 2023 22:47:09 +0100
Subject: [PATCH] Fixing ESLint for .ts / .cts / .js files not svelte

Cant make ESLint work for svelte, I don't know wht :/
---
 package.json                                  |  7 ++++---
 .../electron/.eslintrc.json                   |  2 +-
 src/electron/main.cts                         |  1 -
 .../frontend/.eslintrc.json                   | 19 +++++++++++++++----
 svelte.tsconfig.json                          | 11 +++++------
 yarn.lock                                     |  5 +++++
 6 files changed, 30 insertions(+), 15 deletions(-)
 rename eslint.electron.json => src/electron/.eslintrc.json (99%)
 rename eslint.svelte.json => src/frontend/.eslintrc.json (92%)

diff --git a/package.json b/package.json
index c6dbbb3f..81011f63 100644
--- a/package.json
+++ b/package.json
@@ -29,9 +29,9 @@
     "________________________________Util__________________________________": "",
     "preview": "vite preview",
     "format": "prettier --write \"src/**/**/*\" --write \"scripts/**/**/*\"",
-    "lint:electron": "eslint -c eslint.electron.json --ext .cjs,.cts ./src/electron",
-    "lint:svelte": "eslint -c eslint.svelte.json --ext .js,.ts ./src/frontend",
-    "lint": "npm-run-all -s -c lint:electron lint:svelte",
+    "lint:electron": "eslint -c ./src/electron/.eslintrc.json ",
+    "lint:svelte": "eslint -c ./src/frontend/.eslintrc.json",
+    "lint": "npm-run-all -s -c lint:electron lint:svelte check",
     "check": "svelte-check --tsconfig ./svelte.tsconfig.json"
   },
   "devDependencies": {
@@ -50,6 +50,7 @@
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-jsdoc": "^40.0.1",
     "eslint-plugin-prefer-arrow": "^1.2.3",
+    "eslint-plugin-svelte3": "^4.0.0",
     "html-minifier": "^4.0.0",
     "nodemon": "^2.0.21",
     "npm-run-all": "^4.1.5",
diff --git a/eslint.electron.json b/src/electron/.eslintrc.json
similarity index 99%
rename from eslint.electron.json
rename to src/electron/.eslintrc.json
index bd6d18c2..fdd3c4f4 100644
--- a/eslint.electron.json
+++ b/src/electron/.eslintrc.json
@@ -11,7 +11,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": "tsconfig.electron.json",
+    "project": "electron.tsconfig.json",
     "sourceType": "module"
   },
   "plugins": ["eslint-plugin-jsdoc", "eslint-plugin-prefer-arrow", "@typescript-eslint"],
diff --git a/src/electron/main.cts b/src/electron/main.cts
index 47ab242e..cde411ba 100644
--- a/src/electron/main.cts
+++ b/src/electron/main.cts
@@ -13,7 +13,6 @@ import logger from "./utils/logger.cjs";
 import settings from "./utils/settings.cjs";
 
 const isProd = process.env.NODE_ENV === "production" || app.isPackaged;
-console.log("isprod: ", isProd)
 logger.info("App starting...");
 settings.set("check", true);
 logger.info("Checking if settings store works correctly.");
diff --git a/eslint.svelte.json b/src/frontend/.eslintrc.json
similarity index 92%
rename from eslint.svelte.json
rename to src/frontend/.eslintrc.json
index 03fa831c..0ddc25ce 100644
--- a/eslint.svelte.json
+++ b/src/frontend/.eslintrc.json
@@ -4,18 +4,29 @@
     "es2021": true,
     "node": true
   },
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["svelte3", "eslint-plugin-jsdoc", "eslint-plugin-prefer-arrow", "@typescript-eslint"],
   "extends": [
+    "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking",
     "prettier"
   ],
-  "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": "tsconfig.svelte.json",
+    "project": "svelte.tsconfig.json",
     "ecmaVersion": 2021,
-    "sourceType": "module"
+    "sourceType": "module",
+    "extraFileExtensions": [".svelte"]
+  },
+  "overrides": [
+    {
+      "files": ["*.svelte"],
+      "processor": "svelte3/svelte3"
+    }
+  ],
+  "settings": {
+    "svelte3/typescript": true
   },
-  "plugins": ["eslint-plugin-jsdoc", "eslint-plugin-prefer-arrow", "@typescript-eslint"],
   "rules": {
     "@typescript-eslint/adjacent-overload-signatures": "error",
     "@typescript-eslint/array-type": [
diff --git a/svelte.tsconfig.json b/svelte.tsconfig.json
index d4b4a74e..056fc5c8 100644
--- a/svelte.tsconfig.json
+++ b/svelte.tsconfig.json
@@ -13,10 +13,9 @@
   },
   "include": [
     "vite.config.ts",
-    "../src/frontend/**/*.d.ts",
-    "../src/frontend/**/*.ts",
-    "../src/frontend/**/*.js",
-    "../src/frontend/**/*.svelte"
-  ],
-  "references": [{ "path": "./tsconfig.node.json" }]
+    "src/frontend/**/*.d.ts",
+    "src/frontend/**/*.ts",
+    "src/frontend/**/*.js",
+    "src/frontend/**/*.svelte"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index c3fe8381..c3cd295d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1616,6 +1616,11 @@ eslint-plugin-prefer-arrow@^1.2.3:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041"
   integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==
 
+eslint-plugin-svelte3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-svelte3/-/eslint-plugin-svelte3-4.0.0.tgz#3d4f3dcaec5761dac8bc697f81de3613b485b4e3"
+  integrity sha512-OIx9lgaNzD02+MDFNLw0GEUbuovNcglg+wnd/UY0fbZmlQSz7GlQiQ1f+yX0XvC07XPcDOnFcichqI3xCwp71g==
+
 eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"