From 231bfa6ff31a2a7db0995367570ebbfe550eeffe Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 12 Jul 2022 12:23:34 +0800 Subject: [PATCH] fix(compile-class): fix conflicting with `variant-group` --- packages/transformer-compile-class/src/index.ts | 6 +++--- playground/unocss.config.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/transformer-compile-class/src/index.ts b/packages/transformer-compile-class/src/index.ts index 08df88f1e5..a404e05927 100644 --- a/packages/transformer-compile-class/src/index.ts +++ b/packages/transformer-compile-class/src/index.ts @@ -1,5 +1,5 @@ import type { SourceCodeTransformer } from '@unocss/core' -import { escapeRegExp } from '@unocss/core' +import { escapeRegExp, expandVariantGroup } from '@unocss/core' export interface CompileClassOptions { /** @@ -43,14 +43,14 @@ export default function transformerCompileClass(options: CompileClassOptions = { return { name: 'compile-class', - enforce: 'pre', + enforce: 'post', async transform(s, _, { uno }) { const matches = [...s.original.matchAll(regex)] if (!matches.length) return for (const match of matches) { - let body = match[2].trim() + let body = expandVariantGroup(match[2].trim()) const start = match.index! const replacements = [] if (keepUnknown) { diff --git a/playground/unocss.config.ts b/playground/unocss.config.ts index 44e7fdf934..dd8b2b1cdd 100644 --- a/playground/unocss.config.ts +++ b/playground/unocss.config.ts @@ -21,8 +21,8 @@ export default defineConfig({ presetIcons(), ], transformers: [ + transformerCompileClass(), transformerVariantGroup(), transformerDirectives(), - transformerCompileClass(), ], })