Skip to content

Migrate aria theme keys #18815

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
merged 6 commits into from
Aug 28, 2025
Merged

Migrate aria theme keys #18815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d8ca12
make TypeScript happy
RobinMalfait Aug 28, 2025
79cae4b
refactor: when migrating theme key, handle special cases first
RobinMalfait Aug 28, 2025
bfa6084
add failing test
RobinMalfait Aug 28, 2025
139e1cc
migrate `theme.aria` to custom `@custom-variant aria-*` variants
RobinMalfait Aug 28, 2025
4fe4301
update changelog
RobinMalfait Aug 28, 2025
ebfee41
quotes are technically optional, let's account for that
RobinMalfait Aug 28, 2025
File filter

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
quotes are technically optional, let's account for that 
Co-Authored-By: Jordan Pittman <thecrypticace@gmail.com>
  • Loading branch information
@RobinMalfait @thecrypticace
RobinMalfait and thecrypticace committed Aug 28, 2025
commit ebfee41b5b714543afda06c5fdd4050b59eede93
8 changes: 6 additions & 2 deletions integrations/upgrade/js-config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,8 +992,12 @@ test(
// Automatically handled by bare values
foo: 'foo="true"',

// Quotes are optional in CSS for these kinds of attribute
// selectors
bar: 'bar=true',

// Not automatically handled by bare values because names differ
bar: 'baz="true"',
baz: 'qux="true"',

// Completely custom
asc: 'sort="ascending"',
Expand All @@ -1018,7 +1022,7 @@ test(
--- src/input.css ---
@import 'tailwindcss';

@custom-variant aria-bar (&[aria-baz="true"]);
@custom-variant aria-baz (&[aria-qux="true"]);
@custom-variant aria-asc (&[aria-sort="ascending"]);
@custom-variant aria-desc (&[aria-sort="descending"]);

Expand Down
2 changes: 1 addition & 1 deletion packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ async function migrateTheme(
for (let [key, value] of Object.entries(resolvedConfig.theme.aria ?? {})) {
// Will be handled by bare values if the names match.
// E.g.: `aria-foo:flex` should produce `[aria-foo="true"]`
if (new RegExp(`^${key}=['"]true['"]$`).test(`${value}`)) continue
if (new RegExp(`^${key}=(['"]?)true\\1$`).test(`${value}`)) continue

// Create custom variant
variants.set(`aria-${key}`, `&[aria-${value}]`)
Expand Down