Merge pull request #12 from KyleSmith0905/fix-apple-icons-classifying…

…-as-icon
harlan-zw · Nov 1, 2023 · cf3fe90 · cf3fe90
2 parents ee2e2e8 + 11efc18
commit cf3fe90
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/features/generateTagsFromPublicFiles.ts b/src/features/generateTagsFromPublicFiles.ts
@@ -28,10 +28,16 @@ export default async function generateTagsFromPublicFiles(nuxt: Nuxt = useNuxt()
         sizes: 'any',
       })
     }
+
+    const isIcon = (file: string) => file.includes('icon') && !file.endsWith('.ico');
+    const isAppleIcon = (file: string) => (
+      !isIcon(file) && (file.startsWith('apple-icon.') || file.startsWith('apple-touch-icon.'))
+    );
+
     headConfig.link.push(
       ...await Promise.all([
         ...rootPublicFiles
-          .filter(file => file.includes('icon') && !file.endsWith('.ico'))
+          .filter(file => isIcon(file))
           .sort()
           .map(async (iconFile) => {
             const iconFileExt = iconFile.split('.').pop()
@@ -43,7 +49,8 @@ export default async function generateTagsFromPublicFiles(nuxt: Nuxt = useNuxt()
               sizes,
             }
           }),
-        ...rootPublicFiles.filter(file => file.startsWith('apple-icon.') || file.startsWith('apple-touch-icon.'))
+        ...rootPublicFiles
+          .filter(file => isAppleIcon(file))
           .sort()
           .map(async (appleIconFile) => {
             const appleIconFileExt = appleIconFile.split('.').pop()