From 8b9d34dc7597932c55323a3dd3775bb293930620 Mon Sep 17 00:00:00 2001
From: orangelckc <276126767@qq.com>
Date: Sat, 1 Jun 2024 10:51:01 +0200
Subject: [PATCH] build(deps): move tailwind-merge to dependencies

---
 package.json   | 2 +-
 pnpm-lock.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a7fb7b2a..27480f97 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "naive-ui": "2.38.2",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
+    "tailwind-merge": "^2.3.0",
     "vue": "3.4.27",
     "vue-draggable-plus": "0.4.1",
     "vue-i18n": "9.13.1",
@@ -88,7 +89,6 @@
     "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 6c2b0fcd..75b7a354 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,6 +53,9 @@ importers:
       pinia:
         specifier: 2.1.7
         version: 2.1.7(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5))
+      tailwind-merge:
+        specifier: ^2.3.0
+        version: 2.3.0
       vue:
         specifier: 3.4.27
         version: 3.4.27(typescript@5.4.5)
@@ -129,9 +132,6 @@ 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