[PR #933] [MERGED] Bump tailwind-merge from 2.6.0 to 3.3.1 #890

New Issue

GiteaMirror · 2025-11-13T12:13:17-06:00

GiteaMirror commented

2025-11-13 12:13:17 -06:00

📋 Pull Request Information

Original PR: https://github.com/fosrl/pangolin/pull/933
Author: @dependabot[bot]
Created: 6/18/2025
Status: ✅ Merged
Merged: 6/19/2025
Merged by: @oschwartz10612

Base: main ← Head: dependabot/npm_and_yarn/tailwind-merge-3.3.1

📝 Commits (1)

b403f50 Bump tailwind-merge from 2.6.0 to 3.3.1

📊 Changes

2 files changed (+5 additions, -5 deletions)

View changed files

📝 package-lock.json (+4 -4)
📝 package.json (+1 -1)

📄 Description

Bumps tailwind-merge from 2.6.0 to 3.3.1.

Release notes

Sourced from tailwind-merge's releases.

v3.3.1

Bug Fixes

Fix arbitrary value using color-mix() not being detected as color by @dcastil in dcastil/tailwind-merge#591

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1

Thanks to @brandonmcconnell, @manavm1990, @langy, @roboflow, @syntaxfm, @getsentry, @codecov, @sourcegraph, a private sponsor, @block and @shawt3000 for sponsoring tailwind-merge! ❤️

v3.3.0

New Features

Add support for tailwind CSS v4.1.5 by @dcastil in dcastil/tailwind-merge#575

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.0

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

v3.2.0

New Features

Add support for Tailwind CSS v4.1 by @dcastil in dcastil/tailwind-merge#565

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0

Thanks to @brandonmcconnell, @manavm1990, @langy, @jamesreaco, @roboflow, @syntaxfm, @getsentry, @codecov, @sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.1.0

New Features

Add support for Tailwind CSS v4.0.10 by @dcastil in dcastil/tailwind-merge#546

Bug Fixes

Fix length variable in via-(length:*) class being merged with via-<color> classes accidentally by @dcastil in dcastil/tailwind-merge#559

Documentation

Fix typo in comment in types.ts by @roottool in dcastil/tailwind-merge#549

Update shadow scale recipe to tailwind merge v3 API by @dcastil in dcastil/tailwind-merge#545

Other

Fix metrics report action erroring on PRs from forks by @dcastil in dcastil/tailwind-merge#551

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0

Thanks to @brandonmcconnell, @manavm1990, @langy, @jamesreaco, @roboflow, @syntaxfm, @getsentry, @codecov, @sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.0.2

... (truncated)

Commits

40d8fee v3.3.1
429ea54 add changelog for v3.3.1
d3df877 Merge pull request #591 from dcastil/bugfix/590/fix-arbitrary-value-using-col...
fdd9cdf add color-mix() to colorFunctionRegex
d49e03a add test case for border colors being merged incorrectly
47155f0 Merge pull request #585 from dcastil/renovate/all-minor-patch
2d29675 Update all non-major dependencies
c3d7208 Merge pull request #578 from dcastil/dependabot/npm_and_yarn/dot-github/actio...
527214b Bump undici from 5.28.5 to 5.29.0 in /.github/actions/metrics-report
ceb3b4a v3.3.0
Additional commits viewable in compare view

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 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 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)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fosrl/pangolin/pull/933 **Author:** [@dependabot[bot]](https://github.com/apps/dependabot) **Created:** 6/18/2025 **Status:** ✅ Merged **Merged:** 6/19/2025 **Merged by:** [@oschwartz10612](https://github.com/oschwartz10612) **Base:** `main` ← **Head:** `dependabot/npm_and_yarn/tailwind-merge-3.3.1` --- ### 📝 Commits (1) - [`b403f50`](https://github.com/fosrl/pangolin/commit/b403f5018b7033acf08b2c5c9fedb00fe127377d) Bump tailwind-merge from 2.6.0 to 3.3.1 ### 📊 Changes **2 files changed** (+5 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `package-lock.json` (+4 -4) 📝 `package.json` (+1 -1) </details> ### 📄 Description Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 3.3.1. <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.3.1</h2> <h3>Bug Fixes</h3> <ul> <li>Fix arbitrary value using <code>color-mix()</code> not being detected as color by <a href="https://github.com/dcastil"><code>@dcastil</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/591">dcastil/tailwind-merge#591</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1">https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.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/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>, a private sponsor, <a href="https://github.com/block"><code>@block</code></a> and <a href="https://github.com/shawt3000"><code>@shawt3000</code></a> for sponsoring tailwind-merge! ❤️</p> <h2>v3.3.0</h2> <h3>New Features</h3> <ul> <li>Add support for tailwind CSS v4.1.5 by <a href="https://github.com/dcastil"><code>@dcastil</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/575">dcastil/tailwind-merge#575</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.0">https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.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/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>, a private sponsor and <a href="https://github.com/block"><code>@block</code></a> for sponsoring tailwind-merge! ❤️</p> <h2>v3.2.0</h2> <h3>New Features</h3> <ul> <li>Add support for Tailwind CSS v4.1 by <a href="https://github.com/dcastil"><code>@dcastil</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/565">dcastil/tailwind-merge#565</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0">https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.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.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-<color></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>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/dcastil/tailwind-merge/commit/40d8feed6aafd389eed0a20acb6d9e174fe2fa24"><code>40d8fee</code></a> v3.3.1</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/429ea54ac87ddb49be92b922955c5044ede6244a"><code>429ea54</code></a> add changelog for v3.3.1</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/d3df8775ccd86c48fa7abafbe069220f1c3e854e"><code>d3df877</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/591">#591</a> from dcastil/bugfix/590/fix-arbitrary-value-using-col...</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/fdd9cdfa1488e1eec774824f57c8ebea7b17101c"><code>fdd9cdf</code></a> add <code>color-mix()</code> to <code>colorFunctionRegex</code></li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/d49e03a28c94467e2e8e9f0334efa2f0406c209c"><code>d49e03a</code></a> add test case for border colors being merged incorrectly</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/47155f0ebe17188991c8cafc9fe2ae034b18265c"><code>47155f0</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/585">#585</a> from dcastil/renovate/all-minor-patch</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/2d29675ab0cc0174db86cb98b8eac6a435841556"><code>2d29675</code></a> Update all non-major dependencies</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/c3d7208367b8f1b9c0878b540433a2a6c438ad98"><code>c3d7208</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/578">#578</a> from dcastil/dependabot/npm_and_yarn/dot-github/actio...</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/527214bf13a256174e8a4fa88e9aec2fb0d3d764"><code>527214b</code></a> Bump undici from 5.28.5 to 5.29.0 in /.github/actions/metrics-report</li> <li><a href="https://github.com/dcastil/tailwind-merge/commit/ceb3b4aea113281e75b39f20e40fd1d16e0727be"><code>ceb3b4a</code></a> v3.3.0</li> <li>Additional commits viewable in <a href="https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.3.1">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.3.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) --- <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> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2025-11-13 12:13:17 -06:00

GiteaMirror closed this issue