Skip to content

Commit a7a3c86

Browse files
authored
[Snyk] Upgrade tailwind-merge from 2.5.5 to 2.6.0 (#4)
![snyk-top-banner](https://redirect.github.com/andygongea/OWASP-Benchmark/assets/818805/c518c423-16fe-447e-b67f-ad5a49b5d123) <h3>Snyk has created this PR to upgrade tailwind-merge from 2.5.5 to 2.6.0.</h3> :information_source: Keep your dependencies up-to-date. This makes it easier to fix existing vulnerabilities and to more quickly identify and fix newly disclosed vulnerabilities when they affect your project. <hr/> - The recommended version is **3 versions** ahead of your current version. - The recommended version was released **a month ago**. <details> <summary><b>Release notes</b></summary> <br/> <details> <summary>Package name: <b>tailwind-merge</b></summary> <ul> <li> <b>2.6.0</b> - <a href="https://redirect.github.com/dcastil/tailwind-merge/releases/tag/v2.6.0">2024-12-23</a></br><h3>New Features</h3> <ul> <li>Export ConfigExtension type from package by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/dcastil/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/dcastil">@ dcastil</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2754355068" data-permission-text="Title is private" data-url="dcastil/tailwind-merge#505" data-hovercard-type="pull_request" data-hovercard-url="/dcastil/tailwind-merge/pull/505/hovercard" href="https://redirect.github.com/dcastil/tailwind-merge/pull/505">#505</a></li> </ul> <p><strong>Full Changelog</strong>: <a class="commit-link" href="https://redirect.github.com/dcastil/tailwind-merge/compare/v2.5.5...v2.6.0"><tt>v2.5.5...v2.6.0</tt></a></p> <p>Thanks to <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/brandonmcconnell/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/brandonmcconnell">@ brandonmcconnell</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/manavm1990/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/manavm1990">@ manavm1990</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/langy/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/langy">@ langy</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/jamesreaco/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/jamesreaco">@ jamesreaco</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/roboflow/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/roboflow">@ roboflow</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/syntaxfm/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/syntaxfm">@ syntaxfm</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/getsentry/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/getsentry">@ getsentry</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/codecov/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/codecov">@ codecov</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/sourcegraph/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/sourcegraph">@ sourcegraph</a>, a private sponsor and more via <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/thnxdev/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/thnxdev">@ thnxdev</a> for sponsoring tailwind-merge! ❤️</p> </li> <li> <b>2.6.0-dev.a8b2a84568a50aa01e97d2602f6ed9d9c14fe634</b> - 2025-01-01 </li> <li> <b>2.6.0-dev.1a92c358e0ecc910296be7fce6635ad6f685be87</b> - 2024-12-23 </li> <li> <b>2.5.5</b> - <a href="https://redirect.github.com/dcastil/tailwind-merge/releases/tag/v2.5.5">2024-11-24</a></br><h3>Bug Fixes</h3> <ul> <li>Fix typo "fractons" instead of "fractions" in "stacked-fractions" class by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/oliverhaas/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/oliverhaas">@ oliverhaas</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2688128441" data-permission-text="Title is private" data-url="dcastil/tailwind-merge#492" data-hovercard-type="pull_request" data-hovercard-url="/dcastil/tailwind-merge/pull/492/hovercard" href="https://redirect.github.com/dcastil/tailwind-merge/pull/492">#492</a></li> </ul> <h3>Documentation</h3> <ul> <li>Add installation instructions to configuration docs by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/dcastil/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/dcastil">@ dcastil</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2600348172" data-permission-text="Title is private" data-url="dcastil/tailwind-merge#486" data-hovercard-type="pull_request" data-hovercard-url="/dcastil/tailwind-merge/pull/486/hovercard" href="https://redirect.github.com/dcastil/tailwind-merge/pull/486">#486</a></li> </ul> <p><strong>Full Changelog</strong>: <a class="commit-link" href="https://redirect.github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.5.5"><tt>v2.5.4...v2.5.5</tt></a></p> <p>Thanks to <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/brandonmcconnell/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/brandonmcconnell">@ brandonmcconnell</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/manavm1990/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/manavm1990">@ manavm1990</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/langy/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/langy">@ langy</a>, <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/jamesreaco/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/jamesreaco">@ jamesreaco</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/roboflow/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/roboflow">@ roboflow</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/syntaxfm/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/syntaxfm">@ syntaxfm</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/getsentry/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/getsentry">@ getsentry</a>, <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/codecov/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/codecov">@ codecov</a> and more via <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/thnxdev/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://redirect.github.com/thnxdev">@ thnxdev</a> for sponsoring tailwind-merge! ❤️</p> </li> </ul> from <a href="https://redirect.github.com/dcastil/tailwind-merge/releases">tailwind-merge GitHub release notes</a> </details> </details> --- > [!IMPORTANT] > > - Check the changes in this PR to ensure they won't cause issues with your project. > - This PR was automatically created by Snyk using the credentials of a real user. --- **Note:** _You are seeing this because you or someone else with access to this repository has authorized Snyk to open upgrade PRs._ **For more information:** <img src="https://api.segment.io/v1/pixel/track?data=eyJ3cml0ZUtleSI6InJyWmxZcEdHY2RyTHZsb0lYd0dUcVg4WkFRTnNCOUEwIiwiYW5vbnltb3VzSWQiOiIxODkwMTJhMi1jMzljLTQyZjItYmEzYi01MjdhYTY1NzkxODIiLCJldmVudCI6IlBSIHZpZXdlZCIsInByb3BlcnRpZXMiOnsicHJJZCI6IjE4OTAxMmEyLWMzOWMtNDJmMi1iYTNiLTUyN2FhNjU3OTE4MiJ9fQ==" width="0" height="0"/> > - 🧐 [View latest project report](https://app.snyk.io/org/ehsanpo/project/c2f36089-d689-4396-baf9-72eeb1880e6c?utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr) > - 📜 [Customise PR templates](https://docs.snyk.io/scan-using-snyk/pull-requests/snyk-fix-pull-or-merge-requests/customize-pr-templates?utm_source=&utm_content=fix-pr-template) > - 🛠 [Adjust upgrade PR settings](https://app.snyk.io/org/ehsanpo/project/c2f36089-d689-4396-baf9-72eeb1880e6c/settings/integration?utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr) > - 🔕 [Ignore this dependency or unsubscribe from future upgrade PRs](https://app.snyk.io/org/ehsanpo/project/c2f36089-d689-4396-baf9-72eeb1880e6c/settings/integration?pkg&#x3D;tailwind-merge&amp;utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr#auto-dep-upgrades) [//]: # 'snyk:metadata:{"customTemplate":{"variablesUsed":[],"fieldsUsed":[]},"dependencies":[{"name":"tailwind-merge","from":"2.5.5","to":"2.6.0"}],"env":"prod","hasFixes":false,"isBreakingChange":false,"isMajorUpgrade":false,"issuesToFix":[],"prId":"189012a2-c39c-42f2-ba3b-527aa6579182","prPublicId":"189012a2-c39c-42f2-ba3b-527aa6579182","packageManager":"npm","priorityScoreList":[],"projectPublicId":"c2f36089-d689-4396-baf9-72eeb1880e6c","projectUrl":"https://app.snyk.io/org/ehsanpo/project/c2f36089-d689-4396-baf9-72eeb1880e6c?utm_source=github&utm_medium=referral&page=upgrade-pr","prType":"upgrade","templateFieldSources":{"branchName":"default","commitMessage":"default","description":"default","title":"default"},"templateVariants":[],"type":"auto","upgrade":[],"upgradeInfo":{"versionsDiff":3,"publishedDate":"2024-12-23T16:45:58.371Z"},"vulns":[]}'
2 parents 213f61e + 3e0ac84 commit a7a3c86

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"react": "^18.2.0",
2929
"react-chartjs-2": "^5.2.0",
3030
"react-dom": "^18.2.0",
31-
"tailwind-merge": "^2.5.5",
31+
"tailwind-merge": "^2.6.0",
3232
"tailwindcss-animate": "^1.0.7"
3333
},
3434
"devDependencies": {

0 commit comments

Comments
 (0)