Skip to content

Ensure CSS variable shorthand uses valid CSS variables #15738

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
Jan 27, 2025
Merged

Ensure CSS variable shorthand uses valid CSS variables #15738

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f64cbcf
add failing tests
RobinMalfait Jan 23, 2025
01aa17e
ensure CSS variable shorthand starts with `--`
RobinMalfait Jan 23, 2025
c473bfb
ensure modifiers with var shorthand are valid
RobinMalfait Jan 23, 2025
dafd1f9
update changelog
RobinMalfait Jan 23, 2025
85a898f
Merge branch 'next' into fix/validate-css-variable-shorthand
RobinMalfait Jan 26, 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
Next Next commit
add failing tests
  • Loading branch information
@RobinMalfait
RobinMalfait committed Jan 23, 2025
commit f64cbcf57949e6c5d5bcdef69f7737f277d2cc85
16 changes: 16 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 @@ -570,6 +570,13 @@ it('should parse a utility with an arbitrary value with parens', () => {
`)
})

it('should not parse a utility with an arbitrary value with parens that does not start with --', () => {
let utilities = new Utilities()
utilities.functional('bg', () => [])

expect(run('bg-(my-color)', { utilities })).toMatchInlineSnapshot(`[]`)
})

it('should parse a utility with an arbitrary value including a typehint', () => {
let utilities = new Utilities()
utilities.functional('bg', () => [])
Expand Down Expand Up @@ -616,6 +623,13 @@ it('should parse a utility with an arbitrary value with parens including a typeh
`)
})

it('should not parse a utility with an arbitrary value with parens including a typehint that does not start with --', () => {
let utilities = new Utilities()
utilities.functional('bg', () => [])

expect(run('bg-(color:my-color)', { utilities })).toMatchInlineSnapshot(`[]`)
})

Copy link
Contributor

@thecrypticace thecrypticace Jan 23, 2025

Choose a reason for hiding this comment

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

We should add tests for stuff like bg-foo/(bar) to make sure it's thrown out too

Copy link
Member Author

@RobinMalfait RobinMalfait Jan 23, 2025

Choose a reason for hiding this comment

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

Ah good call!

it('should parse a utility with an arbitrary value with parens and a fallback', () => {
let utilities = new Utilities()
utilities.functional('bg', () => [])
Expand Down Expand Up @@ -888,6 +902,8 @@ it('should not parse invalid arbitrary values in variants', () => {

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

'data-(value):flex',
]) {
expect(run(candidate, { utilities, variants })).toEqual([])
}
Expand Down