@divriots/jampack 0.12.0 → 0.12.2

package/dist/config-types.d.ts

@@ -11,7 +11,7 @@ export type Options = {
         embed_size: number;
         srcset_min_width: number;
         external: {
-            process: 'download' | 'cdn-srcset-when-possible' | 'add-dimensions-only' | 'off';
+            process: 'off' | 'download' | 'cdn-srcset-when-possible' | 'add-dimensions-only';
             src_include: RegExp;
             src_exclude: RegExp | null;
         };

package/dist/index.js

@@ -11,8 +11,6 @@ import { exit } from 'process';
 import kleur from 'kleur';
 import { cleanCache } from './cache.js';
 import { VERSION } from './version.js';
-import { mkdirSync } from 'fs';
-import { join } from 'path';
 const logo = `     __                                    __    
     |__|____    _____ ___________    ____ |  | __
     |  \\__  \\  /     \\\\____ \\__  \\ _/ ___\\|  |/ /
@@ -56,14 +54,6 @@ program
     }
     // Clean cache
     cleanCache(options.cleancache);
-    // Create _jampack folder
-    try {
-        mkdirSync(join($state.dir, '_jampack'));
-    }
-    catch (e) {
-        console.error(e.message);
-        exit(1);
-    }
     if (!options.onlycomp) {
         printTitle('PASS 1 - Optimizing');
         console.time('Done');

package/dist/optimize.js

@@ -194,7 +194,8 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
                 return;
             case 'download': // Download external image for local processing
                 try {
-                    attrib_src = await downloadExternalImage(attrib_src);
+                    const htmlFolder = path.dirname(path.resolve(path.join($state.dir, htmlfile)));
+                    attrib_src = await downloadExternalImage(attrib_src, htmlFolder);
                     img.attr('src', attrib_src);
                 }
                 catch (e) {

package/dist/optimizers/img-external.d.ts

@@ -1 +1,2 @@
-export declare function downloadExternalImage(href: string): Promise<string>;
+import '../utils/polyfill-fetch.js';
+export declare function downloadExternalImage(href: string, dir: string): Promise<string>;

package/dist/optimizers/img-external.js

@@ -4,8 +4,8 @@ import hasha from 'hasha';
 import { fileTypeFromBuffer } from 'file-type';
 import { addToCache, getFromCache } from '../cache.js';
 import { parse } from '../utils/cache-control-parser.js';
-import $state from '../state.js';
-export async function downloadExternalImage(href) {
+import '../utils/polyfill-fetch.js';
+export async function downloadExternalImage(href, dir) {
     var _a, _b, _c, _d, _e;
     const hash = hasha(href, {
         algorithm: 'md5',
@@ -93,7 +93,13 @@ export async function downloadExternalImage(href) {
     // Construct local filename
     if (!ext)
         throw new Error('Unknown image format');
-    const filename = `/_jampack/${hash}.${ext}`;
-    fs.writeFile(path.join($state.dir, filename), buffer);
+    const filename = `./_jampack/${hash}.${ext}`;
+    try {
+        await fs.mkdir(path.join(dir, '_jampack'));
+    }
+    catch (e) {
+        // Nothing to do - folder is probably already present
+    }
+    fs.writeFile(path.join(dir, filename), buffer);
     return filename;
 }

package/dist/utils/polyfill-fetch.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/polyfill-fetch.js

@@ -0,0 +1,4 @@
+import { fetch } from 'undici';
+if (!Object.keys(global).includes('fetch')) {
+    Object.defineProperty(global, 'fetch', { value: fetch });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {
@@ -31,7 +31,8 @@
     "ora": "^6.3.0",
     "sharp": "^0.32.1",
     "svgo": "^3.0.2",
-    "table": "^6.8.1"
+    "table": "^6.8.1",
+    "undici": "^5.22.1"
   },
   "devDependencies": {
     "@types/html-minifier-terser": "^7.0.0",
@@ -49,7 +50,7 @@
     "prepublishOnly": "pnpm build"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=14.0.0"
   },
   "bugs": "https://github.com/divriots/jampack/issues",
   "keywords": [],