From 7669a577ddb3456133f449e3b7aaff8b7874b74a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 08:34:39 +0000 Subject: [PATCH] chore(deps): bump tailwind-merge from 3.4.1 to 3.5.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v3.4.1...v3.5.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/web/package.json | 2 +- pnpm-lock.yaml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 783949d4..44957580 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -34,7 +34,7 @@ "react-dom": "^19.0.0", "react-router": "^7.13.1", "react-router-dom": "^7.13.1", - "tailwind-merge": "^3.4.1" + "tailwind-merge": "^3.5.0" }, "devDependencies": { "@tailwindcss/vite": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7336634a..5ca6c178 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -293,8 +293,8 @@ importers: specifier: ^7.13.1 version: 7.13.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4) tailwind-merge: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.5.0 + version: 3.5.0 devDependencies: '@tailwindcss/vite': specifier: ^4.1.0 @@ -7760,9 +7760,6 @@ packages: tailwind-merge@2.6.1: resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==} - tailwind-merge@3.4.1: - resolution: {integrity: sha512-2OA0rFqWOkITEAOFWSBSApYkDeH9t2B3XSJuI4YztKBzK3mX0737A2qtxDZ7xkw9Zfh0bWl+r34sF3HXV+Ig7Q==} - tailwind-merge@3.5.0: resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==} @@ -15996,8 +15993,6 @@ snapshots: tailwind-merge@2.6.1: {} - tailwind-merge@3.4.1: {} - tailwind-merge@3.5.0: {} tailwindcss-animate@1.0.7(tailwindcss@4.1.18):