diff --git a/apps/antd-view/package.json b/apps/antd-view/package.json index 1f984a6d..e48c48b8 100644 --- a/apps/antd-view/package.json +++ b/apps/antd-view/package.json @@ -26,7 +26,6 @@ "dependencies": { "@vben-core/design": "workspace:*", "@vben-core/design-tokens": "workspace:*", - "@vben-core/typings": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/constants": "workspace:*", "@vben/hooks": "workspace:*", @@ -35,6 +34,7 @@ "@vben/locales": "workspace:*", "@vben/preference": "workspace:*", "@vben/stores": "workspace:*", + "@vben/types": "workspace:*", "@vben/utils": "workspace:*", "ant-design-vue": "^4.2.1", "axios": "^1.7.1", diff --git a/apps/antd-view/src/preference.ts b/apps/antd-view/src/preference.ts index 3ac8e6e4..c214720e 100644 --- a/apps/antd-view/src/preference.ts +++ b/apps/antd-view/src/preference.ts @@ -1,4 +1,4 @@ -import type { Preference } from '@vben-core/typings'; +import type { Preference } from '@vben/types'; /** * @description 项目配置文件 diff --git a/apps/antd-view/src/router/guard/access.ts b/apps/antd-view/src/router/guard/access.ts index 54d82664..54ebcd0c 100644 --- a/apps/antd-view/src/router/guard/access.ts +++ b/apps/antd-view/src/router/guard/access.ts @@ -1,4 +1,4 @@ -import type { ExRouteRecordRaw, MenuRecordRaw } from '@vben-core/typings'; +import type { ExRouteRecordRaw, MenuRecordRaw } from '@vben/types'; import type { RouteRecordRaw, Router } from 'vue-router'; diff --git a/apps/antd-view/src/router/routes/modules/vben.ts b/apps/antd-view/src/router/routes/modules/vben.ts index b4955a32..0bbeb6a6 100644 --- a/apps/antd-view/src/router/routes/modules/vben.ts +++ b/apps/antd-view/src/router/routes/modules/vben.ts @@ -29,9 +29,11 @@ export const vbenRoutes: RouteRecordRaw[] = [ { name: 'AboutDocument', path: 'document', - component: () => import('@/views/about/index.vue'), + component: IFrameView, meta: { icon: 'mdi:flame-circle', + iframeSrc: 'https://doc.vvbin.cn/', + keepAlive: true, title: $t('page.document'), }, }, diff --git a/apps/antd-view/src/services/modules/user/index.ts b/apps/antd-view/src/services/modules/user/index.ts index f1d6d3d6..4fcf798e 100644 --- a/apps/antd-view/src/services/modules/user/index.ts +++ b/apps/antd-view/src/services/modules/user/index.ts @@ -1,4 +1,4 @@ -import type { UserInfo } from '@vben-core/typings'; +import type { UserInfo } from '@vben/types'; import { request } from '@/services/request'; diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index 6579f789..aa3df140 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -49,7 +49,7 @@ "eslint-plugin-no-only-tests": "^3.1.0", "eslint-plugin-perfectionist": "^2.10.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-regexp": "^2.5.0", + "eslint-plugin-regexp": "^2.6.0", "eslint-plugin-unicorn": "^53.0.0", "eslint-plugin-unused-imports": "^3.2.0", "eslint-plugin-vitest": "^0.5.4", diff --git a/internal/tsconfig/package.json b/internal/tsconfig/package.json index c911d49e..8ae752b5 100644 --- a/internal/tsconfig/package.json +++ b/internal/tsconfig/package.json @@ -21,7 +21,7 @@ "web.json" ], "dependencies": { - "@vben-core/typings": "workspace:*", + "@vben/types": "workspace:*", "vite": "^5.2.11" } } diff --git a/internal/tsconfig/web-app.json b/internal/tsconfig/web-app.json index eb3ed397..00479cb8 100644 --- a/internal/tsconfig/web-app.json +++ b/internal/tsconfig/web-app.json @@ -3,6 +3,6 @@ "display": "Web Application", "extends": "./web.json", "compilerOptions": { - "types": ["vite/client", "@vben-core/typings/global"] + "types": ["vite/client", "@vben/types/global"] } } diff --git a/packages/@vben-core/shared/typings/package.json b/packages/@vben-core/shared/typings/package.json index af3ecf72..8b7772ac 100644 --- a/packages/@vben-core/shared/typings/package.json +++ b/packages/@vben-core/shared/typings/package.json @@ -30,9 +30,6 @@ "types": "./src/index.ts", "development": "./src/index.ts", "default": "./dist/index.mjs" - }, - "./global": { - "types": "./global.d.ts" } }, "publishConfig": { diff --git a/packages/@vben-core/shared/typings/src/index.ts b/packages/@vben-core/shared/typings/src/index.ts index b723cecc..50d7a310 100644 --- a/packages/@vben-core/shared/typings/src/index.ts +++ b/packages/@vben-core/shared/typings/src/index.ts @@ -1,6 +1,5 @@ -export * from './access'; -export * from './menu-record'; -export * from './preference'; -export * from './tabs'; -export * from './tools'; -export * from './ui'; +export type * from './access'; +export type * from './menu-record'; +export type * from './preference'; +export type * from './tabs'; +export type * from './tools'; diff --git a/packages/@vben-core/uikit/shadcn-ui/package.json b/packages/@vben-core/uikit/shadcn-ui/package.json index 7f418c68..6b0b619e 100644 --- a/packages/@vben-core/uikit/shadcn-ui/package.json +++ b/packages/@vben-core/uikit/shadcn-ui/package.json @@ -50,7 +50,7 @@ "@vueuse/core": "^10.9.0", "class-variance-authority": "^0.7.0", "clsx": "2.1.1", - "radix-vue": "^1.8.0", + "radix-vue": "^1.8.1", "tailwind-merge": "^2.3.0", "vue": "^3.4.27", "vue-sonner": "^1.1.2" diff --git a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue index 2f9df14e..38453d83 100644 --- a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue +++ b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue @@ -1,5 +1,5 @@