@normed/bundle 4.6.1 → 4.6.3

package/CHANGELOG.md

@@ -6,6 +6,10 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 2. MINOR version when you add functionality in a backwards compatible manner, and
 3. PATCH version when you make backwards compatible bug fixes.
 
+# 4.6.3
+
+* PATCH: Fix JavaScript and TypeScript files referenced from `.static.pug` templates being copied verbatim instead of being bundled. Script files (`.js`, `.jsx`, `.mjs`, `.cjs`, `.ts`, `.tsx`) are now properly processed through esbuild, bundling imports and transpiling TypeScript, producing `.js` output with correct paths in the generated HTML.
+
 # 4.6.1
 
 * PATCH: Fix `pkg:` prefix to respect `assetNames` configuration. Package CSS files now correctly follow the configured output path (e.g., `assets/[name]-[hash]`) instead of being placed at the root.

package/bundles/bin/cli.js

@@ -69172,6 +69172,12 @@ function isPugReference(assetPath) {
 function isLessReference(assetPath) {
   return assetPath.endsWith(".less") && isRelativeAssetPath(assetPath);
 }
+function isScriptReference(assetPath) {
+  const scriptExtensions = [".js", ".jsx", ".mjs", ".cjs", ".ts", ".tsx"];
+  const isScript = scriptExtensions.some((ext) => assetPath.endsWith(ext));
+  const isDeclaration = assetPath.endsWith(".d.ts");
+  return isScript && !isDeclaration && isRelativeAssetPath(assetPath);
+}
 var PKG_PREFIX = "pkg:";
 function isPackageReference(assetPath) {
   return assetPath.startsWith(PKG_PREFIX);
@@ -69192,6 +69198,7 @@ function resolvePackagePath(packageSpecifier, fromFile) {
 }
 var discoveredPugReferences = /* @__PURE__ */ new Map();
 var discoveredLessReferences = /* @__PURE__ */ new Map();
+var discoveredScriptReferences = /* @__PURE__ */ new Map();
 var discoveredPackageCssReferences = /* @__PURE__ */ new Map();
 function clearDiscoveredPugReferences() {
   discoveredPugReferences.clear();
@@ -69199,6 +69206,9 @@ function clearDiscoveredPugReferences() {
 function clearDiscoveredLessReferences() {
   discoveredLessReferences.clear();
 }
+function clearDiscoveredScriptReferences() {
+  discoveredScriptReferences.clear();
+}
 function clearDiscoveredPackageCssReferences() {
   discoveredPackageCssReferences.clear();
 }
@@ -69213,6 +69223,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
   const assets = [];
   const pugReferences = [];
   const lessReferences = [];
+  const scriptReferences = [];
   const packageCssReferences = [];
   const assetNames = options2.assetNames || "[name]-[hash]";
   const outdir = options2.outdir || ".";
@@ -69240,6 +69251,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
   }
   const discoveredPugPaths = /* @__PURE__ */ new Set();
   const discoveredLessPaths = /* @__PURE__ */ new Set();
+  const discoveredScriptPaths = /* @__PURE__ */ new Set();
   const discoveredPackageCssPaths = /* @__PURE__ */ new Set();
   for (const { fullMatch, attr, value } of matches) {
     let newValue = value;
@@ -69292,6 +69304,12 @@ async function processHtmlAssets(html, pugFilePath, options2) {
         discoveredLessPaths.add(absolutePath);
         lessReferences.push({ originalHref: value, absolutePath });
       }
+    } else if (isScriptReference(value)) {
+      const absolutePath = import_path5.default.resolve(pugDir, value);
+      if (!discoveredScriptPaths.has(absolutePath)) {
+        discoveredScriptPaths.add(absolutePath);
+        scriptReferences.push({ originalHref: value, absolutePath });
+      }
     } else if (isPackageCssReference(value)) {
       const packageSpecifier = getPackageSpecifier(value);
       const absolutePath = resolvePackagePath(packageSpecifier, pugFilePath);
@@ -69344,6 +69362,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
     assets,
     pugReferences,
     lessReferences,
+    scriptReferences,
     packageCssReferences
   };
 }
@@ -69522,6 +69541,7 @@ async function loadAsEntrypoint(filepath, options2) {
     assets,
     pugReferences,
     lessReferences,
+    scriptReferences,
     packageCssReferences
   } = await processHtmlAssets(contents, filepath, options2);
   contents = processedHtml;
@@ -69531,6 +69551,9 @@ async function loadAsEntrypoint(filepath, options2) {
   if (lessReferences.length > 0) {
     discoveredLessReferences.set(filepath, lessReferences);
   }
+  if (scriptReferences.length > 0) {
+    discoveredScriptReferences.set(filepath, scriptReferences);
+  }
   if (packageCssReferences.length > 0) {
     discoveredPackageCssReferences.set(filepath, packageCssReferences);
   }
@@ -69807,6 +69830,18 @@ function rewritePackageCssReferencesInHtml(html, packageCssReferences, packageCs
   }
   return result;
 }
+function rewriteScriptReferencesInHtml(html, scriptReferences, scriptToOutputPath, htmlOutputDir, outdir) {
+  let result = html;
+  for (const ref of scriptReferences) {
+    const outputPath = scriptToOutputPath.get(ref.absolutePath);
+    if (outputPath) {
+      const absoluteOutputPath = import_path8.default.join(outdir, outputPath);
+      const relativePath = import_path8.default.relative(htmlOutputDir, absoluteOutputPath);
+      result = result.split(ref.originalHref).join(relativePath);
+    }
+  }
+  return result;
+}
 function outExt(inExt) {
   if (inExt.match(/^((c|m)?sx?|tsx?)$/)) {
     return "js";
@@ -69842,6 +69877,9 @@ var esbuilder = {
             return "css";
         }
         return ext;
+      }, isCssGeneratedAsset = function(filePath) {
+        const ext = import_path8.default.extname(filePath).toLowerCase();
+        return cssAssetExtensions.has(ext);
       };
       const exampleFile = build2[0];
       if (!exampleFile) {
@@ -69913,17 +69951,43 @@ var esbuilder = {
       );
       clearDiscoveredPugReferences();
       clearDiscoveredLessReferences();
+      clearDiscoveredScriptReferences();
       clearDiscoveredPackageCssReferences();
       const pugHtmlOutputs = /* @__PURE__ */ new Map();
       const pugToOutputPath = /* @__PURE__ */ new Map();
       const lessToOutputPath = /* @__PURE__ */ new Map();
+      const scriptToOutputPath = /* @__PURE__ */ new Map();
       const packageCssToOutputPath = /* @__PURE__ */ new Map();
       const processedPugFiles = /* @__PURE__ */ new Set();
       const processedLessFiles = /* @__PURE__ */ new Set();
+      const processedScriptFiles = /* @__PURE__ */ new Set();
       const processedPackageCssFiles = /* @__PURE__ */ new Set();
       const pendingPugFiles = [];
       const pendingLessFiles = [];
+      const pendingScriptFiles = [];
       const pendingPackageCssFiles = [];
+      const cssAssetExtensions = /* @__PURE__ */ new Set([
+        ".png",
+        ".jpg",
+        ".jpeg",
+        ".gif",
+        ".webp",
+        ".svg",
+        ".ico",
+        ".woff",
+        ".woff2",
+        ".ttf",
+        ".eot",
+        ".otf",
+        ".mp4",
+        ".webm",
+        ".ogg",
+        ".mp3",
+        ".wav",
+        ".flac",
+        ".aac",
+        ".avif"
+      ]);
       const processOutputFiles = async (result, currentOutputFilesMap, isDiscoveredBuild) => {
         if (result.errors.length || result.warnings.length) {
           log_default.info(`Build completed with errors or warnings:`, {
@@ -69969,7 +70033,7 @@ var esbuilder = {
                 `Build artefact "${relativeFilePath}" was created but not expected.`
               );
             }
-          } else if (!isDiscoveredBuild) {
+          } else if (!isDiscoveredBuild && !isCssGeneratedAsset(relativeFilePath)) {
             log_default.warn(
               `Build artefact "${relativeFilePath}" was created but not expected.`
             );
@@ -69984,6 +70048,7 @@ var esbuilder = {
           if (isHtmlOutput && sourcePath) {
             const pugRefs = discoveredPugReferences.get(sourcePath) || [];
             const lessRefs = discoveredLessReferences.get(sourcePath) || [];
+            const scriptRefs = discoveredScriptReferences.get(sourcePath) || [];
             const packageCssRefs = discoveredPackageCssReferences.get(sourcePath) || [];
             pugToOutputPath.set(sourcePath, relativeTarget);
             for (const ref of pugRefs) {
@@ -70014,6 +70079,20 @@ var esbuilder = {
                 }
               }
             }
+            for (const ref of scriptRefs) {
+              if (!processedScriptFiles.has(ref.absolutePath) && !pendingScriptFiles.includes(ref.absolutePath)) {
+                if (import_fs7.default.existsSync(ref.absolutePath)) {
+                  pendingScriptFiles.push(ref.absolutePath);
+                  log_default.debug(
+                    `Discovered script reference: ${ref.originalHref} -> ${ref.absolutePath}`
+                  );
+                } else {
+                  log_default.warn(
+                    `Referenced script file not found: ${ref.originalHref} (resolved to ${ref.absolutePath})`
+                  );
+                }
+              }
+            }
             for (const ref of packageCssRefs) {
               if (!processedPackageCssFiles.has(ref.absolutePath) && !pendingPackageCssFiles.includes(ref.absolutePath)) {
                 if (import_fs7.default.existsSync(ref.absolutePath)) {
@@ -70034,6 +70113,7 @@ var esbuilder = {
               outputPath: import_path8.default.join(outdir, relativeTarget),
               pugReferences: pugRefs,
               lessReferences: lessRefs,
+              scriptReferences: scriptRefs,
               packageCssReferences: packageCssRefs
             });
           } else {
@@ -70157,6 +70237,44 @@ var esbuilder = {
               }
             }
           }
+          while (pendingScriptFiles.length > 0) {
+            const batch = pendingScriptFiles.splice(0);
+            const newEntryPoints = batch.filter(
+              (f) => !processedScriptFiles.has(f)
+            );
+            if (newEntryPoints.length === 0) break;
+            log_default.debug(
+              `Building ${newEntryPoints.length} discovered script file(s):`,
+              newEntryPoints
+            );
+            for (const scriptSourcePath of newEntryPoints) {
+              processedScriptFiles.add(scriptSourcePath);
+              const entryNames = finalConfig.assetNames?.replace("[ext]", "") || "[dir]/[name]-[hash]";
+              const scriptConfig = {
+                ...finalConfig,
+                entryPoints: [scriptSourcePath],
+                entryNames,
+                // Use minifyWhitespace to remove module boundary comments (// path/to/file.js)
+                // These comments contain absolute paths that differ between machines,
+                // causing non-deterministic content hashes. minifyWhitespace removes them
+                // while preserving variable names for debugging.
+                minifyWhitespace: true
+              };
+              const scriptResult = await esbuild.build(scriptConfig);
+              for (const file of scriptResult.outputFiles) {
+                const relativeFilePath = import_path8.default.relative(outdir, file.path);
+                if (relativeFilePath.endsWith(".js")) {
+                  scriptToOutputPath.set(scriptSourcePath, relativeFilePath);
+                  log_default.debug(
+                    `Built script file: ${import_path8.default.relative(indir, scriptSourcePath)} -> ${relativeFilePath}`
+                  );
+                }
+                await fileWriter.writeFile(file.path, file.contents, {
+                  encoding: "utf-8"
+                });
+              }
+            }
+          }
           while (pendingPackageCssFiles.length > 0) {
             const batch = pendingPackageCssFiles.splice(0);
             const newEntryPoints = batch.filter(
@@ -70191,7 +70309,7 @@ var esbuilder = {
             }
           }
           log_default.debug(
-            `Rewriting pug/less references in ${pugHtmlOutputs.size} HTML file(s)`
+            `Rewriting pug/less/script references in ${pugHtmlOutputs.size} HTML file(s)`
           );
           const htmlWriters = [];
           for (const [_sourcePath, output] of pugHtmlOutputs.entries()) {
@@ -70215,6 +70333,15 @@ var esbuilder = {
                 outdir
               );
             }
+            if (output.scriptReferences.length > 0) {
+              html = rewriteScriptReferencesInHtml(
+                html,
+                output.scriptReferences,
+                scriptToOutputPath,
+                htmlOutputDir,
+                outdir
+              );
+            }
             if (output.packageCssReferences.length > 0) {
               html = rewritePackageCssReferencesInHtml(
                 html,