Skip to content

Conversation

@sherlockdoyle
Copy link
Contributor

Closes #474

@github-actions github-actions bot added the context-v2 Related to tailwind-merge v2 label Oct 2, 2024
@codspeed-hq
Copy link

codspeed-hq bot commented Oct 3, 2024

CodSpeed Performance Report

Merging #478 will degrade performances by 64.52%

Comparing sherlockdoyle:main (b93b2d9) with main (63b477e)

Summary

❌ 4 regressions
✅ 1 untouched benchmarks

⚠️ Please fix the performance issues or acknowledge them on CodSpeed.

Benchmarks breakdown

Benchmark main sherlockdoyle:main Change
collection with cache 20 ms 28.9 ms -30.84%
heavy 4.9 ms 8.6 ms -42.95%
init 4.8 ms 7.7 ms -38.18%
simple 4.7 ms 13.3 ms -64.52%

@dcastil dcastil added the bugfix label Oct 3, 2024
@dcastil
Copy link
Owner

dcastil commented Oct 3, 2024

Hey @sherlockdoyle! 👋

Thank you for submitting a PR with the fix, I appreciate that a lot! Looks like I overlooked the logical border color properties in #210.

By the way ignore the codspeed perf report (the results are quite imprecise) and the broken metrics report action. Have to fix that at some point.

Copy link
Owner

@dcastil dcastil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks again!

@dcastil dcastil merged commit 9ec6338 into dcastil:main Oct 3, 2024
3 of 5 checks passed
@dcastil dcastil changed the title Adds support for logical border color properties Add missing logical border color properties Oct 3, 2024
@github-actions
Copy link

github-actions bot commented Oct 3, 2024

This was addressed in release v2.5.3.

