Skip to content

Handle ringColor.DEFAULT in js configs #19348

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+32 −0
Open

Handle ringColor.DEFAULT in js configs #19348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90422e9
Treat `ringColor.DEFAULT` as `—default-ring-color` when loading configs
thecrypticace Nov 20, 2025
21e07ef
Migrate `ringColor.DEFAULT` to `—default-ring-color` during upgrades
thecrypticace Nov 20, 2025
8de8ee1
Update test
thecrypticace Nov 20, 2025
301ef64
Update changelog
thecrypticace Nov 20, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Skip over arbitrary property utilities with a top-level `!` in the value ([#19243](https://github.com/tailwindlabs/tailwindcss/pull/19243))
- Support environment API in `@tailwindcss/vite` ([#18970](https://github.com/tailwindlabs/tailwindcss/pull/18970))
- Preserve case of theme keys from JS configs and plugins ([#19337](https://github.com/tailwindlabs/tailwindcss/pull/19337))
- Handle `ringColor.DEFAULT` in JS configs ([#19348](https://github.com/tailwindlabs/tailwindcss/pull/19348))
- Upgrade: Handle `future` and `experimental` config keys ([#19344](https://github.com/tailwindlabs/tailwindcss/pull/19344))

### Added
Expand Down
5 changes: 5 additions & 0 deletions integrations/upgrade/js-config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ test(
steel: 'rgb(70 130 180 / <alpha-value>)',
smoke: 'rgba(245, 245, 245, var(--smoke-alpha, <alpha-value>))',
},
ringColor: {
DEFAULT: '#c0ffee',
},
opacity: {
superOpaque: '0.95',
},
Expand Down Expand Up @@ -191,6 +194,8 @@ test(
--color-steel: rgb(70 130 180);
--color-smoke: rgba(245, 245, 245, var(--smoke-alpha, 1));

--default-ring-color: #c0ffee;

--opacity-*: initial;
--opacity-superOpaque: 95%;

Expand Down
8 changes: 8 additions & 0 deletions 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 @@ -237,6 +237,14 @@ async function migrateTheme(
prevSectionKey = sectionKey
}

// ringColor.DEFAULT is a special case that maps to `--default-ring-color`
// as to match the behavior of v3
if (key[0] === 'ringColor' && key[1] === 'DEFAULT') {
let property = 'default-ring-color'
themeSection.push(` ${escape(`--${property}`)}: ${value};`)
continue
}

if (resetNamespaces.has(key[0]) && resetNamespaces.get(key[0]) === false) {
resetNamespaces.set(key[0], true)
let property = keyPathToCssProperty([key[0]])
Expand Down
6 changes: 6 additions & 0 deletions packages/tailwindcss/src/compat/apply-config-to-theme.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ test('config values can be merged into the theme', () => {
'2xl': ['2rem'],
},

ringColor: {
DEFAULT: '#fff',
},

letterSpacing: {
superWide: '0.25em',
},
Expand Down Expand Up @@ -125,6 +129,8 @@ test('config values can be merged into the theme', () => {
expect(theme.resolve('100%', ['--width'])).toEqual('100%')
expect(theme.resolve('9xs', ['--container'])).toEqual('6rem')
expect(theme.resolve('fast', ['--ease'])).toEqual('cubic-bezier(0, 0.55, 0.45, 1)')
expect(theme.get(['--ring-color'])).toEqual(null)
expect(theme.get(['--default-ring-color'])).toEqual('#fff')
})

test('will reset default theme values with overwriting theme values', () => {
Expand Down
12 changes: 12 additions & 0 deletions packages/tailwindcss/src/compat/apply-config-to-theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@ export function applyConfigToTheme(
}
}

// ringColor.DEFAULT is a special case that maps to `--default-ring-color`
// as to match the behavior of v3
if (path[0] === 'ringColor' && path[1] === 'DEFAULT') {
designSystem.theme.add(
'--default-ring-color',
'' + value,
ThemeOptions.INLINE | ThemeOptions.REFERENCE | ThemeOptions.DEFAULT,
)

continue
}
Comment on lines +53 to +63
Copy link
Member

@philipp-spiess philipp-spiess Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused why this is handled in isolation here since we had a lot of other DEFAULT special keys that are supported in v4 too via the --default-* pattern, e.g.: --default-ring-width, --default-outline-width, --default-transition-duration. So I'd expect there to a code path a bit more generic to handle all of these variants.

From my quick look it seems that we didn't handle this in apply-config-to-theme at all right now so not sure if this is an oversight or if there's an alternative explanation?


let name = keyPathToCssProperty(path)
if (!name) continue

Expand Down