fix: 解决合并冲突，清理无用代码，更新依赖项版本

Author: windbytes

biome.json

@@ -52,8 +52,4 @@
       }
     }
   }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/rsbuild

package.json

@@ -40,21 +40,12 @@
     "react-hotkeys-hook": "^5.1.0",
     "react-i18next": "^15.6.1",
     "react-is": "^19.1.1",
-<<<<<<< HEAD
-    "react-router": "7.8.1",
-=======
     "react-router": "^7.8.1",
->>>>>>> origin/rsbuild
     "screenfull": "^6.0.2",
     "tailwind-merge": "^3.3.1",
     "zustand": "^5.0.7"
   },
   "devDependencies": {
-<<<<<<< HEAD
-    "@biomejs/biome": "2.2.0",
-    "@iconify-icon/react": "^3.0.0",
-    "@tailwindcss/vite": "^4.1.12",
-=======
     "@biomejs/biome": "^2.2.0",
     "@iconify-icon/react": "^3.0.0",
     "@rsbuild/core": "^1.4.15",
@@ -65,7 +56,6 @@
     "@rsbuild/plugin-svgr": "^1.2.2",
     "@rsdoctor/rspack-plugin": "^1.2.2",
     "@tailwindcss/postcss": "^4.1.12",
->>>>>>> origin/rsbuild
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.17.2",
@@ -74,21 +64,10 @@
     "@types/react-is": "^19.0.0",
     "@types/react-resizable": "^3.0.8",
     "babel-plugin-react-compiler": "^19.1.0-rc.2",
-<<<<<<< HEAD
-    "globals": "^16.3.0",
-    "sass-embedded": "^1.90.0",
-    "tailwindcss": "^4.1.12",
-    "terser": "^5.43.1",
-    "typescript": "~5.9.2",
-    "vite": "npm:rolldown-vite@7.1.2",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.9.3"
-=======
     "rsbuild-plugin-html-minifier-terser": "^1.1.2",
     "rspack-plugin-mock": "^1.2.0",
     "tailwindcss": "^4.1.12",
     "typescript": "^5.9.2"
->>>>>>> origin/rsbuild
   },
   "engines": {
     "node": ">=22.12.0"

src/GlobalConfigProvider.tsx

@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-import { ConfigProvider, App as AntdApp } from 'antd';
-import type React from 'react';
-import App from './App';
-import zhCN from 'antd/locale/zh_CN';
-import enUS from 'antd/locale/en_US';
-import 'dayjs/locale/zh-cn';
-import 'dayjs/locale/en';
-import dayjs from 'dayjs';
-import { usePreferencesStore } from './stores/store';
-import { useShallow } from 'zustand/shallow';
-=======
 import { ConfigProvider, App as AntdApp } from "antd";
 import type React from "react";
 import App from "./App";
@@ -20,7 +8,6 @@ import "dayjs/locale/en";
 import dayjs from "dayjs";
 import { usePreferencesStore } from "./stores/store";
 import { useShallow } from "zustand/shallow";
->>>>>>> origin/rsbuild
 /**
  * 全局配置组件（为了将antd的ConfigProvider和App嵌套，不然App中的antdUtil中的组件无法使用全局配置）
  */

src/layouts/Content/index.tsx

@@ -3,13 +3,8 @@ import type React from "react";
 import { Suspense } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { Outlet, useLocation } from "react-router";
-<<<<<<< HEAD
-import AuthRouter from "@/router/AuthRouter";
-import { ErrorFallback } from "@/router/ErrorBoundary";
-=======
 import { ErrorFallback } from "@/router/ErrorBoundary";
 import AuthRouter from "@/router/AuthRouter";
->>>>>>> origin/rsbuild
 
 /**
  * 中间主内容区域

src/layouts/Header/component/SearchMenuModal/index.tsx

@@ -2,13 +2,10 @@ import { SearchOutlined } from '@ant-design/icons';
 import { Input, Modal } from 'antd';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-<<<<<<< HEAD
-import { usePlatformHotkey } from '@/hooks/usePlatformHotkey';
-import { getShortcutLabel } from '@/utils/utils';
-=======
->>>>>>> origin/rsbuild
 import Footer from './footer';
 import Title from './title';
+import { usePlatformHotkey } from '@/hooks/usePlatformHotkey';
+import { getShortcutLabel } from '@/utils/utils';
 
 /**
  * 搜索菜单模态框组件
@@ -50,10 +47,7 @@ const SearchMenuModal: React.FC = () => {
       />
       <Modal
         open={openModal}
-<<<<<<< HEAD
-=======
         width={600}
->>>>>>> origin/rsbuild
         footer={<Footer />}
         title={<Title />}
         styles={{

src/layouts/Header/index.tsx

@@ -32,11 +32,7 @@ const Header = () => {
    * 跳转到github
    */
   const routeGitHub = useCallback(() => {
-<<<<<<< HEAD
-    window.open('https://github.com/yecongling/nexus-admin', '_blank');
-=======
     window.open("https://github.com/yecongling/nexus-admin", "_blank");
->>>>>>> origin/rsbuild
   }, []);
 
   return (
@@ -58,14 +54,10 @@ const Header = () => {
             {/* 全局搜索 */}
             {globalSearch && <SearchMenuModal />}
             <Tooltip placement="bottom" title="github">
-<<<<<<< HEAD
-              <GithubOutlined style={{ cursor: 'pointer', fontSize: '18px' }} onClick={routeGitHub} />
-=======
               <GithubOutlined
                 style={{ cursor: "pointer", fontSize: "18px" }}
                 onClick={routeGitHub}
               />
->>>>>>> origin/rsbuild
             </Tooltip>
             {/* 锁屏 */}
             {lockScreen && (

src/locales/en-US/menu.ts

@@ -1,9 +1,4 @@
 const menu = {
-  dashboard: {
-    main: 'Dashboard',
-    workbench: 'Workbench',
-    monitor: 'Monitor',
-  },
   home: 'Home',
   dashboard: {
     main: 'Dashboard',

src/locales/zh-CN/menu.ts

@@ -1,9 +1,4 @@
 const menu = {
-  dashboard: {
-    main: '仪表盘',
-    workbench: '工作台',
-    monitor: '监控',
-  },
   home: '首页',
   dashboard: {
     main: '仪表盘',

src/main.tsx

@@ -1,52 +1,32 @@
 import React, { useMemo, type ReactNode } from "react";
-<<<<<<< HEAD
-import { Navigate, redirect, useLocation, useRoutes } from "react-router";
-=======
 import {
   Navigate,
   useRoutes
 } from "react-router";
->>>>>>> origin/rsbuild
 import { useMenuStore } from "@/stores/store";
 import type { RouteObject } from "@/types/route";
 import { handleRouter } from "@/utils/utils";
 import { LazyLoad } from "./lazyLoad";
-<<<<<<< HEAD
-import { useUserStore } from "@/stores/userStore";
-=======
->>>>>>> origin/rsbuild
 
 // 默认的错误路由
 const errorRoutes: RouteObject[] = [
   {
     path: "/500",
-<<<<<<< HEAD
-    component: LazyLoad("error/500.tsx").type,
-=======
     component: LazyLoad("error/500.tsx"),
->>>>>>> origin/rsbuild
     handle: {
       menuKey: "500",
     },
   },
   {
     path: "/404",
-<<<<<<< HEAD
-    component: LazyLoad("error/404.tsx").type,
-=======
     component: LazyLoad("error/404.tsx"),
->>>>>>> origin/rsbuild
     handle: {
       menuKey: "404",
     },
   },
   {
     path: "/403",
-<<<<<<< HEAD
-    component: LazyLoad("error/403.tsx").type,
-=======
     component: LazyLoad("error/403.tsx"),
->>>>>>> origin/rsbuild
     handle: {
       menuKey: "403",
     },
@@ -74,11 +54,7 @@ export const dynamicRoutes: RouteObject[] = [
   },
   {
     path: "/login",
-<<<<<<< HEAD
-    component: LazyLoad("Login").type,
-=======
     component: LazyLoad("Login"),
->>>>>>> origin/rsbuild
     handle: {
       menuKey: "login",
     },
@@ -91,30 +67,10 @@ const generateRouter = (routers: RouteObject[]) => {
     if (item.index) {
       return item;
     }
-<<<<<<< HEAD
-    item.element = <item.component />;
-    item.loader = async () => {
-      const { isLogin, homePath } = useUserStore();
-      const location = useLocation();
-
-      if (!isLogin) {
-        // 未登录，允许访问登录页
-        if (location.pathname !== "/login") {
-          throw redirect("/login");
-        }
-      } else {
-        // 已登录访问 "/"，自动跳转到首页
-        if (location.pathname === "/") {
-          throw redirect(homePath);
-        }
-      }
-    };
-=======
     /**
      * 错误边界组件（用于单个页面渲染错误的时候显示，单个模块渲染失败不应该影响整个系统的渲染失败）
      */
     item.element = <item.component />;
->>>>>>> origin/rsbuild
     item.handle = {
       menuKey: item?.handle?.menuKey,
     };