From 3fadfb27171ffc0d5f08308d7edf561d059d4acc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 04:32:55 +0000
Subject: [PATCH] Bump tailwind-merge from 2.6.0 to 3.1.0 in /docs (#1169)
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 3.1.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dcastil/tailwind-merge/releases">tailwind-merge's
releases</a>.</em></p>
<blockquote>
<h2>v3.1.0</h2>
<h3>New Features</h3>
<ul>
<li>Add support for Tailwind CSS v4.0.10 by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/546">dcastil/tailwind-merge#546</a></li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>Fix length variable in <code>via-(length:*)</code> class being
merged with <code>via-&lt;color&gt;</code> classes accidentally by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/559">dcastil/tailwind-merge#559</a></li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Fix typo in comment in types.ts by <a
href="https://github.com/roottool"><code>@​roottool</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/549">dcastil/tailwind-merge#549</a></li>
<li>Update shadow scale recipe to tailwind merge v3 API by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/545">dcastil/tailwind-merge#545</a></li>
</ul>
<h3>Other</h3>
<ul>
<li>Fix metrics report action erroring on PRs from forks by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/551">dcastil/tailwind-merge#551</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0">https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/jamesreaco"><code>@​jamesreaco</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a> and
a private sponsor for sponsoring tailwind-merge! ❤️</p>
<h2>v3.0.2</h2>
<h3>Bug Fixes</h3>
<ul>
<li>Fix <code>px</code> value not being recognized for some class groups
by <a href="https://github.com/dcastil"><code>@​dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/538">dcastil/tailwind-merge#538</a></li>
<li>Fix doc comment being in incorrect place in default config by <a
href="https://github.com/gjtorikian"><code>@​gjtorikian</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/526">dcastil/tailwind-merge#526</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2">https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/jamesreaco"><code>@​jamesreaco</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a> and
a private sponsor for sponsoring tailwind-merge! ❤️</p>
<h2>v3.0.1</h2>
<h3>Bug Fixes</h3>
<ul>
<li>Update info about supported Tailwind CSS version in README by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in
b9c136d</li>
<li>Update incorrect link in v3 changelog by <a
href="https://github.com/dcastil"><code>@​dcastil</code></a> in
e22885e</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1">https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1</a></p>
<p>Thanks to <a
href="https://github.com/brandonmcconnell"><code>@​brandonmcconnell</code></a>,
<a href="https://github.com/manavm1990"><code>@​manavm1990</code></a>,
<a href="https://github.com/langy"><code>@​langy</code></a>, <a
href="https://github.com/jamesreaco"><code>@​jamesreaco</code></a>, <a
href="https://github.com/roboflow"><code>@​roboflow</code></a>, <a
href="https://github.com/syntaxfm"><code>@​syntaxfm</code></a>, <a
href="https://github.com/getsentry"><code>@​getsentry</code></a>, <a
href="https://github.com/codecov"><code>@​codecov</code></a>, <a
href="https://github.com/sourcegraph"><code>@​sourcegraph</code></a> and
a private sponsor for sponsoring tailwind-merge! ❤️</p>
<h2>v3.0.0</h2>
<p><a href="https://tailwindcss.com/blog/tailwindcss-v4">Tailwind CSS v4
is here</a> and it's time to upgrade tailwind-merge to support it.
tailwind-merge v3.0.0 is more accurate than ever and follows the
Tailwind CSS spec more closely than in v2. That is thanks to Tailwind
CSS v4 being more consistent than ever.</p>
<p>This release drops support for Tailwind CSS v3 and in turn adds
support for Tailwind CSS v4. That means you should upgrade to Tailwind
CSS v4 and tailwind-merge v3 together. All breaking changes are related
to the Tailwind CSS v4 support.</p>
<p>Check out the <a
href="https://github.com/dcastil/tailwind-merge/blob/v3.0.0/docs/changelog/v2-to-v3-migration.md">migration
guide</a> and if you have any questions, feel free to <a
href="https://github.com/dcastil/tailwind-merge/issues/new/choose">create
an issue</a>.</p>
<h3>Breaking Changes</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/a3f14e5b69c3d57742c879da90ba15c34326681b"><code>a3f14e5</code></a>
v3.1.0</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/1806ac9c22ef09565c7a0a397b4ba38cafe383fb"><code>1806ac9</code></a>
add <code>packageManager</code> field to package.json</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/0f3ecff584b8c57c5ecc41b72966e28e5ea19ef2"><code>0f3ecff</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/559">#559</a>
from dcastil/bugfix/557/fix-length-variable-in-via-cl...</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/7fd49e7512f893ca310fcf78299de8e3541c2b1a"><code>7fd49e7</code></a>
fix length variable not being detected in via classes</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/7ee600f8d3d497ac5d40d5d07310f9a9a7e9dfae"><code>7ee600f</code></a>
make variable length via test case more specific</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/13b6a20b7b5dc2ae3bf7155e973fd735b82189f6"><code>13b6a20</code></a>
add test case for length variable in via class</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/b7721dc13a6c9cb477eaddd48330d95bd3506023"><code>b7721dc</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/558">#558</a>
from dcastil/dependabot/npm_and_yarn/vite-6.2.4</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/f547c7f7048e15264f0b91e748c74e6bdb1e76b3"><code>f547c7f</code></a>
Bump vite from 6.2.3 to 6.2.4</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/2e63b238d620e867eb7e4db19680d90877085786"><code>2e63b23</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/554">#554</a>
from dcastil/dependabot/npm_and_yarn/vite-6.2.3</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/5c6f8c0f5f36fe548da328f47cec1191453a5b30"><code>5c6f8c0</code></a>
Bump vite from 6.0.11 to 6.2.3</li>
<li>Additional commits viewable in <a
href="https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.1.0">compare
view</a></li>
</ul>
</details>
<br />


[![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=3.1.0)](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)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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 merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> 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)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package.json | 2 +-
 docs/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 0c474072..5ce1a227 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -32,7 +32,7 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-icons": "^5.5.0",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^3.1.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
diff --git a/docs/yarn.lock b/docs/yarn.lock
index bf1859f1..de2408fd 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -6123,10 +6123,10 @@ tabbable@^6.0.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-tailwind-merge@^2.4.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
-  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
+tailwind-merge@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.1.0.tgz#451460cf5580b2da1120b45076e114814d593a36"
+  integrity sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==
 
 tailwindcss-animate@^1.0.7:
   version "1.0.7"