Skip to content

Ensure spacing utilities with no value (e.g. px) don't generate CSS #14911

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
adamwathan merged 3 commits into from
Nov 8, 2024
Merged

Ensure spacing utilities with no value (e.g. px) don't generate CSS #14911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9c5694
Ensure spacing utilities with no value (e.g. `px`) don't generate CSS
adamwathan Nov 7, 2024
a2dc3d8
Update test
adamwathan Nov 8, 2024
f59ca2c
Update changelog
adamwathan Nov 8, 2024
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
16 changes: 16 additions & 0 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16124,6 +16124,22 @@ describe('spacing utilities', () => {
}"
`)
})

test('spacing utilities must have a value', async () => {
let { build } = await compile(css`
@theme {
--spacing: 4px;
}
@tailwind utilities;
`)
let compiled = build(['px'])

expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
":root {
--spacing: 4px;
}"
`)
})
})

describe('custom utilities', () => {
Expand Down
6 changes: 5 additions & 1 deletion packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,10 @@ export function createUtilities(theme: Theme) {
// `defaultValue` (for candidates like `grow` that have no theme values)
// or a bare theme value (like `--radius` for `rounded`). No utility
// will ever support both of these.
value = desc.defaultValue ?? theme.resolve(null, desc.themeKeys ?? [])
value =
desc.defaultValue !== undefined
? desc.defaultValue
: theme.resolve(null, desc.themeKeys ?? [])
} else if (candidate.value.kind === 'arbitrary') {
if (candidate.modifier) return
value = candidate.value.value
Expand Down Expand Up @@ -394,6 +397,7 @@ export function createUtilities(theme: Theme) {
themeKeys,
supportsFractions,
supportsNegative,
defaultValue: null,
handleBareValue: ({ value }) => {
let multiplier = theme.resolve(null, ['--spacing'])
if (!multiplier) return null
Expand Down