happyz
/
memos
mirror of https://github.com/usememos/memos.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: bump tailwind-merge from 2.6.0 to 3.3.1 in /web (#4801) 

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2025-07-03 22:39:25 +08:00 committed by GitHub
parent 1e09bf9a4f
commit f8fa0985fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/package.json
View File

@ -50,7 +50,7 @@
"react-router-dom": "^7.6.3",
"react-simple-pull-to-refresh": "^1.3.3",
"react-use": "^17.6.0",
"tailwind-merge": "^2.6.0",
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.11",
"textarea-caret": "^3.1.0",
"uuid": "^11.1.0"

10
web/pnpm-lock.yaml
View File

@ -135,8 +135,8 @@ importers:
specifier: ^17.6.0
version: 17.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
tailwind-merge:
specifier: ^2.6.0
version: 2.6.0
specifier: ^3.3.1
version: 3.3.1
tailwindcss:
specifier: ^4.1.11
version: 4.1.11
@ -3218,8 +3218,8 @@ packages:
resolution: {integrity: sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==}
engines: {node: ^14.18.0 || >=16.0.0}
tailwind-merge@2.6.0:
resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
tailwind-merge@3.3.1:
resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
tailwindcss@4.1.11:
resolution: {integrity: sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==}
@ -6736,7 +6736,7 @@ snapshots:
dependencies:
'@pkgr/core': 0.2.7
tailwind-merge@2.6.0: {}
tailwind-merge@3.3.1: {}
tailwindcss@4.1.11: {}