Skip to content

Commit e51f68f

Browse files
build(deps): bump tailwind-merge from 2.2.2 to 2.3.0 in /desktop-app
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](dcastil/tailwind-merge@v2.2.2...v2.3.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>
1 parent b4622cd commit e51f68f

File tree

2 files changed

+38
-13
lines changed

2 files changed

+38
-13
lines changed

desktop-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"superagent": "^8.1.2",
7676
"table": "^6.8.2",
7777
"tabs": "^0.2.0",
78-
"tailwind-merge": "^2.2.2",
78+
"tailwind-merge": "^2.3.0",
7979
"tailwindcss-animate": "^1.0.6",
8080
"toast": "^0.5.4",
8181
"zlib": "^1.0.5",

desktop-app/yarn.lock

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2191,10 +2191,10 @@
21912191
dependencies:
21922192
regenerator-runtime "^0.14.0"
21932193

2194-
"@babel/runtime@^7.13.10", "@babel/runtime@^7.20.1", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
2195-
version "7.24.0"
2196-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
2197-
integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
2194+
"@babel/runtime@^7.13.10", "@babel/runtime@^7.20.1", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
2195+
version "7.24.4"
2196+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
2197+
integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
21982198
dependencies:
21992199
regenerator-runtime "^0.14.0"
22002200

@@ -9926,7 +9926,7 @@ streamsearch@^1.1.0:
99269926
resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
99279927
integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
99289928

9929-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
9929+
"string-width-cjs@npm:string-width@^4.2.0":
99309930
version "4.2.3"
99319931
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
99329932
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9952,6 +9952,15 @@ string-width@^3.0.0:
99529952
is-fullwidth-code-point "^2.0.0"
99539953
strip-ansi "^5.1.0"
99549954

9955+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
9956+
version "4.2.3"
9957+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
9958+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
9959+
dependencies:
9960+
emoji-regex "^8.0.0"
9961+
is-fullwidth-code-point "^3.0.0"
9962+
strip-ansi "^6.0.1"
9963+
99559964
string-width@^5.0.1, string-width@^5.1.2:
99569965
version "5.1.2"
99579966
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -10010,7 +10019,7 @@ string_decoder@^1.1.1:
1001010019
dependencies:
1001110020
safe-buffer "~5.2.0"
1001210021

10013-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
10022+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
1001410023
version "6.0.1"
1001510024
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1001610025
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10031,6 +10040,13 @@ strip-ansi@^5.1.0:
1003110040
dependencies:
1003210041
ansi-regex "^4.1.0"
1003310042

10043+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
10044+
version "6.0.1"
10045+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
10046+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
10047+
dependencies:
10048+
ansi-regex "^5.0.1"
10049+
1003410050
strip-ansi@^7.0.1:
1003510051
version "7.1.0"
1003610052
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -10180,12 +10196,12 @@ tailwind-merge@^1.14.0:
1018010196
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
1018110197
integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
1018210198

10183-
tailwind-merge@^2.2.2:
10184-
version "2.2.2"
10185-
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.2.2.tgz#87341e7604f0e20499939e152cd2841f41f7a3df"
10186-
integrity sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==
10199+
tailwind-merge@^2.3.0:
10200+
version "2.3.0"
10201+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.3.0.tgz#27d2134fd00a1f77eca22bcaafdd67055917d286"
10202+
integrity sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==
1018710203
dependencies:
10188-
"@babel/runtime" "^7.24.0"
10204+
"@babel/runtime" "^7.24.1"
1018910205

1019010206
tailwindcss-animate@^1.0.6:
1019110207
version "1.0.7"
@@ -10836,7 +10852,7 @@ word-wrap@~1.2.3:
1083610852
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
1083710853
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
1083810854

10839-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
10855+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
1084010856
version "7.0.0"
1084110857
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1084210858
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10854,6 +10870,15 @@ wrap-ansi@^6.2.0:
1085410870
string-width "^4.1.0"
1085510871
strip-ansi "^6.0.0"
1085610872

10873+
wrap-ansi@^7.0.0:
10874+
version "7.0.0"
10875+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
10876+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
10877+
dependencies:
10878+
ansi-styles "^4.0.0"
10879+
string-width "^4.1.0"
10880+
strip-ansi "^6.0.0"
10881+
1085710882
wrap-ansi@^8.1.0:
1085810883
version "8.1.0"
1085910884
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)