diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2024-07-15 10:29:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-15 10:29:52 +0100 |
| commit | 38df33954e71d02a5b073a8cc2ad9b40f75d4a99 (patch) | |
| tree | 7c8c189b51bc688fa70e8cadd03d2f5e0e25f814 | |
| parent | chore(deps): bump @uiw/codemirror-extensions-langs in /ui (#2262) (diff) | |
| download | atuin-38df33954e71d02a5b073a8cc2ad9b40f75d4a99.zip | |
chore(deps): bump tailwind-merge from 2.3.0 to 2.4.0 in /ui (#2261)
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.3.0...v2.4.0)
---
updated-dependencies:
- dependency-name: tailwind-merge
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
| -rw-r--r-- | ui/package.json | 2 | ||||
| -rw-r--r-- | ui/pnpm-lock.yaml | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ui/package.json b/ui/package.json index 477b7bca..c9d8af42 100644 --- a/ui/package.json +++ b/ui/package.json @@ -58,7 +58,7 @@ "react-window": "^1.8.10", "react-window-infinite-loader": "^1.0.9", "recharts": "^2.12.7", - "tailwind-merge": "^2.3.0", + "tailwind-merge": "^2.4.0", "tailwindcss-animate": "^1.0.7", "usehooks-ts": "^3.1.0", "vaul": "^0.9.1", diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml index e747654b..329defc8 100644 --- a/ui/pnpm-lock.yaml +++ b/ui/pnpm-lock.yaml @@ -153,8 +153,8 @@ importers: specifier: ^2.12.7 version: 2.12.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: - specifier: ^2.3.0 - version: 2.3.0 + specifier: ^2.4.0 + version: 2.4.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.4) @@ -3824,8 +3824,8 @@ packages: tailwind-merge@1.14.0: resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} - tailwind-merge@2.3.0: - resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==} + tailwind-merge@2.4.0: + resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==} tailwind-variants@0.1.20: resolution: {integrity: sha512-AMh7x313t/V+eTySKB0Dal08RHY7ggYK0MSn/ad8wKWOrDUIzyiWNayRUm2PIJ4VRkvRnfNuyRuKbLV3EN+ewQ==} @@ -9024,9 +9024,7 @@ snapshots: tailwind-merge@1.14.0: {} - tailwind-merge@2.3.0: - dependencies: - '@babel/runtime': 7.24.7 + tailwind-merge@2.4.0: {} tailwind-variants@0.1.20(tailwindcss@3.4.4): dependencies: |