From 6a28b9f94cd9533254e5930a8e09eef8a623b755 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2026 16:46:55 +0000 Subject: [PATCH] chore(deps): bump tailwind-merge from 2.6.1 to 3.6.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.1 to 3.6.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.1...v3.6.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- apps/web/package.json | 2 +- package-lock.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 2a597ac..882383c 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -27,7 +27,7 @@ "react-dom": "^19.0.0", "react-i18next": "^17.0.8", "react-router-dom": "^7.18.1", - "tailwind-merge": "^2.6.0" + "tailwind-merge": "^3.6.0" }, "devDependencies": { "@tailwindcss/vite": "^4.0.0", diff --git a/package-lock.json b/package-lock.json index 0ab12da..3dffe6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "vitest": "^2.1.0" }, "engines": { - "node": ">=20" + "node": ">=22" } }, "apps/api": { @@ -89,7 +89,7 @@ "react-dom": "^19.0.0", "react-i18next": "^17.0.8", "react-router-dom": "^7.18.1", - "tailwind-merge": "^2.6.0" + "tailwind-merge": "^3.6.0" }, "devDependencies": { "@tailwindcss/vite": "^4.0.0", @@ -12889,9 +12889,9 @@ "license": "MIT" }, "node_modules/tailwind-merge": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz", - "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz", + "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==", "license": "MIT", "funding": { "type": "github",