mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-18 03:13:55 +00:00
Bump tailwind-merge from 3.3.0 to 3.3.1 in /page (#374)
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.3.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> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="40d8feed6a"><code>40d8fee</code></a> v3.3.1</li> <li><a href="429ea54ac8"><code>429ea54</code></a> add changelog for v3.3.1</li> <li><a href="d3df8775cc"><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="fdd9cdfa14"><code>fdd9cdf</code></a> add <code>color-mix()</code> to <code>colorFunctionRegex</code></li> <li><a href="d49e03a28c"><code>d49e03a</code></a> add test case for border colors being merged incorrectly</li> <li><a href="47155f0ebe"><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="2d29675ab0"><code>2d29675</code></a> Update all non-major dependencies</li> <li><a href="c3d7208367"><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="527214bf13"><code>527214b</code></a> Bump undici from 5.28.5 to 5.29.0 in /.github/actions/metrics-report</li> <li>See full diff in <a href="https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1">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>
This commit is contained in:
8
page/package-lock.json
generated
8
page/package-lock.json
generated
@@ -37,7 +37,7 @@
|
||||
"react-resizable-panels": "^3.0.2",
|
||||
"react-router-dom": "^7.6.1",
|
||||
"react-window": "^1.8.11",
|
||||
"tailwind-merge": "^3.3.0",
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwindcss": "^4.1.5",
|
||||
"tw-animate-css": "^1.3.3",
|
||||
"vaul": "^1.1.2"
|
||||
@@ -5629,9 +5629,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/tailwind-merge": {
|
||||
"version": "3.3.0",
|
||||
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.0.tgz",
|
||||
"integrity": "sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==",
|
||||
"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==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "github",
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
"react-resizable-panels": "^3.0.2",
|
||||
"react-router-dom": "^7.6.1",
|
||||
"react-window": "^1.8.11",
|
||||
"tailwind-merge": "^3.3.0",
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwindcss": "^4.1.5",
|
||||
"tw-animate-css": "^1.3.3",
|
||||
"vaul": "^1.1.2"
|
||||
|
||||
Reference in New Issue
Block a user