feat: update to tailwind-merge v2

nextui-org · Jan 17, 2024 · c2d806a · c2d806a
1 parent ed21cdd
commit c2d806a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 27 deletions.
diff --git a/package.json b/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",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/config.d.ts b/src/config.d.ts
@@ -14,7 +14,7 @@ export type TWMConfig = {
    * The config object for `tailwind-merge` library.
    * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/docs/configuration.md
    */
-  twMergeConfig?: Partial<TwMergeConfig>;
+  twMergeConfig?: Partial<TwMergeConfig<string, string>>;
 };
 
 export type TVConfig<