@divriots/jampack 0.9.0 → 0.9.2

package/dist/cache.js

@@ -26,7 +26,7 @@ async function cleanCache(full) {
     // Delete old cache versions
     await files
         .filter((f) => f !== VERSION)
-        .forEach(async (f) => fs.rmdir(path.join(CACHE_FOLDER, f), {}));
+        .forEach(async (f) => fs.rm(path.join(CACHE_FOLDER, f), { recursive: true }));
 }
 function computeCacheHash(buffer, options) {
     if ($state.args.nocache) {

package/dist/optimize.js

@@ -28,7 +28,7 @@ async function analyse(file) {
     const spinnerImg = ora({ prefixText: ' ' }).start();
     for (let i = 0; i < imgsArray.length; i++) {
         const imgElement = imgsArray[i];
-        spinnerImg.text = kleur.dim(`<img> [${i + 1}/${imgsArray.length}] ${$(imgElement).attr('src')} `);
+        spinnerImg.text = kleur.dim(`<img> [${i + 1}/${imgsArray.length}] ${$(imgElement).attr('src')}`);
         const isAboveTheFold = imgElement.startIndex < theFold;
         try {
             await processImage(file, $, imgElement, isAboveTheFold);
@@ -43,6 +43,30 @@ async function analyse(file) {
     }
     // Reset spinner
     spinnerImg.text = kleur.dim(`<img> [${imgsArray.length}/${imgsArray.length}]`);
+    const iframes = $('iframe');
+    const iframesArray = [];
+    iframes.each(async (index, ifElement) => {
+        iframesArray.push(ifElement);
+    });
+    // Process iframes sequentially
+    const spinnerIframe = ora({ prefixText: ' ' }).start();
+    for (let i = 0; i < iframesArray.length; i++) {
+        const ifElement = iframesArray[i];
+        spinnerIframe.text = kleur.dim(`<iframe> [${i + 1}/${iframesArray.length}] ${$(ifElement).attr('src')}`);
+        const isAboveTheFold = ifElement.startIndex < theFold;
+        try {
+            await processIframe(file, $, ifElement, isAboveTheFold);
+        }
+        catch (e) {
+            $state.reportIssue(file, {
+                type: 'erro',
+                msg: e.message ||
+                    `Unexpected error while processing image: ${JSON.stringify(e)}`,
+            });
+        }
+    }
+    // Reset spinner
+    spinnerIframe.text = kleur.dim(`<iframe> [${imgsArray.length}/${imgsArray.length}]`);
     // Notify issues
     const issues = $state.issues.get(file);
     if (issues) {
@@ -249,9 +273,8 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
      * Only above the fold
      */
     let isEmbed = false;
-    let imageToEmbed;
     if (isAboveTheFold) {
-        imageToEmbed = newImage;
+        let imageToEmbed = newImage;
         // If new image was not generated then take the old image
         if (!imageToEmbed) {
             imageToEmbed = {
@@ -287,7 +310,7 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
             }
         }
     }
-    if (isEmbed && (imageToEmbed === null || imageToEmbed === void 0 ? void 0 : imageToEmbed.format) === 'svg') {
+    if (isEmbed && (await originalImage.getExt()) === 'svg') {
         // SVG has a different behaviour with image size
         // Needs to be tested more
         // For the moment skip image size for SVG
@@ -573,6 +596,12 @@ async function setImageSize(htmlfile, img, image) {
     // Something when wrong
     throw new Error(`Unexpected issue when resolving image size "${image.src}"`);
 }
+async function processIframe(htmlfile, $, imgElement, isAboveTheFold) {
+    const iframe = $(imgElement);
+    if (!isAboveTheFold) {
+        iframe.attr('loading', 'lazy');
+    }
+}
 export async function optimize(include, exclude) {
     const glob = include ? [include] : ['**/*.{htm,html}'];
     if (exclude)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {