Browse Source

chore: update deps

vben 11 months ago
parent
commit
e650a0b863
52 changed files with 359 additions and 288 deletions
  1. 1 5
      apps/antd-view/src/preferences.ts
  2. 2 12
      apps/antd-view/src/router/guard.ts
  3. 1 1
      apps/antd-view/src/router/routes/_essential.ts
  4. 1 1
      apps/antd-view/src/router/routes/dynamic/root.ts
  5. 2 1
      internal/lint-configs/commitlint-config/tsconfig.json
  6. 2 2
      internal/lint-configs/eslint-config/package.json
  7. 2 1
      internal/lint-configs/eslint-config/tsconfig.json
  8. 2 1
      internal/lint-configs/lint-staged-config/tsconfig.json
  9. 2 1
      internal/lint-configs/prettier-config/tsconfig.json
  10. 1 1
      internal/lint-configs/stylelint-config/package.json
  11. 2 1
      internal/lint-configs/stylelint-config/tsconfig.json
  12. 2 1
      internal/node-utils/tsconfig.json
  13. 1 1
      internal/tailwind-config/package.json
  14. 2 1
      internal/tailwind-config/tsconfig.json
  15. 2 1
      internal/vite-config/tsconfig.json
  16. 5 4
      package.json
  17. 11 11
      packages/@vben-core/forward/helpers/src/generator-menus.test.ts
  18. 3 3
      packages/@vben-core/forward/helpers/src/generator-menus.ts
  19. 2 1
      packages/@vben-core/forward/helpers/tsconfig.json
  20. 2 1
      packages/@vben-core/forward/preferences/tsconfig.json
  21. 2 1
      packages/@vben-core/forward/request/tsconfig.json
  22. 2 1
      packages/@vben-core/shared/chche/tsconfig.json
  23. 2 1
      packages/@vben-core/shared/design-tokens/tsconfig.json
  24. 3 2
      packages/@vben-core/shared/design/tsconfig.json
  25. 2 1
      packages/@vben-core/shared/iconify/tsconfig.json
  26. 2 1
      packages/@vben-core/shared/toolkit/tsconfig.json
  27. 1 1
      packages/@vben-core/shared/typings/src/menu-record.ts
  28. 1 1
      packages/@vben-core/shared/typings/src/vue-router.d.ts
  29. 2 1
      packages/@vben-core/shared/typings/tsconfig.json
  30. 2 1
      packages/@vben-core/uikit/layout-ui/tsconfig.json
  31. 2 1
      packages/@vben-core/uikit/menu-ui/tsconfig.json
  32. 6 1
      packages/@vben-core/uikit/shadcn-ui/package.json
  33. 2 1
      packages/@vben-core/uikit/shadcn-ui/tsconfig.json
  34. 2 1
      packages/@vben-core/uikit/tabs-ui/tsconfig.json
  35. 3 4
      packages/business/common-ui/src/fallback/icons/fallback-icon.vue
  36. 6 0
      packages/business/common-ui/src/fallback/icons/icon-403.vue
  37. 6 0
      packages/business/common-ui/src/fallback/icons/icon-500.vue
  38. 7 18
      packages/business/common-ui/src/spinner/spinner.vue
  39. 2 1
      packages/business/common-ui/tsconfig.json
  40. 7 17
      packages/business/layouts/src/iframe/iframe-router-view.vue
  41. 2 1
      packages/business/layouts/tsconfig.json
  42. 2 1
      packages/constants/tsconfig.json
  43. 2 1
      packages/hooks/tsconfig.json
  44. 2 1
      packages/icons/tsconfig.json
  45. 2 1
      packages/locales/tsconfig.json
  46. 2 1
      packages/styles/tsconfig.json
  47. 2 1
      packages/types/tsconfig.json
  48. 2 1
      packages/utils/tsconfig.json
  49. 228 168
      pnpm-lock.yaml
  50. 2 1
      scripts/vsh/tsconfig.json
  51. 2 4
      turbo.json
  52. 1 1
      website/package.json

+ 1 - 5
apps/antd-view/src/preferences.ts

@@ -5,8 +5,4 @@ import type { Preferences } from '@vben-core/preferences';
  * @description 项目配置文件
  * 只需要覆盖项目中的一部分配置,不需要的配置不用覆盖,会自动使用默认配置
  */
-export const overridesPreferences: DeepPartial<Preferences> = {
-  app: {
-    name: 'Vben Admin',
-  },
-};
+export const overridesPreferences: DeepPartial<Preferences> = {};

+ 2 - 12
apps/antd-view/src/router/guard.ts

@@ -10,9 +10,6 @@ import { useTitle } from '@vueuse/core';
 
 import { dynamicRoutes } from '@/router/routes';
 
-// 不需要权限的页面白名单
-const WHITE_ROUTE_NAMES = new Set<string>([]);
-
 /**
  * 通用守卫配置
  * @param router
@@ -67,12 +64,6 @@ function setupAccessGuard(router: Router) {
         return true;
       }
 
-      // 白名单路由列表检查
-      // TODO: 不是很需要,通过 ignoreAccess 也可以做到,考虑删除
-      if (WHITE_ROUTE_NAMES.has(to.name as string)) {
-        return true;
-      }
-
       // 没有访问权限,跳转登录页面
       if (to.fullPath !== LOGIN_PATH) {
         return loginPageMeta(to);
@@ -99,11 +90,10 @@ function setupAccessGuard(router: Router) {
     // 保存菜单信息和路由信息
     accessStore.setAccessMenus(menus);
     accessStore.setAccessRoutes(routes);
-    const redirectPath = (from.query.redirect || to.path) as string;
-    const redirect = decodeURIComponent(redirectPath);
+    const redirectPath = (from.query.redirect ?? to.path) as string;
 
     return {
-      path: redirect,
+      path: decodeURIComponent(redirectPath),
       replace: true,
     };
   });

+ 1 - 1
apps/antd-view/src/router/routes/_essential.ts

@@ -74,7 +74,7 @@ const essentialRoutes: RouteRecordRaw[] = [
       hideInBreadcrumb: true,
       hideInMenu: true,
       hideInTab: true,
-      ignoreAccess: true,
+      // ignoreAccess: true,
       title: 'Fallback',
     },
     name: 'Fallback',

+ 1 - 1
apps/antd-view/src/router/routes/dynamic/root.ts

@@ -7,7 +7,7 @@ const routes: RouteRecordRaw[] = [
     component: BasicLayout,
     meta: {
       hideChildrenInMenu: true,
-      orderNo: -1,
+      order: -1,
       title: '首页',
     },
     name: 'Home',

+ 2 - 1
internal/lint-configs/commitlint-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 2
internal/lint-configs/eslint-config/package.json

@@ -35,8 +35,8 @@
   "devDependencies": {
     "@eslint/js": "^9.4.0",
     "@types/eslint": "^8.56.10",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
-    "@typescript-eslint/parser": "^7.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",

+ 2 - 1
internal/lint-configs/eslint-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
internal/lint-configs/lint-staged-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
internal/lint-configs/prettier-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 1 - 1
internal/lint-configs/stylelint-config/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@stylistic/stylelint-plugin": "^2.1.2",
     "stylelint-config-recess-order": "^5.0.1",
-    "stylelint-scss": "^6.3.0"
+    "stylelint-scss": "^6.3.1"
   },
   "devDependencies": {
     "postcss": "^8.4.38",

+ 2 - 1
internal/lint-configs/stylelint-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
internal/node-utils/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 1 - 1
internal/tailwind-config/package.json

@@ -48,7 +48,7 @@
     "tailwindcss": "^3.4.3"
   },
   "dependencies": {
-    "@iconify/json": "^2.2.215",
+    "@iconify/json": "^2.2.216",
     "@iconify/tailwind": "^1.1.1",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",

+ 2 - 1
internal/tailwind-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
internal/vite-config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 5 - 4
package.json

@@ -16,14 +16,15 @@
     "monorepo",
     "turbo",
     "vben",
-    "vben admin",
+    "vben pro",
+    "vben admin pro",
     "vue",
     "vue admin",
     "vue3"
   ],
   "scripts": {
     "bootstrap": "pnpm install",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build && pnpm install -s",
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build",
     "build:docker": "./build-local-docker-image.sh",
     "changeset": "pnpm exec changeset",
     "check": "pnpm run check:dep && pnpm run check:circular && pnpm run check:type",
@@ -47,7 +48,7 @@
     "@changesets/cli": "^2.27.5",
     "@ls-lint/ls-lint": "^2.2.3",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^20.14.0",
+    "@types/node": "^20.14.1",
     "@vben/commitlint-config": "workspace:*",
     "@vben/eslint-config": "workspace:*",
     "@vben/lint-staged-config": "workspace:*",
@@ -64,7 +65,7 @@
     "jsdom": "^24.1.0",
     "rimraf": "^5.0.7",
     "taze": "^0.13.8",
-    "turbo": "^1.13.3",
+    "turbo": "^2.0.1",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
     "vite": "6.0.0-alpha.17",

+ 11 - 11
packages/@vben-core/forward/helpers/src/generator-menus.test.ts

@@ -49,7 +49,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: 'home-icon',
         name: '首页',
-        orderNo: undefined,
+        order: undefined,
         parent: undefined,
         parents: undefined,
         path: '/home',
@@ -61,7 +61,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: 'about-icon',
         name: '关于',
-        orderNo: undefined,
+        order: undefined,
         parent: undefined,
         parents: undefined,
         path: '/about',
@@ -76,7 +76,7 @@ describe('generatorMenus', () => {
   it('includes additional meta properties in menu items', async () => {
     const mockRoutesWithMeta = [
       {
-        meta: { icon: 'user-icon', orderNo: 1, title: 'Profile' },
+        meta: { icon: 'user-icon', order: 1, title: 'Profile' },
         name: 'profile',
         path: '/profile',
       },
@@ -90,7 +90,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: 'user-icon',
         name: 'Profile',
-        orderNo: 1,
+        order: 1,
         parent: undefined,
         parents: undefined,
         path: '/profile',
@@ -116,7 +116,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: 'details-icon',
         name: 'User Details',
-        orderNo: undefined,
+        order: undefined,
         parent: undefined,
         parents: undefined,
         path: '/users/:userId',
@@ -151,7 +151,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: undefined,
         name: 'redirectedRoute',
-        orderNo: undefined,
+        order: undefined,
         parent: undefined,
         parents: undefined,
         path: '/old-path',
@@ -163,7 +163,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: 'path-icon',
         name: 'New Path',
-        orderNo: undefined,
+        order: undefined,
         parent: undefined,
         parents: undefined,
         path: '/new-path',
@@ -174,12 +174,12 @@ describe('generatorMenus', () => {
 
   const routes: any = [
     {
-      meta: { orderNo: 2, title: 'Home' },
+      meta: { order: 2, title: 'Home' },
       name: 'home',
       path: '/',
     },
     {
-      meta: { orderNo: 1, title: 'About' },
+      meta: { order: 1, title: 'About' },
       name: 'about',
       path: '/about',
     },
@@ -199,7 +199,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: undefined,
         name: 'About',
-        orderNo: 1,
+        order: 1,
         parent: undefined,
         parents: undefined,
         path: '/about',
@@ -211,7 +211,7 @@ describe('generatorMenus', () => {
         badgeVariants: undefined,
         icon: undefined,
         name: 'Home',
-        orderNo: 2,
+        order: 2,
         parent: undefined,
         parents: undefined,
         path: '/',

+ 3 - 3
packages/@vben-core/forward/helpers/src/generator-menus.ts

@@ -30,7 +30,7 @@ async function generatorMenus(
       badgeVariants,
       hideChildrenInMenu = false,
       icon,
-      orderNo,
+      order,
       target,
       title = '',
     } = meta || {};
@@ -57,7 +57,7 @@ async function generatorMenus(
       badgeVariants,
       icon,
       name,
-      orderNo,
+      order,
       parent: route.parent,
       parents: route.parents,
       path: resultPath as string,
@@ -66,7 +66,7 @@ async function generatorMenus(
   });
 
   // 对菜单进行排序
-  menus = menus.sort((a, b) => (a.orderNo || 999) - (b.orderNo || 999));
+  menus = menus.sort((a, b) => (a.order || 999) - (b.order || 999));
   return menus;
 }
 

+ 2 - 1
packages/@vben-core/forward/helpers/tsconfig.json

@@ -4,5 +4,6 @@
   "compilerOptions": {
     "types": ["@vben-core/typings/vue-router"]
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/forward/preferences/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/forward/request/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/shared/chche/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/shared/design-tokens/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 3 - 2
packages/@vben-core/shared/design/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "extends": "@vben/tsconfig/web.json",
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/shared/iconify/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/shared/toolkit/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 1 - 1
packages/@vben-core/shared/typings/src/menu-record.ts

@@ -48,7 +48,7 @@ interface MenuRecordRaw extends MenuRecordBadgeRaw {
   /**
    * 排序号
    */
