build(deps): move tailwind-merge to dependencies

This commit is contained in:
orangelckc 2024-06-01 10:51:01 +02:00
parent 41fc5b6e01
commit 8b9d34dc75
No known key found for this signature in database
GPG Key ID: ABA70086FAC6334C
2 changed files with 4 additions and 4 deletions

View File

@ -61,6 +61,7 @@
"naive-ui": "2.38.2", "naive-ui": "2.38.2",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "2.1.7", "pinia": "2.1.7",
"tailwind-merge": "^2.3.0",
"vue": "3.4.27", "vue": "3.4.27",
"vue-draggable-plus": "0.4.1", "vue-draggable-plus": "0.4.1",
"vue-i18n": "9.13.1", "vue-i18n": "9.13.1",
@ -88,7 +89,6 @@
"lint-staged": "15.2.2", "lint-staged": "15.2.2",
"sass": "1.77.2", "sass": "1.77.2",
"simple-git-hooks": "2.11.1", "simple-git-hooks": "2.11.1",
"tailwind-merge": "^2.3.0",
"tsx": "4.10.5", "tsx": "4.10.5",
"typescript": "5.4.5", "typescript": "5.4.5",
"unplugin-icons": "0.19.0", "unplugin-icons": "0.19.0",

View File

@ -53,6 +53,9 @@ importers:
pinia: pinia:
specifier: 2.1.7 specifier: 2.1.7
version: 2.1.7(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5)) 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: vue:
specifier: 3.4.27 specifier: 3.4.27
version: 3.4.27(typescript@5.4.5) version: 3.4.27(typescript@5.4.5)
@ -129,9 +132,6 @@ importers:
simple-git-hooks: simple-git-hooks:
specifier: 2.11.1 specifier: 2.11.1
version: 2.11.1 version: 2.11.1
tailwind-merge:
specifier: ^2.3.0
version: 2.3.0
tsx: tsx:
specifier: 4.10.5 specifier: 4.10.5
version: 4.10.5 version: 4.10.5