From 1c81b25bba680a762aed974d214d851843557101 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 08:24:42 +0000 Subject: [PATCH] chore: bump tailwind-merge from 2.6.0 to 2.6.1 in /site (#25965) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 2.6.1.
Release notes

Sourced from tailwind-merge's releases.

v2.6.1

Bug Fixes

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v2.6.1

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, a private sponsor, @​block, @​openclaw and more via @​thnxdev for sponsoring tailwind-merge! ❤️

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tailwind-merge&package-manager=npm_and_yarn&previous-version=2.6.0&new-version=2.6.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- site/package.json | 2 +- site/pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/site/package.json b/site/package.json index ac5ada7669..88a43f7656 100644 --- a/site/package.json +++ b/site/package.json @@ -111,7 +111,7 @@ "semver": "7.7.3", "sonner": "2.0.7", "streamdown": "2.5.0", - "tailwind-merge": "2.6.0", + "tailwind-merge": "2.6.1", "tailwindcss-animate": "1.0.7", "tzdata": "1.0.46", "ua-parser-js": "1.0.41", diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 23d9664bdc..aac7e37245 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -249,8 +249,8 @@ importers: specifier: 2.5.0 version: 2.5.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6) tailwind-merge: - specifier: 2.6.0 - version: 2.6.0 + specifier: 2.6.1 + version: 2.6.1 tailwindcss-animate: specifier: 1.0.7 version: 1.0.7(tailwindcss@3.4.18(yaml@2.8.3)) @@ -5740,11 +5740,11 @@ packages: tabbable@6.4.0: resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==, tarball: https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz} - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==, tarball: https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz} + tailwind-merge@2.6.1: + resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==, tarball: https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz} - tailwind-merge@3.5.0: - resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==, tarball: https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz} + tailwind-merge@3.6.0: + resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==, tarball: https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==, tarball: https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz} @@ -12176,7 +12176,7 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.2 remend: 1.3.0 - tailwind-merge: 3.5.0 + tailwind-merge: 3.6.0 unified: 11.0.5 unist-util-visit: 5.1.0 unist-util-visit-parents: 6.0.2 @@ -12270,9 +12270,9 @@ snapshots: tabbable@6.4.0: {} - tailwind-merge@2.6.0: {} + tailwind-merge@2.6.1: {} - tailwind-merge@3.5.0: {} + tailwind-merge@3.6.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.18(yaml@2.8.3)): dependencies: