Skip to content

Ensure -- is allowed inside candidates #16972

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 3 commits into from
Mar 5, 2025
+11 −2
Merged

Ensure -- is allowed inside candidates #16972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d988e
add failing test
RobinMalfait Mar 5, 2025
6dbc234
allow consecutive dashes in named utility
RobinMalfait Mar 5, 2025
992273c
update changelog
RobinMalfait Mar 5, 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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- _Experimental_: Add `user-valid` and `user-invalid` variants ([#12370](https://github.com/tailwindlabs/tailwindcss/pull/12370))
- _Experimental_: Add `wrap-anywhere`, `wrap-break-word`, and `wrap-normal` utilities ([#12128](https://github.com/tailwindlabs/tailwindcss/pull/12128))

### Fixed

- Ensure classes containing `--` are extracted correctly ([#16972](https://github.com/tailwindlabs/tailwindcss/pull/16972))

## [4.0.10] - 2025-03-05

### Added
Expand All @@ -41,7 +45,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed `max-w-auto` and `max-h-auto` utilities as they generate invalid CSS ([#16917](https://github.com/tailwindlabs/tailwindcss/pull/16917))
- Replaced the existing candidate extractor with a brand new extractor to improve maintainability, correctness, and performance ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))


## [4.0.9] - 2025-02-25

### Fixed
Expand Down
1 change: 1 addition & 0 deletions crates/oxide/src/extractor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ mod tests {
("flex block", vec!["flex", "block"]),
// Simple utility with dashes
("items-center", vec!["items-center"]),
("items--center", vec!["items--center"]),
// Simple utility with numbers
("px-2.5", vec!["px-2.5"]),
// Arbitrary properties
Expand Down
6 changes: 5 additions & 1 deletion crates/oxide/src/extractor/named_utility_machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ impl Machine for NamedUtilityMachine {
// ^ Invalid
// E.g.: `flex-2`
// ^ Valid
Class::AlphaLower | Class::AlphaUpper | Class::Number => {
// E.g.: `foo--bar`
// ^ Valid
Class::AlphaLower | Class::AlphaUpper | Class::Number | Class::Dash => {
cursor.advance();
}

Expand Down Expand Up @@ -388,6 +390,8 @@ mod tests {
("a", vec!["a"]),
// With dashes
("items-center", vec!["items-center"]),
// With double dashes
("items--center", vec!["items--center"]),
// With numbers
("px-5", vec!["px-5"]),
("px-2.5", vec!["px-2.5"]),
Expand Down
1 change: 1 addition & 0 deletions crates/oxide/src/extractor/utility_machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ mod tests {
("flex! block", vec!["flex!", "block"]),
// With dashes
("items-center", vec!["items-center"]),
("items--center", vec!["items--center"]),
// Inside a string
("'flex'", vec!["flex"]),
// Multiple utilities
Expand Down