From 0dca3e5ae6040bb2220229628b6127a63c279f94 Mon Sep 17 00:00:00 2001 From: kkopitehong Date: Thu, 22 Dec 2022 21:25:11 +0800 Subject: [PATCH] fix(core): group body match question mark (#2017) --- packages/core/src/utils/variantGroup.ts | 2 +- test/variant-group.test.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/core/src/utils/variantGroup.ts b/packages/core/src/utils/variantGroup.ts index 056d9b3447..9a37823781 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 ab93a47297..20c6e86bab 100644 --- a/test/variant-group.test.ts +++ b/test/variant-group.test.ts @@ -52,4 +52,8 @@ describe('variant-group', () => { 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') }) + + test('inlucde ?', async () => { + expect(expandVariantGroup('a:(b?c d)')).toEqual('a:b?c a:d') + }) })