From 3ed947c8da907e8f0fd987808b93f15f5355c365 Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Sat, 21 Sep 2024 13:26:00 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20tsconfig=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            |  1 +
 package.json                          |  6 ++--
 src/components/RegisterForm/index.vue |  2 +-
 src/components/SystemInfo/index.vue   |  8 +++++
 src/router/guards.ts                  |  4 +--
 src/store/modules/tabbar.ts           |  4 +--
 tsconfig.app.json                     | 49 +++++++++++++++++++++++++++
 tsconfig.json                         | 49 ++-------------------------
 tsconfig.node.json                    | 14 ++++++--
 vite.config.ts                        | 12 +++----
 vite/plugins.ts                       |  5 +--
 11 files changed, 89 insertions(+), 65 deletions(-)
 create mode 100755 tsconfig.app.json
 mode change 100755 => 100644 tsconfig.json

diff --git a/.gitignore b/.gitignore
index 1692b26f..2393345f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ node_modules
 dist*
 dist-ssr
 *.local
+*.tsbuildinfo
 .eslintcache
 .stylelintcache
diff --git a/package.json b/package.json
index 4845d943..bdbf4073 100755
--- a/package.json
+++ b/package.json
@@ -6,15 +6,15 @@
   },
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc && vite build",
-    "build:test": "vue-tsc && vite build --mode test",
+    "build": "vue-tsc -b && vite build",
+    "build:test": "vue-tsc -b && vite build --mode test",
     "serve": "http-server ./dist -o",
     "serve:test": "http-server ./dist-test -o",
     "svgo": "svgo -f src/assets/icons",
     "new": "plop",
     "generate:icons": "esno ./scripts/generate.icons.ts",
     "lint": "npm-run-all -s lint:tsc lint:eslint lint:stylelint",
-    "lint:tsc": "vue-tsc",
+    "lint:tsc": "vue-tsc -b",
     "lint:eslint": "eslint . --cache --fix",
     "lint:stylelint": "stylelint \"src/**/*.{css,scss,vue}\" --cache --fix",
     "postinstall": "simple-git-hooks",
