From de3d1831d059b7c5136d47833592152c790329b2 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Fri, 15 Mar 2024 15:29:33 +0800
Subject: [PATCH] Optimize: tsconfig - optimize alias config

---
 .editorconfig           |  9 ---------
 build/resolvers/antd.ts |  1 -
 electron-builder.yml    |  2 +-
 electron.vite.config.ts |  4 ++--
 package.json            |  4 +---
 tsconfig.json           | 37 +++++++++++++++++++++++++++++++++++--
 tsconfig.web.json       | 38 --------------------------------------
 7 files changed, 39 insertions(+), 56 deletions(-)
 delete mode 100644 .editorconfig
 delete mode 100644 tsconfig.web.json

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 3e10c03..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 4
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
\ No newline at end of file
diff --git a/build/resolvers/antd.ts b/build/resolvers/antd.ts
index 7f61515..0bb5132 100644
--- a/build/resolvers/antd.ts
+++ b/build/resolvers/antd.ts
@@ -417,7 +417,6 @@ export const AntDesignResolver = (options: AntDesignResolverOptions = {}): Compo
                     sideEffects: getSideEffects(importName, options)
                 }
             }
-
             return undefined
         }
     }
diff --git a/electron-builder.yml b/electron-builder.yml
index 888cfcd..806e863 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -8,7 +8,7 @@ files:
   - '!electron.vite.config.{js,ts,mjs,cjs}'
   - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
-  - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
+  - '!{tsconfig.json,tsconfig.node.json}'
 asarUnpack:
   - resources/**
 win:
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index 6f82b37..30dfbc4 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { fileURLToPath, URL } from 'node:url'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import react from '@vitejs/plugin-react'
 import AutoImport from 'unplugin-auto-import/vite'
@@ -82,7 +82,7 @@ export default defineConfig({
         ],
         resolve: {
             alias: {
-                '@': resolve('src/renderer/src')
+                '@': fileURLToPath(new URL('./src/renderer/src', import.meta.url))
             }
         }
     }
diff --git a/package.json b/package.json
index 88aed78..9d9037f 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,7 @@
     "dev": "electron-vite dev",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
-    "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
-    "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "typecheck": "tsc",
     "start": "electron-vite preview",
     "build": "electron-vite build && npm run typecheck",
     "postinstall": "electron-builder install-app-deps",
diff --git a/tsconfig.json b/tsconfig.json
index 31bac6e..c84be5c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,37 @@
 {
-  "files": [],
-  "references": [{ "path": "./tsconfig.node.json" }, { "path": "./tsconfig.web.json" }]
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "skipLibCheck": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/renderer/src/*"]
+    },
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+
+    "types": ["unplugin-icons/types/react"]
+  },
+  "extends": "@electron-toolkit/tsconfig/tsconfig.web.json",
+  "include": [
+    "src/renderer/src/env.d.ts",
+    "src/renderer/src/**/*",
+    "src/renderer/src/**/*.tsx",
+    "src/preload/*.d.ts",
+    "src/renderer/auto-imports.d.ts"
+  ],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/tsconfig.web.json b/tsconfig.web.json
deleted file mode 100644
index 03bbc25..0000000
--- a/tsconfig.web.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "ES2020",
-        "useDefineForClassFields": true,
-        "module": "ESNext",
-        "skipLibCheck": true,
-        "baseUrl": ".",
-        "paths": {
-            "@/*": [
-                "src/renderer/src/*"
-            ]
-        },
-
-        /* Bundler mode */
-        "moduleResolution": "bundler",
-        "allowImportingTsExtensions": true,
-        "resolveJsonModule": true,
-        "isolatedModules": true,
-        "noEmit": true,
-        "jsx": "react-jsx",
-
-        /* Linting */
-        "strict": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noFallthroughCasesInSwitch": true,
-
-        "types": ["unplugin-icons/types/react"]
-    },
-    "extends": "@electron-toolkit/tsconfig/tsconfig.web.json",
-    "include": [
-        "src/renderer/src/env.d.ts",
-        "src/renderer/src/**/*",
-        "src/renderer/src/**/*.tsx",
-        "src/preload/*.d.ts",
-        "src/renderer/auto-imports.d.ts"
-    ]
-}