Skip to content

Commit 1aab04c

Browse files
committed
Temporarily revert changes to `@utility
The github release workflow is currently broken on the 4.0.15 tag for whatever reason and we need to get the release out
1 parent 508746b commit 1aab04c

File tree

4 files changed

+69
-228
lines changed

4 files changed

+69
-228
lines changed

CHANGELOG.md

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1919
- _Experimental_: Add `user-valid` and `user-invalid` variants ([#12370](https://github.com/tailwindlabs/tailwindcss/pull/12370))
2020
- _Experimental_: Add `wrap-anywhere`, `wrap-break-word`, and `wrap-normal` utilities ([#12128](https://github.com/tailwindlabs/tailwindcss/pull/12128))
2121
- _Experimental_: Add `@source inline(…)` ([#17147](https://github.com/tailwindlabs/tailwindcss/pull/17147))
22-
- Add support for literal values in `--value('…')` and `--modifier('…')` ([#17304](https://github.com/tailwindlabs/tailwindcss/pull/17304))
23-
- Add suggestions when `--spacing(--value(integer, number))` is used ([#17308](https://github.com/tailwindlabs/tailwindcss/pull/17308))
2422

2523
### [4.0.15] - 2025-03-20
2624

packages/tailwindcss/src/intellisense.test.ts

+3-38
Original file line numberDiff line numberDiff line change
@@ -476,31 +476,16 @@ test('Custom functional @utility', async () => {
476476
477477
--leading-foo: 1.5;
478478
--leading-bar: 2;
479-
480-
--spacing: 0.25rem;
481-
--spacing-custom: 123px;
482479
}
483480
484481
@utility tab-* {
485-
tab-size: --value(--tab-size, 'revert', 'initial');
482+
tab-size: --value(--tab-size);
486483
}
487484
488485
@utility example-* {
489486
font-size: --value(--text);
490487
line-height: --value(--text- * --line-height);
491-
line-height: --modifier(--leading, 'normal');
492-
}
493-
494-
@utility with-custom-spacing-* {
495-
size: --value(--spacing);
496-
}
497-
498-
@utility with-integer-spacing-* {
499-
size: --spacing(--value(integer));
500-
}
501-
502-
@utility with-number-spacing-* {
503-
size: --spacing(--value(number));
488+
line-height: --modifier(--leading);
504489
}
505490
506491
@utility -negative-* {
@@ -522,32 +507,12 @@ test('Custom functional @utility', async () => {
522507
expect(classNames).toContain('tab-2')
523508
expect(classNames).toContain('tab-4')
524509
expect(classNames).toContain('tab-github')
525-
expect(classNames).toContain('tab-revert')
526-
expect(classNames).toContain('tab-initial')
527510

528511
expect(classNames).not.toContain('-tab-1')
529512
expect(classNames).not.toContain('-tab-2')
530513
expect(classNames).not.toContain('-tab-4')
531514
expect(classNames).not.toContain('-tab-github')
532515

533-
expect(classNames).toContain('with-custom-spacing-custom')
534-
expect(classNames).not.toContain('with-custom-spacing-0')
535-
expect(classNames).not.toContain('with-custom-spacing-0.5')
536-
expect(classNames).not.toContain('with-custom-spacing-1')
537-
expect(classNames).not.toContain('with-custom-spacing-1.5')
538-
539-
expect(classNames).not.toContain('with-integer-spacing-custom')
540-
expect(classNames).toContain('with-integer-spacing-0')
541-
expect(classNames).not.toContain('with-integer-spacing-0.5')
542-
expect(classNames).toContain('with-integer-spacing-1')
543-
expect(classNames).not.toContain('with-integer-spacing-1.5')
544-
545-
expect(classNames).not.toContain('with-number-spacing-custom')
546-
expect(classNames).toContain('with-number-spacing-0')
547-
expect(classNames).toContain('with-number-spacing-0.5')
548-
expect(classNames).toContain('with-number-spacing-1')
549-
expect(classNames).toContain('with-number-spacing-1.5')
550-
551516
expect(classNames).toContain('-negative-1')
552517
expect(classNames).toContain('-negative-2')
553518
expect(classNames).toContain('-negative-4')
@@ -559,7 +524,7 @@ test('Custom functional @utility', async () => {
559524
expect(classNames).not.toContain('--negative-github')
560525

561526
expect(classNames).toContain('example-xs')
562-
expect(classMap.get('example-xs')?.modifiers).toEqual(['normal', 'foo', 'bar'])
527+
expect(classMap.get('example-xs')?.modifiers).toEqual(['foo', 'bar'])
563528
})
564529

565530
test('Theme keys with underscores are suggested with underscores', async () => {

packages/tailwindcss/src/utilities.test.ts

+1-36
Original file line numberDiff line numberDiff line change
@@ -17256,23 +17256,6 @@ describe('custom utilities', () => {
1725617256
expect(await compileCss(input, ['tab-foo'])).toEqual('')
1725717257
})
1725817258

17259-
test('resolve literal values', async () => {
17260-
let input = css`
17261-
@utility tab-* {
17262-
tab-size: --value('revert');
17263-
}
17264-
17265-
@tailwind utilities;
17266-
`
17267-
17268-
expect(await compileCss(input, ['tab-revert'])).toMatchInlineSnapshot(`
17269-
".tab-revert {
17270-
tab-size: revert;
17271-
}"
17272-
`)
17273-
expect(await compileCss(input, ['tab-initial'])).toEqual('')
17274-
})
17275-
1727617259
test('resolving bare values with constraints for integer, percentage, and ratio', async () => {
1727717260
let input = css`
1727817261
@utility example-* {
@@ -17737,7 +17720,6 @@ describe('custom utilities', () => {
1773717720
--value: --value(--value, [length]);
1773817721
--modifier: --modifier(--modifier, [length]);
1773917722
--modifier-with-calc: calc(--modifier(--modifier, [length]) * 2);
17740-
--modifier-literals: --modifier('literal', 'literal-2');
1774117723
}
1774217724
1774317725
@tailwind utilities;
@@ -17749,8 +17731,6 @@ describe('custom utilities', () => {
1774917731
'example-sm/7',
1775017732
'example-[12px]',
1775117733
'example-[12px]/[16px]',
17752-
'example-sm/literal',
17753-
'example-sm/literal-2',
1775417734
]),
1775517735
).toMatchInlineSnapshot(`
1775617736
".example-\\[12px\\]\\/\\[16px\\] {
@@ -17765,16 +17745,6 @@ describe('custom utilities', () => {
1776517745
--modifier-with-calc: calc(var(--modifier-7, 28px) * 2);
1776617746
}
1776717747
17768-
.example-sm\\/literal {
17769-
--value: var(--value-sm, 14px);
17770-
--modifier-literals: literal;
17771-
}
17772-
17773-
.example-sm\\/literal-2 {
17774-
--value: var(--value-sm, 14px);
17775-
--modifier-literals: literal-2;
17776-
}
17777-
1777817748
.example-\\[12px\\] {
1777917749
--value: 12px;
1778017750
}
@@ -17784,12 +17754,7 @@ describe('custom utilities', () => {
1778417754
}"
1778517755
`)
1778617756
expect(
17787-
await compileCss(input, [
17788-
'example-foo',
17789-
'example-foo/[12px]',
17790-
'example-foo/12',
17791-
'example-sm/unknown-literal',
17792-
]),
17757+
await compileCss(input, ['example-foo', 'example-foo/[12px]', 'example-foo/12']),
1779317758
).toEqual('')
1779417759
})
1779517760

0 commit comments

Comments
 (0)