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.5.4 to 2.5.5 in /web (#4171)

dependabot[bot]1e28f7abb529
diff --git a/web/package.json b/web/package.json
index 8c9deeda1..4b3922638 100644
--- a/web/package.json
+++ b/web/package.json
@@ -43,7 +43,7 @@
"react-router-dom": "^6.27.0",
"react-simple-pull-to-refresh": "^1.3.3",
"react-use": "^17.5.1",
- "tailwind-merge": "^2.5.4",
+ "tailwind-merge": "^2.5.5",
"tailwindcss": "^3.4.14",
"tailwindcss-animate": "^1.0.7",
"textarea-caret": "^3.1.0",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index f98c78d1d..b3ad212e8 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -40,7 +40,7 @@ importers:
'@usememos/mui':
specifier: 0.0.1-alpha.26
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -111,8 +111,8 @@ importers:
specifier: ^17.5.1
tailwind-merge:
- specifier: ^2.5.4
- version: 2.5.4
+ specifier: ^2.5.5
+ version: 2.5.5
tailwindcss:
specifier: ^3.4.14
version: 3.4.14
@@ -3230,8 +3230,8 @@ packages:
resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
- resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==}
+ resolution: {integrity: sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==}
resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
@@ -4689,13 +4689,13 @@ snapshots:
'@ungap/[email protected]': {}
dependencies:
lucide-react: 0.453.0([email protected])
postcss: 8.4.47
react: 18.3.1
react-dom: 18.3.1([email protected])
- tailwind-merge: 2.5.4
+ tailwind-merge: 2.5.5
tailwindcss: 3.4.14
@@ -6771,7 +6771,7 @@ snapshots:
dependencies: