chore: included adaptions for current settings

SamTV12345 · SamTV12345 · commit d5dca4e88e51 · 2025-08-04T22:36:15.000+02:00
diff --git a/ep_align/index.js b/ep_align/index.js
@@ -2,7 +2,7 @@
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
 const Changeset = require('ep_etherpad-lite/static/js/Changeset');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_editbarMenuLeft = (hookName, args, cb) => {
   if (args.renderContext.isReadOnly) return cb();
diff --git a/ep_align/package.json b/ep_align/package.json
@@ -19,7 +19,7 @@
     "type": "git",
     "url": "https://github.com/ether/ether-plugins.git"
   },
-  "version": "0.3.100",
+  "version": "next",
   "funding": {
     "type": "individual",
     "url": "https://etherpad.org/"
diff --git a/ep_author_follow/index.js b/ep_author_follow/index.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.clientVars = (hook, context, callback) => {
   if (!settings.ep_author_follow) settings.ep_author_follow = {};
diff --git a/ep_author_follow/package.json b/ep_author_follow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ep_author_follow",
-  "version": "0.1.46",
+  "version": "next",
   "description": "Follow an Authors contributions to a Pad",
   "author": "John McLear <john@mclear.co.uk>",
   "contributors": [],
diff --git a/ep_author_hover/index.js b/ep_author_hover/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_mySettings = (hookName, args, cb) => {
   let checkedState = 'checked';
diff --git a/ep_author_hover/package.json b/ep_author_hover/package.json
@@ -6,7 +6,7 @@
   },
   "name": "ep_author_hover",
   "description": "Adds author names to span titles (shows on hover), works as authors change their name.  Hover includes author color and fast switching between author spans.  Hat tip to Martyn York for the initial work on this.",
-  "version": "1.0.2",
+  "version": "next",
   "repository": {
     "type": "git",
     "url": "https://github.com/ether/ether-plugins.git"
diff --git a/ep_comments_page/apiUtils.js b/ep_comments_page/apiUtils.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const absolutePaths = require('ep_etherpad-lite/node/utils/AbsolutePaths');
+import * as absolutePaths from 'ep_etherpad-lite/node/utils/AbsolutePaths';
 const fs = require('fs');
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 // ensure we have an apiKey
 let apiKey = '';
diff --git a/ep_comments_page/exportHTML.js b/ep_comments_page/exportHTML.js
@@ -2,7 +2,7 @@
 
 const $ = require('cheerio').load('');
 const commentManager = require('./commentManager');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 // Iterate over pad attributes to find only the comment ones
 const findAllCommentUsedOn = (pad) => {
diff --git a/ep_comments_page/index.js b/ep_comments_page/index.js
@@ -3,7 +3,7 @@
 const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
 const Changeset = require('ep_etherpad-lite/static/js/Changeset');
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const {Formidable} = require('formidable');
 const commentManager = require('./commentManager');
 const apiUtils = require('./apiUtils');
diff --git a/ep_comments_page/package.json b/ep_comments_page/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": "1.0.39",
+  "version": "next",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"
diff --git a/ep_comments_page/static/tests/backend/specs/api/exportHTML.js b/ep_comments_page/static/tests/backend/specs/api/exportHTML.js
@@ -4,7 +4,7 @@ const utils = require('../../../utils');
 const codeToBe0 = utils.codeToBe0;
 const apiVersion = utils.apiVersion;
 const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const common = require('ep_etherpad-lite/tests/backend/common');
 const db = require('ep_etherpad-lite/node/db/DB');
 
diff --git a/ep_desktop_notifications/desktop_notifications.js b/ep_desktop_notifications/desktop_notifications.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 let checkedState = '';
 
 exports.eejsBlock_mySettings = (hookName, args, cb) => {
diff --git a/ep_desktop_notifications/package.json b/ep_desktop_notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ep_desktop_notifications",
-  "version": "0.1.45",
+  "version": "next",
   "keywords": [
     "desktop",
     "notifications",
diff --git a/ep_email_notifications/client.js b/ep_email_notifications/client.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_mySettings = (hookName, args, cb) => {
   args.content += eejs.require('ep_email_notifications/templates/email_notifications_settings.ejs');
diff --git a/ep_email_notifications/handleMessage.js b/ep_email_notifications/handleMessage.js
@@ -3,7 +3,7 @@
 const db = require('ep_etherpad-lite/node/db/DB');
 const email = require('emailjs');
 const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const util = require('util');
 const validator = require('validator');
 
diff --git a/ep_email_notifications/index.js b/ep_email_notifications/index.js
@@ -2,7 +2,7 @@
 
 const db = require('ep_etherpad-lite/node/db/DB');
 const fs = require('fs').promises;
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 // Remove cache for this procedure
 db.db.dbSettings.cache = 0;
diff --git a/ep_email_notifications/package.json b/ep_email_notifications/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_email_notifications",
   "description": "Subscribe to a pad and receive an email when someone edits your pad",
-  "version": "0.1.36",
+  "version": "next",
   "author": {
     "name": "John Mclear",
     "email": "john@mclear.co.uk",
diff --git a/ep_email_notifications/update.js b/ep_email_notifications/update.js
@@ -5,7 +5,7 @@
 const db = require('ep_etherpad-lite/node/db/DB');
 const API = require('ep_etherpad-lite/node/db/API.js');
 const email = require('emailjs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const util = require('util');
 
 const SMTPClient = email.SMTPClient;
diff --git a/ep_font_color/index.js b/ep_font_color/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_editbarMenuLeft = (hook, args, cb) => {
   if (JSON.stringify(settings.toolbar).indexOf('fontColor') > -1) {
diff --git a/ep_font_size/index.js b/ep_font_size/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const shared = require('./static/js/shared');
 
 exports.eejsBlock_editbarMenuLeft = (hookName, args, cb) => {
diff --git a/ep_git_commit_saved_revision/handleMessage.js b/ep_git_commit_saved_revision/handleMessage.js
@@ -3,7 +3,7 @@
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
 const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler');
 const db = require('ep_etherpad-lite/node/db/DB').db;
-const settingsStr = require('ep_etherpad-lite/node/utils/Settings');
+import settingsStr from 'ep_etherpad-lite/node/utils/Settings'
 const exportTxt = require('ep_etherpad-lite/node/utils/ExportTxt');
 const settings = settingsStr.ep_git_commit_saved_revision;
 if (!settings) return console.error('No ep_git_commit_saved_revision settings, see the README.md');
diff --git a/ep_git_commit_saved_revision/package.json b/ep_git_commit_saved_revision/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_git_commit_saved_revision",
   "description": "Hooks on Saved Revision calls, designed to git commit a pad text when a user clicks Saved Revision Star",
-  "version": "0.0.27",
+  "version": "next",
   "author": "johnyma22 (John McLear) <john@mclear.co.uk>",
   "dependencies": {},
   "engines": {
diff --git a/ep_hash_auth/ep_hash_auth.js b/ep_hash_auth/ep_hash_auth.js
@@ -8,7 +8,7 @@
 // Made on codepad :P
 
 const fs = require('fs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const authorManager = require('ep_etherpad-lite/node/db/AuthorManager');
 const crypto = require('crypto');
 
diff --git a/ep_hash_auth/package.json b/ep_hash_auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ep_hash_auth",
-  "version": "3.0.21",
+  "version": "next",
   "description": "Allow the use of hashed passwords in etherpad-lite.",
   "main": "ep_hash_auth.js",
   "keywords": [
@@ -18,11 +18,11 @@
     "email": "LaKing@D250.hu",
     "url": "http://D250.hu"
   },
-  "contributors": {
+  "contributors": [{
     "name": "Robin Schneider",
     "email": "ypid@riseup.net",
     "url": "http://github.com/ypid"
-  },
+  }],
   "license": "GPL-3.0+",
   "readmeFilename": "README.md",
   "dist": {
diff --git a/ep_helmet/expressConfigure.js b/ep_helmet/expressConfigure.js
@@ -2,7 +2,7 @@
 
 const helmet = require('helmet');
 const crypto = require('crypto');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings';
 
 exports.expressConfigure = (hookName, app, cb) => {
   app.app.use(helmet());
diff --git a/ep_helmet/package.json b/ep_helmet/package.json
@@ -1,7 +1,7 @@
 {
   "description": "Adds Security headers to Etherpad Express responses, including CSP(content security policy), and x-frame-origin, useful for if you embed Etherpad in an iFrame",
   "name": "ep_helmet",
-  "version": "0.0.25",
+  "version": "next",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk"
diff --git a/ep_inline_toolbar/index.js b/ep_inline_toolbar/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.loadSettings = (hookName, context, cb) => {
   cb();
diff --git a/ep_kaput/index.js b/ep_kaput/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 // Tries to include content that never existed...
 exports.eejsBlock_editbarMenuLeft = (hookName, args, callback) => {
diff --git a/ep_mammoth/import.js b/ep_mammoth/import.js
@@ -3,7 +3,7 @@
 const log4js = require('ep_etherpad-lite/node_modules/log4js');
 const mammoth = require('mammoth');
 const fs = require('fs').promises;
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 const logger = log4js.getLogger('ep_mammoth');
 
diff --git a/ep_mammoth/package.json b/ep_mammoth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_mammoth",
   "description": "Support for improved import of microsoft word doc and docx documents",
-  "version": "0.1.24",
+  "version": "next",
   "author": {
     "name": "johnyma22",
     "email": "john@mclear.co.uk",
diff --git a/ep_markdown/index.ts b/ep_markdown/index.ts
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings';
 import {promises} from 'fs';
 const fsp = promises
 
diff --git a/ep_markdown/package.json b/ep_markdown/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_markdown",
   "description": "Edit and Export as Markdown in Etherpad",
-  "version": "1.0.3",
+  "version": "next",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
diff --git a/ep_mediawiki/index.js b/ep_mediawiki/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_exportColumn = (hookName, args, cb) => {
   args.content += eejs.require('ep_mediawiki/templates/exportcolumn.html', {}, module);
diff --git a/ep_mediawiki/package.json b/ep_mediawiki/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_mediawiki",
   "description": "Edit and Export as mediawiki in Etherpad",
-  "version": "0.0.33",
+  "version": "next",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
diff --git a/ep_oauth/auth.js b/ep_oauth/auth.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const db = require('ep_etherpad-lite/node/db/DB').db;
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const request = require('request');
 
 // Below two lines are not used yet but probably will be at some point
diff --git a/ep_oauth/package.json b/ep_oauth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_oauth",
   "description": "Oauth2 authentication for Etherpad",
-  "version": "0.0.21",
+  "version": "next",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
diff --git a/ep_openid_connect/static/tests/backend/specs/tests.js b/ep_openid_connect/static/tests/backend/specs/tests.js
@@ -7,7 +7,7 @@ const epOpenidConnect = require('../../../../index');
 const login = require('../login');
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
 const plugins = require('ep_etherpad-lite/static/js/pluginfw/plugin_defs');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 const supertest = require('supertest');
 
 describe(__filename, function () {
diff --git a/ep_pad_title/index.js b/ep_pad_title/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.clientVars = (hook, context, callback) => {
   let padTitle;
diff --git a/ep_pad_title/package.json b/ep_pad_title/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_pad_title",
   "description": "Set the pad title to a static string",
-  "version": "0.0.21",
+  "version": "next",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
diff --git a/ep_print/eejs.js b/ep_print/eejs.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.eejsBlock_styles = (hook_name, args, cb) => {
   args.content +=
diff --git a/ep_print/package.json b/ep_print/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_print",
   "description": "Support for printing, works cross browser, supports page breaks",
-  "version": "0.1.12",
+  "version": "next",
   "author": {
     "name": "johnyma22",
     "email": "john@mclear.co.uk",
diff --git a/ep_real_time_chat/index.js b/ep_real_time_chat/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings'
 
 exports.clientVars = (hook, context, callback) => {
   let realTimeChatOnByDefault;
diff --git a/ep_real_time_chat/package.json b/ep_real_time_chat/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ep_real_time_chat",
   "description": "Real time chat updates",
-  "version": "0.2.25",
+  "version": "next",
   "author": "johnyma22 (John McLear) <john@mclear.co.uk>",
   "repository": {
     "type": "git",
diff --git a/ep_rss/index.js b/ep_rss/index.js
diff --git a/ep_rss/package.json b/ep_rss/package.json
diff --git a/ep_spellcheck/spellcheck.js b/ep_spellcheck/spellcheck.js
diff --git a/ep_themes/index.js b/ep_themes/index.js
diff --git a/ep_themes/package.json b/ep_themes/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ep_author_follow",`
`3`		`- "version": "0.1.46",`
	`3`	`+ "version": "next",`
`4`	`4`	`"description": "Follow an Authors contributions to a Pad",`
`5`	`5`	`"author": "John McLear <[email protected]>",`
`6`	`6`	`"contributors": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "Adds comments on sidebar and link it to the text. For no-skin use ep_page_view.",`
`3`	`3`	`"name": "ep_comments_page",`
`4`		`- "version": "1.0.39",`
	`4`	`+ "version": "next",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Nicolas Lescop",`
`7`	`7`	`"email": "[email protected]"`