Skip to content

Commit cb46ebd

Browse files
RobinMalfaitRobinMalfait
authored
Prepare for the v3.2.5 release (#10531)
* Revert "add caption-side utilities (#10470)" This reverts commit f395cc4. * Revert "Add support for configuring default `font-variation-settings` for a `font-family` (#10515)" This reverts commit 8bd2846. * Revert "feat: add hyphens (#10071)" This reverts commit f58a43f. * Revert "Add logical properties support for inline direction" * Revert "Add `delay-0` and `duration-0` by default" * Revert "Support using variables as arbitrary values without `var()`" * Revert "Add `line-height` modifier support to `font-size` utilities"
1 parent 04c5b22 commit cb46ebd

26 files changed

+324
-822
lines changed

‎CHANGELOG.md

-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12-
- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
13-
- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
1412
- Add standalone CLI build for 64-bit Windows on ARM (`node16-win-arm64`) ([#10001](https://github.com/tailwindlabs/tailwindcss/pull/10001))
15-
- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
16-
- Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
17-
- Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
1813
- [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
19-
- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
20-
- Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
2114

2215
### Fixed
2316

‎src/corePlugins.js

+2-94
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import fs from 'fs'
22
import * as path from 'path'
33
import postcss from 'postcss'
4-
import { env } from './lib/sharedState'
54
import createUtilityPlugin from './util/createUtilityPlugin'
65
import buildMediaQuery from './util/buildMediaQuery'
76
import escapeClassName from './util/escapeClassName'
@@ -647,8 +646,6 @@ export let corePlugins = {
647646
['inset-y', ['top', 'bottom']],
648647
],
649648
[
650-
['start', ['inset-inline-start']],
651-
['end', ['inset-inline-end']],
652649
['top', ['top']],
653650
['right', ['right']],
654651
['bottom', ['bottom']],
@@ -700,8 +697,6 @@ export let corePlugins = {
700697
['my', ['margin-top', 'margin-bottom']],
701698
],
702699
[
703-
['ms', ['margin-inline-start']],
704-
['me', ['margin-inline-end']],
705700
['mt', ['margin-top']],
706701
['mr', ['margin-right']],
707702
['mb', ['margin-bottom']],
@@ -772,13 +767,6 @@ export let corePlugins = {
772767
})
773768
},
774769

775-
captionSide: ({ addUtilities }) => {
776-
addUtilities({
777-
'.caption-top': { 'caption-side': 'top' },
778-
'.caption-bottom': { 'caption-side': 'bottom' },
779-
})
780-
},
781-
782770
borderCollapse: ({ addUtilities }) => {
783771
addUtilities({
784772
'.border-collapse': { 'border-collapse': 'collapse' },
@@ -1057,8 +1045,6 @@ export let corePlugins = {
10571045
['scroll-my', ['scroll-margin-top', 'scroll-margin-bottom']],
10581046
],
10591047
[
1060-
['scroll-ms', ['scroll-margin-inline-start']],
1061-
['scroll-me', ['scroll-margin-inline-end']],
10621048
['scroll-mt', ['scroll-margin-top']],
10631049
['scroll-mr', ['scroll-margin-right']],
10641050
['scroll-mb', ['scroll-margin-bottom']],
@@ -1075,8 +1061,6 @@ export let corePlugins = {
10751061
['scroll-py', ['scroll-padding-top', 'scroll-padding-bottom']],
10761062
],
10771063
[
1078-
['scroll-ps', ['scroll-padding-inline-start']],
1079-
['scroll-pe', ['scroll-padding-inline-end']],
10801064
['scroll-pt', ['scroll-padding-top']],
10811065
['scroll-pr', ['scroll-padding-right']],
10821066
['scroll-pb', ['scroll-padding-bottom']],
@@ -1250,16 +1234,6 @@ export let corePlugins = {
12501234
'space-x': (value) => {
12511235
value = value === '0' ? '0px' : value
12521236

1253-
if (env.OXIDE) {
1254-
return {
1255-
'& > :not([hidden]) ~ :not([hidden])': {
1256-
'--tw-space-x-reverse': '0',
1257-
'margin-inline-end': `calc(${value} * var(--tw-space-x-reverse))`,
1258-
'margin-inline-start': `calc(${value} * calc(1 - var(--tw-space-x-reverse)))`,
1259-
},
1260-
}
1261-
}
1262-
12631237
return {
12641238
'& > :not([hidden]) ~ :not([hidden])': {
12651239
'--tw-space-x-reverse': '0',
@@ -1295,17 +1269,6 @@ export let corePlugins = {
12951269
'divide-x': (value) => {
12961270
value = value === '0' ? '0px' : value
12971271

1298-
if (env.OXIDE) {
1299-
return {
1300-
'& > :not([hidden]) ~ :not([hidden])': {
1301-
'@defaults border-width': {},
1302-
'--tw-divide-x-reverse': '0',
1303-
'border-inline-end-width': `calc(${value} * var(--tw-divide-x-reverse))`,
1304-
'border-inline-start-width': `calc(${value} * calc(1 - var(--tw-divide-x-reverse)))`,
1305-
},
1306-
}
1307-
}
1308-
13091272
return {
13101273
'& > :not([hidden]) ~ :not([hidden])': {
13111274
'@defaults border-width': {},
@@ -1473,14 +1436,6 @@ export let corePlugins = {
14731436
})
14741437
},
14751438

1476-
hyphens: ({ addUtilities }) => {
1477-
addUtilities({
1478-
'.hyphens-none': { hyphens: 'none' },
1479-
'.hyphens-manual': { hyphens: 'manual' },
1480-
'.hyphens-auto': { hyphens: 'auto' },
1481-
})
1482-
},
1483-
14841439
whitespace: ({ addUtilities }) => {
14851440
addUtilities({
14861441
'.whitespace-normal': { 'white-space': 'normal' },
@@ -1503,18 +1458,12 @@ export let corePlugins = {
15031458
borderRadius: createUtilityPlugin('borderRadius', [
15041459
['rounded', ['border-radius']],
15051460
[
1506-
['rounded-s', ['border-start-start-radius', 'border-end-start-radius']],
1507-
['rounded-e', ['border-start-end-radius', 'border-end-end-radius']],
15081461
['rounded-t', ['border-top-left-radius', 'border-top-right-radius']],
15091462
['rounded-r', ['border-top-right-radius', 'border-bottom-right-radius']],
15101463
['rounded-b', ['border-bottom-right-radius', 'border-bottom-left-radius']],
15111464
['rounded-l', ['border-top-left-radius', 'border-bottom-left-radius']],
15121465
],
15131466
[
1514-
['rounded-ss', ['border-start-start-radius']],
1515-
['rounded-se', ['border-start-end-radius']],
1516-
['rounded-ee', ['border-end-end-radius']],
1517-
['rounded-es', ['border-end-start-radius']],
15181467
['rounded-tl', ['border-top-left-radius']],
15191468
['rounded-tr', ['border-top-right-radius']],
15201469
['rounded-br', ['border-bottom-right-radius']],
@@ -1531,8 +1480,6 @@ export let corePlugins = {
15311480
['border-y', [['@defaults border-width', {}], 'border-top-width', 'border-bottom-width']],
15321481
],
15331482
[
1534-
['border-s', [['@defaults border-width', {}], 'border-inline-start-width']],
1535-
['border-e', [['@defaults border-width', {}], 'border-inline-end-width']],
15361483
['border-t', [['@defaults border-width', {}], 'border-top-width']],
15371484
['border-r', [['@defaults border-width', {}], 'border-right-width']],
15381485
['border-b', [['@defaults border-width', {}], 'border-bottom-width']],
@@ -1615,32 +1562,6 @@ export let corePlugins = {
16151562

16161563
matchUtilities(
16171564
{
1618-
'border-s': (value) => {
1619-
if (!corePlugins('borderOpacity')) {
1620-
return {
1621-
'border-inline-start-color': toColorValue(value),
1622-
}
1623-
}
1624-
1625-
return withAlphaVariable({
1626-
color: value,
1627-
property: 'border-inline-start-color',
1628-
variable: '--tw-border-opacity',
1629-
})
1630-
},
1631-
'border-e': (value) => {
1632-
if (!corePlugins('borderOpacity')) {
1633-
return {
1634-
'border-inline-end-color': toColorValue(value),
1635-
}
1636-
}
1637-
1638-
return withAlphaVariable({
1639-
color: value,
1640-
property: 'border-inline-end-color',
1641-
variable: '--tw-border-opacity',
1642-
})
1643-
},
16441565
'border-t': (value) => {
16451566
if (!corePlugins('borderOpacity')) {
16461567
return {
@@ -1877,8 +1798,6 @@ export let corePlugins = {
18771798
['py', ['padding-top', 'padding-bottom']],
18781799
],
18791800
[
1880-
['ps', ['padding-inline-start']],
1881-
['pe', ['padding-inline-end']],
18821801
['pt', ['padding-top']],
18831802
['pr', ['padding-right']],
18841803
['pb', ['padding-bottom']],
@@ -1922,16 +1841,13 @@ export let corePlugins = {
19221841
font: (value) => {
19231842
let [families, options = {}] =
19241843
Array.isArray(value) && isPlainObject(value[1]) ? value : [value]
1925-
let { fontFeatureSettings, fontVariationSettings } = options
1844+
let { fontFeatureSettings } = options
19261845

19271846
return {
19281847
'font-family': Array.isArray(families) ? families.join(', ') : families,
19291848
...(fontFeatureSettings === undefined
19301849
? {}
19311850
: { 'font-feature-settings': fontFeatureSettings }),
1932-
...(fontVariationSettings === undefined
1933-
? {}
1934-
: { 'font-variation-settings': fontVariationSettings }),
19351851
}
19361852
},
19371853
},
@@ -1945,16 +1861,9 @@ export let corePlugins = {
19451861
fontSize: ({ matchUtilities, theme }) => {
19461862
matchUtilities(
19471863
{
1948-
text: (value, { modifier }) => {
1864+
text: (value) => {
19491865
let [fontSize, options] = Array.isArray(value) ? value : [value]
19501866

1951-
if (modifier) {
1952-
return {
1953-
'font-size': fontSize,
1954-
'line-height': modifier,
1955-
}
1956-
}
1957-
19581867
let { lineHeight, letterSpacing, fontWeight } = isPlainObject(options)
19591868
? options
19601869
: { lineHeight: options }
@@ -1969,7 +1878,6 @@ export let corePlugins = {
19691878
},
19701879
{
19711880
values: theme('fontSize'),
1972-
modifiers: theme('lineHeight'),
19731881
type: ['absolute-size', 'relative-size', 'length', 'percentage'],
19741882
}
19751883
)

‎src/css/preflight.css

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
3. Use a more readable tab size.
2424
4. Use the user's configured `sans` font-family by default.
2525
5. Use the user's configured `sans` font-feature-settings by default.
26-
6. Use the user's configured `sans` font-variation-settings by default.
2726
*/
2827

2928
html {
@@ -33,7 +32,6 @@ html {
3332
tab-size: 4; /* 3 */
3433
font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
3534
font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
36-
font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
3735
}
3836

3937
/*

‎src/util/dataTypes.js

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ const placeholderRe = new RegExp(placeholder, 'g')
1616
// This is not a data type, but rather a function that can normalize the
1717
// correct values.
1818
export function normalize(value, isRoot = true) {
19-
if (value.startsWith('--')) {
20-
return `var(${value})`
21-
}
22-
2319
// Keep raw strings if it starts with `url(`
2420
if (value.includes('url(')) {
2521
return value

‎src/util/pluginUtils.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,6 @@ export function parseColorFormat(value) {
133133
return value
134134
}
135135

136-
function unwrapArbitraryModifier(modifier) {
137-
modifier = modifier.slice(1, -1)
138-
if (modifier.startsWith('--')) {
139-
modifier = `var(${modifier})`
140-
}
141-
return modifier
142-
}
143-
144136
export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
145137
if (options.values?.[modifier] !== undefined) {
146138
return parseColorFormat(options.values?.[modifier])
@@ -161,7 +153,7 @@ export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
161153
normalizedColor = parseColorFormat(normalizedColor)
162154

163155
if (isArbitraryValue(alpha)) {
164-
return withAlphaValue(normalizedColor, unwrapArbitraryModifier(alpha))
156+
return withAlphaValue(normalizedColor, alpha.slice(1, -1))
165157
}
166158

167159
if (tailwindConfig.theme?.opacity?.[alpha] === undefined) {
@@ -295,7 +287,7 @@ export function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
295287
if (configValue !== null) {
296288
utilityModifier = configValue
297289
} else if (isArbitraryValue(utilityModifier)) {
298-
utilityModifier = unwrapArbitraryModifier(utilityModifier)
290+
utilityModifier = utilityModifier.slice(1, -1)
299291
}
300292
}
301293
}

‎stubs/defaultConfig.stub.js

-2
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,6 @@ module.exports = {
853853
'top-left': 'top left',
854854
},
855855
transitionDelay: {
856-
0: '0s',
857856
75: '75ms',
858857
100: '100ms',
859858
150: '150ms',
@@ -865,7 +864,6 @@ module.exports = {
865864
},
866865
transitionDuration: {
867866
DEFAULT: '150ms',
868-
0: '0s',
869867
75: '75ms',
870868
100: '100ms',
871869
150: '150ms',

‎tests/any-type.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ crosscheck(({ stable, oxide }) => {
428428
}
429429
.space-x-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
430430
--tw-space-x-reverse: 0;
431-
margin-inline-start: calc(var(--any-value) * calc(1 - var(--tw-space-x-reverse)));
432-
margin-inline-end: calc(var(--any-value) * var(--tw-space-x-reverse));
431+
margin-right: calc(var(--any-value) * var(--tw-space-x-reverse));
432+
margin-left: calc(var(--any-value) * calc(1 - var(--tw-space-x-reverse)));
433433
}
434434
.space-y-\[var\(--any-value\)\] > :not([hidden]) ~ :not([hidden]) {
435435
--tw-space-y-reverse: 0;

‎tests/arbitrary-values.oxide.test.css

+8-8
Original file line numberDiff line numberDiff line change
@@ -455,13 +455,13 @@
455455
}
456456
.space-x-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
457457
--tw-space-x-reverse: 0;
458-
margin-inline-start: calc(20cm * calc(1 - var(--tw-space-x-reverse)));
459-
margin-inline-end: calc(20cm * var(--tw-space-x-reverse));
458+
margin-right: calc(20cm * var(--tw-space-x-reverse));
459+
margin-left: calc(20cm * calc(1 - var(--tw-space-x-reverse)));
460460
}
461461
.space-x-\[calc\(20\%-1cm\)\] > :not([hidden]) ~ :not([hidden]) {
462462
--tw-space-x-reverse: 0;
463-
margin-inline-start: calc(calc(20% - 1cm) * calc(1 - var(--tw-space-x-reverse)));
464-
margin-inline-end: calc(calc(20% - 1cm) * var(--tw-space-x-reverse));
463+
margin-right: calc(calc(20% - 1cm) * var(--tw-space-x-reverse));
464+
margin-left: calc(calc(20% - 1cm) * calc(1 - var(--tw-space-x-reverse)));
465465
}
466466
.space-y-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
467467
--tw-space-y-reverse: 0;
@@ -475,13 +475,13 @@
475475
}
476476
.divide-x-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
477477
--tw-divide-x-reverse: 0;
478-
border-inline-end-width: calc(20cm * var(--tw-divide-x-reverse));
479-
border-inline-start-width: calc(20cm * calc(1 - var(--tw-divide-x-reverse)));
478+
border-right-width: calc(20cm * var(--tw-divide-x-reverse));
479+
border-left-width: calc(20cm * calc(1 - var(--tw-divide-x-reverse)));
480480
}
481481
.divide-x-\[calc\(20\%-1cm\)\] > :not([hidden]) ~ :not([hidden]) {
482482
--tw-divide-x-reverse: 0;
483-
border-inline-end-width: calc(calc(20% - 1cm) * var(--tw-divide-x-reverse));
484-
border-inline-start-width: calc(calc(20% - 1cm) * calc(1 - var(--tw-divide-x-reverse)));
483+
border-right-width: calc(calc(20% - 1cm) * var(--tw-divide-x-reverse));
484+
border-left-width: calc(calc(20% - 1cm) * calc(1 - var(--tw-divide-x-reverse)));
485485
}
486486
.divide-y-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
487487
--tw-divide-y-reverse: 0;

0 commit comments

Comments
 (0)