@divriots/jampack 0.23.2 → 0.23.4

package/README.md

@@ -219,19 +219,14 @@ For more options see [CLI options](https://jampack.divriots.com/cli-options/).
 
 ## `jampack` used in the wild
 
-- [divRIOTS.com](https://divRIOTS.com)
-- [Backlight.dev](https://backlight.dev)
-- [story.to.design](https://story.to.design)
-- [html.to.design](https://html.to.design/docs)
-- [WebComponents.dev](https://WebComponents.dev)
-- [LWC.studio](https://lwc.studio)
-- [Components.studio](https://components.studio)
+- Powering all [‹div›RIOTS](https://divRIOTS.com)' websites
 - [keycloak.ch](https://keycloak.ch)
 - [bayjs.org](https://bayjs.org/)
 - [qwind.pages.dev](https://qwind.pages.dev/)
 - [Bloycey's Blog](https://bloycey.blog/)
 - [gxanshu.in](https://gxanshu.in/)
-  
+- [cloudcannon.com](https://cloudcannon.com)
+- [groupsync.app](https://groupsync.app)
 > Add yours here
 
 ## Why is it called `jampack`?

package/dist/config-default.js

@@ -53,6 +53,7 @@ const default_options = {
         },
         svg: {
             optimization: true,
+            add_width_and_height: false,
         },
     },
     misc: {

package/dist/config-types.d.ts

@@ -1,3 +1,4 @@
+import type { UrlTransformer } from 'unpic';
 export type WebpOptions = {
     effort: number;
     mode: 'lossless' | 'lossly';
@@ -32,6 +33,7 @@ export type Options = {
             process: 'off' | 'optimize';
             src_include: RegExp;
             src_exclude: RegExp | null;
+            transformer?: UrlTransformer;
         };
         compress: boolean;
         jpeg: {
@@ -51,6 +53,7 @@ export type Options = {
         };
         svg: {
             optimization: boolean;
+            add_width_and_height: boolean;
         };
     };
     misc: {

package/dist/optimize.js

@@ -275,10 +275,13 @@ async function processImage(htmlfile, img, isAboveTheFold) {
             case 'off':
                 break;
             case 'optimize':
-                const canonical = getCanonicalCdnForUrl(attrib_src);
-                if (!canonical)
-                    break;
-                const cdnTransformer = getTransformer(canonical.cdn);
+                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))
@@ -647,6 +650,10 @@ async function setImageSize(htmlfile, img, image) {
     let height = img.attr('height');
     let width_new = undefined;
     let height_new = undefined;
+    const img_fmt = await image.getExt();
+    if (img_fmt === 'svg' && !config.image.svg.add_width_and_height) {
+        return [];
+    }
     // Check valid values
     if (width !== undefined) {
         if (!isNumeric(width)) {
@@ -693,7 +700,7 @@ async function setImageSize(htmlfile, img, image) {
     }
     else {
         // No width or height provided - set both to image size
-        if ((await image.getExt()) === 'svg') {
+        if (img_fmt === 'svg') {
             // svg with no height and width has special sizing by browsers
             // They size it inside 300x150 unless they have width and height
             // attributes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.23.2",
+  "version": "0.23.4",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -58,17 +58,18 @@
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"
   },
-  "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"
+}