From b55c7ad2f776051d84b42da596432bf1ba4e7a7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:48:04 +0000 Subject: [PATCH] chore(deps): bump tailwind-merge from 1.13.2 to 2.3.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.13.2 to 2.3.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.13.2...v2.3.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 959d8bf..c19e960 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "class-variance-authority": "^0.6.1", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", - "tailwind-merge": "^1.13.2" + "tailwind-merge": "^2.3.0" }, "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index cc2694d..bd0a830 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,6 +36,13 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/runtime@^7.24.1": + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd" + integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA== + dependencies: + regenerator-runtime "^0.14.0" + "@esbuild/android-arm64@0.17.19": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd" @@ -2085,6 +2092,11 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" @@ -2399,10 +2411,12 @@ svelte@^4.0.5: magic-string "^0.30.0" periscopic "^3.1.0" -tailwind-merge@^1.13.2: - version "1.13.2" - resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.13.2.tgz" - integrity sha512-R2/nULkdg1VR/EL4RXg4dEohdoxNUJGLMnWIQnPKL+O9Twu7Cn3Rxi4dlXkDzZrEGtR+G+psSXFouWlpTyLhCQ== +tailwind-merge@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.3.0.tgz#27d2134fd00a1f77eca22bcaafdd67055917d286" + integrity sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA== + dependencies: + "@babel/runtime" "^7.24.1" tailwind-scrollbar@^3.0.4: version "3.0.4"