@divriots/jampack 0.9.2 → 0.9.4

package/dist/optimize.js

@@ -43,6 +43,15 @@ async function analyse(file) {
     }
     // Reset spinner
     spinnerImg.text = kleur.dim(`<img> [${imgsArray.length}/${imgsArray.length}]`);
+    // Notify issues
+    const issues = $state.issues.get(file);
+    if (issues) {
+        spinnerImg.fail();
+        console.log(kleur.red(`  ${issues.length} issue${issues.length > 1 ? 's' : ''}`));
+    }
+    else {
+        spinnerImg.succeed();
+    }
     const iframes = $('iframe');
     const iframesArray = [];
     iframes.each(async (index, ifElement) => {
@@ -67,15 +76,7 @@ async function analyse(file) {
     }
     // Reset spinner
     spinnerIframe.text = kleur.dim(`<iframe> [${imgsArray.length}/${imgsArray.length}]`);
-    // Notify issues
-    const issues = $state.issues.get(file);
-    if (issues) {
-        spinnerImg.fail();
-        console.log(kleur.red(`  ${issues.length} issue${issues.length > 1 ? 's' : ''}`));
-    }
-    else {
-        spinnerImg.succeed();
-    }
+    spinnerIframe.succeed();
     // Remove the fold
     if (theFold) {
         $('the-fold').remove();
@@ -226,47 +227,39 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
                 ? 'unchanged'
                 : 'webp';
     }
-    if (!$state.optimizedFiles.has(originalImage.filePathAbsolute)) {
-        // Let's avoid to optimize same images twice
-        $state.optimizedFiles.add(originalImage.filePathAbsolute);
-        newImage = await compressImage(await originalImage.getData(), {
-            toFormat: srcToFormat,
-        });
-        if ((newImage === null || newImage === void 0 ? void 0 : newImage.data) &&
-            (newImage.data.length < (await originalImage.getLen()) ||
-                srcToFormat === 'jpeg+progressive') // Progressive override all even if worse
-        ) {
-            // Do we need to add an new extension?
-            const newExtension = `.${newImage.format}`;
-            const additionalExtension = path.extname(originalImage.filePathAbsolute) === newExtension
-                ? ''
-                : newExtension;
-            const newFilename = originalImage.filePathAbsolute + additionalExtension;
-            if (!$state.args.nowrite) {
-                fs.writeFile(newFilename, newImage.data);
-            }
-            // Mark new file as optimized
-            $state.compressedFiles.add(newFilename);
-            // Report compression result
-            $state.reportSummary({
-                action: newFilename !== originalImage.filePathAbsolute
-                    ? `${await originalImage.getExt()}->${newImage.format}`
-                    : path.extname(originalImage.filePathAbsolute),
-                originalSize: await originalImage.getLen(),
-                compressedSize: newImage.data.length,
-            });
-            img.attr('src', attrib_src + additionalExtension);
-        }
-        else {
-            // Drop new Image
-            newImage = undefined;
-            // Report non-compression
-            $state.reportSummary({
-                action: path.extname(originalImage.filePathAbsolute),
-                originalSize: await originalImage.getLen(),
-                compressedSize: await originalImage.getLen(),
-            });
+    newImage = await compressImage(await originalImage.getData(), {
+        toFormat: srcToFormat,
+    });
+    if ((newImage === null || newImage === void 0 ? void 0 : newImage.data) &&
+        (newImage.data.length < (await originalImage.getLen()) ||
+            srcToFormat === 'jpeg+progressive') // Progressive override all even if worse
+    ) {
+        const additionalExtension = `.${newImage.format}`;
+        const newFilename = originalImage.filePathAbsolute + additionalExtension;
+        if (!$state.compressedFiles.has(newFilename) && !$state.args.nowrite) {
+            fs.writeFile(newFilename, newImage.data);
         }
+        // Mark new file as compressed
+        $state.compressedFiles.add(newFilename);
+        // Report compression result
+        $state.reportSummary({
+            action: newFilename !== originalImage.filePathAbsolute
+                ? `${await originalImage.getExt()}->${newImage.format}`
+                : path.extname(originalImage.filePathAbsolute),
+            originalSize: await originalImage.getLen(),
+            compressedSize: newImage.data.length,
+        });
+        img.attr('src', attrib_src + additionalExtension);
+    }
+    else {
+        // Drop new Image
+        newImage = undefined;
+        // Report non-compression
+        $state.reportSummary({
+            action: path.extname(originalImage.filePathAbsolute),
+            originalSize: await originalImage.getLen(),
+            compressedSize: await originalImage.getLen(),
+        });
     }
     /*
      * Embed small images

package/dist/state.d.ts

@@ -21,7 +21,6 @@ export declare class GlobalState {
     dir: string;
     args: Args;
     compressedFiles: Set<string>;
-    optimizedFiles: Set<string>;
     issues: Map<string, Issue[]>;
     summary: Summary;
     summaryByExtension: Record<string, Summary>;

package/dist/state.js

@@ -3,7 +3,6 @@ export class GlobalState {
         this.dir = 'dist';
         this.args = {};
         this.compressedFiles = new Set();
-        this.optimizedFiles = new Set();
         this.issues = new Map();
         this.summary = {
             nbFiles: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {
@@ -18,13 +18,10 @@
   "dependencies": {
     "@swc/core": "^1.3.30",
     "@types/cheerio": "^0.22.31",
-    "@types/commander": "^2.12.2",
     "@types/csso": "^5.0.0",
     "@types/html-minifier-terser": "^7.0.0",
-    "@types/ora": "^3.2.0",
     "@types/sharp": "^0.31.1",
     "@types/svgo": "^2.6.4",
-    "@types/table": "^6.3.2",
     "cheerio": "0.22.0",
     "commander": "^9.4.1",
     "csso": "^5.0.5",
@@ -49,7 +46,7 @@
   },
   "scripts": {
     "watch": "pnpm build --watch",
-    "try": "shx rm -fr demo && cp -R demo_wcd demo && node ./dist/index.js ./demo --nocache --onlyoptim",
+    "try": "shx rm -fr demo && cp -R demo_rf demo && node ./dist/index.js ./demo --nocache --onlyoptim",
     "build": "shx rm -rf dist && tsc -b",
     "lint": "eslint . --ext .ts --config .eslintrc"
   },