-
Notifications
You must be signed in to change notification settings - Fork 931
Commit 6c82f8f
authored
chore: bump tailwind-merge from 2.5.4 to 2.6.0 in /site (#16394)
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from
2.5.4 to 2.6.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>v2.6.0</h2>
<h3>New Features</h3>
<ul>
<li>Export ConfigExtension type from package by <a
href="https://github.com/dcastil"><code>@dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/505">dcastil/tailwind-merge#505</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v2.5.5...v2.6.0">https://github.com/dcastil/tailwind-merge/compare/v2.5.5...v2.6.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>, a
private sponsor and more via <a
href="https://github.com/thnxdev"><code>@thnxdev</code></a> for
sponsoring tailwind-merge! ❤️</p>
<h2>v2.5.5</h2>
<h3>Bug Fixes</h3>
<ul>
<li>Fix typo "fractons" instead of "fractions" in
"stacked-fractions" class by <a
href="https://github.com/oliverhaas"><code>@oliverhaas</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/492">dcastil/tailwind-merge#492</a></li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add installation instructions to configuration docs by <a
href="https://github.com/dcastil"><code>@dcastil</code></a> in <a
href="https://redirect.github.com/dcastil/tailwind-merge/pull/486">dcastil/tailwind-merge#486</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.5.5">https://github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.5.5</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> and more
via <a href="https://github.com/thnxdev"><code>@thnxdev</code></a> for
sponsoring tailwind-merge! ❤️</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/1a92c358e0ecc910296be7fce6635ad6f685be87"><code>1a92c35</code></a>
v2.6.0</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/64803754e7d67583f42fb65c725fb8271ff4bbf4"><code>6480375</code></a>
add changelog for v2.6.0</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/7bb2dc0e023eae4f7875ca9ba591096b6fb33b66"><code>7bb2dc0</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/509">#509</a>
from dcastil/renovate/rollup-plugin-node-resolve-16.x</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/19eb0a1476d19771626294339a75e7c8e09d5c64"><code>19eb0a1</code></a>
chore(deps): update dependency <code>@rollup/plugin-node-resolve</code>
to v16</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/d6f10146e3b077b6a43d54f03fed5152c0b940cc"><code>d6f1014</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/508">#508</a>
from dcastil/renovate/codspeed-vitest-plugin-4.x</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/d039e296dd4d878ee5bbba470a4b05fb5d2db1a7"><code>d039e29</code></a>
chore(deps): update dependency <code>@codspeed/vitest-plugin</code> to
v4</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/4aac490b6f6f08d2be451ca205a946e9127ba4ec"><code>4aac490</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/507">#507</a>
from dcastil/renovate/migrate-config</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/433e53208a540f3053b575acad6052e84f405674"><code>433e532</code></a>
chore(config): migrate config .github/renovate.json</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/31da3f22d763b357f1a51da034c4936c394bb88f"><code>31da3f2</code></a>
fix unsupported import assertion</li>
<li><a
href="https://github.com/dcastil/tailwind-merge/commit/34078eee528e6e95599033aa39a5e9a8a2531566"><code>34078ee</code></a>
Merge pull request <a
href="https://redirect.github.com/dcastil/tailwind-merge/issues/506">#506</a>
from dcastil/other/upgrade-github-workflows-to-node-22</li>
<li>Additional commits viewable in <a
href="https://github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.6.0">compare
view</a></li>
</ul>
</details>
<br />
[](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>1 parent f124c03 commit 6c82f8fCopy full SHA for 6c82f8f
File tree
Expand file treeCollapse file tree
2 files changed
+6
-6
lines changedFilter options
- site
Expand file treeCollapse file tree
2 files changed
+6
-6
lines changed+1-1Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
114 | | - | |
| 114 | + | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| |||
+5-5Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments