Skip to content

Improve canCollapseWhitespaceIn handling for "tailwindPreserveWhitespace": true #428

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
thecrypticace merged 3 commits into from
Dec 24, 2025
Merged

Improve canCollapseWhitespaceIn handling for "tailwindPreserveWhitespace": true #428

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d68d0c
Improve `canCollapseWhitespaceIn` handling for `tailwindPreserveWhite…
Dunqing Dec 24, 2025
c8691d8
Fix type error
thecrypticace Dec 24, 2025
1e0a3d6
Bring back check in `sortClasses`
thecrypticace Dec 24, 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
27 changes: 18 additions & 9 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function transformDynamicAngularAttribute(attr: any, env: TransformerEnv) {
StringLiteral(node, path) {
if (!node.value) return

let collapseWhitespace = canCollapseWhitespaceIn(path)
let collapseWhitespace = canCollapseWhitespaceIn(path, env)

changes.push({
start: node.start + 1,
Expand All @@ -124,7 +124,7 @@ function transformDynamicAngularAttribute(attr: any, env: TransformerEnv) {
TemplateLiteral(node, path) {
if (!node.quasis.length) return

let collapseWhitespace = canCollapseWhitespaceIn(path)
let collapseWhitespace = canCollapseWhitespaceIn(path, env)

for (let i = 0; i < node.quasis.length; i++) {
let quasi = node.quasis[i]
Expand All @@ -143,10 +143,12 @@ function transformDynamicAngularAttribute(attr: any, env: TransformerEnv) {
// And does not end with a space
ignoreLast: i < node.expressions.length && !/\s$/.test(quasi.value.raw),

collapseWhitespace: {
start: collapseWhitespace.start && i === 0,
end: collapseWhitespace.end && i >= node.expressions.length,
},
collapseWhitespace: collapseWhitespace
? {
start: collapseWhitespace.start && i === 0,
end: collapseWhitespace.end && i >= node.expressions.length,
}
: false,
}),
})
}
Expand Down Expand Up @@ -604,7 +606,14 @@ function isSortableExpression(
return false
}

function canCollapseWhitespaceIn(path: Path<import('@babel/types').Node, any>) {
function canCollapseWhitespaceIn(
path: Path<import('@babel/types').Node, any>,
env: TransformerEnv,
): false | { start: boolean; end: boolean } {
if (env.options.tailwindPreserveWhitespace) {
return false
}

let start = true
let end = true

Expand Down Expand Up @@ -656,7 +665,7 @@ function transformJavaScript(ast: import('@babel/types').Node, { env }: Transfor

function sortInside(ast: import('@babel/types').Node) {
visit(ast, (node, path) => {
let collapseWhitespace = canCollapseWhitespaceIn(path)
let collapseWhitespace = canCollapseWhitespaceIn(path, env)

if (isStringLiteral(node)) {
sortStringLiteral(node, { env, collapseWhitespace })
Expand Down Expand Up @@ -712,7 +721,7 @@ function transformJavaScript(ast: import('@babel/types').Node, { env }: Transfor
return
}

let collapseWhitespace = canCollapseWhitespaceIn(path)
let collapseWhitespace = canCollapseWhitespaceIn(path, env)

sortTemplateLiteral(node.quasi, {
env,
Expand Down