@jsenv/plugin-minification 1.2.2 → 1.3.0

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@jsenv/plugin-minification",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jsenv/jsenv-core",
+    "url": "https://github.com/jsenv/core",
     "directory": "packages/jsenv-plugin-minification"
   },
   "publishConfig": {
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "html-minifier": "4.0.0",
-    "lightningcss": "1.19.0",
-    "terser": "5.16.9"
+    "lightningcss": "1.20.0",
+    "terser": "5.17.5"
   },
   "peerDependencies": {
     "@jsenv/core": "*"

package/src/css/css_minification.js

@@ -1,36 +1,36 @@
-import { fileURLToPath } from "node:url"
+import { fileURLToPath } from "node:url";
 
 export const minifyCss = async ({ cssUrlInfo, context }) => {
-  const { transform } = await import("lightningcss")
+  const { transform } = await import("lightningcss");
 
-  const targets = runtimeCompatToTargets(context.runtimeCompat)
+  const targets = runtimeCompatToTargets(context.runtimeCompat);
   const { code, map } = transform({
     filename: fileURLToPath(cssUrlInfo.originalUrl),
     code: Buffer.from(cssUrlInfo.content),
     targets,
     minify: true,
-  })
+  });
   return {
     content: String(code),
     sourcemap: map,
-  }
-}
+  };
+};
 
 const runtimeCompatToTargets = (runtimeCompat) => {
-  const targets = {}
-  ;["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
-    const version = runtimeCompat[runtimeName]
+  const targets = {};
+  ["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
+    const version = runtimeCompat[runtimeName];
     if (version) {
-      targets[runtimeName] = versionToBits(version)
+      targets[runtimeName] = versionToBits(version);
     }
-  })
-  return targets
-}
+  });
+  return targets;
+};
 
 const versionToBits = (version) => {
   const [major, minor = 0, patch = 0] = version
     .split("-")[0]
     .split(".")
-    .map((v) => parseInt(v, 10))
-  return (major << 16) | (minor << 8) | patch
-}
+    .map((v) => parseInt(v, 10));
+  return (major << 16) | (minor << 8) | patch;
+};

package/src/html/html_minification.js

@@ -1,15 +1,28 @@
-import { createRequire } from "node:module"
+import { createRequire } from "node:module";
 
 // https://github.com/kangax/html-minifier#options-quick-reference
 export const minifyHtml = ({ htmlUrlInfo, options } = {}) => {
-  const require = createRequire(import.meta.url)
-  const { minify } = require("html-minifier")
+  const require = createRequire(import.meta.url);
+  const { minify } = require("html-minifier");
 
-  const { collapseWhitespace = true, removeComments = true } = options
+  const {
+    // usually HTML will contain a few markup, it's better to keep white spaces
+    // and line breaks to favor readability. A few white spaces means very few
+    // octets that won't impact performances. Removing whitespaces however will certainly
+    // decrease HTML readability
+    collapseWhitespace = false,
+    // saving a fewline breaks won't hurt performances
+    // but will help a lot readability
+    preserveLineBreaks = true,
+    removeComments = true,
+    conservativeCollapse = false,
+  } = options;
 
   const htmlMinified = minify(htmlUrlInfo.content, {
     collapseWhitespace,
+    conservativeCollapse,
     removeComments,
-  })
-  return htmlMinified
-}
+    preserveLineBreaks,
+  });
+  return htmlMinified;
+};

package/src/js/js_minification.js

