Release v1.5.2

Author: pilafmon

dist/rev-web-assets.d.ts

@@ -1,4 +1,4 @@
-//! rev-web-assets v1.5.1 ~~ https://github.com/center-key/rev-web-assets ~~ MIT License
+//! rev-web-assets v1.5.3 ~~ https://github.com/center-key/rev-web-assets ~~ MIT License
 
 export type Settings = {
     cd: string | null;
@@ -7,6 +7,10 @@ export type Settings = {
     saveManifest: boolean;
     skip: string | null;
 };
+export type MissingAsset = {
+    ext: string;
+    line: string;
+};
 export type ManifestDetail = {
     origin: string;
     filename: string;
@@ -22,7 +26,7 @@ export type ManifestDetail = {
     usedIn: string[] | null;
     references: number | null;
     skipped: boolean;
-    missing: string[] | null;
+    missing: MissingAsset[] | null;
 };
 export type Manifest = ManifestDetail[];
 export type Results = {

dist/rev-web-assets.js

@@ -1,4 +1,4 @@
-//! rev-web-assets v1.5.1 ~~ https://github.com/center-key/rev-web-assets ~~ MIT License
+//! rev-web-assets v1.5.3 ~~ https://github.com/center-key/rev-web-assets ~~ MIT License
 
 import { EOL } from 'node:os';
 import chalk from 'chalk';
@@ -62,22 +62,24 @@ const revWebAssets = {
     hashAssetPath(manifest, detail, settings) {
         const webPages = ['.html', '.htm', '.php'];
         const replacer = (matched, pre, url, post) => {
+            const line = matched.replace(/\s+/g, ' ');
             const uri = url.replace(/[#?].*/, '');
             const ext = path.extname(uri);
-            const doNotHash = uri.includes(':') || webPages.includes(ext) || ext.length < 2;
+            const isTemplate = /{.*}|<.*>|~~.*~~/.test(uri);
+            const unhashable = uri.includes(':') || webPages.includes(ext) || ext.length < 2;
             const canonicalPath = detail.canonicalFolder ? detail.canonicalFolder + '/' : '';
             const canonical = slash(path.normalize(canonicalPath + uri));
             const isAssetDetail = (detail) => detail.canonical === canonical;
-            const assetDetail = doNotHash ? null : manifest.find(isAssetDetail);
+            const assetDetail = isTemplate || unhashable ? null : manifest.find(isAssetDetail);
             const skipAsset = !!settings.skip && uri.includes(settings.skip);
             if (assetDetail && !assetDetail.hash && !skipAsset)
                 revWebAssets.calcAssetHash(assetDetail);
             if (assetDetail)
                 assetDetail.references++;
             if (assetDetail && !assetDetail.usedIn.includes(detail.canonical))
                 assetDetail.usedIn.push(detail.canonical);
-            if (!doNotHash && !skipAsset && !assetDetail)
-                detail.missing.push(matched.replace(/\s+/g, ' '));
+            if (!isTemplate && !unhashable && !skipAsset && !assetDetail)
+                detail.missing.push({ ext, line });
             const trailingSlashes = /\/*$/;
             const metaContentBase = settings.metaContentBase?.replace(trailingSlashes, '/');
             const absoluteUrl = () => `${metaContentBase}${assetDetail?.canonicalFolder}/${assetDetail?.hashedFilename}`;
@@ -185,14 +187,14 @@ const revWebAssets = {
         const arrow = { big: chalk.gray.bold(' ⟹  '), little: chalk.gray.bold('→') };
         const infoColor = results.count ? chalk.white : chalk.red.bold;
         const info = infoColor(`(files: ${results.count}, ${results.duration}ms)`);
-        const warning = chalk.red.bold('missing asset in');
         log(name, source, arrow.big, target, info);
         const logDetail = (detail) => {
             const origin = chalk.white(detail.origin.substring(results.source.length + 1));
             const dest = chalk.green(detail.destPath.substring(results.target.length + 1));
             const file = chalk.blue.bold(detail.origin);
+            const warning = (ext) => chalk.red.bold(`missing ${ext} asset in`);
             log(name, origin, arrow.little, dest);
-            const logMissingAsset = (assetLine) => log(name, warning, file, arrow.little, chalk.green(assetLine));
+            const logMissingAsset = (missing) => log(name, warning(missing.ext), file, arrow.little, chalk.green(missing.line));
             if (!settings.hide404s && detail.missing)
                 detail.missing.forEach(logMissingAsset);
         };

package.json

@@ -1,6 +1,6 @@
 {
    "name": "rev-web-assets",
-   "version": "1.5.1",
+   "version": "1.5.2",
    "description": "Revision web asset filenames with cache busting content hash fingerprints",
    "license": "MIT",
    "type": "module",