fix(module): safelist regex when a : was present before color

Also prevents parsing colors already safelisted initially.
nuxt · Jun 21, 2023 · f7e2082 · f7e2082
1 parent f719111
commit f7e2082
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/colors.ts b/src/colors.ts
@@ -139,17 +139,18 @@ export const generateSafelist = (colors: string[]) => {
   ]
 }
 
-export const customSafelistExtractor = (prefix, content: string, colors: string[]) => {
+export const customSafelistExtractor = (prefix, content: string, colors: string[], safelistColors: string[]) => {
   const classes = []
-  const regex = /<(\w+)\s+[^>:]*color=["']([^"']+)["'][^>]*>/gs
+  const regex = /<(\w+)\s+(?![^>]*:color\b)[^>]*\bcolor=["']([^"']+)["'][^>]*>/gs
+
   const matches = content.matchAll(regex)
 
   const components = Object.keys(safelistByComponent).map(component => `${prefix}${component.charAt(0).toUpperCase() + component.slice(1)}`)
 
   for (const match of matches) {
     const [, component, color] = match
 
-    if (!colors.includes(color)) {
+    if (!colors.includes(color) || safelistColors.includes(color)) {
       continue
     }
 

diff --git a/src/module.ts b/src/module.ts
@@ -156,7 +156,7 @@ export default defineNuxtModule<ModuleOptions>({
             vue: (content) => {
               return [
                 ...defaultExtractor(content),
-                ...customSafelistExtractor(options.prefix, content, nuxt.options.appConfig.ui.colors)
+                ...customSafelistExtractor(options.prefix, content, nuxt.options.appConfig.ui.colors, options.safelistColors)
               ]
             }
           }