-  orderNo?: number;
+  order?: number;
   /**
    * 父级路径
    */

+ 1 - 1
packages/@vben-core/shared/typings/src/vue-router.d.ts

@@ -75,7 +75,7 @@ interface RouteMeta {
   /**
    * 用于路由->菜单排序
    */
-  orderNo?: number;
+  order?: number;
   /**
    * 外链-跳转路径
    */

+ 2 - 1
packages/@vben-core/shared/typings/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/uikit/layout-ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/uikit/menu-ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 6 - 1
packages/@vben-core/uikit/shadcn-ui/package.json

@@ -30,6 +30,11 @@
       "types": "./src/index.ts",
       "development": "./src/index.ts",
       "default": "./dist/index.mjs"
+    },
+    "./*": {
+      "types": "./src/*.ts",
+      "development": "./src/*.ts",
+      "default": "./dist/*.mjs"
     }
   },
   "publishConfig": {
@@ -48,7 +53,7 @@
     "@vueuse/core": "^10.10.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "2.1.1",
-    "radix-vue": "^1.8.2",
+    "radix-vue": "^1.8.3",
     "tailwind-merge": "^2.3.0",
     "vue": "3.4.27",
     "vue-sonner": "^1.1.2"

+ 2 - 1
packages/@vben-core/uikit/shadcn-ui/tsconfig.json

@@ -7,5 +7,6 @@
       "#/*": ["./src/*"]
     }
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/@vben-core/uikit/tabs-ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 3 - 4
packages/business/common-ui/src/fallback/icons/fallback-icon.vue

