Skip to content

Discard invalid variants such as data-checked-[selected=1]:* #15629

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 5 commits into from
Jan 15, 2025
Merged

Discard invalid variants such as data-checked-[selected=1]:* #15629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f47f29
Discard invalid variants such as `data-checked-[selected=1]:*`
thecrypticace Jan 14, 2025
7415a49
Update changelog
thecrypticace Jan 14, 2025
7f24a5d
Move check out of `findRoots`
thecrypticace Jan 15, 2025
6a1ae3a
Perform same check for `(…)` too
thecrypticace Jan 15, 2025
a93d1ca
Tweak code
thecrypticace Jan 15, 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 @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add missing `main` and `browser` fields for `@tailwindcss/browser` ([#15594](https://github.com/tailwindlabs/tailwindcss/pull/15594))
- _Upgrade (experimental)_: Pretty print `--spacing(…)` to prevent ambiguity ([#15596](https://github.com/tailwindlabs/tailwindcss/pull/15596))
- Discard invalid variants such as `data-checked-[selected=1]:*` ([#15629](https://github.com/tailwindlabs/tailwindcss/pull/15629))

## [4.0.0-beta.9] - 2025-01-09

Expand Down
69 changes: 69 additions & 0 deletions packages/tailwindcss/src/candidate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,63 @@ it('should not parse invalid arbitrary values', () => {
}
})

it('should not parse invalid arbitrary values in variants', () => {
let utilities = new Utilities()
utilities.static('flex', () => [])

let variants = new Variants()
variants.functional('data', () => {})

for (let candidate of [
'data-foo-[#0088cc]:flex',
'data-foo[#0088cc]:flex',

'data-foo-[color:var(--value)]:flex',
'data-foo[color:var(--value)]:flex',

'data-foo-[#0088cc]/50:flex',
'data-foo[#0088cc]/50:flex',

'data-foo-[#0088cc]/[50%]:flex',
'data-foo[#0088cc]/[50%]:flex',

'data-foo-[#0088cc]:flex!',
'data-foo[#0088cc]:flex!',

'data-foo-[var(--value)]:flex',
'data-foo[var(--value)]:flex',

'data-foo-[var(--value)]:flex!',
'data-foo[var(--value)]:flex!',

'data-foo-(color:--value):flex',
'data-foo(color:--value):flex',

'data-foo-(color:--value)/50:flex',
'data-foo(color:--value)/50:flex',

'data-foo-(color:--value)/(--mod):flex',
'data-foo(color:--value)/(--mod):flex',

'data-foo-(color:--value)/(number:--mod):flex',
'data-foo(color:--value)/(number:--mod):flex',

'data-foo-(--value):flex',
'data-foo(--value):flex',

'data-foo-(--value)/50:flex',
'data-foo(--value)/50:flex',

'data-foo-(--value)/(--mod):flex',
'data-foo(--value)/(--mod):flex',

'data-foo-(--value)/(number:--mod):flex',
'data-foo(--value)/(number:--mod):flex',
]) {
expect(run(candidate, { utilities, variants })).toEqual([])
}
})

it('should parse a utility with an implicit variable as the modifier', () => {
let utilities = new Utilities()
utilities.functional('bg', () => [])
Expand Down Expand Up @@ -966,6 +1023,18 @@ it('should parse a utility with an explicit variable as the modifier that is imp
`)
})

it('should not parse a partial variant', () => {
let utilities = new Utilities()
utilities.static('flex', () => [])

let variants = new Variants()
variants.static('open', () => {})
variants.functional('data', () => {})

expect(run('open-:flex', { utilities, variants })).toMatchInlineSnapshot(`[]`)
expect(run('data-:flex', { utilities, variants })).toMatchInlineSnapshot(`[]`)
})

it('should parse a static variant starting with @', () => {
let utilities = new Utilities()
utilities.static('flex', () => [])
Expand Down
10 changes: 8 additions & 2 deletions packages/tailwindcss/src/candidate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,10 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
}
}

if (value[0] === '[' && value[value.length - 1] === ']') {
if (value[value.length - 1] === ']') {
// Discard values like `foo-[#bar]`
if (value[0] !== '[') continue

let arbitraryValue = decodeArbitraryValue(value.slice(1, -1))

// Empty arbitrary values are invalid. E.g.: `data-[]:`
Expand All @@ -638,7 +641,10 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
}
}

if (value[0] === '(' && value[value.length - 1] === ')') {
if (value[value.length - 1] === ')') {
// Discard values like `foo-(--bar)`
if (value[0] !== '(') continue

let arbitraryValue = decodeArbitraryValue(value.slice(1, -1))

// Empty arbitrary values are invalid. E.g.: `data-():`
Expand Down