ep_comments_page 0.1.93 → 0.1.96

package/.eslintrc.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require('eslint-config-etherpad/patch/modern-module-resolution');
+
+module.exports = {
+  root: true,
+  extends: 'etherpad/plugin',
+  ignorePatterns: [
+    '/static/js/jquery.tmpl.min.js',
+    '/static/js/moment-with-locales.min.js',
+  ],
+};

package/index.js

@@ -29,7 +29,10 @@ exports.padCopy = async (hookName, context) => {
   ]);
 };
 
-exports.handleMessageSecurity = async (hookName, {message, client: socket}) => {
+exports.handleMessageSecurity = async (hookName, ctx) => {
+  // ctx.client was renamed to ctx.socket in newer versions of Etherpad. Fall back to ctx.client in
+  // case this plugin is installed on an older version of Etherpad.
+  const {message, socket = ctx.client} = ctx;
   const {type: mtype, data: {type: dtype, apool, changeset} = {}} = message;
   if (mtype !== 'COLLABROOM') return;
   if (dtype !== 'USER_CHANGES') return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Adds comments on sidebar and link it to the text.  For no-skin use ep_page_view.",
   "name": "ep_comments_page",
-  "version": "0.1.93",
+  "version": "0.1.96",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"
@@ -27,32 +27,18 @@
     "underscore": "^1.13.1"
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint-config-etherpad": "^2.0.2",
-    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-mocha": "^9.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^5.1.1",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
+    "eslint": "^8.9.0",
+    "eslint-config-etherpad": "^3.0.1",
     "socket.io-client": "^2.3.0",
-    "superagent": "^6.1.0"
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": "etherpad/plugin",
-    "ignorePatterns": [
-      "/static/js/jquery.tmpl.min.js",
-      "/static/js/moment-with-locales.min.js"
-    ]
+    "superagent": "^6.1.0",
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=12.17.0"
   },
   "peerDependencies": {
     "ep_etherpad-lite": ">=1.8.6"

package/static/tests/backend/specs/api/exportHTML.js

@@ -140,7 +140,7 @@ describe(__filename, function () {
   context('when pad text has comment in strong', function () {
     before(async function () {
       html = () => buildHTML(
-          textWithComment('c-2342', '<strong>this is a comment and bold</strong>')
+          textWithComment('c-2342', '<strong>this is a comment and bold</strong>'),
       );
     });
 

package/static/tests/backend/specs/readOnlyPad.js

@@ -124,7 +124,7 @@ describe(__filename, function () {
     for (const {desc, opcode, attribs} of testCases) {
       it(desc, async function () {
         const head = pad.head;
-        await common.sendUserChanges(socket, makeUserChanges(opcode, attribs));
+        await assert.rejects(common.sendUserChanges(socket, makeUserChanges(opcode, attribs)));
         // common.sendUserChanges() waits for message ack, so if the message was accepted then head
         // should have already incremented by the time we get here.
         assert.equal(pad.head, head);