diff --git a/src/node/utils/Cleanup.ts b/src/node/utils/Cleanup.ts index 2dbad6232..526174a70 100644 --- a/src/node/utils/Cleanup.ts +++ b/src/node/utils/Cleanup.ts @@ -4,7 +4,7 @@ import {AChangeSet} from "../types/PadType.js"; import {Revision} from "../types/Revision.js"; import {timesLimit, firstSatisfies} from './promises.js'; -import padManager from 'ep_etherpad-lite/node/db/PadManager.js'; +import * as padManager from 'ep_etherpad-lite/node/db/PadManager.js'; import db from 'ep_etherpad-lite/node/db/DB.js'; import * as Changeset from 'ep_etherpad-lite/static/js/Changeset.js'; import padMessageHandler from 'ep_etherpad-lite/node/handler/PadMessageHandler.js'; diff --git a/src/node/utils/ExportEtherpad.ts b/src/node/utils/ExportEtherpad.ts index 70408557e..75717528a 100644 --- a/src/node/utils/ExportEtherpad.ts +++ b/src/node/utils/ExportEtherpad.ts @@ -17,9 +17,9 @@ import Stream from './Stream.js'; import { strict as assert } from 'assert'; -import authorManager from '../db/AuthorManager.js'; +import * as authorManager from '../db/AuthorManager.js'; import hooks from '../../static/js/pluginfw/hooks.js'; -import padManager from '../db/PadManager.js'; +import * as padManager from '../db/PadManager.js'; export const getPadRaw = async (padId:string, readOnlyId:string, revNum?: number) => { const dstPfx = `pad:${readOnlyId || padId}`; diff --git a/src/node/utils/ExportHtml.ts b/src/node/utils/ExportHtml.ts index 13fd56af1..ddb60fb4b 100644 --- a/src/node/utils/ExportHtml.ts +++ b/src/node/utils/ExportHtml.ts @@ -20,7 +20,7 @@ import {MapArrayType} from "../types/MapType.js"; import {deserializeOps, splitAttributionLines, subattribution} from '../../static/js/Changeset.js'; import * as attributes from '../../static/js/attributes.js'; -import padManager from '../db/PadManager.js'; +import * as padManager from '../db/PadManager.js'; import _ from 'underscore'; import Security from '../../static/js/security.js'; import hooks from '../../static/js/pluginfw/hooks.js'; diff --git a/src/node/utils/ExportTxt.ts b/src/node/utils/ExportTxt.ts index b906b5e62..e16a8ac60 100644 --- a/src/node/utils/ExportTxt.ts +++ b/src/node/utils/ExportTxt.ts @@ -26,7 +26,7 @@ import {deserializeOps, splitAttributionLines, subattribution} from '../../stati import {StringIterator} from "../../static/js/StringIterator.js"; import {StringAssembler} from "../../static/js/StringAssembler.js"; import * as attributes from '../../static/js/attributes.js'; -import padManager from '../db/PadManager.js'; +import * as padManager from '../db/PadManager.js'; import { _analyzeLine } from './ExportHelper.js'; // This is slightly different than the HTML method as it passes the output to getTXTFromAText diff --git a/src/node/utils/ImportEtherpad.ts b/src/node/utils/ImportEtherpad.ts index defaae92b..ee4e23583 100644 --- a/src/node/utils/ImportEtherpad.ts +++ b/src/node/utils/ImportEtherpad.ts @@ -21,7 +21,7 @@ import {APool} from "../types/PadType.js"; import AttributePool from '../../static/js/AttributePool.js'; import { Pad } from '../db/Pad.js'; import Stream from './Stream.js'; -import authorManager from '../db/AuthorManager.js'; +import * as authorManager from '../db/AuthorManager.js'; import db from '../db/DB.js'; import hooks from '../../static/js/pluginfw/hooks.js'; import log4js from 'log4js'; diff --git a/src/tests/backend/specs/api/pad.ts b/src/tests/backend/specs/api/pad.ts index 78c5b1180..7f9a84804 100644 --- a/src/tests/backend/specs/api/pad.ts +++ b/src/tests/backend/specs/api/pad.ts @@ -12,7 +12,7 @@ import {dirname} from 'node:path'; import assert from 'assert'; import * as common from '../../common.js'; -import padManager from '../../../../node/db/PadManager.js'; +import * as padManager from '../../../../node/db/PadManager.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/src/tests/backend/specs/api/restoreRevision.ts b/src/tests/backend/specs/api/restoreRevision.ts index e72bc31af..df4158765 100644 --- a/src/tests/backend/specs/api/restoreRevision.ts +++ b/src/tests/backend/specs/api/restoreRevision.ts @@ -5,9 +5,9 @@ import {dirname} from 'node:path'; import {PadType} from "../../../../node/types/PadType"; import assert from 'assert'; -import authorManager from '../../../../node/db/AuthorManager.js'; +import * as authorManager from '../../../../node/db/AuthorManager.js'; import * as common from '../../common.js'; -import padManager from '../../../../node/db/PadManager.js'; +import * as padManager from '../../../../node/db/PadManager.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/src/tests/backend/specs/chat.ts b/src/tests/backend/specs/chat.ts index c029f4d53..e7868ca8a 100644 --- a/src/tests/backend/specs/chat.ts +++ b/src/tests/backend/specs/chat.ts @@ -9,7 +9,7 @@ import ChatMessage from '../../../static/js/ChatMessage.js'; import {Pad} from '../../../node/db/Pad.js'; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/src/tests/backend/specs/clientvar_rev_consistency.ts b/src/tests/backend/specs/clientvar_rev_consistency.ts index e0ab2f58e..2f965c9a6 100644 --- a/src/tests/backend/specs/clientvar_rev_consistency.ts +++ b/src/tests/backend/specs/clientvar_rev_consistency.ts @@ -18,7 +18,7 @@ import {dirname} from 'node:path'; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; import settings from '../../../node/utils/Settings.js'; import {randomString} from '../../../static/js/pad_utils.js'; diff --git a/src/tests/backend/specs/export.ts b/src/tests/backend/specs/export.ts index bdba5b3e8..afe7fd2c5 100644 --- a/src/tests/backend/specs/export.ts +++ b/src/tests/backend/specs/export.ts @@ -5,7 +5,7 @@ import {dirname} from 'node:path'; import {MapArrayType} from "../../../node/types/MapType"; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import settings from '../../../node/utils/Settings.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/src/tests/backend/specs/export_list.ts b/src/tests/backend/specs/export_list.ts index a1d5402f1..8fd792490 100644 --- a/src/tests/backend/specs/export_list.ts +++ b/src/tests/backend/specs/export_list.ts @@ -4,9 +4,9 @@ import {fileURLToPath} from 'node:url'; import {dirname} from 'node:path'; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; -import importHtml from '../../../node/utils/ImportHtml.js'; -import exportHtml from '../../../node/utils/ExportHtml.js'; +import * as padManager from '../../../node/db/PadManager.js'; +import * as importHtml from '../../../node/utils/ImportHtml.js'; +import * as exportHtml from '../../../node/utils/ExportHtml.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/src/tests/backend/specs/lowerCasePadIds.ts b/src/tests/backend/specs/lowerCasePadIds.ts index d76c269b9..3dba264fd 100644 --- a/src/tests/backend/specs/lowerCasePadIds.ts +++ b/src/tests/backend/specs/lowerCasePadIds.ts @@ -4,7 +4,7 @@ import {fileURLToPath} from 'node:url'; import {dirname} from 'node:path'; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import settings from '../../../node/utils/Settings.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/src/tests/backend/specs/messages.ts b/src/tests/backend/specs/messages.ts index 070afcd75..b592efa19 100644 --- a/src/tests/backend/specs/messages.ts +++ b/src/tests/backend/specs/messages.ts @@ -7,7 +7,7 @@ import {MapArrayType} from "../../../node/types/MapType"; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; import readOnlyManager from '../../../node/db/ReadOnlyManager.js'; diff --git a/src/tests/backend/specs/regression-db.ts b/src/tests/backend/specs/regression-db.ts index 67e994738..de97a593a 100644 --- a/src/tests/backend/specs/regression-db.ts +++ b/src/tests/backend/specs/regression-db.ts @@ -2,7 +2,7 @@ import {fileURLToPath} from 'node:url'; import {dirname} from 'node:path'; -import authorManager from '../../../node/db/AuthorManager.js'; +import * as authorManager from '../../../node/db/AuthorManager.js'; import {strict as assert} from "assert"; import * as common from '../common.js'; import db from '../../../node/db/DB.js'; diff --git a/src/tests/backend/specs/socketio.ts b/src/tests/backend/specs/socketio.ts index 00ef922bf..d9b66e50e 100644 --- a/src/tests/backend/specs/socketio.ts +++ b/src/tests/backend/specs/socketio.ts @@ -6,7 +6,7 @@ import {MapArrayType} from "../../../node/types/MapType"; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; import readOnlyManager from '../../../node/db/ReadOnlyManager.js'; import settings from '../../../node/utils/Settings.js'; diff --git a/src/tests/backend/specs/undo_clear_authorship.ts b/src/tests/backend/specs/undo_clear_authorship.ts index 966cf11c3..f3568ff6d 100644 --- a/src/tests/backend/specs/undo_clear_authorship.ts +++ b/src/tests/backend/specs/undo_clear_authorship.ts @@ -18,7 +18,7 @@ import {PadType} from "../../../node/types/PadType"; import assert from 'assert'; import * as common from '../common.js'; -import padManager from '../../../node/db/PadManager.js'; +import * as padManager from '../../../node/db/PadManager.js'; import AttributePool from '../../../static/js/AttributePool.js'; import padutils from '../../../static/js/pad_utils.js';