@divriots/jampack 0.11.3 → 0.11.5

package/README.md

@@ -96,7 +96,7 @@ In a 2nd PASS, `jampack` compresses all untouched assets and keep the same name
 | Extension       | Compressor            | 
 | --------------- | --------------------- | 
 | `.html`,`.htm`  | [`html-minifier-terser`](https://github.com/terser/html-minifier-terser) |   
-| `.css`          | Best of [`csso`](https://github.com/css/csso) & [`lightningCSS`](https://lightningcss.dev)  |
+| `.css`          | [`lightningCSS`](https://lightningcss.dev)  |
 | `.js`           | [`swc`](https://swc.rs/)                   |   
 | `.svg`          | [`svgo`](https://github.com/svg/svgo)                  |  
 | `.jpg`,`.jpeg`  | [`sharp`](https://sharp.pixelplumbing.com/)                 |  

package/dist/compressors/css.js

@@ -1,14 +1,7 @@
-import { minify as csso } from 'csso';
 import { transform as lightcss, transformStyleAttribute as lightcssStyleAttribute, } from 'lightningcss';
 export async function compressCSS(originalCode, type) {
-    // csso only support css files. No inline style
-    let cssoCSSData = undefined;
-    if (type !== 'inline') {
-        // Compress with csso
-        cssoCSSData = Buffer.from(await csso(originalCode.toString(), { comments: false }).css);
-    }
     // Compress with lightningcss
-    let lightCSSData;
+    let lightCSSData = undefined;
     try {
         const options = {
             code: originalCode,
@@ -24,18 +17,11 @@ export async function compressCSS(originalCode, type) {
     }
     catch (e) {
         // Error while processing with lightningcss
-        // Ignore, we have csso as backup
+        // Take original code
+        // TODO catch SyntaxError and report a Warning
     }
     let resultBuffer = undefined;
-    // Pick the best
-    if (cssoCSSData && lightCSSData) {
-        resultBuffer =
-            cssoCSSData.length <= lightCSSData.length ? cssoCSSData : lightCSSData;
-    }
-    else if (cssoCSSData && !lightCSSData) {
-        resultBuffer = cssoCSSData;
-    }
-    else if (!cssoCSSData && lightCSSData) {
+    if (lightCSSData && lightCSSData.length < originalCode.length) {
         resultBuffer = lightCSSData;
     }
     return resultBuffer || originalCode;

package/dist/config-default.js

@@ -5,11 +5,6 @@ const default_options = {
     image: {
         embed_size: 1500,
         srcset_min_width: 640,
-        external: {
-            process: 'download',
-            src_include: /.*/,
-            src_exclude: null,
-        },
         compress: true,
         jpeg: {
             options: {

package/dist/config-types.d.ts

@@ -10,11 +10,6 @@ export type Options = {
     image: {
         embed_size: number;
         srcset_min_width: number;
-        external: {
-            process: 'download' | 'add-dimensions-only' | 'off';
-            src_include: RegExp | undefined;
-            src_exclude: RegExp | null;
-        };
         compress: boolean;
         jpeg: {
             options: {

package/dist/optimize.js

@@ -184,21 +184,9 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
      * Attribute 'decoding'
      */
     img.attr('decoding', 'async');
-    /*
-     * Check for external images
-     */
     if (!isLocal(attrib_src)) {
-        switch (config.image.external.process) {
-            case 'off':
-                // Don't process external images
-                return;
-            case 'download':
-                // Download external image for local processing
-                break;
-            case 'add-dimensions-only':
-                // Only add dimensions of image
-                return;
-        }
+        // Image not local, don't touch it
+        return;
     }
     /*
      * Loading image

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {
@@ -19,12 +19,7 @@
     "@divriots/cheerio": "1.0.0-rc.12",
     "@proload/core": "^0.3.3",
     "@swc/core": "^1.3.57",
-    "@types/csso": "^5.0.0",
-    "@types/html-minifier-terser": "^7.0.0",
-    "@types/sharp": "^0.32.0",
-    "@types/svgo": "^3.0.0",
     "commander": "^10.0.1",
-    "csso": "^5.0.5",
     "deepmerge": "^4.3.1",
     "file-type": "^18.4.0",
     "globby": "^13.1.4",
@@ -39,22 +34,23 @@
     "table": "^6.8.1"
   },
   "devDependencies": {
+    "@types/html-minifier-terser": "^7.0.0",
     "@types/node": "^16.18.28",
     "shx": "^0.3.3",
     "ts-node": "^10.2.1",
     "tslib": "^2.5.0",
     "typescript": "^5.0.4"
   },
-  "scripts": {
-    "watch": "pnpm build --watch",
-    "try": "shx rm -fr demo && cp -R demo_rf demo && node ./dist/index.js ./demo --nocache --onlyoptim",
-    "build": "shx rm -rf dist && tsc -b",
-    "lint": "eslint . --ext .ts --config .eslintrc"
-  },
   "engines": {
     "node": ">=14.0.0"
   },
   "bugs": "https://github.com/divriots/jampack/issues",
   "keywords": [],
-  "types": "dist/index.d.ts"
-}
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "watch": "pnpm build --watch",
+    "try": "shx rm -fr demo && cp -R demo_rf demo && node ./dist/index.js ./demo --nocache --onlyoptim",
+    "build": "shx rm -rf dist && tsc -b",
+    "lint": "eslint . --ext .ts --config .eslintrc"
+  }
+}