Fixed icon parser issue when named slots were considered as icons

vuelessjs · Jan 9, 2025 · 88278c7 · 88278c7
1 parent 6f35f83
commit 88278c7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/src/assets/icons/vueless/edit.svg b/src/assets/icons/vueless/edit.svg
diff --git a/src/assets/icons/vueless/expand.svg b/src/assets/icons/vueless/expand.svg
diff --git a/src/assets/icons/vueless/label.svg b/src/assets/icons/vueless/label.svg
diff --git a/src/assets/icons/vueless/title.svg b/src/assets/icons/vueless/title.svg
diff --git a/src/utils/node/loaderIcon.js b/src/utils/node/loaderIcon.js
@@ -177,13 +177,14 @@ async function findAndCopyIcons(files) {
     }
 
     /* Vueless components props */
-    const uComponentIconNamePattern = `\\b\\w*(name|icon)\\w*\\s*=\\s*(['"])(.*?)\\2`;
+    const iconPropsPattern = `\\b\\w*(name|icon)\\w*\\s*=\\s*(['"])(.*?)\\2`;
+    const uComponentIconNamePattern = /<U\w+\s+.*?\b\w*(name|icon)\w*\s*[:=]\s*(['"])(.*?)\2.*?>/;
     const uComponentIconNameArray = fileContents.match(new RegExp(uComponentIconNamePattern, "g"));
 
     if (!uComponentIconNameArray) return;
 
     for (const match of uComponentIconNameArray) {
-      const groupMatch = match.match(new RegExp(uComponentIconNamePattern));
+      const groupMatch = match.match(new RegExp(iconPropsPattern));
       const iconName = groupMatch ? groupMatch[3] : null;
 
       try {