arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-28 19:00:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Also prevents parsing colors already safelisted initially.
This commit is contained in:
Benjamin Canac
2023-06-21 17:03:09 +02:00
parent f719111abb
commit f7e2082983
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/colors.ts
View File

@@ -139,9 +139,10 @@ 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 classes = []
const regex = /<(\w+)\s+[^>:]*color=["']([^"']+)["'][^>]*>/gs const regex = /<(\w+)\s+(?![^>]*:color\b)[^>]*\bcolor=["']([^"']+)["'][^>]*>/gs
const matches = content.matchAll(regex) const matches = content.matchAll(regex)
const components = Object.keys(safelistByComponent).map(component => `${prefix}${component.charAt(0).toUpperCase() + component.slice(1)}`) const components = Object.keys(safelistByComponent).map(component => `${prefix}${component.charAt(0).toUpperCase() + component.slice(1)}`)
@@ -149,7 +150,7 @@ export const customSafelistExtractor = (prefix, content: string, colors: string[
for (const match of matches) { for (const match of matches) {
const [, component, color] = match const [, component, color] = match
if (!colors.includes(color)) { if (!colors.includes(color) || safelistColors.includes(color)) {
continue continue
} }

2
src/module.ts
View File

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