chore(deps): upgrade

Author: sonofmagic

packages-runtime/ui/package.json

@@ -129,7 +129,8 @@
     }
   },
   "dependencies": {
-    "tailwind-merge": "catalog:tailwindMerge",
+    "@weapp-tailwindcss/merge": "workspace:*",
+    "@weapp-tailwindcss/variants": "workspace:*",
     "tailwind-variants": "^3.2.2"
   },
   "devDependencies": {

packages-runtime/ui/src/utils/class-names.ts

@@ -1,43 +1,18 @@
 /**
  * 类名合并工具
- * 基于 tailwind-merge 的封装
+ * 基于 @weapp-tailwindcss/merge 的封装
  */
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '@weapp-tailwindcss/merge'
 
-export type ClassValue = string | number | boolean | undefined | null | ClassValue[] | Record<string, boolean>
+export type ClassValue = Parameters<typeof twMerge>[number]
 
 /**
  * 合并类名,解决 Tailwind CSS 冲突问题
  * @param classes - 类名值数组
  * @returns 合并后的类名字符串
  */
 export function cn(...classes: ClassValue[]): string {
-  const flattenedClasses: string[] = []
-
-  for (const cls of classes) {
-    if (!cls) {
-      continue
-    }
-
-    if (typeof cls === 'string' || typeof cls === 'number') {
-      flattenedClasses.push(String(cls))
-    }
-    else if (Array.isArray(cls)) {
-      const nested = cn(...cls)
-      if (nested) {
-        flattenedClasses.push(nested)
-      }
-    }
-    else if (typeof cls === 'object') {
-      for (const [key, value] of Object.entries(cls)) {
-        if (value) {
-          flattenedClasses.push(key)
-        }
-      }
-    }
-  }
-
-  return twMerge(flattenedClasses.join(' '))
+  return twMerge(...classes)
 }
 
 /**