Skip to content

Handle @variant inside @custom-variant #18885

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
RobinMalfait merged 8 commits into from
Sep 5, 2025
Merged

Handle @variant inside @custom-variant #18885

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f628ea8
add failing test
RobinMalfait Sep 3, 2025
0dc5ab5
add topological sort utility
RobinMalfait Sep 4, 2025
19949cc
add `substituteAtVariant` utility
RobinMalfait Sep 4, 2025
e3b4c4c
handle `@variant` inside `@custom-variant`'s
RobinMalfait Sep 4, 2025
5f52530
use `substituteAtVariant` in main CSS handling
RobinMalfait Sep 4, 2025
8ef8419
register `@custom-variant` in the correct topological order
RobinMalfait Sep 4, 2025
6636897
update changelog
RobinMalfait Sep 4, 2025
866ab4f
Merge branch 'main' into feat/use-variant-in-custom-variant
RobinMalfait Sep 5, 2025
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
Prev Previous commit
Next Next commit
use substituteAtVariant in main CSS handling
  • Loading branch information
@RobinMalfait
RobinMalfait committed Sep 4, 2025
commit 5f5253004a9699a5a4798634f3afb06a68ddd12d
29 changes: 3 additions & 26 deletions packages/tailwindcss/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { substituteAtImports } from './at-import'
import { applyCompatibilityHooks } from './compat/apply-compat-hooks'
import type { UserConfig } from './compat/config/types'
import { type Plugin } from './compat/plugin-api'
import { applyVariant, compileCandidates } from './compile'
import { compileCandidates } from './compile'
import { substituteFunctions } from './css-functions'
import * as CSS from './css-parser'
import { buildDesignSystem, type DesignSystem } from './design-system'
Expand All @@ -32,7 +32,7 @@ import { createCssUtility } from './utilities'
import { expand } from './utils/brace-expansion'
import { escape, unescape } from './utils/escape'
import { segment } from './utils/segment'
import { compoundsForSelectors, IS_VALID_VARIANT_NAME } from './variants'
import { compoundsForSelectors, IS_VALID_VARIANT_NAME, substituteAtVariant } from './variants'
export type Config = UserConfig

const IS_VALID_PREFIX = /^[a-z]+$/
Expand Down Expand Up @@ -636,30 +636,7 @@ async function parseCss(
firstThemeRule.nodes = [context({ theme: true }, nodes)]
}

// Replace the `@variant` at-rules with the actual variant rules.
if (variantNodes.length > 0) {
for (let variantNode of variantNodes) {
// Starting with the `&` rule node
let node = styleRule('&', variantNode.nodes)

let variant = variantNode.params

let variantAst = designSystem.parseVariant(variant)
if (variantAst === null) {
throw new Error(`Cannot use \`@variant\` with unknown variant: ${variant}`)
}

let result = applyVariant(node, variantAst, designSystem.variants)
if (result === null) {
throw new Error(`Cannot use \`@variant\` with variant: ${variant}`)
}

// Update the variant at-rule node, to be the `&` rule node
Object.assign(variantNode, node)
}
features |= Features.Variants
}

features |= substituteAtVariant(ast, designSystem)
features |= substituteFunctions(ast, designSystem)
features |= substituteAtApply(ast, designSystem)

Expand Down