@normed/bundle 4.5.1 → 4.5.3

package/CHANGELOG.md

@@ -6,6 +6,14 @@ 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.5.3
+
+* MINOR: Less files referenced from pug templates are now compiled to CSS. The `href` is rewritten to point to the compiled `.css` file with a content hash.
+
+# 4.5.2
+
+* PATCH: Fixes incorrect asset path resolution in pug templates when using custom `assetNames` configuration. Asset paths are now correctly computed relative to the HTML output location.
+
 # 4.5.1
 
 * PATCH: Fixes discovered pug files being output with `.pug` extension instead of `.html`.

package/bundles/bin/cli.js

@@ -25376,8 +25376,8 @@ var require_plugin_manager = __commonJS({
     var PluginManager = (
       /** @class */
       function() {
-        function PluginManager2(less2) {
-          this.less = less2;
+        function PluginManager2(less3) {
+          this.less = less3;
           this.visitors = [];
           this.preProcessors = [];
           this.postProcessors = [];
@@ -25385,7 +25385,7 @@ var require_plugin_manager = __commonJS({
           this.fileManagers = [];
           this.iterator = -1;
           this.pluginCache = {};
-          this.Loader = new less2.PluginLoader(less2);
+          this.Loader = new less3.PluginLoader(less3);
         }
         PluginManager2.prototype.addPlugins = function(plugins) {
           if (plugins) {
@@ -25467,9 +25467,9 @@ var require_plugin_manager = __commonJS({
       }()
     );
     var pm;
-    var PluginManagerFactory = function(less2, newFactory) {
+    var PluginManagerFactory = function(less3, newFactory) {
       if (newFactory || !pm) {
-        pm = new PluginManager(less2);
+        pm = new PluginManager(less3);
       }
       return pm;
     };
@@ -25782,8 +25782,8 @@ var require_import_manager = __commonJS({
       var ImportManager = (
         /** @class */
         function() {
-          function ImportManager2(less2, context, rootFileInfo) {
-            this.less = less2;
+          function ImportManager2(less3, context, rootFileInfo) {
+            this.less = less3;
             this.rootFilename = rootFileInfo.filename;
             this.paths = context.paths || [];
             this.contents = {};
@@ -26397,8 +26397,8 @@ var require_plugin_loader = __commonJS({
     var tslib_1 = require_tslib();
     var path_1 = tslib_1.__importDefault(require("path"));
     var abstract_plugin_loader_js_1 = tslib_1.__importDefault(require_abstract_plugin_loader());
-    var PluginLoader = function(less2) {
-      this.less = less2;
+    var PluginLoader = function(less3) {
+      this.less = less3;
       this.require = function(prefix) {
         prefix = path_1.default.dirname(prefix);
         return function(id) {
@@ -27079,17 +27079,17 @@ var require_less_node = __commonJS({
     var file_manager_1 = tslib_1.__importDefault(require_file_manager());
     var url_file_manager_1 = tslib_1.__importDefault(require_url_file_manager());
     var less_1 = tslib_1.__importDefault(require_less());
-    var less2 = (0, less_1.default)(environment_1.default, [new file_manager_1.default(), new url_file_manager_1.default()]);
+    var less3 = (0, less_1.default)(environment_1.default, [new file_manager_1.default(), new url_file_manager_1.default()]);
     var lessc_helper_1 = tslib_1.__importDefault(require_lessc_helper());
-    less2.createFromEnvironment = less_1.default;
-    less2.lesscHelper = lessc_helper_1.default;
-    less2.PluginLoader = require_plugin_loader().default;
-    less2.fs = require_fs2().default;
-    less2.FileManager = file_manager_1.default;
-    less2.UrlFileManager = url_file_manager_1.default;
-    less2.options = require_default_options().default();
-    require_image_size().default(less2.environment);
-    exports2.default = less2;
+    less3.createFromEnvironment = less_1.default;
+    less3.lesscHelper = lessc_helper_1.default;
+    less3.PluginLoader = require_plugin_loader().default;
+    less3.fs = require_fs2().default;
+    less3.FileManager = file_manager_1.default;
+    less3.UrlFileManager = url_file_manager_1.default;
+    less3.options = require_default_options().default();
+    require_image_size().default(less3.environment);
+    exports2.default = less3;
   }
 });
 
@@ -69136,11 +69136,25 @@ var import_pug = __toESM(require_lib14());
 var import_fs4 = __toESM(require("fs"));
 var import_path5 = __toESM(require("path"));
 var import_crypto = __toESM(require("crypto"));
+var import_less2 = __toESM(require_less2());
+var less2 = import_less2.default;
 function computeContentHash(content) {
   const hash = import_crypto.default.createHash("sha256").update(content).digest();
   const num = hash.readUInt32BE(0);
   return num.toString(36).toUpperCase().padStart(8, "0").slice(0, 8);
 }
+function isCompilableAsset(assetPath) {
+  return assetPath.endsWith(".less");
+}
+async function compileLess(absoluteSource) {
+  const fileData = await import_fs4.default.promises.readFile(absoluteSource, {
+    encoding: "utf8"
+  });
+  const lessResult = await less2.render(fileData, {
+    paths: [import_path5.default.dirname(absoluteSource)]
+  });
+  return { content: lessResult.css, outputExt: ".css" };
+}
 var ASSET_ATTRIBUTES = {
   img: ["src", "srcset"],
   video: ["src", "poster"],
@@ -69226,6 +69240,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
           const hashedPath = await processAsset(
             assetPath,
             pugDir,
+            pugFilePath,
             outdir,
             outbase,
             assetNames,
@@ -69255,6 +69270,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
       const hashedPath = await processAsset(
         value,
         pugDir,
+        pugFilePath,
         outdir,
         outbase,
         assetNames,
@@ -69273,7 +69289,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
   }
   return { html: modifiedHtml, assets, pugReferences };
 }
-async function processAsset(assetPath, pugDir, outdir, outbase, assetNames, publicPath, assets, processedAssets) {
+async function processAsset(assetPath, pugDir, pugFilePath, outdir, outbase, assetNames, publicPath, assets, processedAssets) {
   const absoluteSource = import_path5.default.resolve(pugDir, assetPath);
   if (processedAssets.has(absoluteSource)) {
     return processedAssets.get(absoluteSource);
@@ -69282,21 +69298,40 @@ async function processAsset(assetPath, pugDir, outdir, outbase, assetNames, publ
     return null;
   }
   try {
-    const content = await import_fs4.default.promises.readFile(absoluteSource);
+    let content;
+    let compiledContent;
+    let outputAssetPath = assetPath;
+    if (isCompilableAsset(assetPath)) {
+      const compiled = await compileLess(absoluteSource);
+      content = compiled.content;
+      compiledContent = compiled.content;
+      outputAssetPath = assetPath.replace(/\.less$/, compiled.outputExt);
+    } else {
+      content = await import_fs4.default.promises.readFile(absoluteSource);
+    }
     const hash = computeContentHash(content);
     const hashedFilename = applyAssetNamesTemplate(
       assetNames,
-      assetPath,
+      outputAssetPath,
       hash,
       outbase
     );
     const absoluteOutput = import_path5.default.join(outdir, hashedFilename);
-    const htmlPath = publicPath ? publicPath.replace(/\/$/, "") + "/" + hashedFilename : hashedFilename;
+    const pugRelativeToOutbase = import_path5.default.relative(outbase, pugFilePath);
+    const htmlOutputPath = import_path5.default.join(outdir, pugRelativeToOutbase);
+    const htmlOutputDir = import_path5.default.dirname(htmlOutputPath);
+    let htmlPath;
+    if (publicPath) {
+      htmlPath = publicPath.replace(/\/$/, "") + "/" + hashedFilename;
+    } else {
+      htmlPath = import_path5.default.relative(htmlOutputDir, absoluteOutput);
+    }
     assets.push({
       originalPath: assetPath,
       hashedPath: htmlPath,
       absoluteSource,
-      absoluteOutput
+      absoluteOutput,
+      compiledContent
     });
     processedAssets.set(absoluteSource, htmlPath);
     return htmlPath;
@@ -69305,13 +69340,19 @@ async function processAsset(assetPath, pugDir, outdir, outbase, assetNames, publ
   }
 }
 async function copyAssets(assets) {
-  const copied = /* @__PURE__ */ new Set();
+  const written = /* @__PURE__ */ new Set();
   for (const asset of assets) {
-    if (copied.has(asset.absoluteOutput)) continue;
-    copied.add(asset.absoluteOutput);
+    if (written.has(asset.absoluteOutput)) continue;
+    written.add(asset.absoluteOutput);
     const outputDir = import_path5.default.dirname(asset.absoluteOutput);
     await import_fs4.default.promises.mkdir(outputDir, { recursive: true });
-    await import_fs4.default.promises.copyFile(asset.absoluteSource, asset.absoluteOutput);
+    if (asset.compiledContent !== void 0) {
+      await import_fs4.default.promises.writeFile(asset.absoluteOutput, asset.compiledContent, {
+        encoding: "utf8"
+      });
+    } else {
+      await import_fs4.default.promises.copyFile(asset.absoluteSource, asset.absoluteOutput);
+    }
   }
 }
 var filters = {