eleventy-auto-cache-buster 0.8.0 → 0.8.2

package/11tyAutoCacheBuster.js

@@ -94,19 +94,35 @@ function replaceAssetsInFile(fileData, filePath, assetPathsAndHashes, writeFunc)
 
     // Check for every asset
     assetPathsAndHashes.forEach(({assetPath, assetHash}) => {
-        if (fileData.includes(assetPath)) {
-            logGreen(`[ACB] ${filePath} contains asset ${assetPath}`)
+        let found = false;
+        let indexPush = 0;  // With values being replaced, the index values will need to be adjusted
+        const regex = new RegExp(assetPath.replaceAll("/", "\\/").replaceAll("?", "\\?") + '.*?(?=")', "g")
+        const matches = outputString.matchAll(regex);
+
+        while ((match = matches.next()).done != true) {
+            found = true;
+            const value = match.value
+            const path = value[0]
+            logGreen(`[ACB] ${filePath} contains asset ${assetPath} (matched on: ${path})`)
 
             // Optionally truncate
             if (hashTruncate > 0) {
                 assetHash = assetHash.substring(0, hashTruncate);
             }
 
+            const seperator = path.includes("?") ? "&" : "?";
+            const newPath = `${path}${seperator}v=${assetHash}`;
             // Replace asset path with asset path with hash
-            outputString = outputString.replaceAll(assetPath, `${assetPath}?v=${assetHash}`);
+            outputString = outputString.substring(0, value.index + indexPush)
+                + newPath
+                + outputString.substring(value.index + indexPush + path.length)
+
+            indexPush += newPath.length - path.length;
+
             // Write changes to file
             outputChanged = true;
-        } else {
+        }
+        if (!found) {
             logRegular(`[ACB] ${filePath} does NOT contain asset ${assetPath}. Skipping`)                        
         }
     });
@@ -144,14 +160,16 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {
-                fs.readFile(outputPath, encoding="UTF-8", (err, pageData) => { 
-                    if (err) {
-                        logRed(err);
-                        throw err;
-                    }
-                    // Save the output data
-                    replaceAssetsInFile(pageData, outputPath, assetPathsAndHashes, writeAsync);
-                });
+                if (!globOptions.ignore?.includes(outputPath)) { // -- Do not attempt to read explicitly ignored files as they may no longer exist!
+                    fs.readFile(outputPath, encoding="UTF-8", (err, pageData) => { 
+                        if (err) {
+                            logRed(err);
+                            throw err;
+                        }
+                        // Save the output data
+                        replaceAssetsInFile(pageData, outputPath, assetPathsAndHashes, writeAsync);
+                    });
+                }
             });
         });
     } else {
@@ -161,9 +179,11 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {
-                const pageData = fs.readFileSync(outputPath, encoding="UTF-8"); 
-                // Save the output data
-                replaceAssetsInFile(pageData, outputPath, assetPathsAndHashes, writeSync);
+                if (!globOptions.ignore?.includes(outputPath)) { // -- Do not attempt to read explicitly ignored files as they may no longer exist!
+                    const pageData = fs.readFileSync(outputPath, encoding="UTF-8"); 
+                    // Save the output data
+                    replaceAssetsInFile(pageData, outputPath, assetPathsAndHashes, writeSync);
+                }
             });
         });
     }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "eleventy-auto-cache-buster",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "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": {
+    "start": "pushd tests && RUNASYNC=0 USESERVE=1 HASHTRUNCATE=16 eleventy && popd",
     "test": "ava tests/test.mjs --timeout=30s"
   },
   "dependencies": {