@@ -1,12 +1,12 @@
 // https://github.com/terser-js/terser#minify-options
 
 export const minifyJs = async ({ jsUrlInfo, options }) => {
-  const url = jsUrlInfo.url
-  const content = jsUrlInfo.content
-  const sourcemap = jsUrlInfo.sourcemap
-  const isJsModule = jsUrlInfo.type === "js_module"
+  const url = jsUrlInfo.url;
+  const content = jsUrlInfo.content;
+  const sourcemap = jsUrlInfo.sourcemap;
+  const isJsModule = jsUrlInfo.type === "js_module";
 
-  const { minify } = await import("terser")
+  const { minify } = await import("terser");
   const terserResult = await minify(
     {
       [url]: content,
@@ -18,14 +18,14 @@ export const minifyJs = async ({ jsUrlInfo, options }) => {
         includeSources: true,
       },
       module: isJsModule,
-      // We need to preserve "new InlineContent()" calls to be able to recognize them
+      // We need to preserve "new __InlineContent__()" calls to be able to recognize them
       // after minification in order to version urls inside inline content text
-      keep_fnames: /InlineContent/,
+      keep_fnames: /__InlineContent__/,
       ...options,
     },
-  )
+  );
   return {
     content: terserResult.code,
     sourcemap: terserResult.map,
-  }
-}
+  };
+};

package/src/jsenv_plugin_minification.js

@@ -1,7 +1,7 @@
-import { minifyHtml } from "./html/html_minification.js"
-import { minifyCss } from "./css/css_minification.js"
-import { minifyJs } from "./js/js_minification.js"
-import { minifyJson } from "./json/json_minification.js"
+import { minifyHtml } from "./html/html_minification.js";
+import { minifyCss } from "./css/css_minification.js";
+import { minifyJs } from "./js/js_minification.js";
+import { minifyJson } from "./json/json_minification.js";
 
 export const jsenvPluginMinification = ({
   html = {},
@@ -18,7 +18,7 @@ export const jsenvPluginMinification = ({
           context,
           options: html === true ? {} : html,
         })
-    : null
+    : null;
   const svgMinifier = svg
     ? (urlInfo, context) =>
         minifyHtml({
@@ -26,7 +26,7 @@ export const jsenvPluginMinification = ({
           context,
           options: svg === true ? {} : svg,
         })
-    : null
+    : null;
   const cssMinifier = css
     ? (urlInfo, context) =>
         minifyCss({
@@ -34,7 +34,7 @@ export const jsenvPluginMinification = ({
           context,
           options: css === true ? {} : css,
         })
-    : null
+    : null;
   const jsClassicMinifier = js_classic
     ? (urlInfo, context) =>
         minifyJs({
@@ -42,7 +42,7 @@ export const jsenvPluginMinification = ({
           context,
           options: js_classic === true ? {} : js_classic,
         })
-    : null
+    : null;
   const jsModuleMinifier = js_module
     ? (urlInfo, context) =>
         minifyJs({
@@ -50,7 +50,7 @@ export const jsenvPluginMinification = ({
           context,
           options: js_module === true ? {} : js_module,
         })
-    : null
+    : null;
   const jsonMinifier = json
     ? (urlInfo, context) =>
         minifyJson({
@@ -58,7 +58,7 @@ export const jsenvPluginMinification = ({
           context,
           options: json === true ? {} : html,
         })
-    : null
+    : null;
 
   return {
     name: "jsenv:minification",
@@ -73,5 +73,5 @@ export const jsenvPluginMinification = ({
       importmap: jsonMinifier,
       webmanifest: jsonMinifier,
     },
-  }
-}
+  };
+};

package/src/json/json_minification.js

@@ -1,8 +1,8 @@
 export const minifyJson = ({ jsonUrlInfo }) => {
-  const { content } = jsonUrlInfo
+  const { content } = jsonUrlInfo;
   if (content.startsWith("{\n")) {
-    const jsonWithoutWhitespaces = JSON.stringify(JSON.parse(content))
-    return jsonWithoutWhitespaces
+    const jsonWithoutWhitespaces = JSON.stringify(JSON.parse(content));
+    return jsonWithoutWhitespaces;
   }
-  return null
-}
+  return null;
+};

package/src/main.js

@@ -1 +1 @@
-export { jsenvPluginMinification } from "./jsenv_plugin_minification.js"
+export { jsenvPluginMinification } from "./jsenv_plugin_minification.js";