feat: update to tailwind-merge v2

package.json

@@ -36,7 +36,7 @@
     "test": "jest --verbose"
   },
   "dependencies": {
-    "tailwind-merge": "^1.14.0"
+    "tailwind-merge": "^2.2.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.2.0",

src/__tests__/tv.test.ts

@@ -5,21 +5,23 @@ import {tv, cn} from "../index";
 const COMMON_UNITS = ["small", "medium", "large"];
 
 const twMergeConfig = {
-  theme: {
-    opacity: ["disabled"],
-    spacing: ["divider", "unit", "unit-2", "unit-4", "unit-6"],
-    borderWidth: COMMON_UNITS,
-    borderRadius: COMMON_UNITS,
-  },
-  classGroups: {
-    shadow: [{shadow: COMMON_UNITS}],
-    "font-size": [{text: ["tiny", ...COMMON_UNITS]}],
-    "bg-image": ["bg-stripe-gradient"],
-    "min-w": [
-      {
-        "min-w": ["unit", "unit-2", "unit-4", "unit-6"],
-      },
-    ],
+  extend: {
+    theme: {
+      opacity: ["disabled"],
+      spacing: ["divider", "unit", "unit-2", "unit-4", "unit-6"],
+      borderWidth: COMMON_UNITS,
+      borderRadius: COMMON_UNITS,
+    },
+    classGroups: {
+      shadow: [{shadow: COMMON_UNITS}],
+      "font-size": [{text: ["tiny", ...COMMON_UNITS]}],
+      "bg-image": ["bg-stripe-gradient"],
+      "min-w": [
+        {
+          "min-w": ["unit", "unit-2", "unit-4", "unit-6"],
+        },
+      ],
+    },
   },
 };
 

src/config.d.ts

@@ -1,20 +1,20 @@
-import type {Config as TwMergeConfig} from "tailwind-merge";
+import type {extendTailwindMerge} from "tailwind-merge";
 import type {TVVariants} from "./index";
 import type {TVGeneratedScreens} from "./generated";
 
 export type TWMConfig = {
   /**
    * Whether to merge the class names with `tailwind-merge` library.
    * It's avoid to have duplicate tailwind classes. (Recommended)
-   * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/README.md
+   * @see https://github.com/dcastil/tailwind-merge/blob/v2.2.0/README.md
    * @default true
    */
   twMerge?: boolean;
   /**
    * The config object for `tailwind-merge` library.
-   * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/docs/configuration.md
+   * @see https://github.com/dcastil/tailwind-merge/blob/v2.2.0/docs/configuration.md
    */
-  twMergeConfig?: Partial<TwMergeConfig>;
+  twMergeConfig?: Parameters<typeof extendTailwindMerge>[0];
 };
 
 export type TVConfig<