Skip to content

Fix theme(…/15%) to only apply when used on its own #14922

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.

Sign up for GitHub

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

Merged
RobinMalfait merged 5 commits into from
Nov 8, 2024
Merged

Fix theme(…/15%) to only apply when used on its own #14922

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
153f2b9
only convert `theme(…)` to a candidate modifier when used on its own
RobinMalfait Nov 8, 2024
d5321f5
update changelog
RobinMalfait Nov 8, 2024
16ef052
Update CHANGELOG.md
RobinMalfait Nov 8, 2024
eac7848
Update packages/@tailwindcss-upgrade/src/template/codemods/theme-to-v…
adamwathan Nov 8, 2024
93ee21f
Update packages/@tailwindcss-upgrade/src/template/codemods/theme-to-v…
adamwathan Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update packages/@tailwindcss-upgrade/src/template/codemods/theme-to-v… 
…ar.ts
  • Loading branch information
@adamwathan
adamwathan authored Nov 8, 2024
commit eac784894aae35d95ce90efa93b20cd2c8bac6bc
5 changes: 2 additions & 3 deletions packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,8 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
// which means that we can typically convert them to a modifier on the
// candidate itself.
//
// If however the `theme(…)` is used with a color, and other ast nodes
// exists then we don't want to handle it as a modifier because it's not
// guaranteed that the value is a color.
// If there is more than one node in the AST though, `theme(…)` must not
// be the whole value so it's not safe to use a modifier instead.
//
// E.g.: `inset 0px 1px theme(colors.red.500/50%)` is a shadow, not a color.
if (ast.length === 1 && parts.length === 2 && options & Convert.MigrateModifier) {
Expand Down