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.
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
fix(variant-group)!: remove quotes matching, add option to config seperator #1231
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ec55c4e
fix: ms.replace only replaces the original content
Dunqing ac30230
feat: direct use of expandVariantGroup
Dunqing 982de8a
refactor: remove extractQuoted
Dunqing 7de7419
fix: ci
Dunqing ab00722
chore: update
antfu f0be678
Merge branch 'main' into fix-1215
antfu 9ade65b
chore: update test
antfu File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,12 @@ | ||
import type { SourceCodeTransformer } from '@unocss/core' | ||
import { expandVariantGroup, extractQuoted } from '@unocss/core' | ||
import { expandVariantGroup } from '@unocss/core' | ||
|
||
export default function transformerVariantGroup(): SourceCodeTransformer { | ||
return { | ||
name: 'variant-group', | ||
enforce: 'pre', | ||
transform(s) { | ||
extractQuoted( | ||
s.toString(), | ||
{ | ||
details: true, | ||
templateStaticOnly: true, | ||
deep: true, | ||
}, | ||
) | ||
.filter(({ value: { length } }) => length) | ||
.forEach(({ value, range }) => s.overwrite(...range, expandVariantGroup(value))) | ||
expandVariantGroup(s) | ||
}, | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But this one is a JS that should not be transformed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but there is no good way to solve this problem.
I think this is a very rare case where no one would write arithmetic this way, and we can either wait for this problem to appear and then solve it, or provide an option to disable the
-
transform.