mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-11 16:46:16 +00:00
Build(deps): Bump tailwind-merge from 3.3.1 to 3.4.0 in /page (#621)
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.3.1 to 3.4.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.4.0</h2> <h3>New Features</h3> <ul> <li>Performance optimizations which make tailwind-merge >10% faster <ul> <li>Vibe optimization by <a href="https://github.com/quantizor"><code>@quantizor</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/547">dcastil/tailwind-merge#547</a></li> <li>Additional optimizations by <a href="https://github.com/quantizor"><code>@quantizor</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/619">dcastil/tailwind-merge#619</a></li> </ul> </li> </ul> <h3>Documentation</h3> <ul> <li>Improve docs by clarifying things, adding more examples by <a href="https://github.com/dcastil"><code>@dcastil</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/618">dcastil/tailwind-merge#618</a></li> <li>Make examples more realistic by <a href="https://github.com/dcastil"><code>@dcastil</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/617">dcastil/tailwind-merge#617</a></li> <li>Add custom variant as an alternative to docs by <a href="https://github.com/kidonng"><code>@kidonng</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/592">dcastil/tailwind-merge#592</a></li> </ul> <h3>Other</h3> <ul> <li>Improve benchmarking suite by <a href="https://github.com/quantizor"><code>@quantizor</code></a> in <a href="https://redirect.github.com/dcastil/tailwind-merge/pull/620">dcastil/tailwind-merge#620</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/dcastil/tailwind-merge/compare/v3.3.1...v3.4.0">https://github.com/dcastil/tailwind-merge/compare/v3.3.1...v3.4.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> and a private sponsor for sponsoring tailwind-merge! ❤️</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="3e1256a21d"><code>3e1256a</code></a> v3.4.0</li> <li><a href="e15f392d50"><code>e15f392</code></a> add changelog for v3.4.0</li> <li><a href="75e9aefda0"><code>75e9aef</code></a> Merge pull request <a href="https://redirect.github.com/dcastil/tailwind-merge/issues/619">#619</a> from quantizor/further-improvements</li> <li><a href="1bafc9c51b"><code>1bafc9c</code></a> Make benchmark test names consistent</li> <li><a href="0799c127ec"><code>0799c12</code></a> revert: remove array-based string building optimization</li> <li><a href="19278585b6"><code>1927858</code></a> test: add ultra long class list benchmark</li> <li><a href="87baba3afb"><code>87baba3</code></a> Remove unnecessary pre-computed conflict maps</li> <li><a href="7831c8e5a4"><code>7831c8e</code></a> perf: pre-compute conflict arrays at initialization</li> <li><a href="1a3d133076"><code>1a3d133</code></a> perf: replace localeCompare with direct string comparison</li> <li><a href="0270028cb2"><code>0270028</code></a> perf: use index-based recursion to avoid array allocations</li> <li>Additional commits viewable in <a href="https://github.com/dcastil/tailwind-merge/compare/v3.3.1...v3.4.0">compare view</a></li> </ul> </details> <details> <summary>Maintainer changes</summary> <p>This version was pushed to npm by [GitHub Actions](<a href="https://www.npmjs.com/~GitHub">https://www.npmjs.com/~GitHub</a> Actions), a new releaser for tailwind-merge since your current version.</p> </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>
This commit is contained in:
8
page/package-lock.json
generated
8
page/package-lock.json
generated
@@ -38,7 +38,7 @@
|
||||
"react-router-dom": "^7.9.5",
|
||||
"react-window": "^2.2.3",
|
||||
"shell-quote": "^1.8.3",
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwind-merge": "^3.4.0",
|
||||
"tailwindcss": "^4.1.16",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"vaul": "^1.1.2",
|
||||
@@ -9189,9 +9189,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/tailwind-merge": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
|
||||
"integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
|
||||
"version": "3.4.0",
|
||||
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.0.tgz",
|
||||
"integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "github",
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
"react-router-dom": "^7.9.5",
|
||||
"react-window": "^2.2.3",
|
||||
"shell-quote": "^1.8.3",
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwind-merge": "^3.4.0",
|
||||
"tailwindcss": "^4.1.16",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"vaul": "^1.1.2",
|
||||
|
||||
Reference in New Issue
Block a user