@divriots/jampack 0.24.2 → 0.24.3

package/dist/config-default.js

@@ -24,7 +24,7 @@ const default_options = {
         },
         cdn: {
             process: 'off',
-            src_include: /^.*$/,
+            src_include: null,
             src_exclude: null,
         },
         compress: true,

package/dist/config-types.d.ts

@@ -31,7 +31,7 @@ export type Options = {
         };
         cdn: {
             process: 'off' | 'optimize';
-            src_include: RegExp;
+            src_include: RegExp | null;
             src_exclude: RegExp | null;
             transformer?: UrlTransformer;
         };

package/dist/optimize.js

@@ -270,48 +270,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.3",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"