Skip to content

Commit

Permalink
Update dependency tailwind-merge to v1.14.0 (#2746)
Browse files Browse the repository at this point in the history
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [tailwind-merge](https://togithub.com/dcastil/tailwind-merge) |
[`1.13.2` ->
`1.14.0`](https://renovatebot.com/diffs/npm/tailwind-merge/1.13.2/1.14.0)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/1.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/1.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/1.13.2/1.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/1.13.2/1.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>dcastil/tailwind-merge (tailwind-merge)</summary>

###
[`v1.14.0`](https://togithub.com/dcastil/tailwind-merge/releases/tag/v1.14.0)

[Compare
Source](https://togithub.com/dcastil/tailwind-merge/compare/v1.13.2...v1.14.0)

##### New Features

- Improve support for arbitrary values by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[dcastil/tailwind-merge#263
- Previously, tailwind-merge checked the content of the arbitrary value
portion of a class in most cases to understand whether the type of the
arbitrary value is correct (e.g. it checked for number followed by
length unit for the length type). That lead to the issue that a class
like `mt-[calc(theme(fontSize.4xl)/1.125)]` would not be recognized
correctly because no length unit is present in the arbitrary value.
- I changed the check of the arbitrary value to also pass when a
`calc()`, `min()`, `max()` and `clamp()` function is used in the
arbitrary value.
- In ambiguous cases, you can use data type labels to mark the type of a
class. [Read
more](https://togithub.com/dcastil/tailwind-merge/blob/v1.14.0/docs/features.md#supports-arbitrary-values)
- Moreover, I removed the check where the type of the arbitrary value is
unambiguous. In the class `mt-[…]` the arbitrary value can only be a
length, so I don't check for it. A consequence of this is that if you
use non-Tailwind classes like `mt-[this-is-totally-not-tailwind]`,
tailwind-merge will recognize it as a Tailwind class from now on.
**Please don't use classes that look like Tailwind classes with
arbitrary value but aren't Tailwind classes with tailwind-merge (in
default config) to prevent incorrect merging behavior**.

##### Bug Fixes

- Fix `col-span-full` class missing in default config by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[dcastil/tailwind-merge#267
- Fix arbitrary value with no present length unit not being recognized
by [@&#8203;dcastil](https://togithub.com/dcastil) in
[dcastil/tailwind-merge#263

##### Documentation

- Add missing info about where to call config functions to docs by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[dcastil/tailwind-merge#264

**Full Changelog**:
dcastil/tailwind-merge@v1.13.2...v1.14.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/ariakit/ariakit).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi41Ni4wIiwidXBkYXRlZEluVmVyIjoiMzYuNTYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
renovate[bot] committed Aug 24, 2023
1 parent 2eb09fd commit 08d6dfa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"stylelint-config-standard": "34.0.0",
"stylis": "4.3.0",
"sugarss": "4.0.1",
"tailwind-merge": "1.13.2",
"tailwind-merge": "1.14.0",
"tailwindcss": "3.3.3",
"textarea-caret": "3.1.0",
"tiny-invariant": "1.3.1",
Expand Down

1 comment on commit 08d6dfa

@vercel
Copy link

@vercel vercel bot commented on 08d6dfa Aug 24, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

ariakit – ./

www.ariakit.org
ariakit.org
ariakit-git-main-ariakit.vercel.app
ariakit-ariakit.vercel.app

Please sign in to comment.