Fix theme(…/15%) to only apply when used on its own
#14922
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamwathan
reviewed
Nov 8, 2024
Co-authored-by: Adam Wathan <adam.wathan@gmail.com>
adamwathan
reviewed
Nov 8, 2024
packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.test.ts
Outdated
Show resolved
Hide resolved
adamwathan
reviewed
Nov 8, 2024
packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts
Outdated
Show resolved
Hide resolved
adamwathan
approved these changes
Nov 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes an issue where our codemod migrations can convert
bg-[theme(colors.white/15%)]tobg-[var(--color-white)]/15where the15%from within thetheme(…)is converted to a candidate modifier (at the end).The idea was that if the
theme(…)is used with a modifier, then it can only be used with colors. If a candidate uses it, it also means that a color was used and we can use/15instead.However this is not true if it is used as part of a bigger value. E.g.:
shadow-[shadow:inset_0_0_0_1px_theme(colors.white/15%)]would be converted toshadow-[inset_0_0_0_1px_var(--color-white)]/15which is not correct because the value isn't a color, the color is part of the value.In this case, we make sure that the
theme(…)is the only AST node in the value, and if it is we can safely do the conversion. If there are other AST nodes we keep thetheme(…)call.