aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/package.json2
-rw-r--r--ui/pnpm-lock.yaml12
2 files changed, 6 insertions, 8 deletions
diff --git a/ui/package.json b/ui/package.json
index 477b7bca..c9d8af42 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -58,7 +58,7 @@
"react-window": "^1.8.10",
"react-window-infinite-loader": "^1.0.9",
"recharts": "^2.12.7",
- "tailwind-merge": "^2.3.0",
+ "tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7",
"usehooks-ts": "^3.1.0",
"vaul": "^0.9.1",
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index e747654b..329defc8 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -153,8 +153,8 @@ importers:
specifier: ^2.12.7
version: 2.12.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
tailwind-merge:
- specifier: ^2.3.0
- version: 2.3.0
+ specifier: ^2.4.0
+ version: 2.4.0
tailwindcss-animate:
specifier: ^1.0.7
version: 1.0.7(tailwindcss@3.4.4)
@@ -3824,8 +3824,8 @@ packages:
tailwind-merge@1.14.0:
resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
- tailwind-merge@2.3.0:
- resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==}
+ tailwind-merge@2.4.0:
+ resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==}
tailwind-variants@0.1.20:
resolution: {integrity: sha512-AMh7x313t/V+eTySKB0Dal08RHY7ggYK0MSn/ad8wKWOrDUIzyiWNayRUm2PIJ4VRkvRnfNuyRuKbLV3EN+ewQ==}
@@ -9024,9 +9024,7 @@ snapshots:
tailwind-merge@1.14.0: {}
- tailwind-merge@2.3.0:
- dependencies:
- '@babel/runtime': 7.24.7
+ tailwind-merge@2.4.0: {}
tailwind-variants@0.1.20(tailwindcss@3.4.4):
dependencies: