Skip to content

Handle CSS nesting natively #20124

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

Draft
RobinMalfait wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

Handle CSS nesting natively #20124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1450178
use pretty AST tests
RobinMalfait May 13, 2026
e3be044
temp: do not optimize
RobinMalfait May 15, 2026
eb9d2f9
temp: re-add leading `0`
RobinMalfait May 15, 2026
1cfdf1e
temp: ignore invalid variant test
RobinMalfait May 15, 2026
1abb491
remove unnecessary AST tests
RobinMalfait May 16, 2026
6bf2ce8
check booleans before traversing strings
RobinMalfait May 27, 2026
592917c
expose helper functions
RobinMalfait May 27, 2026
00a7d04
expose `cloneAstNode` for Selector AST
RobinMalfait May 27, 2026
f6979ff
expose helpers
RobinMalfait May 28, 2026
aa658cb
add CSS nesting specific tests + oracle implementation
RobinMalfait May 27, 2026
252bf81
cache variable extraction
RobinMalfait May 27, 2026
d6492eb
simplify `optimizeAst` step
RobinMalfait May 27, 2026
b010e42
handle nesting
RobinMalfait May 27, 2026
1fa185f
validate `data-*` and `aria-*` attribute selectors
RobinMalfait May 24, 2026
8d0134e
revert: temp: ignore invalid variant test
RobinMalfait May 20, 2026
727dda5
revert: temp: re-add leading `0`
RobinMalfait May 20, 2026
6d7f04a
revert: temp: do not optimize
RobinMalfait May 20, 2026
a60d440
fix applyVariant on CSS node without rules
RobinMalfait May 28, 2026
9f648d5
update integration tests
RobinMalfait May 28, 2026
9e82582
track original src/dst of rules
RobinMalfait May 29, 2026
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
8 changes: 6 additions & 2 deletions integrations/cli/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2480,7 +2480,9 @@ test(
@supports (not (-webkit-appearance: -apple-pay-button)) or (contain-intrinsic-size: 1px) {
::placeholder {
color: currentcolor;
@supports (color: color-mix(in lab, red, red)) {
}
@supports (color: color-mix(in lab, red, red)) {
::placeholder {
color: color-mix(in oklab, currentcolor 50%, transparent);
}
}
Expand Down Expand Up @@ -2523,7 +2525,9 @@ test(
@layer utilities {
.bg-red-500\\/50 {
background-color: color-mix(in srgb, oklch(63.7% 0.237 25.331) 50%, transparent);
@supports (color: color-mix(in lab, red, red)) {
}
@supports (color: color-mix(in lab, red, red)) {
.bg-red-500\\/50 {
background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
}
}
Expand Down
42 changes: 22 additions & 20 deletions integrations/vite/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ test(
<link rel="stylesheet" href="./src/index.css" />
</head>
<body>
<div class="hover:flex">Hello, world!</div>
<div class="focus:text-[black]">Hello, world!</div>
</body>
`,
'src/index.css': css`
Expand All @@ -1149,16 +1149,16 @@ test(
async ({ exec, expect, fs }) => {
await exec('pnpm vite build')

let files = await fs.glob('dist/**/*.css')
expect(files).toHaveLength(1)
let [filename] = files[0]

// Should not be minified when optimize is disabled
let content = await fs.read(filename)
expect(content).toContain('.hover\\:flex {')
expect(content).toContain('&:hover {')
expect(content).toContain('@media (hover: hover) {')
expect(content).toContain('display: flex;')
expect((await fs.dumpFiles('dist/**/*.css')).replace(/-([_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'))
.toMatchInlineSnapshot(`
"
--- dist/assets/index-<hash>.css ---
.focus\\:text-\\[black\\]:focus {
color: black;
}
"
`)
},
)

Expand Down Expand Up @@ -1192,7 +1192,7 @@ test(
<link rel="stylesheet" href="./src/index.css" />
</head>
<body>
<div class="hover:flex">Hello, world!</div>
<div class="hover:text-[black]">Hello, world!</div>
</body>
`,
'src/index.css': css`
Expand All @@ -1204,15 +1204,17 @@ test(
async ({ exec, expect, fs }) => {
await exec('pnpm vite build')

let files = await fs.glob('dist/**/*.css')
expect(files).toHaveLength(1)
let [filename] = files[0]

// Should be optimized but not minified
let content = await fs.read(filename)
expect(content).toContain('@media (hover: hover) {')
expect(content).toContain('.hover\\:flex:hover {')
expect(content).toContain('display: flex;')
expect((await fs.dumpFiles('dist/**/*.css')).replace(/-([_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'))
.toMatchInlineSnapshot(`
"
--- dist/assets/index-<hash>.css ---
@media (hover: hover) {
.hover\\:text-\\[black\\]:hover {
color: #000;
}
}
"
`)
},
)

Expand Down
Loading