@divriots/jampack 0.33.0 → 0.34.0

package/dist/config-default.js

@@ -3,7 +3,6 @@ const default_options = {
         browserslist: 'defaults', // defaults = '> 0.5%, last 2 versions, Firefox ESR, not dead'
     },
     html: {
-        add_css_reset_as: 'off',
         sort_attributes: false,
     },
     css: {

package/dist/config-types.d.ts

@@ -9,7 +9,6 @@ export type Options = {
         browserslist: string;
     };
     html: {
-        add_css_reset_as: 'inline' | 'off';
         sort_attributes: boolean;
     };
     js: {

package/dist/optimize.js

@@ -53,9 +53,8 @@ async function analyse(state, file) {
     const charsetElements$ = heads.find('meta[charset]');
     const wasCharsetFirst = !charsetElements$.prev().length;
     const { options } = state;
-    if (options.html.add_css_reset_as === 'inline') {
-        prependToHead += `<style>:where(img){height:auto;}</style>`;
-    }
+    // Add a CSS reset for images that have been sized by jampack
+    prependToHead += `<style>:where(img[jampack-sized]){max-width:100%;height:auto;}</style>`;
     if (prependToHead || appendToHead) {
         if (prependToHead)
             heads.prepend(prependToHead);
@@ -795,6 +794,7 @@ async function setImageSize(state, htmlfile, img, image) {
         const result_h = Math.round(height_new);
         img.attr('width', result_w.toFixed(0));
         img.attr('height', result_h.toFixed(0));
+        img.attr('jampack-sized', 'true');
         return [result_w, result_h];
     }
     // Something when wrong

package/dist/optimizers/process-iframe.js

@@ -1,9 +1,8 @@
 import { install_lozad } from '../utils/install-dep.js';
 export async function processIframe(state, htmlfile, iframe, isAboveTheFold, appendToBody) {
-    // Reset loading attribute
-    iframe.removeAttr('loading');
     const lazyloadOptions = state.options.iframe.lazyload;
-    if (lazyloadOptions.when === 'never') {
+    if (lazyloadOptions.when === 'never' || iframe.attr('loading') === 'eager') {
+        // If lazy loading is set to 'never' or 'eager', do not modify the iframe
         return;
     }
     if (lazyloadOptions.when === 'always' ||

package/dist/utils/resource.js

@@ -108,7 +108,8 @@ export class Resource {
         if (!u.pathname) {
             throw new Error(`Invalid src format "${src}"`);
         }
-        const relativePath = path.join(state.dir, src.startsWith('/') ? '' : path.dirname(relativeFile), u.pathname);
+        const pathname = decodeURIComponent(u.pathname);
+        const relativePath = path.join(state.dir, src.startsWith('/') ? '' : path.dirname(relativeFile), pathname);
         let absolutePath = path.resolve(relativePath);
         if (await fileExists(state, absolutePath)) {
             return new Resource(state, src, absolutePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -60,17 +60,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"
 }