eleventy-auto-cache-buster 0.6.0 → 0.7.0

package/11tyAutoCacheBuster.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const path = require("path");
 const crypto = require("crypto");
 const glob = require("glob");
 
@@ -40,7 +41,8 @@ function logRed(string) {
 }
 
 const defaultOptions = {
-    globstring: "**/*.{css,js,png,jpg,jpeg,gif,mp4,ico}",
+    globstring: "**/*",
+    extensions: ["css", "js", "png", "jpg", "jpeg", "gif", "mp4", "ico"],
     hashTruncate: 12,
     runAsync: true,
     enableLogging: enableLogging,
@@ -48,10 +50,14 @@ const defaultOptions = {
     hashFunction: hash,
 }
 
-function collectLocalAssets(globResults=[], outputDir) {
+function collectLocalAssets(globResults=[], outputDir, extensions=defaultOptions.extensions) {
     const assetPaths = [];
     globResults.forEach((assetPath) => {
         assetPath = assetPath.replace(/\\/g, "/")
+        if (!extensions.includes(path.extname(assetPath).substring(1))) {
+            return;
+        }
+
         logGreen(`[ACB] ${assetPath} is an asset! Calculating hash...`);
         const assetHash = hashFunction(fs.readFileSync(assetPath));
         logGreen(`[ACB] ${assetPath} hash = ${assetHash}`);
@@ -114,6 +120,7 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
     // Override default options with set options
     options = Object.assign(defaultOptions, options);
     const globstring = options.globstring;
+    const extensions = options.extensions;
     const runAsync = options.runAsync;
     // Set options to globals
     enableLogging = options.enableLogging;
@@ -132,7 +139,7 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
     if (runAsync) {
         eleventyConfig.on("eleventy.after", async ({ dir, results, runMode, outputMode }) => {
             logYellow(`[ACB] Collecting assets & calculating hashes using ${globstring}...`);
-            const assetPathsAndHashes = collectLocalAssets(await glob.glob(dir.output + "/" + globstring), dir.output);
+            const assetPathsAndHashes = collectLocalAssets(await glob.glob(dir.output + "/" + globstring, {nodir: true}), dir.output, extensions);
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {
@@ -149,7 +156,7 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
     } else {
         eleventyConfig.on("eleventy.after", ({ dir, results, runMode, outputMode }) => {
             logYellow(`[ACB] Collecting assets & calculating hashes using ${globstring}...`);
-            const assetPathsAndHashes = collectLocalAssets(glob.globSync(dir.output + "/" + globstring), dir.output);
+            const assetPathsAndHashes = collectLocalAssets(glob.globSync(dir.output + "/" + globstring, {nodir: true}), dir.output, extensions);
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {

package/README.md

@@ -44,7 +44,8 @@ module.exports = function (eleventyConfig) {
         enableLogging: true,  // Whether to enable eleventy-auto-cache-buster logging.
         hashTruncate: 0,  // Desired substring length of the hash. Set to 0 or lower to disable truncating
         runAsync: false,  // Whether to run asynchronously. Default is true
-        globstring: "**/*.ico",  // What glob string is used to locate assets.
+        globstring: "subdir/**/*",  // What glob string is used to locate assets.
+        extensions: ["css"],  // What file extensions are accepted when locating assets.
         hashAlgorithm: "sha1",  // What hash method to pass to the hash function. See Node.js' crypto.createHash documentation.
         hashFunction: function (content) { return "example" }  // What function to run to calculate hashes. Overrides hashAlgorithm.
     });

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "eleventy-auto-cache-buster",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Busts cache using ?v= with minimal configuration!",
   "main": "11tyAutoCacheBuster.js",
   "repository": "https://github.com/Denperidge/eleventy-auto-cache-buster.git",
   "author": "Denperidge",
   "license": "MIT",
   "scripts": {
-    "test": "ava tests/*.mjs"
+    "test": "ava tests/test.mjs --timeout=30s"
   },
   "dependencies": {
     "glob": "^10.3.10"
   },
   "devDependencies": {
-    "@11ty/eleventy": "^2.0.1",
+    "@11ty/eleventy": "^3.0.0",
     "ava": "^6.1.3",
     "jsdom": "^24.1.0"
   }