From 0b305d32c7bb608ff4aa2b48ea3e0f0d6f342d54 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Mon, 25 May 2026 16:45:17 +0200
Subject: [PATCH] fix: backward-compat for ESM etherpad

- Drop trailing slash on ep_etherpad-lite/node/eejs/ require (index.js)
- Replace ep_etherpad-lite/node_modules/async with async (exportWhoDidWhat.js)

Backward-compatible with current CJS etherpad release; also
compatible with the upcoming ESM etherpad branch which has stricter
exports map resolution.
---
 exportWhoDidWhat.js | 2 +-
 index.js            | 2 +-
 package.json        | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/exportWhoDidWhat.js b/exportWhoDidWhat.js
index aca9e6f..f620752 100644
--- a/exportWhoDidWhat.js
+++ b/exportWhoDidWhat.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const async = require('ep_etherpad-lite/node_modules/async');
+const async = require('async');
 const Changeset = require('ep_etherpad-lite/static/js/Changeset');
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
 const authorManager = require('ep_etherpad-lite/node/db/AuthorManager');
diff --git a/index.js b/index.js
index 6944419..a558112 100755
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@ const {template} = require('ep_plugin_helpers');
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const eejs = require('ep_etherpad-lite/node/eejs/');
+const eejs = require('ep_etherpad-lite/node/eejs');
 const settings = require('ep_etherpad-lite/node/utils/Settings');
 
 exports.eejsBlock_timesliderScripts = (fn, args, cb) => {
diff --git a/package.json b/package.json
index 10275fa..482a3e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ep_who_did_what",
-  "version": "11.0.30",
+  "version": "11.0.31",
   "description": "Who made what changes to a pad?  A historical report available in the timeslider",
   "author": "John McLear <john@mclear.co.uk>",
   "contributors": [],
@@ -25,6 +25,7 @@
     "url": "https://github.com/ether/ep_who_did_what.git"
   },
   "dependencies": {
-    "ep_plugin_helpers": "^0.6.2"
+    "ep_plugin_helpers": "^0.6.2",
+    "async": "^3.2.6"
   }
 }