html-bundle 6.0.20 → 6.0.22

package/dist/bundle.mjs

@@ -19,6 +19,7 @@ const isCritical = process.argv.includes("--isCritical") || bundleConfig.isCriti
 const critters = new Critters({
     path: bundleConfig.build,
     logLevel: "silent",
+    ...bundleConfig.critical,
 });
 const isSecure = process.argv.includes("--secure") || bundleConfig.secure; // uses CSP for critical too
 const handlerFile = process.argv.includes("--handler")
@@ -243,8 +244,9 @@ async function writeInlineScripts(file) {
         const script = scripts[index];
         const scriptTextNode = script.childNodes[0];
         const isReferencedScript = script.attrs.find((a) => a.name === "src");
+        const type = script.attrs.find((a) => a.name === "type");
         const scriptContent = scriptTextNode?.value;
-        if (!scriptContent || isReferencedScript)
+        if (!scriptContent || isReferencedScript || type?.value === "importmap")
             continue;
         const jsFile = file.replace(".html", `-bundle-${index}.tsx`);
         inlineFiles.add(jsFile);
@@ -273,7 +275,10 @@ async function minifyHTML(file, buildFile) {
         const script = scripts[index];
         const scriptTextNode = script.childNodes[0];
         const isReferencedScript = script.attrs.find((a) => a.name === "src");
-        if (!scriptTextNode?.value || isReferencedScript)
+        const type = script.attrs.find((a) => a.name === "type");
+        if (!scriptTextNode?.value ||
+            isReferencedScript ||
+            type?.value === "importmap")
             continue;
         // Use bundled file
         const buildInlineScript = buildFile.replace(".html", `-bundle-${index}.js`);

package/dist/utils.mjs

@@ -71,8 +71,12 @@ async function getBundleConfig() {
         port: 5000,
         esbuild: {},
         "html-minifier-terser": {},
-        critical: {},
         deletePrev: true,
+        critical: {},
+        isCritical: false,
+        hmr: false,
+        secure: false,
+        handler: "",
     };
     try {
         const cfgPath = path.resolve(process.cwd(), "bundle.config.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-bundle",
-  "version": "6.0.20",
+  "version": "6.0.22",
   "description": "A very simple bundler for HTML SFC",
   "bin": "./dist/bundle.mjs",
   "scripts": {
@@ -36,14 +36,14 @@
     "await-spawn": "^4.0.2",
     "chokidar": "^3.5.3",
     "critters": "^0.0.20",
-    "cssnano": "^6.0.2",
-    "esbuild": "^0.19.10",
-    "fastify": "^4.25.1",
+    "cssnano": "^6.0.3",
+    "esbuild": "^0.19.11",
+    "fastify": "^4.25.2",
     "glob": "^10.3.10",
     "html-minifier-terser": "^7.2.0",
     "hydro-js": "^1.5.14",
     "parse5": "^7.1.2",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.33",
     "postcss-load-config": "^5.0.2"
   }
 }

package/src/bundle.mts

@@ -33,6 +33,7 @@ const isCritical =
 const critters = new Critters({
   path: bundleConfig.build,
   logLevel: "silent",
+  ...bundleConfig.critical,
 });
 const isSecure = process.argv.includes("--secure") || bundleConfig.secure; // uses CSP for critical too
 const handlerFile = process.argv.includes("--handler")
@@ -292,8 +293,10 @@ async function writeInlineScripts(file: string) {
     const isReferencedScript = script.attrs.find(
       (a: { name: string }) => a.name === "src"
     );
+    const type = script.attrs.find((a: { name: string }) => a.name === "type");
     const scriptContent = scriptTextNode?.value;
-    if (!scriptContent || isReferencedScript) continue;
+    if (!scriptContent || isReferencedScript || type?.value === "importmap")
+      continue;
 
     const jsFile = file.replace(".html", `-bundle-${index}.tsx`);
     inlineFiles.add(jsFile);
@@ -326,7 +329,13 @@ async function minifyHTML(file: string, buildFile: string) {
     const isReferencedScript = script.attrs.find(
       (a: { name: string }) => a.name === "src"
     );
-    if (!scriptTextNode?.value || isReferencedScript) continue;
+    const type = script.attrs.find((a: { name: string }) => a.name === "type");
+    if (
+      !scriptTextNode?.value ||
+      isReferencedScript ||
+      type?.value === "importmap"
+    )
+      continue;
 
     // Use bundled file
     const buildInlineScript = buildFile.replace(".html", `-bundle-${index}.js`);

package/src/utils.mts

@@ -1,3 +1,6 @@
+import type { Options as HTMLOptions } from "html-minifier-terser";
+import type { Options } from "critters";
+import type { BuildOptions } from "esbuild";
 import type { Node } from "@web/parse5-utils";
 import type { FastifyServerOptions } from "fastify";
 import { copyFile, mkdir, readFile } from "fs/promises";
@@ -86,15 +89,32 @@ export async function getPostCSSConfig() {
   }
 }
 
-async function getBundleConfig() {
+export type Config = {
+  build: string;
+  src: string;
+  port: number;
+  secure: boolean;
+  esbuild?: BuildOptions;
+  "html-minifier-terser"?: HTMLOptions;
+  critical?: Options;
+  deletePrev?: boolean;
+  isCritical?: boolean;
+  hmr?: boolean;
+  handler?: string;
+};
+async function getBundleConfig(): Promise<Config> {
   const base = {
     build: "build",
     src: "src",
     port: 5000,
     esbuild: {},
     "html-minifier-terser": {},
-    critical: {},
     deletePrev: true,
+    critical: {},
+    isCritical: false,
+    hmr: false,
+    secure: false,
+    handler: "",
   };
 
   try {