@chialab/esbuild-plugin-html - npm Package Compare versions

Comparing version 0.9.8 to 0.9.10

lib/collectIcons.js

@@ -90,2 +90,70 @@ import { promises } from 'fs';
 /**
+ * @param {string} icon
+ * @param {string} mimeType
+ * @param {string} outputDir
+ * @param {typeof FAVICONS} favicons
+ */
+function generateFavicons(icon, mimeType, outputDir, favicons) {
+    return Promise.all(
+        favicons.map(async ({ name, size }) => {
+            const outputFile = path.join(outputDir, name);
+            const buffer = await generateIcon(icon, size, 0, { r: 255, g: 255, b: 255, a: 1 }, mimeType);
+            await writeFile(outputFile, buffer);
+
+            return {
+                name,
+                size,
+                file: outputFile,
+            };
+        })
+    );
+}
+
+/**
+ * @param {string} icon
+ * @param {string} mimeType
+ * @param {string} outputDir
+ * @param {typeof APPLE_ICONS} icons
+ */
+function generateAppleIcons(icon, mimeType, outputDir, icons) {
+    return Promise.all(
+        icons.map(async ({ name, size, gutter, background }) => {
+            const outputFile = path.join(outputDir, name);
+            const buffer = await generateIcon(icon, size, gutter, background, mimeType);
+            await writeFile(outputFile, buffer);
+            return {
+                name,
+                size,
+                gutter,
+                background,
+                file: outputFile,
+            };
+        })
+    );
+}
+
+/**
+ * @param {string} icon
+ * @param {string} mimeType
+ * @param {string} outputDir
+ * @param {typeof APPLE_LAUNCH_SCREENS} launchScreens
+ */
+function generateAppleLaunchScreens(icon, mimeType, outputDir, launchScreens) {
+    return Promise.all(
+        launchScreens.map(async ({ name, width, height, query }) => {
+            const outputFile = path.join(outputDir, name);
+            const buffer = await generateLaunch(icon, width, height, 0, { r: 255, g: 255, b: 255, a: 1 }, mimeType);
+            await writeFile(outputFile, buffer);
+            return {
+                name,
+                width,
+                height,
+                query,
+                file: outputFile,
+            };
+        })
+    );
+}
+
+/**
  * Collect and bundle favicons.
@@ -140,11 +208,17 @@ * @param {import('cheerio').CheerioAPI} $ The cheerio selector.
                 const iconFile = path.resolve(base, iconHref);
-                for (let i = 0; i < FAVICONS.length; i++) {
-                    const { name, size } = FAVICONS[i];
-                    const outputFile = path.join(iconsDir, name);
-                    const buffer = await generateIcon(iconFile, size, 0, { r: 255, g: 255, b: 255, a: 1 }, mimeType);
-                    await writeFile(outputFile, buffer);
+                const [
+                    favicons,
+                    appleIcons,
+                    appleLaunchScreens,
+                ] = await Promise.all([
+                    generateFavicons(iconFile, mimeType, iconsDir, FAVICONS),
+                    generateAppleIcons(iconFile, mimeType, iconsDir, APPLE_ICONS),
+                    generateAppleLaunchScreens(iconFile, mimeType, iconsDir, APPLE_LAUNCH_SCREENS),
+                ]);
+
+                favicons.forEach(({ size, file }) => {
                     if (size === 196) {
                         const link = $('<link>');
                         link.attr('rel', 'shortcut icon');
-                        link.attr('href', path.relative(outdir, outputFile));
+                        link.attr('href', path.relative(outdir, file));
                         link.insertBefore($(element));
@@ -157,34 +231,26 @@ $(element).before('\n    ');
                     link.attr('sizes', `${size}x${size}`);
-                    link.attr('href', path.relative(outdir, outputFile));
+                    link.attr('href', path.relative(outdir, file));
                     link.insertBefore($(element));
                     $(element).before('\n    ');
-                }
+                });
 
-                for (let i = 0; i < APPLE_ICONS.length; i++) {
-                    const { name, size, gutter, background } = APPLE_ICONS[i];
-                    const outputFile = path.join(iconsDir, name);
-                    const buffer = await generateIcon(iconFile, size, gutter, background, mimeType);
-                    await writeFile(outputFile, buffer);
+                appleIcons.forEach(({ size, file }) => {
                     const link = $('<link>');
                     link.attr('rel', 'apple-touch-icon');
                     link.attr('sizes', `${size}x${size}`);
-                    link.attr('href', path.relative(outdir, outputFile));
+                    link.attr('href', path.relative(outdir, file));
                     link.insertBefore($(element));
                     $(element).before('\n    ');
-                }
+                });
 
-                for (let i = 0; i < APPLE_LAUNCH_SCREENS.length; i++) {
-                    const { name, query, width, height } = APPLE_LAUNCH_SCREENS[i];
-                    const outputFile = path.join(iconsDir, name);
-                    const buffer = await generateLaunch(iconFile, width, height, 0, { r: 255, g: 255, b: 255, a: 1 }, mimeType);
-                    await writeFile(outputFile, buffer);
+                appleLaunchScreens.forEach(({ query, file }, index, arr) => {
                     const link = $('<link>');
                     link.attr('rel', 'apple-touch-startup-image');
                     link.attr('media', query);
-                    link.attr('href', path.relative(outdir, outputFile));
+                    link.attr('href', path.relative(outdir, file));
                     link.insertBefore($(element));
-                    if (i !== APPLE_LAUNCH_SCREENS.length - 1) {
+                    if (index !== arr.length - 1) {
                         $(element).before('\n    ');
                     }
-                }
+                });
 
@@ -191,0 +257,0 @@ $(element).remove();

package.json

 {
   "name": "@chialab/esbuild-plugin-html",
   "type": "module",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "A HTML loader plugin for esbuild.",
@@ -44,3 +44,3 @@ "main": "lib/index.js",
   },
-  "gitHead": "c01ee1b125775e30193da6c7f20541b019cdb6ec"
+  "gitHead": "425dfd18e15e656f05dc839edb8fa9f52b643cd0"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

44955

increased by3.4%

Lines of code

889

increased by7.37%

No dependency changes