diff --git a/src/components/RegisterForm/index.vue b/src/components/RegisterForm/index.vue
index f969dbc1..84579f12 100644
--- a/src/components/RegisterForm/index.vue
+++ b/src/components/RegisterForm/index.vue
@@ -38,7 +38,7 @@ const rules = ref<FormRules>({
   checkPassword: [
     { required: true, trigger: 'blur', message: '请再次输入密码' },
     {
-      validator: (rule, value, callback) => {
+      validator: (_rule, value, callback) => {
         if (value !== form.value.password) {
           callback(new Error('两次输入的密码不一致'))
         }
diff --git a/src/components/SystemInfo/index.vue b/src/components/SystemInfo/index.vue
index c3d01cec..a28afbce 100755
--- a/src/components/SystemInfo/index.vue
+++ b/src/components/SystemInfo/index.vue
@@ -14,6 +14,14 @@ onMounted(() => {
 
 <template>
   <HSlideover v-model="isShow" title="系统信息">
+    <div v-if="pkg.version" class="px-4">
+      <h2 class="m-0 text-lg font-bold">
+        版本号
+      </h2>
+      <div class="my-4 text-center text-lg font-sans">
+        {{ pkg.version }}
+      </div>
+    </div>
     <div class="px-4">
       <h2 class="m-0 text-lg font-bold">
         最后编译时间
diff --git a/src/router/guards.ts b/src/router/guards.ts
index ae33267f..987568ec 100644
--- a/src/router/guards.ts
+++ b/src/router/guards.ts
@@ -9,7 +9,7 @@ import { asyncRoutes, asyncRoutesByFilesystem } from './routes'
 import '@/assets/styles/nprogress.css'
 
 function setupRoutes(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to, _from, next) => {
     const settingsStore = useSettingsStore()
     const userStore = useUserStore()
     const routeStore = useRouteStore()
@@ -110,7 +110,7 @@ function setupRoutes(router: Router) {
 // 进度条
 function setupProgress(router: Router) {
   const { isLoading } = useNProgress()
-  router.beforeEach((to, from, next) => {
+  router.beforeEach((_to, _from, next) => {
     const settingsStore = useSettingsStore()
     if (settingsStore.settings.app.enableProgress) {
       isLoading.value = true
diff --git a/src/store/modules/tabbar.ts b/src/store/modules/tabbar.ts
index 31c378bb..83fb0b92 100755
--- a/src/store/modules/tabbar.ts
+++ b/src/store/modules/tabbar.ts
@@ -113,7 +113,7 @@ const useTabbarStore = defineStore(
         }
       })
       keepAliveStore.remove(name)
-      list.value = list.value.filter((item, i) => {
+      list.value = list.value.filter((_item, i) => {
         return i >= index
       })
     }
@@ -138,7 +138,7 @@ const useTabbarStore = defineStore(
         }
       })
       keepAliveStore.remove(name)
-      list.value = list.value.filter((item, i) => {
+      list.value = list.value.filter((_item, i) => {
         return i <= index
       })
     }
diff --git a/tsconfig.app.json b/tsconfig.app.json
new file mode 100755
index 00000000..c0cccaba
--- /dev/null
+++ b/tsconfig.app.json
@@ -0,0 +1,49 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "jsx": "preserve",
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "moduleDetection": "force",
+    "useDefineForClassFields": true,
+    "baseUrl": "./",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ],
+      "#/*": [
+        "src/types/*"
+      ]
+    },
+    "resolveJsonModule": true,
+    "types": [
+      "vite/client",
+      "vite-plugin-pages/client",
+      "vite-plugin-vue-meta-layouts/client",
+      "vite-plugin-app-loading/client",
+      "element-plus/global"
+    ],
+    "allowImportingTsExtensions": true,
+    "allowJs": false,
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue"
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
old mode 100755
new mode 100644
index 4c4e05b5..a2efd469
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,50 +1,7 @@
 {
-  "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "preserve",
-    "lib": [
-      "ESNext",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "useDefineForClassFields": true,
-    "baseUrl": "./",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "paths": {
-      "@/*": [
-        "src/*"
-      ],
-      "#/*": [
-        "src/types/*"
-      ]
-    },
-    "resolveJsonModule": true,
-    "types": [
-      "vite/client",
-      "vite-plugin-pages/client",
-      "vite-plugin-vue-meta-layouts/client",
-      "vite-plugin-app-loading/client",
-      "element-plus/global"
-    ],
-    "allowImportingTsExtensions": true,
-    "allowJs": false,
-    "strict": true,
-    "noEmit": true,
-    "sourceMap": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "skipLibCheck": true
-  },
   "references": [
-    {
-      "path": "./tsconfig.node.json"
-    }
+    { "path": "./tsconfig.app.json" },
+    { "path": "./tsconfig.node.json" }
   ],
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.d.ts",
-    "src/**/*.tsx",
-    "src/**/*.vue"
-  ]
+  "files": []
 }
diff --git a/tsconfig.node.json b/tsconfig.node.json
index f4962820..ddd9f479 100755
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -1,9 +1,17 @@
 {
   "compilerOptions": {
-    "composite": true,
+    "target": "ES2022",
+    "lib": ["ES2023"],
+    "moduleDetection": "force",
     "module": "ESNext",
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "isolatedModules": true,
     "skipLibCheck": true
   },
   "include": [
diff --git a/vite.config.ts b/vite.config.ts
index 46ffd349..c3c62434 100755
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,16 +7,16 @@ import pkg from './package.json'
 import createVitePlugins from './vite/plugins'
 
 // https://vitejs.dev/config/
-export default async ({ mode, command }) => {
+export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd())
   // 全局 scss 资源
-  const scssResources = []
+  const scssResources: string[] = []
   fs.readdirSync('src/assets/styles/resources').forEach((dirname) => {
     if (fs.statSync(`src/assets/styles/resources/${dirname}`).isFile()) {
       scssResources.push(`@use "src/assets/styles/resources/${dirname}" as *;`)
     }
   })
-  return defineConfig({
+  return {
     // 开发服务器选项 https://cn.vitejs.dev/config/server-options
     server: {
       open: true,
@@ -44,7 +44,7 @@ export default async ({ mode, command }) => {
         lastBuildTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       }),
     },
-    plugins: createVitePlugins(env, command === 'build'),
+    plugins: createVitePlugins(mode, command === 'build'),
     resolve: {
       alias: {
         '@': path.resolve(__dirname, 'src'),
@@ -58,5 +58,5 @@ export default async ({ mode, command }) => {
         },
       },
     },
-  })
-}
+  }
+})
diff --git a/vite/plugins.ts b/vite/plugins.ts
index 3749279c..d03c6a9d 100644
--- a/vite/plugins.ts
+++ b/vite/plugins.ts
@@ -1,4 +1,3 @@
-import type { PluginOption } from 'vite'
 import path from 'node:path'
 import process from 'node:process'
 import vueLegacy from '@vitejs/plugin-legacy'
@@ -10,6 +9,7 @@ import Unocss from 'unocss/vite'
 import autoImport from 'unplugin-auto-import/vite'
 import TurboConsole from 'unplugin-turbo-console/vite'
 import components from 'unplugin-vue-components/vite'
+import { loadEnv, type PluginOption } from 'vite'
 import AppLoading from 'vite-plugin-app-loading'
 import Archiver from 'vite-plugin-archiver'
 import banner from 'vite-plugin-banner'
@@ -20,7 +20,8 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 import VueDevTools from 'vite-plugin-vue-devtools'
 import Layouts from 'vite-plugin-vue-meta-layouts'
 
-export default function createVitePlugins(viteEnv, isBuild = false) {
+export default function createVitePlugins(mode: string, isBuild = false) {
+  const viteEnv = loadEnv(mode, process.cwd())
   const vitePlugins: (PluginOption | PluginOption[])[] = [
     vue(),
     vueJsx(),