@@ -1,9 +1,8 @@
 <template>
   <svg
-    data-name="Layer 1"
-    height="571.14799"
-    viewBox="0 0 860.13137 571.14799"
-    width="860.13137"
+    height="571"
+    viewBox="0 0 860 571"
+    width="860"
     xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink"
   >

File diff suppressed because it is too large
+ 6 - 0
packages/business/common-ui/src/fallback/icons/icon-403.vue


File diff suppressed because it is too large
+ 6 - 0
packages/business/common-ui/src/fallback/icons/icon-500.vue


+ 7 - 18
packages/business/common-ui/src/spinner/spinner.vue

@@ -23,7 +23,6 @@ const props = withDefaults(defineProps<Props>(), {
   minLoadingTime: 200,
 });
 const startTime = ref(0);
-const endTime = ref(0);
 const showSpinner = ref(false);
 const timer = ref<TimeoutHandle>();
 
@@ -37,9 +36,7 @@ watch(
     }
     startTime.value = performance.now();
     timer.value = setTimeout(() => {
-      endTime.value = performance.now();
-
-      const loadingTime = endTime.value - startTime.value;
+      const loadingTime = performance.now() - startTime.value;
 
       showSpinner.value = loadingTime > props.minLoadingTime;
     }, props.minLoadingTime);
