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

- Drop trailing slash on ep_etherpad-lite/node/eejs/ require

Backward-compatible with current CJS etherpad release; also
compatible with the upcoming ESM etherpad branch which has stricter
exports map resolution.
---
 package.json              |  2 +-
 static/js/help_bubbles.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0c0b554..5e3062a 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "email": "john@mclear.co.uk",
     "url": "http://mclear.co.uk"
   },
-  "version": "1.1.61",
+  "version": "1.1.62",
   "repository": {
     "type": "git",
     "url": "https://github.com/ether/ep_help_bubbles.git"
diff --git a/static/js/help_bubbles.js b/static/js/help_bubbles.js
index d983a86..cfd13b7 100644
--- a/static/js/help_bubbles.js
+++ b/static/js/help_bubbles.js
@@ -1,23 +1,23 @@
 'use strict';
 
 exports.eejsBlock_scripts = (hookName, args, cb) => {
-  args.content += require('ep_etherpad-lite/node/eejs/')
+  args.content += require('ep_etherpad-lite/node/eejs')
       .require('ep_help_bubbles/static/js/Bubble.js');
-  args.content += require('ep_etherpad-lite/node/eejs/')
+  args.content += require('ep_etherpad-lite/node/eejs')
       .require('ep_help_bubbles/static/js/jquery.grumble.js');
-  args.content += require('ep_etherpad-lite/node/eejs/')
+  args.content += require('ep_etherpad-lite/node/eejs')
       .require('ep_help_bubbles/static/js/help_bubbles_function.js');
   cb();
 };
 
 exports.eejsBlock_styles = (hookName, args, cb) => {
-  args.content += require('ep_etherpad-lite/node/eejs/')
+  args.content += require('ep_etherpad-lite/node/eejs')
       .require('ep_help_bubbles/static/css/help_bubbles.css');
   cb();
 };
 
 exports.eejsBlock_editbarMenuRight = (hookName, args, cb) => {
-  args.content = require('ep_etherpad-lite/node/eejs/')
+  args.content = require('ep_etherpad-lite/node/eejs')
       .require('ep_help_bubbles/templates/help_bubbles.ejs') + args.content;
   cb();
 };