eleventy-auto-cache-buster 0.9.0 → 0.9.2

package/11tyAutoCacheBuster.js

@@ -2,7 +2,10 @@ const fs     = require("fs");
 const path   = require("path");
 const crypto = require("crypto");
 const glob   = require("glob");
-const escape = require("regexp.escape");
+
+const regexEscape = parseInt(process.versions.node.split(".")[0]) >= 24 
+    ? RegExp.escape 
+    : require("escape-string-regexp").default;
 
 let enableLogging = false;
 let algorithm     = "md5";
@@ -100,7 +103,7 @@ function replaceAssetsInFile(fileData, filePath, assetPathsAndHashes, writeFunc)
             assetHash = assetHash.substring(0, hashTruncate);
         }
         // find and replace all instances of the asset URL
-        const assetPathRegexString = escape(assetPath);
+        const assetPathRegexString = regexEscape(assetPath);
         const regexWithQueryString = new RegExp(`${assetPathRegexString}\\?`, 'g')
         const regexWithoutQueryString = new RegExp(`${assetPathRegexString}(?!\\?)`, 'g')
         const newOutputString = outputString
@@ -120,6 +123,11 @@ function replaceAssetsInFile(fileData, filePath, assetPathsAndHashes, writeFunc)
     }
 }
 
+// Meant to normalise eleventt.after directories.output to dir.output style
+function stripPath(path) {
+    return path.replace(/^\.\//m, "");
+}
+
 module.exports = function(eleventyConfig, options=defaultOptions) {
     // Override default options with set options
     options = Object.assign(defaultOptions, options, {
@@ -143,8 +151,9 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
 
     if (runAsync) {
         eleventyConfig.on("eleventy.after", async ({ directories, results, runMode, outputMode }) => {
-            logYellow(`[ACB] Collecting assets & calculating hashes using ${globstring} in ${directories.output}...`);
-            const assetPathsAndHashes = collectLocalAssets(await glob.glob(directories.output + "/" + globstring, globOptions), directories.output, extensions);
+            const outputDir = stripPath(directories.output);
+            logYellow(`[ACB] Collecting assets & calculating hashes using ${globstring} in ${outputDir}...`);
+            const assetPathsAndHashes = collectLocalAssets(await glob.glob(outputDir + "/" + globstring, globOptions), outputDir, extensions);
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {
@@ -162,8 +171,9 @@ module.exports = function(eleventyConfig, options=defaultOptions) {
         });
     } else {
         eleventyConfig.on("eleventy.after", ({ directories, results, runMode, outputMode }) => {
+            const outputDir = stripPath(directories.output);
             logYellow(`[ACB] Collecting assets & calculating hashes using ${globstring}...`);
-            const assetPathsAndHashes = collectLocalAssets(glob.globSync(directories.output + "/" + globstring, globOptions), directories.output, extensions);
+            const assetPathsAndHashes = collectLocalAssets(glob.globSync(outputDir + "/" + globstring, globOptions), outputDir, extensions);
 
             logRegular(`[ACB] Replacing in output...`);
             results.forEach(({inputPath, outputPath, url, content}) => {

package/README.md

@@ -15,8 +15,9 @@ Into...
 ## How-to
 ### Getting started
 1. Install the plugin
+    - pnpm: `pnpm install eleventy-auto-cache-buster`
     - Yarn: `yarn add -D eleventy-auto-cache-buster`
-    - Npm: `npm install --save-dev eleventy-auto-cache-buster`
+    - npm: `npm install --save-dev eleventy-auto-cache-buster`
 2. Enable the plugin
     ```js
     // .eleventy.js
@@ -54,6 +55,20 @@ module.exports = function (eleventyConfig) {
 }
 ```
 
+### Clone locally/dev
+This requires git & Node.js to be installed
+```bash
+# Clone repository & enter directory
+git clone https://github.com/Denperidge/eleventy-auto-cache-buster.git
+cd eleventy-auto-cache-buster
+
+# Prepare correct pnpm version
+corepack enable
+# Install dependencies
+pnpm install
+# Run tests
+pnpm test
+```
 
 ## License
 This project is licensed under the [MIT License](LICENSE).

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "eleventy-auto-cache-buster",
-  "version": "0.9.0",
+  "version": "0.9.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",
+  "engines": {
+    "node": ">=20"
+  },
+  "packageManager": "pnpm@10.32.1+sha256.9b943b94bc8f55efb993aad8e44b538e6b091e60a9e4a944dcde869855f233e3",
   "scripts": {
-    "start": "pushd tests && RUNASYNC=0 USESERVE=1 HASHTRUNCATE=16 eleventy && popd",
+    "start": "pushd tests/scenarios/8-sync@3 && eleventy && popd",
     "test": "ava tests/test.mjs --timeout=30s"
   },
   "dependencies": {
-    "glob": "^13.0.6",
-    "regexp.escape": "^2.0.1"
+    "escape-string-regexp": "^5.0.0",
+    "glob": "^13.0.6"
   },
   "devDependencies": {
     "@11ty/eleventy": "^3.1.2",

package/pnpm-workspace.yaml

@@ -0,0 +1,22 @@
+# Minimum release age
+# https://yarnpkg.com/configuration/yarnrc#npmMinimalAgeGate
+minimumReleaseAge: 4320  # in minutes
+minimumReleaseAgeExclude:
+  - undici@7.24.2
+
+# Block install scripts
+# https://pnpm.io/settings#strictdepbuilds
+strictDepBuilds: true
+
+# Block git repo/tarball sources for indirect dependencies
+# https://pnpm.io/settings#blockexoticsubdeps
+blockExoticSubdeps: true
+
+# Don't install newer versions if security measures decreased
+# https://pnpm.io/settings#trustpolicy
+trustPolicy: no-downgrade
+
+# Disable hoisting
+# https://pnpm.io/blog/2020/10/17/node-modules-configuration-options-with-pnpm#a-strict-traditional-modules-directory
+hoist: false
+