Skip to content

Migrate negative arbitrary values to negative bare values #18212

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 3 commits into from
Jun 3, 2025
Merged

Migrate negative arbitrary values to negative bare values #18212

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e470f00
add failing test
RobinMalfait Jun 3, 2025
5d142f8
migrate negative arbitrary values to negative bare values
RobinMalfait Jun 3, 2025
98421ab
update changelog
RobinMalfait Jun 3, 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
migrate negative arbitrary values to negative bare values
  • Loading branch information
@RobinMalfait
RobinMalfait committed Jun 3, 2025
commit 5d142f8d31a09b64d2159a8de599b3f2a17d883e
9 changes: 8 additions & 1 deletion packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,21 @@ export function migrateArbitraryUtilities(
candidate.kind === 'arbitrary' ? candidate.value : (candidate.value?.value ?? null)
if (value === null) return

let spacingMultiplier = spacing.get(designSystem)?.get(value)
let spacingMultiplier = spacing.get(designSystem)?.get(value) ?? null
let rootPrefix = ''
if (spacingMultiplier !== null && spacingMultiplier < 0) {
rootPrefix = '-'
spacingMultiplier = Math.abs(spacingMultiplier)
Copy link
Member Author

@RobinMalfait RobinMalfait Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also an option 🤔

Suggested change
spacingMultiplier = Math.abs(spacingMultiplier)
spacingMultiplier *= -1

}

for (let root of Array.from(designSystem.utilities.keys('functional')).sort(
// Sort negative roots after positive roots so that we can try
// `mt-*` before `-mt-*`. This is especially useful in situations where
// `-mt-[0px]` can be translated to `mt-[0px]`.
(a, z) => Number(a[0] === '-') - Number(z[0] === '-'),
)) {
if (rootPrefix) root = `${rootPrefix}${root}`

// Try as bare value
for (let replacementCandidate of parseCandidate(designSystem, `${root}-${value}`)) {
yield replacementCandidate
Expand Down