From 88278c71bbbcb6f8ef07ca4a20e0292096b106d7 Mon Sep 17 00:00:00 2001
From: Explicit12 <explicit1@tutanota.com>
Date: Thu, 9 Jan 2025 09:30:48 +0200
Subject: [PATCH] Fixed icon parser issue when named slots were considered as
 icons

---
 src/assets/icons/vueless/edit.svg   | 1 -
 src/assets/icons/vueless/expand.svg | 1 -
 src/assets/icons/vueless/label.svg  | 1 -
 src/assets/icons/vueless/title.svg  | 1 -
 src/utils/node/loaderIcon.js        | 5 +++--
 5 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/assets/icons/vueless/edit.svg
 delete mode 100644 src/assets/icons/vueless/expand.svg
 delete mode 100644 src/assets/icons/vueless/label.svg
 delete mode 100644 src/assets/icons/vueless/title.svg

diff --git a/src/assets/icons/vueless/edit.svg b/src/assets/icons/vueless/edit.svg
deleted file mode 100644
index ad1f8de2..00000000
--- a/src/assets/icons/vueless/edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 -960 960 960"><path d="M181.91-182.15h44.24l459.81-458.81-43.76-44-460.29 459.05v43.76Zm-67.89 68.13V-253.5l574.52-573.76q8.24-8.48 19.81-13.22 11.56-4.74 24.11-4.74 11.47 0 22.95 4.74 11.48 4.74 21.2 12.98l51.89 51.17q9.24 9.72 13.48 21.32t4.24 23.31q0 11.72-4.74 23.7-4.74 11.98-12.98 20.46L253.74-114.02H114.02ZM775.17-732.7l-41.24-41.47 41.24 41.47ZM664.2-663.2l-22-21.76 43.76 44-21.76-22.24Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/vueless/expand.svg b/src/assets/icons/vueless/expand.svg
deleted file mode 100644
index 2be8644d..00000000
--- a/src/assets/icons/vueless/expand.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 -960 960 960"><path d="M154.02-65.65v-68.37h652.2v68.37h-652.2ZM482-174.02 325.46-330.57l46.58-46.82 77.33 77.32v-360.1l-77.33 77.56-46.58-46.82L482-786.22l156.78 156.79-46.82 46.82-77.33-77.56v360.1l77.33-77.32 46.82 46.82L482-174.02Zm-327.98-652.2v-68.13h652.2v68.13h-652.2Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/vueless/label.svg b/src/assets/icons/vueless/label.svg
deleted file mode 100644
index c4cc6491..00000000
--- a/src/assets/icons/vueless/label.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 -960 960 960"><path d="M846.22-480 674.83-237.89q-14.2 19.67-33.86 31.77-19.67 12.1-43.36 12.1H182.15q-28.1 0-48.12-20.01-20.01-20.02-20.01-48.12v-435.7q0-28.2 20.01-48.28 20.02-20.09 48.12-20.09h415.46q23.69 0 43.36 12.34 19.67 12.34 33.86 31.77L846.22-480Zm-85.29 0L608.56-697.85H182.15v435.7h426.46L760.93-480Zm-578.78 0v217.85-435.7V-480Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/vueless/title.svg b/src/assets/icons/vueless/title.svg
deleted file mode 100644
index c2f39d51..00000000
--- a/src/assets/icons/vueless/title.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 -960 960 960"><path d="M425.93-154.02v-544.07H194.02v-108.13h572.2v108.13H534.3v544.07H425.93Z"/></svg>
\ No newline at end of file
diff --git a/src/utils/node/loaderIcon.js b/src/utils/node/loaderIcon.js
index a6ddbe85..20dfc254 100644
--- 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 {