fix(tsconfig): change moduleResolution to 'bundler' across multiple packages

.vscode/extensions.json

@@ -9,6 +9,7 @@
     "mhutchie.git-graph",
     "mikestead.dotenv",
     "naumovs.color-highlight",
+    "oxc.oxc-vscode",
     "pkief.material-icon-theme",
     "sdras.vue-vscode-snippets",
     "vue.volar",

.vscode/settings.json

@@ -15,6 +15,6 @@
   "i18n-ally.parsers.typescript.compilerOptions": {
     "moduleResolution": "node"
   },
-  "prettier.enable": false,
+  "oxc.fmt.configPath": ".oxfmtrc.json",
   "unocss.root": ["./"]
 }

CHANGELOG.md

@@ -1,5 +1,61 @@
 # Changelog
 
+## [v2.1.0](https://github.com/soybeanjs/soybean-admin/compare/v2.0.2...v2.1.0) (2026-03-09)
+
+###    🚨 Breaking Changes
+
+- **projects**: integrate oxlint and oxfmt &nbsp;-&nbsp; by **soybeanfe** [<samp>(6ff74)</samp>](https://github.com/soybeanjs/soybean-admin/commit/6ff74c0c)
+
+### &nbsp;&nbsp;&nbsp;🚀 Features
+
+- **components**:
+  - Column settings support fixed columns. &nbsp;-&nbsp; by @m-xlsea [<samp>(70658)</samp>](https://github.com/soybeanjs/soybean-admin/commit/70658643)
+  - Add “Select All” to TableColumnSetting &nbsp;-&nbsp; by @wenyuanw [<samp>(0081b)</samp>](https://github.com/soybeanjs/soybean-admin/commit/0081b9c0)
+- **logo**:
+  - use new logo &nbsp;-&nbsp; by @soybeanjs [<samp>(5aac5)</samp>](https://github.com/soybeanjs/soybean-admin/commit/5aac540a)
+- **projects**:
+  - add the plugin: vite-plugin-vue-transition-root-validator, to optimize the development experience. &nbsp;-&nbsp; by **Azir-11** [<samp>(30e3c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/30e3cdc7)
+- **types**:
+  - Added type definition `force` to router push options. &nbsp;-&nbsp; by @m-xlsea [<samp>(a3794)</samp>](https://github.com/soybeanjs/soybean-admin/commit/a37949f2)
+- **workflows**:
+  - add opencode workflow for issue and PR comment triggers &nbsp;-&nbsp; by @soybeanjs [<samp>(dacee)</samp>](https://github.com/soybeanjs/soybean-admin/commit/dacee143)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
+
+- **projects**:
+  - fix the long list TableColumnSetting component exceeds the viewport. &nbsp;-&nbsp; by **skyfeiz** [<samp>(cbfb9)</samp>](https://github.com/soybeanjs/soybean-admin/commit/cbfb932f)
+  - fix NButton props conflicts. &nbsp;-&nbsp; by **skyfeiz** [<samp>(54107)</samp>](https://github.com/soybeanjs/soybean-admin/commit/54107aca)
+  - ensure HTML lang attribute is updated when setting locale &nbsp;-&nbsp; by @pan0xc [<samp>(f96c3)</samp>](https://github.com/soybeanjs/soybean-admin/commit/f96c3c9e)
+  - correct HTML lang attribute to standard format &nbsp;-&nbsp; by @pan0xc [<samp>(b520d)</samp>](https://github.com/soybeanjs/soybean-admin/commit/b520db3e)
+- **router**:
+  - simplify route guard logic and remove unnecessary next calls &nbsp;-&nbsp; by **soybeanfe** [<samp>(3c2cb)</samp>](https://github.com/soybeanjs/soybean-admin/commit/3c2cbb74)
+
+### &nbsp;&nbsp;&nbsp;🛠 Optimizations
+
+- **projects**:
+  - modify the injection location of the token. &nbsp;-&nbsp; by **Azir-11** [<samp>(9d48c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/9d48ca5f)
+  - optimize unocss config &nbsp;-&nbsp; by **soybeanfe** [<samp>(6fc6f)</samp>](https://github.com/soybeanjs/soybean-admin/commit/6fc6f1c9)
+
+### &nbsp;&nbsp;&nbsp;📖 Documentation
+
+- **projects**: V2 has been released. &nbsp;-&nbsp; by **skyfeiz** [<samp>(d7394)</samp>](https://github.com/soybeanjs/soybean-admin/commit/d73947a5)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **deps**:
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(232e1)</samp>](https://github.com/soybeanjs/soybean-admin/commit/232e1ac4)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(2a023)</samp>](https://github.com/soybeanjs/soybean-admin/commit/2a0231da)
+  - update deps &nbsp;-&nbsp; by **soybeanfe** [<samp>(b867c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/b867c290)
+
+### &nbsp;&nbsp;&nbsp;🎨 Styles
+
+- **projects**: fix lint code and format code &nbsp;-&nbsp; by **soybeanfe** [<samp>(781a1)</samp>](https://github.com/soybeanjs/soybean-admin/commit/781a18f4)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![pan0xc](https://github.com/pan0xc.png?size=48)](https://github.com/pan0xc)&nbsp;&nbsp;[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![wenyuanw](https://github.com/wenyuanw.png?size=48)](https://github.com/wenyuanw)&nbsp;&nbsp;
+[soybeanfe](mailto:honghuangdc@gmail.com),&nbsp;[Azir-11](mailto:2075125282@qq.com),&nbsp;[skyfeiz](mailto:webzhangfei@163.com),&nbsp;
+
 ## [v2.0.2](https://github.com/soybeanjs/soybean-admin/compare/v2.0.1...v2.0.2) (2025-12-23)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes

build/plugins/unocss.ts

@@ -1,7 +1,7 @@
 import process from 'node:process';
 import path from 'node:path';
-import unocss from '@unocss/vite';
+import { presetIcons } from 'unocss';
-import { presetIcons } from '@unocss/preset-icons';
+import unocss from 'unocss/vite';
 import { FileSystemIconLoader } from '@iconify/utils/lib/loader/node-loaders';
 
 export function setupUnocss(viteEnv: Env.ImportMeta) {

eslint.config.js

@@ -1,3 +1,12 @@
 import { defineConfig } from '@soybeanjs/eslint-config-vue';
 
-export default defineConfig();
+export default defineConfig({
+  'vue/component-name-in-template-casing': [
+    'warn',
+    'PascalCase',
+    {
+      registeredComponentsOnly: false,
+      ignores: ['/^icon-/']
+    }
+  ]
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "soybean-admin",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "A fresh and elegant admin template, based on Vue3、Vite7、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite7、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "keywords": [
     "TypeScript",
@@ -53,7 +53,7 @@
     "@sa/utils": "workspace:*",
     "@vueuse/core": "14.2.1",
     "clipboard": "2.0.11",
-    "dayjs": "1.11.19",
+    "dayjs": "1.11.20",
     "defu": "6.1.4",
     "echarts": "6.0.0",
     "json5": "2.2.3",
@@ -61,43 +61,39 @@
     "nprogress": "0.2.0",
     "pinia": "3.0.4",
     "tailwind-merge": "3.5.0",
-    "vue": "3.5.29",
+    "vue": "3.5.31",
     "vue-draggable-plus": "0.6.1",
     "vue-i18n": "11.3.0",
-    "vue-router": "5.0.3"
+    "vue-router": "5.0.4"
   },
   "devDependencies": {
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.447",
+    "@iconify/json": "2.2.456",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config-vue": "^0.0.2",
-    "@types/node": "25.3.5",
+    "@types/node": "25.5.0",
     "@types/nprogress": "0.2.3",
-    "@unocss/preset-icons": "66.6.6",
+    "@vitejs/plugin-vue": "6.0.5",
-    "@unocss/preset-uno": "66.6.6",
+    "@vitejs/plugin-vue-jsx": "5.1.5",
-    "@unocss/transformer-directives": "66.6.6",
-    "@unocss/transformer-variant-group": "66.6.6",
-    "@unocss/vite": "66.6.6",
-    "@vitejs/plugin-vue": "6.0.4",
-    "@vitejs/plugin-vue-jsx": "5.1.4",
     "consola": "3.4.2",
-    "eslint": "10.0.3",
+    "eslint": "10.1.0",
     "kolorist": "1.8.0",
-    "oxfmt": "^0.36.0",
+    "oxfmt": "^0.42.0",
-    "oxlint": "^1.51.0",
+    "oxlint": "^1.57.0",
-    "sass": "1.97.3",
+    "sass": "1.98.0",
     "simple-git-hooks": "2.13.1",
     "tsx": "4.21.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.2",
+    "unocss": "^66.6.7",
     "unplugin-icons": "23.0.1",
-    "unplugin-vue-components": "31.0.0",
+    "unplugin-vue-components": "32.0.0",
-    "vite": "7.3.1",
+    "vite": "8.0.3",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "8.0.7",
+    "vite-plugin-vue-devtools": "8.1.1",
     "vite-plugin-vue-transition-root-validator": "^0.1.0",
-    "vue-tsc": "3.2.5"
+    "vue-tsc": "3.2.6"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/alova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/alova",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [
@@ -15,7 +15,7 @@
     "./mock": "./src/mock.ts"
   },
   "dependencies": {
-    "@alova/mock": "2.0.19",
+    "@alova/mock": "2.0.20",
     "@sa/utils": "workspace:*",
     "alova": "3.5.1"
   }

packages/alova/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "axios": "1.13.6",
+    "axios": "1.14.0",
     "axios-retry": "4.5.0",
     "qs": "6.15.0"
   },

packages/axios/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [

packages/color/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [

packages/hooks/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [

packages/materials/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/scripts/bin.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env tsx
 
-import './src/index.ts';
+import './src/index';

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -15,16 +15,16 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@soybeanjs/changelog": "0.4.3",
+    "@soybeanjs/changelog": "0.4.5",
-    "bumpp": "10.4.1",
+    "bumpp": "11.0.1",
     "c12": "3.3.3",
-    "cac": "6.7.14",
+    "cac": "7.0.0",
     "consola": "3.4.2",
     "enquirer": "2.4.1",
     "execa": "9.6.1",
     "kolorist": "1.8.0",
-    "npm-check-updates": "19.6.3",
+    "npm-check-updates": "19.6.6",
-    "picomatch": "4.0.3",
+    "picomatch": "4.0.4",
     "rimraf": "6.1.3"
   }
 }

packages/scripts/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [

packages/uno-preset/src/index.ts

@@ -1,7 +1,7 @@
 // @unocss-include
 
 import type { Preset } from '@unocss/core';
-import type { Theme } from '@unocss/preset-uno';
+import type { Theme } from '@unocss/preset-mini';
 
 export function presetSoybeanAdmin(): Preset<Theme> {
   const preset: Preset<Theme> = {

packages/uno-preset/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "typesVersions": {
     "*": {
       "*": [
@@ -16,7 +16,7 @@
     "crypto-js": "4.2.0",
     "klona": "2.0.6",
     "localforage": "1.10.0",
-    "nanoid": "5.1.6"
+    "nanoid": "5.1.7"
   },
   "devDependencies": {
     "@types/crypto-js": "4.2.2"

packages/utils/tsconfig.json

@@ -3,9 +3,8 @@
     "target": "ESNext",
     "jsx": "preserve",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node"],
     "strict": true,

src/components/advanced/table-column-setting.vue

@@ -64,7 +64,7 @@ function toggleSelectAll(checked: boolean) {
     <template #trigger>
       <NButton size="small">
         <template #icon>
-          <IconAntDesignSettingOutlined class="text-icon" />
+          <icon-ant-design-setting-outlined class="text-icon" />
         </template>
         {{ $t('common.columnSetting') }}
       </NButton>
@@ -90,7 +90,7 @@ function toggleSelectAll(checked: boolean) {
           :class="{ hidden: !item.visible }"
         >
           <div class="h-full flex-y-center flex-1 rd-4px hover:(bg-primary bg-opacity-20)">
-            <IconMdiDrag class="mr-8px h-full cursor-move text-icon" />
+            <icon-mdi-drag class="mr-8px h-full cursor-move text-icon" />
             <NCheckbox v-model:checked="item.checked" class="none_draggable flex-1">
               <template v-if="typeof item.title === 'function'">
                 <component :is="item.title" />
@@ -104,9 +104,9 @@ function toggleSelectAll(checked: boolean) {
             :tooltip-content="$t(tooltipRecord[item.fixed!])"
             @click="handleFixed(item)"
           >
-            <IconOcticonPin16 v-if="item.fixed === 'unFixed'" />
+            <icon-octicon-pin-16 v-if="item.fixed === 'unFixed'" />
-            <IconOcticonPin16 v-else-if="item.fixed === 'left'" class="rotate-270" />
+            <icon-octicon-pin-16 v-else-if="item.fixed === 'left'" class="rotate-270" />
-            <IconOcticonPinSlash16 v-else />
+            <icon-octicon-pin-slash-16 v-else />
           </ButtonIcon>
         </div>
       </VueDraggable>

src/components/advanced/table-header-operation.vue

@@ -44,7 +44,7 @@ function refresh() {
     <slot name="default">
       <NButton size="small" ghost type="primary" @click="add">
         <template #icon>
-          <IconIcRoundPlus class="text-icon" />
+          <icon-ic-round-plus class="text-icon" />
         </template>
         {{ $t('common.add') }}
       </NButton>
@@ -52,7 +52,7 @@ function refresh() {
         <template #trigger>
           <NButton size="small" ghost type="error" :disabled="disabledDelete">
             <template #icon>
-              <IconIcRoundDelete class="text-icon" />
+              <icon-ic-round-delete class="text-icon" />
             </template>
             {{ $t('common.batchDelete') }}
           </NButton>
@@ -62,7 +62,7 @@ function refresh() {
     </slot>
     <NButton size="small" @click="refresh">
       <template #icon>
-        <IconMdiRefresh class="text-icon" :class="{ 'animate-spin': loading }" />
+        <icon-mdi-refresh class="text-icon" :class="{ 'animate-spin': loading }" />
       </template>
       {{ $t('common.refresh') }}
     </NButton>

src/components/common/full-screen.vue

@@ -14,8 +14,8 @@ defineProps<Props>();
 
 <template>
   <ButtonIcon :key="String(full)" :tooltip-content="full ? $t('icon.fullscreenExit') : $t('icon.fullscreen')">
-    <IconGridiconsFullscreenExit v-if="full" />
+    <icon-gridicons-fullscreen-exit v-if="full" />
-    <IconGridiconsFullscreen v-else />
+    <icon-gridicons-fullscreen v-else />
   </ButtonIcon>
 </template>
 

src/components/common/reload-button.vue

@@ -14,7 +14,7 @@ defineProps<Props>();
 
 <template>
   <ButtonIcon :tooltip-content="$t('icon.reload')">
-    <IconAntDesignReloadOutlined :class="{ 'animate-spin animate-duration-750': loading }" />
+    <icon-ant-design-reload-outlined :class="{ 'animate-spin animate-duration-750': loading }" />
   </ButtonIcon>
 </template>
 

src/layouts/modules/global-search/components/search-footer.vue

@@ -7,16 +7,16 @@ defineOptions({ name: 'SearchFooter' });
 <template>
   <div class="h-44px flex-y-center gap-14px px-24px">
     <span class="flex-y-center">
-      <IconMdiKeyboardReturn class="operate-shadow operate-item" />
+      <icon-mdi-keyboard-return class="operate-shadow operate-item" />
       <span>{{ $t('common.confirm') }}</span>
     </span>
     <span class="flex-y-center">
-      <IconMdiArrowUpThin class="operate-shadow operate-item" />
+      <icon-mdi-arrow-up-thin class="operate-shadow operate-item" />
-      <IconMdiArrowDownThin class="operate-shadow operate-item" />
+      <icon-mdi-arrow-down-thin class="operate-shadow operate-item" />
       <span>{{ $t('common.switch') }}</span>
     </span>
     <span class="flex-y-center">
-      <IconMdiKeyboardEsc class="operate-shadow operate-item" />
+      <icon-mdi-keyboard-esc class="operate-shadow operate-item" />
       <span>{{ $t('common.close') }}</span>
     </span>
   </div>

src/layouts/modules/global-search/components/search-modal.vue

@@ -104,7 +104,7 @@ registerShortcut();
     <NInputGroup>
       <NInput v-model:value="keyword" clearable :placeholder="$t('common.keywordSearch')" @input="handleSearch">
         <template #prefix>
-          <IconUilSearch class="text-15px text-#c2c2c2" />
+          <icon-uil-search class="text-15px text-#c2c2c2" />
         </template>
       </NInput>
       <NButton v-if="isMobile" type="primary" ghost @click="handleClose">{{ $t('common.cancel') }}</NButton>

src/layouts/modules/global-search/components/search-result.vue

@@ -46,7 +46,7 @@ function handleTo() {
           <span class="ml-5px flex-1">
             {{ (item.i18nKey && $t(item.i18nKey)) || item.label }}
           </span>
-          <IconAntDesignEnterOutlined class="icon mr-3px p-2px text-20px" />
+          <icon-ant-design-enter-outlined class="icon mr-3px p-2px text-20px" />
         </div>
       </template>
     </div>

src/layouts/modules/global-search/index.vue

@@ -10,7 +10,7 @@ const { bool: show, toggle } = useBoolean();
 
 <template>
   <ButtonIcon :tooltip-content="$t('common.search')" @click="toggle">
-    <IconUilSearch />
+    <icon-uil-search />
   </ButtonIcon>
   <SearchModal v-model:show="show" />
 </template>

src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue

@@ -68,14 +68,15 @@ const swatches: string[] = [
           {{ $t('theme.appearance.themeColor.followPrimary') }}
         </NCheckbox>
       </template>
-      <NColorPicker
+      <div class="w-90px">
-        class="w-90px"
+        <NColorPicker
-        :value="themeStore.themeColors[key]"
+          :value="themeStore.themeColors[key]"
-        :disabled="key === 'info' && themeStore.isInfoFollowPrimary"
+          :disabled="key === 'info' && themeStore.isInfoFollowPrimary"
-        :show-alpha="false"
+          :show-alpha="false"
-        :swatches="swatches"
+          :swatches="swatches"
-        @update:value="handleUpdateColor($event, key)"
+          @update:value="handleUpdateColor($event, key)"
-      />
+        />
+      </div>
     </SettingItem>
   </div>
 </template>

src/locales/langs/en-us.ts

@@ -135,7 +135,7 @@ const local: App.I18n.Schema = {
         title: 'Tab Settings',
         visible: 'Tab Visible',
         cache: 'Tag Bar Info Cache',
-        cacheTip: 'One-click to open/close global keepalive',
+        cacheTip: 'Keep the tab bar information after leaving the page',
         height: 'Tab Height',
         mode: {
           title: 'Tab Mode',

src/locales/langs/zh-cn.ts

@@ -132,7 +132,7 @@ const local: App.I18n.Schema = {
         title: '标签栏设置',
         visible: '显示标签栏',
         cache: '标签栏信息缓存',
-        cacheTip: '一键开启/关闭全局 keepalive',
+        cacheTip: '离开页面后仍然保留标签栏信息',
         height: '标签栏高度',
         mode: {
           title: '标签栏风格',

src/plugins/assets.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error ignore type error of svg icons
 import 'virtual:svg-icons-register';
 import 'uno.css';
 import '../styles/css/global.css';

src/router/guard/progress.ts

@@ -1,11 +1,11 @@
 import type { Router } from 'vue-router';
 
 export function createProgressGuard(router: Router) {
-  router.beforeEach((_to, _from, next) => {
+  router.beforeEach(() => {
     window.NProgress?.start?.();
-    next();
+    return;
   });
-  router.afterEach(_to => {
+  router.afterEach(() => {
     window.NProgress?.done?.();
   });
 }

src/router/guard/route.ts

@@ -1,10 +1,4 @@
-import type {
+import type { LocationQueryRaw, RouteLocationNormalized, RouteLocationRaw, Router } from 'vue-router';
-  LocationQueryRaw,
-  NavigationGuardNext,
-  RouteLocationNormalized,
-  RouteLocationRaw,
-  Router
-} from 'vue-router';
 import type { RouteKey, RoutePath } from '@elegant-router/types';
 import { useAuthStore } from '@/store/modules/auth';
 import { useRouteStore } from '@/store/modules/route';
@@ -17,12 +11,11 @@ import { getRouteName } from '@/router/elegant/transform';
  * @param router router instance
  */
 export function createRouteGuard(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to, from) => {
     const location = await initRoute(to);
 
     if (location) {
-      next(location);
+      return location;
-      return;
     }
 
     const authStore = useAuthStore();
@@ -40,30 +33,26 @@ export function createRouteGuard(router: Router) {
 
     // if it is login route when logged in, then switch to the root page
     if (to.name === loginRoute && isLogin) {
-      next({ name: rootRoute });
+      return { name: rootRoute };
-      return;
     }
 
     // if the route does not need login, then it is allowed to access directly
     if (!needLogin) {
-      handleRouteSwitch(to, from, next);
+      return handleRouteSwitch(to, from);
-      return;
     }
 
     // the route need login but the user is not logged in, then switch to the login page
     if (!isLogin) {
-      next({ name: loginRoute, query: { redirect: to.fullPath } });
+      return { name: loginRoute, query: { redirect: to.fullPath } };
-      return;
     }
 
     // if the user is logged in but does not have authorization, then switch to the 403 page
     if (!hasAuth) {
-      next({ name: noAuthorizationRoute });
+      return { name: noAuthorizationRoute };
-      return;
     }
 
     // switch route normally
-    handleRouteSwitch(to, from, next);
+    return handleRouteSwitch(to, from);
   });
 }
 
@@ -161,17 +150,13 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
   return null;
 }
 
-function handleRouteSwitch(to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext) {
+function handleRouteSwitch(to: RouteLocationNormalized, from: RouteLocationNormalized) {
   // route with href
   if (to.meta.href) {
     window.open(to.meta.href, '_blank');
 
-    next({ path: from.fullPath, replace: true, query: from.query, hash: to.hash });
+    return { path: from.fullPath, replace: true, query: from.query, hash: to.hash };
-
-    return;
   }
-
-  next();
 }
 
 function getRouteQueryOfLoginRoute(to: RouteLocationNormalized, routeHome: RouteKey) {

src/views/home/modules/creativity-banner.vue

@@ -9,7 +9,7 @@ defineOptions({
 <template>
   <NCard :title="$t('page.home.creativity')" :bordered="false" size="small" class="h-full card-wrapper">
     <div class="h-full flex-center">
-      <IconLocalBanner class="text-400px text-primary sm:text-320px" />
+      <icon-local-banner class="text-400px text-primary sm:text-320px" />
     </div>
   </NCard>
 </template>

tsconfig.json

@@ -4,7 +4,6 @@
     "jsx": "preserve",
     "jsxImportSource": "vue",
     "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
     "module": "ESNext",
     "moduleResolution": "bundler",
     "paths": {

uno.config.ts

@@ -1,12 +1,8 @@
-import { defineConfig } from '@unocss/vite';
+import { defineConfig, transformerDirectives, transformerVariantGroup, presetWind3 } from 'unocss';
-import transformerDirectives from '@unocss/transformer-directives';
-import transformerVariantGroup from '@unocss/transformer-variant-group';
-import { presetWind3 } from '@unocss/preset-wind3';
-import type { Theme } from '@unocss/preset-uno';
 import { presetSoybeanAdmin } from '@sa/uno-preset';
 import { themeVars } from './src/theme/vars';
 
-export default defineConfig<Theme>({
+export default defineConfig({
   content: {
     pipeline: {
       exclude: ['node_modules', 'dist']