Skip to content

Commit

Permalink
fix(deps): update dependency tailwind-merge to v2 (#685)
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.14.0` ->
`^2.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/1.14.0/2.0.0)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/1.14.0/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/1.14.0/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

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

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

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

The tailwind-merge v2 release has been sitting here almost finished for
2 months already. But the timing was never quite right, especially
thinking about the increased support needed after the release. In the
meantime, the product of the company I work at [launched in public
beta](https://medium.com/@&#8203;risecal/meet-rise-the-calendar-that-works-for-you-were-launching-the-public-beta-today-bc07555a2191)
and I married. Thank you for your patience.

This release focuses on making it easier to configure the library for
new users. Check out the [migration
guide](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/changelog/v1-to-v2-migration.md)
and if you have any questions, feel free to [create an
issue](https://togithub.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://togithub.com/dcastil/tailwind-merge/pull/300)
- Values for `background-position` and `background-size` can look very
similar and Tailwind CSS uses the same `bg-` prefix for both groups.
This results in some
[limitations](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/limitations.md)
for tailwind-merge. If you use background position or background size
with arbitrary values, please read [this
section](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/limitations.md#you-need-to-use-label-in-arbitrary-background-position-and-background-size-classes)
about how to use them.
- Make types of available keys more strict and configurable through
generics by [@&#8203;kachkaev](https://togithub.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://togithub.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://togithub.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://togithub.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://togithub.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://togithub.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://togithub.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://togithub.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://togithub.com/dcastil/tailwind-merge/pull/287)

##### New Features

- Make types of available keys more strict and configurable through
generics by [@&#8203;kachkaev](https://togithub.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://togithub.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://togithub.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://togithub.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://togithub.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://togithub.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://togithub.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://togithub.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://togithub.com/dcastil/tailwind-merge/pull/287)
- Add ES5 bundle by [@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/286](https://togithub.com/dcastil/tailwind-merge/pull/286)

##### Bug Fixes

- Fix touch action classes overriding each other incorrectly by
[@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/313](https://togithub.com/dcastil/tailwind-merge/pull/313)
- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://togithub.com/dcastil/tailwind-merge/pull/300)
- Fix number validators accidentally returning `true` for empty strings
by [@&#8203;dcastil](https://togithub.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/295](https://togithub.com/dcastil/tailwind-merge/pull/295)
- Rename lazy-initializaton.test.ts to lazy-initialization.test.ts by
[@&#8203;CrutchTheClutch](https://togithub.com/CrutchTheClutch) in
[https://github.com/dcastil/tailwind-merge/pull/284](https://togithub.com/dcastil/tailwind-merge/pull/284)

##### Documentation

- Explain limitations of arbitrary values in `bg-size` and `bg-position`
class groups in docs by [@&#8203;dcastil](https://togithub.com/dcastil)
in
[https://github.com/dcastil/tailwind-merge/pull/328](https://togithub.com/dcastil/tailwind-merge/pull/328)

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

Thanks to [@&#8203;quezlatch](https://togithub.com/quezlatch),
[@&#8203;brandonmcconnell](https://togithub.com/brandonmcconnell),
[@&#8203;manavm1990](https://togithub.com/manavm1990) and
[@&#8203;ErwinAI](https://togithub.com/ErwinAI) for sponsoring
tailwind-merge! ❤️

</details>

---

### Configuration

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

🚦 **Automerge**: Enabled.

♻ **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/dotkom/monoweb).

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
renovate[bot] authored Nov 11, 2023
1 parent 0021b85 commit 1c3ddf1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"cva": "npm:class-variance-authority@^0.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwind-merge": "^1.14.0"
"tailwind-merge": "^2.0.0"
},
"devDependencies": {
"@dotkomonline/config": "workspace:*",
Expand Down
21 changes: 17 additions & 4 deletions pnpm-lock.yaml

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

0 comments on commit 1c3ddf1

Please sign in to comment.