build(deps): update dependency tailwind-merge to v3

inabagumi · Jan 30, 2025 · 793fd2f · 793fd2f
1 parent 27a1953
commit 793fd2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/apps/inaba-jinja/package.json b/apps/inaba-jinja/package.json
@@ -22,7 +22,7 @@
     "next": "^15.1.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "tailwind-merge": "^2.6.0"
+    "tailwind-merge": "^3.0.1"
   },
   "description": "The source code for the Inaba Jinja.",
   "devDependencies": {

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@types/react": "^19.0.0",
     "react": "^19.0.0",
-    "tailwind-merge": "^2.2.1"
+    "tailwind-merge": "^2.2.1 || ^3.0.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml