Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
9 changes: 5 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- _Experimental_: Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))

### Changed

- Improve canonicalization for `& > :pseudo` and `& :pseudo` arbitrary variants ([#19178](https://github.com/tailwindlabs/tailwindcss/pull/19178))

### Fixed

- Discard candidates with an empty data type ([#19172](https://github.com/tailwindlabs/tailwindcss/pull/19172))
- Fix canonicalization of arbitrary variants with attribute selectors ([#19176](https://github.com/tailwindlabs/tailwindcss/pull/19176))
- Fix invalid colors due to nested `&` ([#19184](https://github.com/tailwindlabs/tailwindcss/pull/19184))

### Changed

- Improve canonicalization for `& > :pseudo` and `& :pseudo` arbitrary variants ([#19178](https://github.com/tailwindlabs/tailwindcss/pull/19178))

## [4.1.15] - 2025-10-20

Expand Down
4 changes: 1 addition & 3 deletions packages/tailwindcss/src/ast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,7 @@ export function optimizeAst(
...declaration,
value: ValueParser.toCss(ast),
}
let colorMixQuery = rule('@supports (color: color-mix(in lab, red, red))', [
rule('&', [declaration]),
])
let colorMixQuery = rule('@supports (color: color-mix(in lab, red, red))', [declaration])
colorMixQuery.src = declaration.src
parent.splice(idx, 1, fallback, colorMixQuery)
}
Expand Down
12 changes: 3 additions & 9 deletions packages/tailwindcss/src/compat/plugin-api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,7 @@ describe('theme', async () => {
.variable {
color: #ef4444;
@supports (color: color-mix(in lab, red, red)) {
& {
color: color-mix(in oklab, #ef4444 var(--opacity), transparent);
}
color: color-mix(in oklab, #ef4444 var(--opacity), transparent);
}
}
"
Expand Down Expand Up @@ -379,9 +377,7 @@ describe('theme', async () => {
.css-variable {
color: rgba(255 0 0 / <alpha-value>);
@supports (color: color-mix(in lab, red, red)) {
& {
color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) var(--opacity), transparent);
}
color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) var(--opacity), transparent);
}
}
.js-fraction {
Expand All @@ -393,9 +389,7 @@ describe('theme', async () => {
.js-variable {
color: rgb(255 0 0 / 1);
@supports (color: color-mix(in lab, red, red)) {
& {
color: color-mix(in oklab, rgb(255 0 0 / 1) var(--opacity), transparent);
}
color: color-mix(in oklab, rgb(255 0 0 / 1) var(--opacity), transparent);
}
}
"
Expand Down
54 changes: 27 additions & 27 deletions packages/tailwindcss/src/source-maps/source-map.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,33 +265,33 @@ test('source maps trace back to @import location', async ({ expect }) => {
'preflight.css: 118:4-18 <- 293:2-16',
'preflight.css: 119:6-25 <- 294:4-61',
'preflight.css: 120:6-53 <- 294:4-61',
'preflight.css: 122:10-67 <- 294:4-61',
'preflight.css: 127:2-11 <- 302:0-9',
'preflight.css: 128:4-20 <- 303:2-18',
'preflight.css: 130:2-30 <- 310:0-28',
'preflight.css: 131:4-28 <- 311:2-26',
'preflight.css: 133:2-32 <- 319:0-30',
'preflight.css: 134:4-19 <- 320:2-17',
'preflight.css: 135:4-23 <- 321:2-21',
'preflight.css: 137:2-26 <- 328:0-24',
'preflight.css: 138:4-24 <- 329:2-22',
'preflight.css: 140:2-41 <- 336:0-39',
'preflight.css: 141:4-14 <- 337:2-12',
'preflight.css: 143:2-329 <- 340:0-348:39',
'preflight.css: 144:4-20 <- 349:2-18',
'preflight.css: 146:2-38 <- 356:0-36',
'preflight.css: 147:4-18 <- 357:2-16',
'preflight.css: 149:2-19 <- 364:0-17',
'preflight.css: 150:4-20 <- 365:2-18',
'preflight.css: 152:2-96 <- 372:0-374:23',
'preflight.css: 153:4-22 <- 375:2-20',
'preflight.css: 155:2-59 <- 382:0-383:28',
'preflight.css: 156:4-16 <- 384:2-14',
'preflight.css: 158:2-47 <- 391:0-45',
'preflight.css: 159:4-28 <- 392:2-26',
'index.css: 162:0-16 <- 5:0-42',
'input.css: 163:0-5 <- 3:0-5',
'input.css: 164:2-33 <- 4:9-18',
'preflight.css: 121:8-65 <- 294:4-61',
'preflight.css: 125:2-11 <- 302:0-9',
'preflight.css: 126:4-20 <- 303:2-18',
'preflight.css: 128:2-30 <- 310:0-28',
'preflight.css: 129:4-28 <- 311:2-26',
'preflight.css: 131:2-32 <- 319:0-30',
'preflight.css: 132:4-19 <- 320:2-17',
'preflight.css: 133:4-23 <- 321:2-21',
'preflight.css: 135:2-26 <- 328:0-24',
'preflight.css: 136:4-24 <- 329:2-22',
'preflight.css: 138:2-41 <- 336:0-39',
'preflight.css: 139:4-14 <- 337:2-12',
'preflight.css: 141:2-329 <- 340:0-348:39',
'preflight.css: 142:4-20 <- 349:2-18',
'preflight.css: 144:2-38 <- 356:0-36',
'preflight.css: 145:4-18 <- 357:2-16',
'preflight.css: 147:2-19 <- 364:0-17',
'preflight.css: 148:4-20 <- 365:2-18',
'preflight.css: 150:2-96 <- 372:0-374:23',
'preflight.css: 151:4-22 <- 375:2-20',
'preflight.css: 153:2-59 <- 382:0-383:28',
'preflight.css: 154:4-16 <- 384:2-14',
'preflight.css: 156:2-47 <- 391:0-45',
'preflight.css: 157:4-28 <- 392:2-26',
'index.css: 160:0-16 <- 5:0-42',
'input.css: 161:0-5 <- 3:0-5',
'input.css: 162:2-33 <- 4:9-18',
])
})

Expand Down
Loading