@dcastil dcastil added bug Something isn't working and removed bugfix labels Oct 20, 2024
tchow-zlai added a commit to zipline-ai/chronon that referenced this pull request Nov 25, 2024
![snyk-top-banner](https://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.3 to
2.5.4.</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 **4 versions** ahead of your current
version.

- The recommended version was released on **a month ago**.



<details>
<summary><b>Release notes</b></summary>
<br/>
  <details>
    <summary>Package name: <b>tailwind-merge</b></summary>
    <ul>
      <li>
<b>2.5.4</b> - <a
href="https://github.com/dcastil/tailwind-merge/releases/tag/v2.5.4">2024-10-14</a></br><h3>Bug
Fixes</h3>
<ul>
<li>Fix incorrect paths within sourcemaps 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://github.com/dcastil">@ dcastil</a> in <a class="issue-link
js-issue-link" data-error-text="Failed to load title"
data-id="2585699167" data-permission-text="Title is private"
data-url="dcastil/tailwind-merge#483"
data-hovercard-type="pull_request"
data-hovercard-url="/dcastil/tailwind-merge/pull/483/hovercard"
href="https://github.com/dcastil/tailwind-merge/pull/483">#483</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a class="commit-link"
href="https://github.com/dcastil/tailwind-merge/compare/v2.5.3...v2.5.4"><tt>v2.5.3...v2.5.4</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://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://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://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://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://github.com/roboflow">@ roboflow</a> and <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://github.com/codecov">@ codecov</a> for sponsoring
tailwind-merge! ❤️</p>
      </li>
      <li>
<b>2.5.4-dev.aac29dcdc25353cd05d708b8528c844a335ac25f</b> - 2024-10-20
      </li>
      <li>
<b>2.5.4-dev.a57f245d6ae3ce80627d4546940972f6e140ead3</b> - 2024-10-14
      </li>
      <li>
<b>2.5.4-dev.4dc0491f877f97cd5b9d7cc6d0bb87c385a0def8</b> - 2024-10-20
      </li>
      <li>
<b>2.5.3</b> - <a
href="https://github.com/dcastil/tailwind-merge/releases/tag/v2.5.3">2024-10-03</a></br><h3>Bug
Fixes</h3>
<ul>
<li>Add missing logical border color properties by <a
class="user-mention notranslate" data-hovercard-type="user"
data-hovercard-url="/users/sherlockdoyle/hovercard"
data-octo-click="hovercard-link-click"
data-octo-dimensions="link_type:self"
href="https://github.com/sherlockdoyle">@ sherlockdoyle</a> in <a
class="issue-link js-issue-link" data-error-text="Failed to load title"
data-id="2561872126" data-permission-text="Title is private"
data-url="dcastil/tailwind-merge#478"
data-hovercard-type="pull_request"
data-hovercard-url="/dcastil/tailwind-merge/pull/478/hovercard"
href="https://github.com/dcastil/tailwind-merge/pull/478">#478</a></li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add benchmark reporting to PRs and commits by <a class="user-mention
notranslate" data-hovercard-type="user"
data-hovercard-url="/users/XantreDev/hovercard"
data-octo-click="hovercard-link-click"
data-octo-dimensions="link_type:self"
href="https://github.com/XantreDev">@ XantreDev</a> in <a
class="issue-link js-issue-link" data-error-text="Failed to load title"
data-id="2459787149" data-permission-text="Title is private"
data-url="dcastil/tailwind-merge#455"
data-hovercard-type="pull_request"
data-hovercard-url="/dcastil/tailwind-merge/pull/455/hovercard"
href="https://github.com/dcastil/tailwind-merge/pull/455">#455</a></li>
</ul>
<h3>Other</h3>
<ul>
<li>Switch test suite to vitest 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://github.com/dcastil">@ dcastil</a> in <a class="issue-link
js-issue-link" data-error-text="Failed to load title"
data-id="2472026355" data-permission-text="Title is private"
data-url="dcastil/tailwind-merge#461"
data-hovercard-type="pull_request"
data-hovercard-url="/dcastil/tailwind-merge/pull/461/hovercard"
href="https://github.com/dcastil/tailwind-merge/pull/461">#461</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a class="commit-link"
href="https://github.com/dcastil/tailwind-merge/compare/v2.5.2...v2.5.3"><tt>v2.5.2...v2.5.3</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://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://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://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://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://github.com/roboflow">@ roboflow</a>, <a
class="user-mention notranslate" data-hovercard-type="user"
data-hovercard-url="/users/xeger/hovercard"
data-octo-click="hovercard-link-click"
data-octo-dimensions="link_type:self" href="https://github.com/xeger">@
xeger</a> and <a class="user-mention notranslate"
data-hovercard-type="user"
data-hovercard-url="/users/MrDeatHHH/hovercard"
data-octo-click="hovercard-link-click"
data-octo-dimensions="link_type:self"
href="https://github.com/MrDeatHHH">@ MrDeatHHH</a> for sponsoring
tailwind-merge! ❤️</p>
      </li>
    </ul>
from <a
href="https://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.
> - Snyk has automatically assigned this pull request, [set who gets
assigned](/settings/integration).

---

**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=eyJ3cml0ZUtleSI6InJyWmxZcEdHY2RyTHZsb0lYd0dUcVg4WkFRTnNCOUEwIiwiYW5vbnltb3VzSWQiOiIxMGZlNTA0Zi0yNzUzLTQxYTMtYWZkYi1iZGI0MWY0NDBlMTAiLCJldmVudCI6IlBSIHZpZXdlZCIsInByb3BlcnRpZXMiOnsicHJJZCI6IjEwZmU1MDRmLTI3NTMtNDFhMy1hZmRiLWJkYjQxZjQ0MGUxMCJ9fQ=="
width="0" height="0"/>

> - 🧐 [View latest project
report](https://app.snyk.io/org/varant-zlai/project/f4bdc116-d05b-4937-96b5-b1f9a02872e5?utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr)
> - 👩‍💻 [Set who automatically gets
assigned](https://app.snyk.io/org/varant-zlai/project/f4bdc116-d05b-4937-96b5-b1f9a02872e5/settings/integration?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)
> - 🛠 [Adjust upgrade PR
settings](https://app.snyk.io/org/varant-zlai/project/f4bdc116-d05b-4937-96b5-b1f9a02872e5/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/varant-zlai/project/f4bdc116-d05b-4937-96b5-b1f9a02872e5/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.3","to":"2.5.4"}],"env":"prod","hasFixes":false,"isBreakingChange":false,"isMajorUpgrade":false,"issuesToFix":[],"prId":"10fe504f-2753-41a3-afdb-bdb41f440e10","prPublicId":"10fe504f-2753-41a3-afdb-bdb41f440e10","packageManager":"npm","priorityScoreList":[],"projectPublicId":"f4bdc116-d05b-4937-96b5-b1f9a02872e5","projectUrl":"https://app.snyk.io/org/varant-zlai/project/f4bdc116-d05b-4937-96b5-b1f9a02872e5?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":4,"publishedDate":"2024-10-14T11:21:41.676Z"},"vulns":[]}'

Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: tchow <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working context-v2 Related to tailwind-merge v2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Logical border color properties does not work with generic border color

2 participants