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
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.
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Bumps tailwind-merge from 1.12.0 to 1.14.0.
Release notes
Sourced from tailwind-merge's releases.
... (truncated)
Commits
788822b
v1.14.0914203c
Merge pull request #271 from dcastil/dependabot/npm_and_yarn/semver-6.3.16114e7b
Bump semver from 6.3.0 to 6.3.1a759d25
Merge pull request #270 from dcastil/dependabot/npm_and_yarn/tough-cookie-4.1.37f5b1c1
Bump tough-cookie from 4.1.2 to 4.1.32bd3b98
Merge pull request #268 from dcastil/renovate/all-minor-patchcc97f4b
Update all non-major dependencies909cb1d
Merge pull request #267 from dcastil/bugfix/265/fix-col-span-classesbaf880a
add missing class col-span-full184b279
add test case for missing col-span classDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)