Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

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

dependabot[bot]f8fa0985fb43
diff --git a/web/package.json b/web/package.json
index cd2206568..6a98d19a9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -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"
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index 38e870ecd..075e71815 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
specifier: ^17.6.0
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}
- resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
+ resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
resolution: {integrity: sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==}
@@ -6736,7 +6736,7 @@ snapshots:
dependencies:
'@pkgr/core': 0.2.7