refactor(@vben/layouts): remove @vben/widgets and migrate to @vben/layouts/src/widgets

packages/@core/ui-kit/shadcn-ui/package.json

@@ -49,7 +49,7 @@
     "@vben-core/typings": "workspace:*",
     "@vueuse/core": "^10.11.0",
     "class-variance-authority": "^0.7.0",
-    "lucide-vue-next": "^0.403.0",
+    "lucide-vue-next": "^0.406.0",
     "radix-vue": "^1.9.0",
     "vue": "^3.4.31"
   }

packages/business/layouts/package.json

@@ -37,6 +37,7 @@
     }
   },
   "dependencies": {
+    "@vben-core/colorful": "workspace:*",
     "@vben-core/helpers": "workspace:*",
     "@vben-core/iconify": "workspace:*",
     "@vben-core/layout-ui": "workspace:*",
@@ -47,7 +48,7 @@
     "@vben-core/stores": "workspace:*",
     "@vben-core/tabs-ui": "workspace:*",
     "@vben-core/toolkit": "workspace:*",
-    "@vben/widgets": "workspace:*",
+    "@vueuse/core": "^10.11.0",
     "vue": "^3.4.31",
     "vue-router": "^4.4.0"
   },

packages/business/layouts/src/authentication/toolbar.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { LanguageToggle, ThemeToggle } from '@vben/widgets';
-
 import {
   AuthenticationColorToggle,
   AuthenticationLayoutToggle,
-} from './widgets';
+  LanguageToggle,
+  ThemeToggle,
+} from '../widgets';
 
 defineOptions({
   name: 'AuthenticationToolbar',

packages/business/layouts/src/authentication/widgets/index.ts

@@ -1,2 +0,0 @@
-export { default as AuthenticationColorToggle } from './color-toggle.vue';
-export { default as AuthenticationLayoutToggle } from './layout-toggle.vue';

packages/business/layouts/src/basic/header/header.vue

@@ -1,9 +1,10 @@
 <script lang="ts" setup>
-import { GlobalSearch, LanguageToggle, ThemeToggle } from '@vben/widgets';
 import { usePreferences } from '@vben-core/preferences';
 import { VbenFullScreen } from '@vben-core/shadcn-ui';
 import { useCoreAccessStore } from '@vben-core/stores';
 
+import { GlobalSearch, LanguageToggle, ThemeToggle } from '../../widgets';
+
 interface Props {
   /**
    * Logo 主题

packages/business/layouts/src/basic/layout.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 
-import { PreferencesWidget } from '@vben/widgets';
 import { VbenAdminLayout } from '@vben-core/layout-ui';
 import { $t } from '@vben-core/locales';
 import {
@@ -13,6 +12,7 @@ import { VbenBackTop, VbenLogo } from '@vben-core/shadcn-ui';
 import { mapTree } from '@vben-core/toolkit';
 import { MenuRecordRaw } from '@vben-core/typings';
 
+import { Breadcrumb, CozeAssistant, PreferencesWidget } from '../widgets';
 import { LayoutContent } from './content';
 import { Copyright } from './copyright';
 import { LayoutFooter } from './footer';
@@ -25,7 +25,6 @@ import {
   useMixedMenu,
 } from './menu';
 import { LayoutTabbar, LayoutTabbarTools } from './tabbar';
-import { Breadcrumb } from './widgets';
 
 defineOptions({ name: 'BasicLayout' });
 
@@ -160,6 +159,10 @@ function clearPreferencesAndLogout() {
     </template>
 
     <template #floating-groups>
+      <CozeAssistant
+        v-if="preferences.app.aiAssistant"
+        :is-mobile="preferences.app.isMobile"
+      />
       <VbenBackTop />
     </template>
 

packages/business/layouts/src/basic/widgets/index.ts

@@ -1 +0,0 @@
-export { default as Breadcrumb } from './breadcrumb.vue';

packages/business/layouts/src/index.ts

@@ -1,3 +1,4 @@
 export * from './authentication';
 export * from './basic';
 export * from './iframe';
+export * from './widgets';

packages/business/layouts/src/widgets/index.ts

@@ -0,0 +1,10 @@
+export { default as Breadcrumb } from './breadcrumb.vue';
+export { default as AuthenticationColorToggle } from './color-toggle.vue';
+export { default as CozeAssistant } from './coze-assistant.vue';
+export * from './global-search';
+export { default as LanguageToggle } from './language-toggle.vue';
+export { default as AuthenticationLayoutToggle } from './layout-toggle.vue';
+export * from './notification';
+export * from './preferences';
+export * from './theme-toggle';
+export * from './user-dropdown';

packages/business/layouts/src/widgets/notification/index.ts

@@ -1,3 +1,3 @@
-export type * from './interface';
-
 export { default as Notification } from './notification.vue';
+
+export type * from './types';

packages/business/layouts/src/widgets/notification/notification.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { NotificationItem } from './interface';
+import type { NotificationItem } from './types';
 
 import {
   IcRoundMarkEmailRead,

packages/business/universal-ui/src/global-provider/global-provider.vue

@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import { Toaster } from '@vben-core/shadcn-ui';
+
+defineOptions({ name: 'GlobalProvider' });
+</script>
+<template>
+  <Toaster />
+  <slot></slot>
+</template>

packages/business/universal-ui/src/index.ts

@@ -2,4 +2,5 @@ export * from './about';
 export * from './authentication';
 export * from './dashboard';
 export * from './fallback';
+export * from './global-provider';
 export { useToast } from '@vben-core/shadcn-ui';

packages/business/widgets/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "@vben/widgets",
-  "version": "5.0.0",
-  "homepage": "https://github.com/vbenjs/vue-vben-admin",
-  "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vbenjs/vue-vben-admin.git",
-    "directory": "packages/business/widgets"
-  },
-  "license": "MIT",
-  "type": "module",
-  "scripts": {
-    "build": "pnpm vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "files": [
-    "dist"
-  ],
-  "sideEffects": [
-    "**/*.css"
-  ],
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
-  "exports": {
-    ".": {
-      "types": "./src/index.ts",
-      "development": "./src/index.ts",
-      "default": "./dist/index.mjs"
-    }
-  },
-  "publishConfig": {
-    "exports": {
-      ".": {
-        "default": "./dist/index.mjs"
-      }
-    }
-  },
-  "dependencies": {
-    "@vben-core/colorful": "workspace:*",
-    "@vben-core/iconify": "workspace:*",
-    "@vben-core/locales": "workspace:*",
-    "@vben-core/preferences": "workspace:*",
-    "@vben-core/shadcn-ui": "workspace:*",
-    "@vben-core/toolkit": "workspace:*",
-    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.31",
-    "vue-router": "^4.4.0"
-  },
-  "devDependencies": {
-    "@types/qrcode": "^1.5.5",
-    "@vben/types": "workspace:*"
-  }
-}

packages/business/widgets/postcss.config.mjs

@@ -1 +0,0 @@
-export { default } from '@vben/tailwind-config/postcss';

packages/business/widgets/src/coze-assistant/index.ts

@@ -1 +0,0 @@
-export { default as CozeAssistant } from './assistant.vue';

packages/business/widgets/src/global-provider/global-provider.vue

@@ -1,22 +0,0 @@
-<script setup lang="ts">
-import { Toaster } from '@vben-core/shadcn-ui';
-
-import { CozeAssistant } from '../coze-assistant';
-
-interface Props {
-  enableAiAssistant?: boolean;
-  isMobile?: boolean;
-}
-
-defineOptions({ name: 'GlobalProvider' });
-
-withDefaults(defineProps<Props>(), {
-  enableAiAssistant: false,
-  isMobile: false,
-});
-</script>
-<template>
-  <Toaster />
-  <CozeAssistant v-if="enableAiAssistant" :is-mobile="isMobile" />
-  <slot></slot>
-</template>

packages/business/widgets/src/index.ts

@@ -1,8 +0,0 @@
-export * from './coze-assistant';
-export * from './global-provider';
-export * from './global-search';
-export * from './language-toggle';
-export * from './notification';
-export * from './preferences';
-export * from './theme-toggle';
-export * from './user-dropdown';

packages/business/widgets/src/language-toggle/index.ts

@@ -1 +0,0 @@
-export { default as LanguageToggle } from './language-toggle.vue';

packages/business/widgets/tailwind.config.mjs

@@ -1 +0,0 @@
-export { default } from '@vben/tailwind-config';

packages/business/widgets/tsconfig.json

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

packages/business/widgets/vite.config.mts

@@ -1,3 +0,0 @@
-import { defineConfig } from '@vben/vite-config';
-
-export default defineConfig();