@divriots/jampack 0.14.0 → 0.15.0

package/dist/compressors/images.js

@@ -19,8 +19,6 @@ export async function compressImage(data, options) {
     }
     // Load modifiable toFormat
     let toFormat = options.toFormat || 'unchanged';
-    if (!config.image.compress)
-        return undefined;
     let sharpFile = await sharp(data, { animated: true });
     const meta = await sharpFile.metadata();
     if (meta.pages && meta.pages > 1) {
@@ -30,6 +28,8 @@ export async function compressImage(data, options) {
     let outputFormat;
     // Special case for svg
     if (meta.format === 'svg') {
+        if (!config.image.svg.optimization)
+            return undefined;
         try {
             const output = svgo(data.toString(), {
                 multipass: true,

package/dist/config-default.js

@@ -36,6 +36,9 @@ const default_options = {
                 mode: 'lossly',
             },
         },
+        svg: {
+            optimization: true,
+        },
     },
 };
 export default default_options;

package/dist/config-fast.js

@@ -21,6 +21,9 @@ const fast_options_override = {
                 effort: 0,
             },
         },
+        svg: {
+            optimization: false,
+        },
     },
 };
 export default fast_options_override;

package/dist/config-types.d.ts

@@ -33,5 +33,8 @@ export type Options = {
             options_lossless: WebpOptions;
             options_lossly: WebpOptions;
         };
+        svg: {
+            optimization: boolean;
+        };
     };
 };

package/dist/config.js

@@ -10,7 +10,7 @@ export function fast() {
 export async function loadConfig() {
     const proload = await load('jampack', { mustExist: false });
     if (proload) {
-        console.log('Overriding default config with:');
+        console.log('Merging default config with:');
         console.log(JSON.stringify(proload.value, null, 2));
         Object.assign(options, deepmerge(options, proload.value));
     }

package/dist/optimize.js

@@ -252,10 +252,12 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
                 ? 'unchanged'
                 : 'webp';
     }
-    newImage = await compressImage(await originalImage.getData(), {
-        toFormat: srcToFormat,
-        resize: { width: config.image.srcset_max_width },
-    });
+    if (config.image.compress) {
+        newImage = await compressImage(await originalImage.getData(), {
+            toFormat: srcToFormat,
+            resize: { width: config.image.srcset_max_width },
+        });
+    }
     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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -22,29 +22,29 @@
   "dependencies": {
     "@divriots/cheerio": "1.0.0-rc.12",
     "@proload/core": "^0.3.3",
-    "@swc/core": "^1.3.57",
+    "@swc/core": "^1.3.80",
     "commander": "^10.0.1",
     "deepmerge": "^4.3.1",
-    "file-type": "^18.4.0",
-    "globby": "^13.1.4",
+    "file-type": "^18.5.0",
+    "globby": "^13.2.2",
     "hasha": "^5.2.2",
     "html-minifier-terser": "^7.2.0",
     "kleur": "^4.1.5",
-    "lightningcss": "^1.20.0",
+    "lightningcss": "^1.21.5",
     "mini-svg-data-uri": "^1.4.4",
-    "ora": "^6.3.0",
+    "ora": "^7.0.1",
     "sharp": "^0.32.5",
     "svgo": "^3.0.2",
     "table": "^6.8.1",
-    "undici": "^5.22.1"
+    "undici": "^5.23.0"
   },
   "devDependencies": {
     "@types/html-minifier-terser": "^7.0.0",
-    "@types/node": "^16.18.28",
+    "@types/node": "^20.5.7",
     "shx": "^0.3.3",
     "ts-node": "^10.2.1",
-    "tslib": "^2.5.0",
-    "typescript": "^5.0.4"
+    "tslib": "^2.6.2",
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "watch": "pnpm build --watch",