@@ -55,12 +52,14 @@ watch(
     v-if="showSpinner"
     class="flex-center bg-overlay absolute left-0 top-0 size-full backdrop-blur-sm"
   >
-    <div class="loader relative h-12 w-12"></div>
+    <div
+      class="loader before:bg-primary/50 after:bg-primary relative h-12 w-12 before:absolute before:left-0 before:top-[60px] before:h-[5px] before:w-12 before:animate-[loader-shadow-ani_0.5s_linear_infinite] before:rounded-[50%] before:content-[''] after:absolute after:left-0 after:top-0 after:h-full after:w-full after:animate-[loader-jump-ani_0.5s_linear_infinite] after:rounded after:content-['']"
+    ></div>
   </div>
 </template>
 
-<style scoped>
-@keyframes jump-ani {
+<style>
+@keyframes loader-jump-ani {
   15% {
     border-bottom-right-radius: 3px;
   }
@@ -83,7 +82,7 @@ watch(
   }
 }
 
-@keyframes shadow-ani {
+@keyframes loader-shadow-ani {
   0%,
   100% {
     transform: scale(1, 1);
@@ -93,14 +92,4 @@ watch(
     transform: scale(1.2, 1);
   }
 }
-
-.loader {
-  &::before {
-    @apply bg-primary/50 absolute left-0 top-[60px] h-[5px] w-12 animate-[shadow-ani_0.5s_linear_infinite] rounded-[50%] content-[''];
-  }
-
-  &::after {
-    @apply bg-primary absolute left-0 top-0 h-full w-full animate-[jump-ani_0.5s_linear_infinite] rounded content-[''];
-  }
-}
 </style>

+ 2 - 1
packages/business/common-ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 7 - 17
packages/business/layouts/src/iframe/iframe-router-view.vue

@@ -18,33 +18,23 @@ const iframeRoutes = computed(() => {
   if (!enableTabbar.value) {
     return route.meta.iframeSrc ? [route] : [];
   }
-  const tabs = tabsStore.getTabs.filter((tab) => !!tab.meta?.iframeSrc);
-  return tabs;
+  return tabsStore.getTabs.filter((tab) => !!tab.meta?.iframeSrc);
 });
 
-const tabNames = computed(() => {
-  const names = new Set<string>();
-  iframeRoutes.value.forEach((item) => {
-    names.add(item.name as string);
-  });
-  return names;
-});
+const tabNames = computed(
+  () => new Set(iframeRoutes.value.map((item) => item.name as string)),
+);
 
 const showIframe = computed(() => iframeRoutes.value.length > 0);
 
 function routeShow(tabItem: RouteLocationNormalized) {
-  const { name } = tabItem;
-  return name === route.name;
+  return tabItem.name === route.name;
 }
 
 function canRender(tabItem: RouteLocationNormalized) {
   const { meta, name } = tabItem;
 
-  if (!name) {
-    return false;
-  }
-
-  if (!tabsStore.renderRouteView) {
+  if (!name || !tabsStore.renderRouteView) {
     return false;
   }
 
@@ -60,7 +50,7 @@ function canRender(tabItem: RouteLocationNormalized) {
   ) {
     return false;
   }
-  return tabsStore.getTabs.findIndex((tab) => tab.name === name) !== -1;
+  return tabsStore.getTabs.some((tab) => tab.name === name);
 }
 
 function hideLoading() {

+ 2 - 1
packages/business/layouts/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/constants/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/hooks/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/icons/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/locales/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/styles/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/types/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 1
packages/utils/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/library.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

File diff suppressed because it is too large
+ 228 - 168
pnpm-lock.yaml


+ 2 - 1
scripts/vsh/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/node.json",
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["node_modules"]
 }

+ 2 - 4
turbo.json

@@ -13,7 +13,7 @@
     "scripts/*/src/**/*.json"
   ],
   "globalEnv": ["NODE_ENV"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": ["dist/**"]
@@ -26,9 +26,7 @@
       "persistent": true
     },
     "typecheck": {
-      "outputs": [],
-      "outputMode": "errors-only"
-      // "outputMode": "new-only"
+      "outputs": []
     }
   }
 }

+ 1 - 1
website/package.json

@@ -8,7 +8,7 @@
     "docs:preview": "vitepress preview"
   },
   "devDependencies": {
-    "vitepress": "^1.2.2",
+    "vitepress": "^1.2.3",
     "vue": "3.4.27"
   }
 }

Some files were not shown because too many files changed in this diff