@divriots/jampack 0.24.2 → 0.24.4

package/dist/config-default.js

@@ -17,6 +17,8 @@ const default_options = {
         srcset_min_width: 390 * 2, // HiDPI phone
         srcset_max_width: 1920 * 2, // 4K
         max_width: 99999,
+        src_include: /^.*$/,
+        src_exclude: /^\/vercel\/image\?/, // Ignore /vervel/image? URLs because not local and most likely already optimized,
         external: {
             process: 'off',
             src_include: /^.*$/,
@@ -24,7 +26,7 @@ const default_options = {
         },
         cdn: {
             process: 'off',
-            src_include: /^.*$/,
+            src_include: null,
             src_exclude: null,
         },
         compress: true,

package/dist/config-types.d.ts

@@ -24,6 +24,8 @@ export type Options = {
         srcset_min_width: number;
         srcset_max_width: number;
         max_width: number;
+        src_include: RegExp;
+        src_exclude: RegExp | null;
         external: {
             process: 'off' | 'download';
             src_include: RegExp;
@@ -31,7 +33,7 @@ export type Options = {
         };
         cdn: {
             process: 'off' | 'optimize';
-            src_include: RegExp;
+            src_include: RegExp | null;
             src_exclude: RegExp | null;
             transformer?: UrlTransformer;
         };

package/dist/index.js

@@ -65,7 +65,7 @@ program
         mkdirSync(join(dir, '_jampack'));
     }
     catch (e) {
-        console.error('Failed to create `_jampack` folder.');
+        console.error('Folder `_jampack` is present in target folder. This means that jampack has already processed this folder. You should always run jampack on clean build of the static website.');
         exit(1);
     }
     // Inject config into modules

package/dist/optimize.js

@@ -220,6 +220,10 @@ async function processImage(htmlfile, img, isAboveTheFold) {
         });
         return;
     }
+    if (!isIncluded(attrib_src, config.image.src_include, config.image.src_exclude)) {
+        // Setup to ignore
+        return;
+    }
     /*
      * Attribute 'alt'
      */
@@ -270,48 +274,51 @@ async function processImage(htmlfile, img, isAboveTheFold) {
     /*
      * Check for external images
      */
-    if (!isLocal(attrib_src)) {
-        switch (config.image.cdn.process) {
-            case 'off':
-                break;
-            case 'optimize':
-                let cdnTransformer = config.image.cdn.transformer;
-                if (!cdnTransformer) {
-                    const canonical = getCanonicalCdnForUrl(attrib_src);
-                    if (!canonical)
-                        break;
-                    cdnTransformer = getTransformer(canonical.cdn);
-                }
-                if (!cdnTransformer)
-                    break;
-                if (!isIncluded(attrib_src, config.image.cdn.src_include, config.image.cdn.src_exclude))
+    switch (config.image.cdn.process) {
+        case 'off':
+            break;
+        case 'optimize':
+            let cdnTransformer = config.image.cdn.transformer;
+            if (cdnTransformer && !config.image.cdn.src_include) {
+                throw new Error('config.image.cdn.src_include is required when specifying a config.image.cdn.transformer');
+            }
+            if (!cdnTransformer) {
+                const canonical = getCanonicalCdnForUrl(attrib_src);
+                if (!canonical)
                     break;
-                let attrib_width = getIntAttr(img, 'width');
-                if (!attrib_width) {
-                    $state.reportIssue(htmlfile, {
-                        type: 'warn',
-                        msg: `Missing or malformed'width' attribute for image ${attrib_src}, unable to perform CDN transform`,
-                    });
-                    return;
-                }
-                let attrib_height = getIntAttr(img, 'height');
-                if (!attrib_height) {
-                    $state.reportIssue(htmlfile, {
-                        type: 'warn',
-                        msg: `Missing or malformed 'height' attribute for image ${attrib_src}, unable to perform CDN transform`,
-                    });
-                    return;
-                }
-                const new_srcset = await generateSrcSetForCdn(attrib_src, cdnTransformer, attrib_width, attrib_height);
-                if (new_srcset !== null) {
-                    img.attr('srcset', new_srcset);
-                }
-                // Add sizes attribute if not specified
-                if (img.attr('srcset') && !img.attr('sizes')) {
-                    img.attr('sizes', '100vw');
-                }
+                cdnTransformer = getTransformer(canonical.cdn);
+            }
+            if (!cdnTransformer)
+                break;
+            if (!isIncluded(attrib_src, config.image.cdn.src_include || /.*/, config.image.cdn.src_exclude))
+                break;
+            let attrib_width = getIntAttr(img, 'width');
+            if (!attrib_width) {
+                $state.reportIssue(htmlfile, {
+                    type: 'warn',
+                    msg: `Missing or malformed'width' attribute for image ${attrib_src}, unable to perform CDN transform`,
+                });
                 return;
-        }
+            }
+            let attrib_height = getIntAttr(img, 'height');
+            if (!attrib_height) {
+                $state.reportIssue(htmlfile, {
+                    type: 'warn',
+                    msg: `Missing or malformed 'height' attribute for image ${attrib_src}, unable to perform CDN transform`,
+                });
+                return;
+            }
+            const new_srcset = await generateSrcSetForCdn(attrib_src, cdnTransformer, attrib_width, attrib_height);
+            if (new_srcset !== null) {
+                img.attr('srcset', new_srcset);
+            }
+            // Add sizes attribute if not specified
+            if (img.attr('srcset') && !img.attr('sizes')) {
+                img.attr('sizes', '100vw');
+            }
+            return;
+    }
+    if (!isLocal(attrib_src)) {
         switch (config.image.external.process) {
             case 'off': // Don't process external images
                 return;

package/dist/utils/resource.js

@@ -115,8 +115,6 @@ export class Resource {
     }
 }
 export function isLocal(src) {
-    if (src.startsWith('/cdn_cgi/'))
-        return false;
     const u = url.parse(src);
     return !u.host;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.24.2",
+  "version": "0.24.4",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -58,17 +58,18 @@
     "tslib": "^2.6.2",
     "typescript": "^5.4.5"
   },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "bugs": "https://github.com/divriots/jampack/issues",
-  "keywords": [],
-  "types": "dist/index.d.ts",
   "scripts": {
     "watch": "pnpm build --watch",
     "try": "shx rm -fr demo && cp -R demo_drc demo && node ./dist/index.js ./demo --nocache",
     "build": "shx rm -rf dist && tsc -b",
     "lint": "eslint . --ext .ts --config .eslintrc",
+    "prepublishOnly": "pnpm build",
     "cleanAllDotJampack": "find -s . | grep '.jampack$' | xargs rm -fr"
-  }
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "bugs": "https://github.com/divriots/jampack/issues",
+  "keywords": [],
+  "types": "dist/index.d.ts"
 }