chore(deps): bump tailwind-merge version (#3657)

* chore(deps): bump tailwind-merge versions

* chore(theme): adopt latest extendTailwindMerge

* chore(changeset): add changeset

* chore(changeset): change to minor

* Update .changeset/grumpy-mayflies-rhyme.md

---------

Co-authored-by: Junior Garcia <jrgarciadev@gmail.com>

.changeset/grumpy-mayflies-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/theme": patch
+---
+
+bump `tailwind-merge` version (#3614)

packages/core/theme/package.json

@@ -57,7 +57,7 @@
     "lodash.omit": "^4.5.0",
     "clsx": "^1.2.1",
     "tailwind-variants": "^0.1.20",
-    "tailwind-merge": "^1.14.0"
+    "tailwind-merge": "^2.5.2"
   },
   "peerDependencies": {
     "tailwindcss": ">=3.4.0"

packages/core/theme/src/utils/cn.ts

@@ -10,7 +10,7 @@ import {twMergeConfig} from "./tw-merge-config";
  *
  * So we can use classes like `text-small` or `text-default-500` and override them.
  */
-const twMerge = extendTailwindMerge(twMergeConfig);
+const twMerge = extendTailwindMerge({extend: twMergeConfig});
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));

packages/core/theme/src/utils/tw-merge-config.ts

@@ -1,7 +1,6 @@
-import type {Config} from "tailwind-merge";
 export const COMMON_UNITS = ["small", "medium", "large"];
 
-export const twMergeConfig: Partial<Config> = {
+export const twMergeConfig = {
   theme: {
     opacity: ["disabled"],
     spacing: ["divider"],