fix: 🐛 splitVariantGroups does not handle all edge-cases

windicss · Feb 28, 2022 · 492442a · 492442a
1 parent e96e8e5
commit 492442a
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -47,13 +47,11 @@ const styles: {
 }
 
 function splitVariantGroups(content: string) {
-  return content.replace(
-    /([\w!][\w/:-]*?):\(([\s\w/-]*)\)/g,
-    (_, groupOne: string, groupTwo: string) =>
-      groupTwo
-        .split(/\s/g)
-        .map((cssClass) => `${groupOne}:${cssClass}`)
-        .join(' ')
+  return content.replace(/(\w+):\(([\s\w/<:!-]+)\)/g, (_, groupOne: string, groupTwo: string) =>
+    groupTwo
+      .split(/\s/g)
+      .map((cssClass) => `${groupOne}:${cssClass}`)
+      .join(' ')
   )
 }
 
@@ -123,6 +121,7 @@ function extractStyles(): PreprocessorGroup {
   return {
     async markup({ content, filename }): Promise<Processed> {
       if (!filename) return { code: content }
+      content = splitVariantGroups(content)
       if (initialFileName.length === 0) initialFileName = filename
       content = addStyleTag(content)
       content = content.replace(/global:/gi, '')