From f660cfa641825800d11fa005bbdb93d947a3748a Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 20 Jul 2022 10:29:03 +0800 Subject: [PATCH] fix(variant-group): filter spaces, close #828 --- packages/core/src/utils/variantGroup.ts | 1 + test/__snapshots__/transformer-variant-group.test.ts.snap | 2 +- test/variant-group.test.ts | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/core/src/utils/variantGroup.ts b/packages/core/src/utils/variantGroup.ts index 1b95b45aae..3669722524 100644 --- a/packages/core/src/utils/variantGroup.ts +++ b/packages/core/src/utils/variantGroup.ts @@ -17,6 +17,7 @@ export function expandVariantGroup(str: string | MagicString, seperators: ('-' | return from return body .split(/\s/g) + .filter(Boolean) .map(i => i === '~' ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)) .join(' ') }, diff --git a/test/__snapshots__/transformer-variant-group.test.ts.snap b/test/__snapshots__/transformer-variant-group.test.ts.snap index 616ab7bdbd..8285c27402 100644 --- a/test/__snapshots__/transformer-variant-group.test.ts.snap +++ b/test/__snapshots__/transformer-variant-group.test.ts.snap @@ -11,7 +11,7 @@ exports[`transformer-variant-group > basic > "dark:lg:(p-1 p-2)" 1`] = `"dark:lg exports[`transformer-variant-group > basic > "hover:( !m-2 p-2 -)" 1`] = `"hover: !hover:m-2 hover: hover:p-2 hover:"`; +)" 1`] = `"!hover:m-2 hover:p-2"`; exports[`transformer-variant-group > basic > "hover:(!m-2 p-2)" 1`] = `"!hover:m-2 hover:p-2"`; diff --git a/test/variant-group.test.ts b/test/variant-group.test.ts index c0975fc476..56c1717d16 100644 --- a/test/variant-group.test.ts +++ b/test/variant-group.test.ts @@ -24,4 +24,8 @@ describe('variant-group', () => { test('nested', () => { expect(expandVariantGroup('a-(b c-(d e f))')).toEqual('a-b a-c-d a-c-e a-c-f') }) + + test('spaces', () => { + expect(expandVariantGroup('a-( ~ b c )')).toEqual('a a-b a-c') + }) })