Skip to content

Fix parsing of theme() inside calc() when there are no spaces around operators #11157

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 12 commits into from
May 4, 2023
Merged

Fix parsing of theme() inside calc() when there are no spaces around operators #11157

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3828760
Refactor
thecrypticace Apr 18, 2023
f04fa9d
Don’t resolve functions for anything not using theme or screen
thecrypticace Apr 18, 2023
8d9e850
Normalize math operators inside calc when handling functions
thecrypticace Apr 18, 2023
6f4d080
Inline postcss-value-parser
thecrypticace Apr 18, 2023
af687b7
Treat all functions the same as calc
thecrypticace May 1, 2023
163e105
Remove workaround for calc + operators without spaces
thecrypticace May 1, 2023
c02ca9e
Remove `postcss-value-parser` dependency
thecrypticace May 4, 2023
1d58170
Update lockfile
thecrypticace May 4, 2023
f08c38e
Update sourcemaps
thecrypticace May 4, 2023
6daaf00
Update changelog
thecrypticace May 4, 2023
36e3f68
Update `value-parser` formatting
thecrypticace May 4, 2023
94563a3
Stop prettier from complaining
thecrypticace May 4, 2023
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
Don’t resolve functions for anything not using theme or screen
  • Loading branch information
@thecrypticace
thecrypticace committed May 4, 2023
commit f04fa9d173948fdabfcf12a6f081055fbeccb6a8
2 changes: 2 additions & 0 deletions src/lib/evaluateTailwindFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ function resolveVNode(node, vNode, functions) {
}

function resolveFunctions(node, input, functions) {
let hasAnyFn = Object.keys(functions).some((fn) => input.includes(`${fn}(`))
if (!hasAnyFn) return input
return parseValue(input)
.walk((vNode) => {
resolveVNode(node, vNode, functions)
Expand Down