mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-19 06:03:34 +01:00
Fixed ueberdb2 build. (#6533)
This commit is contained in:
parent
2f41b1b278
commit
8a1a03eca1
4 changed files with 336 additions and 181 deletions
501
pnpm-lock.yaml
501
pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
|
@ -21,7 +21,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import ueberDB from 'ueberdb2';
|
||||
import {Database} from 'ueberdb2';
|
||||
const settings = require('../utils/Settings');
|
||||
import log4js from 'log4js';
|
||||
const stats = require('../stats')
|
||||
|
@ -37,7 +37,7 @@ exports.db = null;
|
|||
* Initializes the database with the settings provided by the settings module
|
||||
*/
|
||||
exports.init = async () => {
|
||||
exports.db = new ueberDB.Database(settings.dbType, settings.dbSettings, null, logger);
|
||||
exports.db = new Database(settings.dbType, settings.dbSettings, null, logger);
|
||||
await exports.db.init();
|
||||
if (exports.db.metrics != null) {
|
||||
for (const [metric, value] of Object.entries(exports.db.metrics)) {
|
||||
|
|
|
@ -26,7 +26,7 @@ const db = require('../db/DB');
|
|||
const hooks = require('../../static/js/pluginfw/hooks');
|
||||
import log4js from 'log4js';
|
||||
const supportedElems = require('../../static/js/contentcollector').supportedElems;
|
||||
import ueberdb from 'ueberdb2';
|
||||
import {Database} from 'ueberdb2';
|
||||
|
||||
const logger = log4js.getLogger('ImportEtherpad');
|
||||
|
||||
|
@ -56,7 +56,7 @@ exports.setPadRaw = async (padId: string, r: string, authorId = '') => {
|
|||
|
||||
const data = new Map();
|
||||
const existingAuthors = new Set();
|
||||
const padDb = new ueberdb.Database('memory', {data});
|
||||
const padDb = new Database('memory', {data});
|
||||
await padDb.init();
|
||||
try {
|
||||
const processRecord = async (key:string, value: null|{
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
"http-errors": "^2.0.0",
|
||||
"jose": "^5.6.3",
|
||||
"js-cookie": "^3.0.5",
|
||||
"jsdom": "^24.1.0",
|
||||
"jsdom": "^24.1.1",
|
||||
"jsonminify": "0.4.2",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
"languages4translatewiki": "0.1.3",
|
||||
|
@ -71,7 +71,7 @@
|
|||
"threads": "^1.7.0",
|
||||
"tinycon": "0.6.8",
|
||||
"tsx": "4.16.2",
|
||||
"ueberdb2": "^4.2.84",
|
||||
"ueberdb2": "^4.2.85",
|
||||
"underscore": "1.13.6",
|
||||
"unorm": "1.6.0",
|
||||
"wtfnode": "^0.9.3"
|
||||
|
@ -81,7 +81,7 @@
|
|||
"etherpad-lite": "node/server.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.45.2",
|
||||
"@playwright/test": "^1.45.3",
|
||||
"@types/async": "^3.2.24",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/formidable": "^3.4.5",
|
||||
|
@ -100,7 +100,7 @@
|
|||
"eslint": "^9.7.0",
|
||||
"eslint-config-etherpad": "^4.0.4",
|
||||
"etherpad-cli-client": "^3.0.2",
|
||||
"mocha": "^10.6.0",
|
||||
"mocha": "^10.7.0",
|
||||
"mocha-froth": "^0.2.10",
|
||||
"nodeify": "^1.0.1",
|
||||
"openapi-schema-validation": "^0.4.2",
|
||||
|
|
Loading…
Reference in a new issue