@divriots/jampack 0.1.6 → 0.1.8

package/dist/compress.js

@@ -89,7 +89,18 @@ export const compressImage = async (data, resize) => {
     const meta = await sharpFile.metadata();
     switch (meta.format) {
         case 'svg':
-            const newData = svgo(data, {});
+            const newData = svgo(data, {
+                multipass: true,
+                plugins: [{
+                        name: "preset-default",
+                        params: {
+                            overrides: {
+                                removeViewBox: false,
+                            },
+                        },
+                    }
+                ],
+            });
             if (newData.error || newData.modernError) {
                 console.log(`Error processing svg ${data}`);
                 return undefined;
@@ -100,7 +111,11 @@ export const compressImage = async (data, resize) => {
         case 'jpeg':
         case 'webp':
             //case 'gif':
-            return await sharpFile.resize({ ...resize, fit: 'fill', withoutEnlargement: true }).toBuffer();
+            let sf = sharpFile;
+            if (resize.width && resize.height) {
+                sf = sf.resize({ ...resize, fit: 'fill', withoutEnlargement: true });
+            }
+            return await sf.toBuffer();
     }
     return undefined;
 };

package/dist/optimize.js

@@ -124,14 +124,6 @@ async function processImage(file, $, imgElement) {
             return;
         }
         /*
-        * Attribute 'width' & 'height'
-        */
-        const [w, h] = setImageSize(img, meta);
-        if (w < 0 || h < 0) {
-            console.warn(`Unexpected error in image size calculation - some optimizations can't be done`);
-            return;
-        }
-        /*
         * Compress image
         */
         if (!globalState.compressedFiles.has(absoluteImgPath)) {
@@ -141,7 +133,7 @@ async function processImage(file, $, imgElement) {
                 originalSize: originalData.length,
                 compressedSize: originalData.length
             };
-            const newImage = await compressImage(originalData, { width: w, height: h });
+            const newImage = await compressImage(originalData, {});
             if (newImage && newImage.length < originalData.length) {
                 if (!globalState.args.nowrite) {
                     fs.writeFile(absoluteImgPath, newImage);
@@ -150,11 +142,27 @@ async function processImage(file, $, imgElement) {
             }
             globalState.addFile(result);
         }
+        //
+        // Stop here if svg
+        //
+        if (meta.format === 'svg')
+            return;
+        /*
+         * Attribute 'width' & 'height'
+         */
+        const [w, h] = setImageSize(img, meta);
+        if (w < 0 || h < 0) {
+            console.warn(`Unexpected error in image size calculation - some optimizations can't be done`);
+            return;
+        }
+        /*
+         * Attribute 'srcset'
+         */
         const attr_srcset = img.attr('srcset');
         if (attr_srcset) {
             // If srcset is set, don't touch it.
-            // Just compress files
-            // TODO
+            // The compress pass will compress the images
+            // of the srcset
         }
         else {
             // Generate image set

package/dist/options.js

@@ -1,6 +1,6 @@
 const default_options = {
     image: {
-        embed_size: 0,
+        embed_size: 400,
         srcset_min_width: 400,
         srcset_max_width: 5120
     }

package/package.json

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