Skip to content

Make themeToVar reusable #14694

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 1 commit into from
Oct 17, 2024
Merged

Make themeToVar reusable #14694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Make themeToVar reusable
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 16, 2024
commit 5163a9b910d4e1c69e04cbdaf47d57f6a52c82d9
10 changes: 8 additions & 2 deletions packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { toKeyPath } from '../../../../tailwindcss/src/utils/to-key-path'
import * as ValueParser from '../../../../tailwindcss/src/value-parser'
import { printCandidate } from '../candidates'

enum Convert {
export enum Convert {
All = 0,
MigrateModifier = 1 << 0,
MigrateThemeOnly = 1 << 1,
Expand All @@ -23,6 +23,8 @@ export function themeToVar(
_userConfig: Config,
rawCandidate: string,
): string {
let convert = createConverter(designSystem)

for (let candidate of parseCandidate(rawCandidate, designSystem)) {
let clone = structuredClone(candidate)
let changed = false
Expand Down Expand Up @@ -75,6 +77,10 @@ export function themeToVar(
return changed ? printCandidate(designSystem, clone) : rawCandidate
}

return rawCandidate
}

export function createConverter(designSystem: DesignSystem) {
function convert(input: string, options = Convert.All): [string, CandidateModifier | null] {
let ast = ValueParser.parse(input)

Expand Down Expand Up @@ -209,7 +215,7 @@ export function themeToVar(
return fallback ? `theme(${variable}${modifier}, ${fallback})` : `theme(${variable}${modifier})`
}

return rawCandidate
return convert
}

function substituteFunctionsInValue(
Expand Down