@divriots/jampack 0.9.3 → 0.10.0

package/README.md

@@ -68,6 +68,7 @@ For more options see [CLI options](https://jampack.divriots.com/cli-options).
 - [bayjs.org](https://bayjs.org/)
 - [qwind.pages.dev](https://qwind.pages.dev/)
 - [Bloycey's Blog](https://bloycey.blog/)
+- [codenanshu.in](https://codenanshu.in/)
   
 > Add yours here
 

package/dist/compressors/images.d.ts

@@ -3,7 +3,7 @@ import sharp from 'sharp';
 import { MimeType } from 'file-type';
 export type ImageMimeType = MimeType | 'image/svg+xml';
 export declare const AllImageFormat: string[];
-export type ImageFormat = typeof AllImageFormat[number] | undefined;
+export type ImageFormat = (typeof AllImageFormat)[number] | undefined;
 export type Image = {
     format: ImageFormat;
     data: Buffer;

package/dist/compressors/images.js

@@ -30,24 +30,26 @@ export async function compressImage(data, options) {
     let outputFormat;
     // Special case for svg
     if (meta.format === 'svg') {
-        const newData = svgo(data, {
-            multipass: true,
-            plugins: [
-                {
-                    name: 'preset-default',
-                    params: {
-                        overrides: {
-                            removeViewBox: false,
+        try {
+            const output = svgo(data.toString(), {
+                multipass: true,
+                plugins: [
+                    {
+                        name: 'preset-default',
+                        params: {
+                            overrides: {
+                                removeViewBox: false,
+                            },
                         },
                     },
-                },
-            ],
-        });
-        if (newData.error || newData.modernError) {
-            console.log(`Error processing svg ${data}`);
+                ],
+            });
+            return { format: 'svg', data: Buffer.from(output.data, 'utf8') };
+        }
+        catch (e) {
+            // In case of any issue with svg compression:
             return undefined;
         }
-        return { format: 'svg', data: Buffer.from(newData.data, 'utf8') };
     }
     // TODO
     // Use information of input image to the destination format

package/dist/config-default.d.ts

@@ -0,0 +1,3 @@
+import { Options } from './config-types.js';
+declare const default_options: Options;
+export default default_options;

package/dist/config-default.js

@@ -0,0 +1,31 @@
+const default_options = {
+    image: {
+        embed_size: 1500,
+        srcset_min_width: 640,
+        compress: true,
+        jpeg: {
+            options: {
+                quality: 75,
+                mozjpeg: true,
+            },
+        },
+        png: {
+            options: {
+                compressionLevel: 9,
+            },
+        },
+        webp: {
+            options_lossless: {
+                effort: 4,
+                quality: 77,
+                mode: 'lossless',
+            },
+            options_lossly: {
+                effort: 4,
+                quality: 77,
+                mode: 'lossly',
+            },
+        },
+    },
+};
+export default default_options;

package/dist/config-fast.d.ts

@@ -0,0 +1,2 @@
+declare const fast_options_override: any;
+export default fast_options_override;

package/dist/config-fast.js

@@ -0,0 +1,26 @@
+const fast_options_override = {
+    image: {
+        embed_size: 0,
+        srcset_min_width: 16000,
+        compress: false,
+        jpeg: {
+            options: {
+                mozjpeg: false,
+            },
+        },
+        png: {
+            options: {
+                compressionLevel: 0,
+            },
+        },
+        webp: {
+            options_lossless: {
+                effort: 0,
+            },
+            options_lossly: {
+                effort: 0,
+            },
+        },
+    },
+};
+export default fast_options_override;

package/dist/config-types.d.ts

@@ -0,0 +1,27 @@
+export type WebpOptions = {
+    effort: number;
+    mode: 'lossless' | 'lossly';
+    quality: number;
+};
+export type Options = {
+    image: {
+        embed_size: number;
+        srcset_min_width: number;
+        compress: boolean;
+        jpeg: {
+            options: {
+                quality: number;
+                mozjpeg: boolean;
+            };
+        };
+        png: {
+            options: {
+                compressionLevel: number;
+            };
+        };
+        webp: {
+            options_lossless: WebpOptions;
+            options_lossly: WebpOptions;
+        };
+    };
+};

package/dist/config-types.js

@@ -0,0 +1 @@
+export {};

package/dist/config.d.ts

@@ -1,30 +1,4 @@
-export type WebpOptions = {
-    effort: number;
-    mode: 'lossless' | 'lossly';
-    quality: number;
-};
-export type Options = {
-    image: {
-        embed_size: number;
-        srcset_min_width: number;
-        compress: boolean;
-        jpeg: {
-            options: {
-                quality: number;
-                mozjpeg: boolean;
-            };
-        };
-        png: {
-            options: {
-                compressionLevel: number;
-            };
-        };
-        webp: {
-            options_lossless: WebpOptions;
-            options_lossly: WebpOptions;
-        };
-    };
-};
-declare const default_options: Options;
+declare const options: import("./config-types.js").Options;
 export declare function fast(): void;
-export default default_options;
+export declare function loadConfig(): Promise<void>;
+export default options;

package/dist/config.js

@@ -1,59 +1,18 @@
-const default_options = {
-    image: {
-        embed_size: 1500,
-        srcset_min_width: 640,
-        compress: true,
-        jpeg: {
-            options: {
-                quality: 75,
-                mozjpeg: true,
-            },
-        },
-        png: {
-            options: {
-                compressionLevel: 9,
-            },
-        },
-        webp: {
-            options_lossless: {
-                effort: 4,
-                quality: 77,
-                mode: 'lossless',
-            },
-            options_lossly: {
-                effort: 4,
-                quality: 77,
-                mode: 'lossly',
-            },
-        },
-    },
-};
-const fast_options_override = {
-    image: {
-        embed_size: 0,
-        srcset_min_width: 16000,
-        compress: false,
-        jpeg: {
-            options: {
-                mozjpeg: false,
-            },
-        },
-        png: {
-            options: {
-                compressionLevel: 0,
-            },
-        },
-        webp: {
-            options_lossless: {
-                effort: 0,
-            },
-            options_lossly: {
-                effort: 0,
-            },
-        },
-    },
-};
+// @ts-ignore
+import load from '@proload/core';
+import deepmerge from 'deepmerge';
+import default_options from './config-default.js';
+import fast_options_override from './config-fast.js';
+const options = default_options;
 export function fast() {
-    Object.assign(default_options, fast_options_override);
+    deepmerge(options, fast_options_override);
 }
-export default default_options;
+export async function loadConfig() {
+    const proload = await load('jampack', { mustExist: false });
+    if (proload) {
+        console.log('Overriding default config with:');
+        console.log(JSON.stringify(proload.value, null, 2));
+        deepmerge(options, proload.value);
+    }
+}
+export default options;

package/dist/index.js

@@ -5,7 +5,7 @@ import { optimize } from './optimize.js';
 import $state from './state.js';
 import { table } from 'table';
 import { formatBytes } from './utils.js';
-import { fast } from './config.js';
+import { fast, loadConfig } from './config.js';
 import { printTitle } from './logger.js';
 import { exit } from 'process';
 import kleur from 'kleur';
@@ -41,7 +41,9 @@ program
     .action(async (dir, options) => {
     $state.dir = dir;
     $state.args = options;
-    // Override config with fast options
+    // Override default config with config file
+    await loadConfig();
+    // Override config with fast options if set
     if (options.fast) {
         fast();
     }

package/dist/optimize.js

@@ -227,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.3",
+  "version": "0.10.0",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {
@@ -16,40 +16,39 @@
     "/dist"
   ],
   "dependencies": {
-    "@swc/core": "^1.3.30",
+    "@proload/core": "^0.3.3",
+    "@swc/core": "^1.3.57",
     "@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",
+    "@types/sharp": "^0.32.0",
+    "@types/svgo": "^3.0.0",
     "cheerio": "0.22.0",
-    "commander": "^9.4.1",
+    "commander": "^10.0.1",
     "csso": "^5.0.5",
-    "file-type": "^18.0.0",
-    "globby": "^13.1.3",
+    "deepmerge": "^4.3.1",
+    "file-type": "^18.4.0",
+    "globby": "^13.1.4",
     "hasha": "^5.2.2",
-    "html-minifier-terser": "^7.1.0",
+    "html-minifier-terser": "^7.2.0",
     "kleur": "^4.1.5",
-    "lightningcss": "^1.18.0",
+    "lightningcss": "^1.20.0",
     "mini-svg-data-uri": "^1.4.4",
-    "ora": "^6.1.2",
-    "sharp": "^0.31.3",
-    "svgo": "^2.8.0",
+    "ora": "^6.3.0",
+    "sharp": "^0.32.1",
+    "svgo": "^3.0.2",
     "table": "^6.8.1"
   },
   "devDependencies": {
-    "@types/node": "^16.11.59",
+    "@types/node": "^16.18.28",
     "shx": "^0.3.3",
     "ts-node": "^10.2.1",
-    "tslib": "^2.4.1",
-    "typescript": "^4.9.4"
+    "tslib": "^2.5.0",
+    "typescript": "^5.0.4"
   },
   "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"
   },