From 99fc39d4016a719073bb8d9cabdfa7fb1e06ba93 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 13 Jun 2024 13:54:36 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=80=9F=E5=BA=A6=20(#5440)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                      | 59 +++++++++-------------
 frontend/src/components/terminal/index.vue |  6 +--
 frontend/src/lang/modules/en.ts            |  4 +-
 frontend/src/lang/modules/tw.ts            |  4 +-
 frontend/src/lang/modules/zh.ts            |  4 +-
 frontend/src/routers/router.ts             |  9 ++--
 frontend/src/typings/plugins.d.ts          |  2 -
 7 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 5d230d35d..70807860f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,51 +20,41 @@
         "prettier": "prettier --write ."
     },
     "dependencies": {
-        "@codemirror/lang-javascript": "^6.1.0",
-        "@codemirror/language": "^6.3.2",
-        "@codemirror/legacy-modes": "^6.3.1",
-        "@codemirror/theme-one-dark": "^6.1.0",
+        "@codemirror/lang-javascript": "^6.2.2",
+        "@codemirror/language": "^6.10.2",
+        "@codemirror/legacy-modes": "^6.4.0",
+        "@codemirror/theme-one-dark": "^6.1.2",
         "@element-plus/icons-vue": "^1.1.4",
-        "@vueuse/core": "^8.0.1",
-        "axios": "^1.6.0",
-        "echarts": "^5.3.0",
-        "echarts-liquidfill": "^3.1.0",
-        "element-plus": "^2.3.4",
+        "@vueuse/core": "^8.9.4",
+        "@xterm/addon-fit": "^0.10.0",
+        "@xterm/xterm": "^5.5.0",
+        "axios": "^1.7.2",
+        "echarts": "^5.5.0",
+        "element-plus": "^2.7.5",
         "fit2cloud-ui-plus": "^1.1.4",
-        "js-base64": "^3.7.2",
-        "js-md5": "^0.7.3",
-        "md-editor-v3": "^2.7.2",
-        "monaco-editor": "^0.34.0",
+        "js-base64": "^3.7.7",
+        "md-editor-v3": "^2.11.3",
+        "monaco-editor": "^0.34.1",
         "nprogress": "^0.2.0",
-        "optionator": "^0.9.3",
-        "pinia": "^2.0.12",
+        "pinia": "^2.1.7",
         "pinia-plugin-persistedstate": "^1.6.1",
-        "qs": "^6.10.3",
-        "sass-loader": "^13.0.2",
+        "qs": "^6.12.1",
         "screenfull": "^6.0.2",
         "unplugin-vue-define-options": "^0.7.3",
-        "vue": "^3.2.25",
+        "vue": "^3.4.27",
         "vue-clipboard3": "^2.0.0",
         "vue-codemirror": "^6.1.1",
-        "vue-i18n": "^9.10.2",
-        "vue-router": "^4.0.12",
-        "vue3-seamless-scroll": "^1.2.0",
-        "xterm": "^4.19.0",
-        "xterm-addon-attach": "^0.6.0",
-        "xterm-addon-fit": "^0.5.0"
+        "vue-i18n": "^9.13.1",
+        "vue-router": "^4.3.3"
     },
     "devDependencies": {
-        "@commitlint/cli": "^17.0.1",
-        "@commitlint/config-conventional": "^17.0.0",
-        "@types/node": "^17.0.31",
+        "@types/node": "^20.14.2",
         "@typescript-eslint/eslint-plugin": "^5.22.0",
         "@typescript-eslint/parser": "^5.22.0",
-        "@vitejs/plugin-vue": "^2.2.0",
-        "@vitejs/plugin-vue-jsx": "^1.3.10",
+        "@vitejs/plugin-vue": "^5.0.5",
+        "@vitejs/plugin-vue-jsx": "^4.0.0",
         "autoprefixer": "^10.4.7",
         "commitizen": "^4.2.4",
-        "cz-git": "^1.3.2",
-        "driver.js": "^0.9.8",
         "eslint": "^8.43.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.0.0",
@@ -81,11 +71,10 @@
         "typescript": "^4.5.4",
         "unplugin-auto-import": "^0.16.4",
         "unplugin-vue-components": "^0.25.0",
-        "vite": "^2.9.17",
-        "vite-plugin-cdn-import": "^0.3.5",
+        "vite": "^5.2.13",
         "vite-plugin-compression": "^0.5.1",
-        "vite-plugin-eslint": "^1.6.0",
-        "vite-plugin-html": "^3.2.0",
+        "vite-plugin-eslint": "^1.8.1",
+        "vite-plugin-html": "^3.2.2",
         "vite-plugin-vue-setup-extend": "^0.4.0",
         "vite-svg-loader": "^5.1.0",
         "vue-tsc": "^0.29.8"
diff --git a/frontend/src/components/terminal/index.vue b/frontend/src/components/terminal/index.vue
index 4c088e989..653ef9f3a 100644
--- a/frontend/src/components/terminal/index.vue
+++ b/frontend/src/components/terminal/index.vue
@@ -4,9 +4,9 @@
 
 <script lang="ts" setup>
 import { ref, watch, onBeforeUnmount, nextTick } from 'vue';
-import { Terminal } from 'xterm';
-import 'xterm/css/xterm.css';
-import { FitAddon } from 'xterm-addon-fit';
+import { Terminal } from '@xterm/xterm';
+import '@xterm/xterm/css/xterm.css';
+import { FitAddon } from '@xterm/addon-fit';
 import { Base64 } from 'js-base64';
 
 const terminalElement = ref<HTMLDivElement | null>(null);
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 6565e8c87..c04e9ee28 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1,8 +1,8 @@
 import fit2cloudEnLocale from 'fit2cloud-ui-plus/src/locale/lang/en';
 let xpackEnLocale = {};
-const xpackModules = import.meta.globEager('../../xpack/lang/en.ts');
+const xpackModules = import.meta.glob('../../xpack/lang/en.ts', { eager: true });
 if (xpackModules['../../xpack/lang/en.ts']) {
-    xpackEnLocale = xpackModules['../../xpack/lang/en.ts'].default || {};
+    xpackEnLocale = xpackModules['../../xpack/lang/en.ts']['default'] || {};
 }
 
 const message = {
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 992dc3797..9b47d7e04 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -1,8 +1,8 @@
 import fit2cloudTwLocale from 'fit2cloud-ui-plus/src/locale/lang/zh-cn';
 let xpackTwLocale = {};
-const xpackModules = import.meta.globEager('../../xpack/lang/tw.ts');
+const xpackModules = import.meta.glob('../../xpack/lang/tw.ts', { eager: true });
 if (xpackModules['../../xpack/lang/tw.ts']) {
-    xpackTwLocale = xpackModules['../../xpack/lang/tw.ts'].default || {};
+    xpackTwLocale = xpackModules['../../xpack/lang/tw.ts']['default'] || {};
 }
 
 const message = {
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 3c159479f..ea19c5835 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1,8 +1,8 @@
 import fit2cloudZhLocale from 'fit2cloud-ui-plus/src/locale/lang/zh-cn';
 let xpackZhLocale = {};
-const xpackModules = import.meta.globEager('../../xpack/lang/zh.ts');
+const xpackModules = import.meta.glob('../../xpack/lang/zh.ts', { eager: true });
 if (xpackModules['../../xpack/lang/zh.ts']) {
-    xpackZhLocale = xpackModules['../../xpack/lang/zh.ts'].default || {};
+    xpackZhLocale = xpackModules['../../xpack/lang/zh.ts']['default'] || {};
 }
 
 const message = {
diff --git a/frontend/src/routers/router.ts b/frontend/src/routers/router.ts
index 62f37706c..fc319d367 100644
--- a/frontend/src/routers/router.ts
+++ b/frontend/src/routers/router.ts
@@ -1,8 +1,8 @@
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 import { Layout } from '@/routers/constant';
 
-let modules = import.meta.globEager('./modules/*.ts');
-const xpackModules = import.meta.globEager('../xpack/routers/*.ts');
+let modules: Record<string, RouteRecordRaw> = import.meta.glob('./modules/*.ts', { eager: true });
+const xpackModules: Record<string, RouteRecordRaw> = import.meta.glob('../xpack/routers/*.ts', { eager: true });
 modules = { ...modules, ...xpackModules };
 
 const homeRouter: RouteRecordRaw = {
@@ -30,7 +30,7 @@ export const routerArray: RouteRecordRaw[] = [];
 
 export const rolesRoutes = [
     ...Object.keys(modules)
-        .map((key) => modules[key].default)
+        .map((key) => modules[key]['default'])
         .sort((r1, r2) => {
             r1.sort ??= Number.MAX_VALUE;
             r2.sort ??= Number.MAX_VALUE;
@@ -47,6 +47,9 @@ export const menuList: RouteRecordRaw[] = [];
 rolesRoutes.forEach((item) => {
     let menuItem = JSON.parse(JSON.stringify(item));
     let menuChildren: RouteRecordRaw[] = [];
+    if (menuItem.children == undefined) {
+        return;
+    }
     menuItem.children.forEach((child: any) => {
         if (child.hidden == undefined || child.hidden == false) {
             menuChildren.push(child);
diff --git a/frontend/src/typings/plugins.d.ts b/frontend/src/typings/plugins.d.ts
index 14af0c6cd..f98b942c1 100644
--- a/frontend/src/typings/plugins.d.ts
+++ b/frontend/src/typings/plugins.d.ts
@@ -1,4 +1,2 @@
 declare module 'nprogress';
-declare module 'js-md5';
-declare module 'echarts-liquidfill';
 declare module 'qs';