mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-22 05:03:56 +00:00
03e9faa291
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.2.0 to 3.3.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.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> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="ceb3b4aea1"><code>ceb3b4a</code></a> v3.3.0</li> <li><a href="876ada9209"><code>876ada9</code></a> add changelog for v3.3.0</li> <li><a href="ac1d918718"><code>ac1d918</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/575">#575</a> from dcastil/feature/add-support-for-tailwind-css-v4.1.5</li> <li><a href="e545f96abb"><code>e545f96</code></a> add *-lh utilities</li> <li><a href="596d9a6ef4"><code>596d9a6</code></a> add test case for *-lh utilities</li> <li><a href="8c2f180908"><code>8c2f180</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/572">#572</a> from dcastil/renovate/major-octokit-monorepo</li> <li><a href="b4d2ed6cce"><code>b4d2ed6</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/570">#570</a> from dcastil/dependabot/npm_and_yarn/vite-6.3.4</li> <li><a href="d6ba428330"><code>d6ba428</code></a> Bump vite from 6.2.6 to 6.3.4</li> <li><a href="421f4f219f"><code>421f4f2</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/571">#571</a> from dcastil/renovate/all-minor-patch</li> <li><a href="efb48ab0b7"><code>efb48ab</code></a> Update dependency <code>@octokit/types</code> to v14</li> <li>Additional commits viewable in <a href="https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.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>