refactor: 📦️ update eslint

caorushizi · May 26, 2024 · 4d76029 · 4d76029
1 parent a4cd419
commit 4d76029
Show file tree

Hide file tree

Showing 18 changed files with 152 additions and 1,473 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,9 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  { languageOptions: { globals: globals.browser } },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];
diff --git a/package.json b/package.json
@@ -35,20 +35,20 @@
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/core": "^19.3.0",
     "@commitlint/cz-commitlint": "^19.2.0",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
+    "@commitlint/format": "^19.3.0",
+    "@eslint/js": "^9.3.0",
     "@waline/client": "^3.2.0",
     "commitizen": "^4.3.0",
     "cross-env": "^7.0.3",
     "cspell": "^8.8.3",
     "cz-git": "^1.9.1",
     "eslint": "^9.3.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "globals": "^15.3.0",
     "husky": "^9.0.11",
-    "prettier": "3.2.5",
     "tsx": "^4.11.0",
+    "typescript-eslint": "^7.10.0",
     "vitepress": "1.2.2",
     "vue": "^3.4.27",
     "zx": "^8.1.1"
@@ -57,9 +57,5 @@
     "patchedDependencies": {
       "@cliqz/[email protected]": "patches/@[email protected]"
     }
-  },
-  "dependencies": {
-    "@commitlint/core": "^19.3.0",
-    "@commitlint/format": "^19.3.0"
   }
 }
diff --git a/packages/main/.eslintignore b/packages/main/.eslintignore
diff --git a/packages/main/.eslintrc.cjs b/packages/main/.eslintrc.cjs
diff --git a/packages/main/eslint.config.js b/packages/main/eslint.config.js
@@ -0,0 +1,11 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  {
+    languageOptions: { globals: globals.node },
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "@electron/rebuild": "^3.6.0",
-    "@rushstack/eslint-patch": "^1.10.3",
+    "@eslint/js": "^9.3.0",
     "@types/electron-devtools-installer": "^2.2.5",
     "@types/fs-extra": "^11.0.4",
     "@types/gulp": "^4.0.17",
@@ -30,8 +30,6 @@
     "@types/node": "^20.12.12",
     "@types/node-fetch": "^2.6.11",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "7.10.0",
-    "@typescript-eslint/parser": "7.10.0",
     "consola": "^3.2.3",
     "cross-env": "^7.0.3",
     "del": "^7.1.0",
@@ -42,17 +40,12 @@
     "esbuild": "^0.21.4",
     "esbuild-register": "^3.5.0",
     "eslint": "^9.3.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-n": "17.7.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "6.1.1",
+    "globals": "^15.3.0",
     "gulp": "^5.0.0",
     "prebuild-install": "^7.1.2",
-    "prettier": "3.2.5",
     "semver": "^7.6.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.10.0"
   },
   "dependencies": {
     "@cliqz/adblocker-electron": "^1.27.3",

diff --git a/packages/main/src/windows/BrowserWindow.ts b/packages/main/src/windows/BrowserWindow.ts
@@ -32,11 +32,11 @@ export default class BrowserWindow extends Window {
     this.store.onDidAnyChange(this.storeChange);
   }
 
-  storeChange = (store: any) => {
+  storeChange = (store: unknown) => {
     this.send("store-change", store);
   };
 
-  handleNewWindowsVal = (newValue: any) => {
+  handleNewWindowsVal = (newValue: unknown) => {
     if (!this.window) return;
 
     // 向所有窗口发送通知
@@ -75,7 +75,7 @@ export default class BrowserWindow extends Window {
     this.window.close();
   };
 
-  send(channel: string, ...args: any[]) {
+  send(channel: string, ...args: unknown[]) {
     if (!this.window) return;
 
     this.window.webContents.send(channel, ...args);

diff --git a/packages/main/src/windows/MainWindow.ts b/packages/main/src/windows/MainWindow.ts
@@ -98,7 +98,7 @@ export default class MainWindow extends Window {
     }
   };
 
-  storeChange = (store: any) => {
+  storeChange = (store: unknown) => {
     // 向所有窗口发送通知
     this.send("store-change", store);
   };
@@ -121,7 +121,7 @@ export default class MainWindow extends Window {
     this.send("download-success", id);
   };
 
-  onDownloadFailed = async (id: number, err: any) => {
+  onDownloadFailed = async (id: number, err: unknown) => {
     const promptTone = this.store.get("promptTone");
     if (promptTone) {
       const video = await this.videoRepository.findVideo(id);
@@ -152,7 +152,7 @@ export default class MainWindow extends Window {
     }
   };
 
-  send(channel: string, ...args: any[]) {
+  send(channel: string, ...args: unknown[]) {
     if (!this.window) return;
 
     this.window.webContents.send(channel, ...args);

diff --git a/packages/plugin/.eslintrc.cjs b/packages/plugin/.eslintrc.cjs
diff --git a/packages/plugin/eslint.config.js b/packages/plugin/eslint.config.js
@@ -0,0 +1,9 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  { languageOptions: { globals: globals.browser } },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -16,19 +16,17 @@
     "nanoid": "^5.0.7"
   },
   "devDependencies": {
+    "@eslint/js": "^9.3.0",
     "@types/jquery": "^3.5.30",
     "@types/node": "^20.12.12",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
     "eslint": "^9.3.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "globals": "^15.3.0",
     "lint-staged": "^15.2.5",
-    "prettier": "3.2.5",
     "stylelint": "^16.6.0",
     "stylelint-config-standard": "^36.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "typescript": "^5.4.5",
+    "typescript-eslint": "^7.10.0",
     "vite": "^5.2.11"
   },
   "lint-staged": {

diff --git a/packages/renderer/.eslintignore b/packages/renderer/.eslintignore
diff --git a/packages/renderer/.eslintrc.cjs b/packages/renderer/.eslintrc.cjs
diff --git a/packages/renderer/eslint.config.js b/packages/renderer/eslint.config.js
@@ -0,0 +1,12 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
+import { fixupConfigRules } from "@eslint/compat";
+
+export default [
+  { languageOptions: { globals: globals.browser } },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  ...fixupConfigRules(pluginReactConfig),
+];
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
@@ -37,6 +37,8 @@
     "sort-by": "^1.2.0"
   },
   "devDependencies": {
+    "@eslint/compat": "^1.0.1",
+    "@eslint/js": "^9.3.0",
     "@types/node": "^20.12.12",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
@@ -46,19 +48,13 @@
     "@typescript-eslint/parser": "7.10.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "eslint": "^9.3.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.7.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-react": "^7.34.1",
-    "prettier": "3.2.5",
+    "globals": "^15.3.0",
     "sass": "^1.77.2",
     "stylelint": "^16.6.0",
     "stylelint-config-standard": "^36.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "typescript": "~5.4.5",
+    "typescript-eslint": "^7.10.0",
     "vite": "^5.2.11",
     "vite-bundle-visualizer": "^1.2.1"
   },