From 4d951a1e00922794597f55d8866209a306110b50 Mon Sep 17 00:00:00 2001 From: Chris <1633711653@qq.com> Date: Wed, 21 Dec 2022 19:15:26 +0800 Subject: [PATCH] fix(core): support expand `@` for variant group (#2015) --- packages/core/src/utils/variantGroup.ts | 2 +- test/variant-group.test.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/core/src/utils/variantGroup.ts b/packages/core/src/utils/variantGroup.ts index fa2c6c10c0..056d9b3447 100644 --- a/packages/core/src/utils/variantGroup.ts +++ b/packages/core/src/utils/variantGroup.ts @@ -1,6 +1,6 @@ import type MagicString from 'magic-string' -export const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm +export const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm export function expandVariantGroup(str: string, separators?: string[], depth?: number): string export function expandVariantGroup(str: MagicString, separators?: string[], depth?: number): MagicString diff --git a/test/variant-group.test.ts b/test/variant-group.test.ts index 705ae9cb6c..ab93a47297 100644 --- a/test/variant-group.test.ts +++ b/test/variant-group.test.ts @@ -47,4 +47,9 @@ describe('variant-group', () => { ] `) }) + + test('expand @', async () => { + expect(expandVariantGroup('@a:(c-d d-c)')).toEqual('@a:c-d @a:d-c') + expect(expandVariantGroup('!@a:(c-d d-c)')).toEqual('!@a:c-d !@a:d-c') + }) })