Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make conflictingClassGroupModifiers in config non-optional #291

Conversation

dcastil
Copy link
Owner

@dcastil dcastil commented Aug 19, 2023

Closes #216

@github-actions github-actions bot added breaking Is breaking change feature Is new feature labels Aug 19, 2023
@github-actions
Copy link

size-limit report 📦

Path Size
dist/bundle-mjs.mjs 6.58 KB (0%)
dist/bundle-cjs.js 6.7 KB (0%)
dist/es5/bundle-mjs.mjs 6.85 KB (0%)
dist/es5/bundle-cjs.js 7.02 KB (0%)

@dcastil dcastil enabled auto-merge August 19, 2023 12:54
@dcastil dcastil merged commit b2d1c1b into main Aug 19, 2023
@dcastil dcastil deleted the breaking-feature/216/make-conflictingClassGroupModifiers-in-config-non-optional branch August 19, 2023 12:54
@github-actions
Copy link

This was addressed in release v2.0.0.

diegohaz referenced this pull request in ariakit/ariakit Oct 29, 2023
[![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://github.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://github.com/dcastil/tailwind-merge/releases/tag/v2.0.0)

[Compare
Source](https://github.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](./v1-to-v2-migration.md) and
if you have any questions, feel free to [create an
issue](https://github.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://github.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](../limitations.md) for
tailwind-merge.
- Make types of available keys more strict and configurable through
generics by [@&#8203;kachkaev](https://github.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://github.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://github.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://github.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://github.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://github.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://github.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://github.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://github.com/dcastil/tailwind-merge/pull/287)

##### New Features

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

##### Bug Fixes

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

**Full Changelog**:
dcastil/tailwind-merge@v1.14.0...v2.0.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:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@dcastil dcastil added the context-v2 Related to tailwind-merge v2 label Oct 30, 2023
sebald referenced this pull request in sebald/pattern-analyzer Nov 10, 2023
[![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://github.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://github.com/dcastil/tailwind-merge/releases/tag/v2.0.0)

[Compare
Source](https://github.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://github.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://github.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://github.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://github.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://github.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://github.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://github.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://github.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://github.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://github.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://github.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://github.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://github.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://github.com/dcastil/tailwind-merge/pull/287)

##### New Features

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

##### Bug Fixes

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

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

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

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the
month" (UTC), Automerge - At any time (no schedule defined).

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

♻ **Rebasing**: Whenever PR is behind base branch, 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/sebald/pattern-analyzer).

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
kharann referenced this pull request in dotkom/monoweb Nov 11, 2023
[![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://github.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://github.com/dcastil/tailwind-merge/releases/tag/v2.0.0)

[Compare
Source](https://github.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://github.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://github.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://github.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://github.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://github.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://github.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://github.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://github.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://github.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://github.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://github.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://github.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://github.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://github.com/dcastil/tailwind-merge/pull/287)

##### New Features

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

##### Bug Fixes

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

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

Thanks to [@&#8203;quezlatch](https://github.com/quezlatch),
[@&#8203;brandonmcconnell](https://github.com/brandonmcconnell),
[@&#8203;manavm1990](https://github.com/manavm1990) and
[@&#8203;ErwinAI](https://github.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>
kkrishguptaa referenced this pull request in kkrishguptaa/study-web3 Nov 18, 2023
[![Mend Renovate logo
banner](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://github.com/dcastil/tailwind-merge) |
[`^1.13.2` ->
`^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://github.com/dcastil/tailwind-merge/releases/tag/v2.0.0)

[Compare
Source](https://github.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://github.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://github.com/dcastil/tailwind-merge/issues/new/choose).

##### Breaking Changes

- Fix `background-image` and `background-position` being merged
incorrectly by [@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/300](https://github.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://github.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://github.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://github.com/kachkaev) in
[https://github.com/dcastil/tailwind-merge/pull/279](https://github.com/dcastil/tailwind-merge/pull/279)
- Make it possible to override elements with `extendTailwindMerge` by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/294](https://github.com/dcastil/tailwind-merge/pull/294)
- Separate validators better by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/292](https://github.com/dcastil/tailwind-merge/pull/292)
- Make `conflictingClassGroupModifiers` in config non-optional by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/291](https://github.com/dcastil/tailwind-merge/pull/291)
- Move separator to config by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/290](https://github.com/dcastil/tailwind-merge/pull/290)
- Remove `module` field from package.json by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/289](https://github.com/dcastil/tailwind-merge/pull/289)
- Remove deprecated exports by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/288](https://github.com/dcastil/tailwind-merge/pull/288)
- Transpile lib to more modern JS by
[@&#8203;dcastil](https://github.com/dcastil) in
[https://github.com/dcastil/tailwind-merge/pull/287](https://github.com/dcastil/tailwind-merge/pull/287)

##### New Features

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

##### Bug Fixes

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

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

Thanks to [@&#8203;quezlatch](https://github.com/quezlatch),
[@&#8203;brandonmcconnell](https://github.com/brandonmcconnell),
[@&#8203;manavm1990](https://github.com/manavm1990) and
[@&#8203;ErwinAI](https://github.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/xkrishguptaa/study-web3).

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking Is breaking change context-v2 Related to tailwind-merge v2 feature Is new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make conflictingClassGroupModifiers in config non-optional
1 participant