Skip to content

Fix container names with hyphens #17628

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
philipp-spiess merged 4 commits into from
Apr 11, 2025
Merged

Fix container names with hyphens #17628

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b65bcf
Fix container names with hyphens
wongjn Apr 9, 2025
d643d22
Update changelog
wongjn Apr 9, 2025
aec5672
Only special-case `@` once
philipp-spiess Apr 10, 2025
113c172
Remove negation in CHANGELOG.md
wongjn Apr 10, 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
Prev Previous commit
Next Next commit
Only special-case @ once
  • Loading branch information
@philipp-spiess
philipp-spiess committed Apr 10, 2025
commit aec5672a45765343dd03740e422c18f5e40da86a
12 changes: 2 additions & 10 deletions packages/tailwindcss/src/candidate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,14 +745,6 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
// Otherwise test every permutation of the input by iteratively removing
// everything after the last dash.
let idx = input.lastIndexOf('-')
if (idx === -1) {
// Variants starting with `@` are special because they don't need a `-`
// after the `@` (E.g.: `@-lg` should be written as `@lg`).
if (input[0] === '@' && exists('@')) {
yield ['@', input.slice(1)]
}
return
}

// Determine the root and value by testing permutations of the incoming input.
//
Expand All @@ -761,7 +753,7 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
// `bg-red-500` -> No match
// `bg-red` -> No match
// `bg` -> Match
do {
while (idx > 0) {
let maybeRoot = input.slice(0, idx)

if (exists(maybeRoot)) {
Expand All @@ -776,7 +768,7 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
}

idx = input.lastIndexOf('-', idx - 1)
} while (idx > 0)
}

// Try '@' variant after permutations. This allows things like `@max` of `@max-foo-bar`
// to match before looking for `@`.
Expand Down