From ce3ccd473a583e8ae42427b504e33938250999a1 Mon Sep 17 00:00:00 2001
From: orangelckc <276126767@qq.com>
Date: Fri, 31 May 2024 22:20:02 +0200
Subject: [PATCH] build(deps): add tailwind-merge for class merging

---
 package.json   |  1 +
 pnpm-lock.yaml | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/package.json b/package.json
index 05c928b4..a7fb7b2a 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "lint-staged": "15.2.2",
     "sass": "1.77.2",
     "simple-git-hooks": "2.11.1",
+    "tailwind-merge": "^2.3.0",
     "tsx": "4.10.5",
     "typescript": "5.4.5",
     "unplugin-icons": "0.19.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9406c1d2..6c2b0fcd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -129,6 +129,9 @@ importers:
       simple-git-hooks:
         specifier: 2.11.1
         version: 2.11.1
+      tailwind-merge:
+        specifier: ^2.3.0
+        version: 2.3.0
       tsx:
         specifier: 4.10.5
         version: 4.10.5
@@ -4295,6 +4298,9 @@ packages:
     resolution: {integrity: sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
+  tailwind-merge@2.3.0:
+    resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==}
+
   tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
@@ -9361,6 +9367,10 @@ snapshots:
       '@pkgr/core': 0.1.1
       tslib: 2.6.2
 
+  tailwind-merge@2.3.0:
+    dependencies:
+      '@babel/runtime': 7.24.5
+
   tapable@2.2.1: {}
 
   tar@6.2.1: