From 85f87c7d0d6de5c718d26c4b646b775dbf7fd965 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 21:28:30 +0000 Subject: [PATCH] build(deps-dev): bump tailwind-merge from 2.0.0 to 2.5.2 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.0.0 to 2.5.2. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.0.0...v2.5.2) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index cfe4292..8e5a5c0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "prettier-plugin-astro": "^0.12.0", "reading-time": "^1.5.0", "slugify": "^1.6.6", - "tailwind-merge": "2.0.0", + "tailwind-merge": "2.5.2", "tailwindcss": "3.4.4", "tinacms": "^1.6.4", "typescript": "^5.2.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5184013..01f27c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -85,8 +85,8 @@ importers: specifier: ^1.6.6 version: 1.6.6 tailwind-merge: - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.5.2 + version: 2.5.2 tailwindcss: specifier: 3.4.4 version: 3.4.4 @@ -6038,8 +6038,8 @@ packages: tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - tailwind-merge@2.0.0: - resolution: {integrity: sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==} + tailwind-merge@2.5.2: + resolution: {integrity: sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==} tailwindcss@3.4.4: resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==} @@ -14995,9 +14995,7 @@ snapshots: tabbable@6.2.0: {} - tailwind-merge@2.0.0: - dependencies: - '@babel/runtime': 7.23.2 + tailwind-merge@2.5.2: {} tailwindcss@3.4.4: dependencies: