Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2026-03-27 05:43:23 +08:00 · 2025-01-01 12:57:20 +08:00
parent 26431faf6c 081d2aed23
commit 844a9b5013
251 changed files with 619 additions and 959 deletions
--- a/packages/@core/base/shared/package.json
+++ b/packages/@core/base/shared/package.json
@@ -45,7 +45,7 @@
      "default": "./dist/store.mjs"
    },
    "./global-state": {
-      "types": "./dist/global-state.d.ts",
+      "types": "./src/global-state.ts",
      "development": "./src/global-state.ts",
      "default": "./dist/global-state.mjs"
    }
--- a/packages/@core/base/shared/src/utils/cn.ts
+++ b/packages/@core/base/shared/src/utils/cn.ts
@@ -1,4 +1,6 @@
-import { type ClassValue, clsx } from 'clsx';
+import type { ClassValue } from 'clsx';
+
+import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';

 function cn(...inputs: ClassValue[]) {