diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 3fe41b22e15..1eaa6406321 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -131,7 +131,6 @@ "@types/meteor-collection-hooks": "^0.8.9", "@types/mkdirp": "^1.0.2", "@types/mocha": "github:whitecolor/mocha-types", - "@types/nedb": "^1", "@types/node": "~22.16.1", "@types/node-rsa": "^1.1.4", "@types/nodemailer": "^6.4.17", @@ -190,7 +189,6 @@ "jest": "~30.0.2", "jsdom-global": "^3.0.2", "mocha": "^9.2.2", - "nedb": "~1.8.0", "nyc": "^17.1.0", "outdent": "~0.8.0", "pino-pretty": "^7.6.1", diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json index 648a0848ad7..6370d60fc6d 100644 --- a/packages/apps-engine/package.json +++ b/packages/apps-engine/package.json @@ -71,10 +71,10 @@ "devDependencies": { "@rocket.chat/eslint-config": "workspace:~", "@rocket.chat/ui-kit": "workspace:~", + "@seald-io/nedb": "^4.1.2", "@types/adm-zip": "^0.5.7", "@types/debug": "^4.1.12", "@types/lodash.clonedeep": "^4.5.9", - "@types/nedb": "^1.8.16", "@types/node": "~22.16.1", "@types/semver": "^7.5.8", "@types/stack-trace": "0.0.33", @@ -84,7 +84,6 @@ "alsatian": "^2.4.0", "browserify": "^16.5.2", "eslint": "~8.45.0", - "nedb": "^1.8.0", "npm-run-all": "^4.1.5", "nyc": "^17.1.0", "rimraf": "^6.0.1", diff --git a/packages/apps-engine/tests/test-data/storage/storage.ts b/packages/apps-engine/tests/test-data/storage/storage.ts index 0d1329df642..8412e67c65e 100644 --- a/packages/apps-engine/tests/test-data/storage/storage.ts +++ b/packages/apps-engine/tests/test-data/storage/storage.ts @@ -1,10 +1,11 @@ -import * as Datastore from 'nedb'; - import type { IAppStorageItem } from '../../../src/server/storage'; import { AppMetadataStorage } from '../../../src/server/storage'; +// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/consistent-type-imports +const Datastore = require('@seald-io/nedb') as typeof import('@seald-io/nedb').default; + export class TestsAppStorage extends AppMetadataStorage { - private db: Datastore; + private db: InstanceType; constructor() { super('nedb'); @@ -17,13 +18,13 @@ export class TestsAppStorage extends AppMetadataStorage { item.createdAt = new Date(); item.updatedAt = new Date(); - this.db.findOne({ $or: [{ id: item.id }, { 'info.nameSlug': item.info.nameSlug }] }, (err: Error, doc: IAppStorageItem) => { + this.db.findOne({ $or: [{ id: item.id }, { 'info.nameSlug': item.info.nameSlug }] }, (err, doc: IAppStorageItem) => { if (err) { reject(err); } else if (doc) { reject(new Error('App already exists.')); } else { - this.db.insert(item, (err2: Error, doc2: IAppStorageItem) => { + this.db.insert(item, (err2, doc2: IAppStorageItem) => { if (err2) { reject(err2); } else { @@ -37,7 +38,7 @@ export class TestsAppStorage extends AppMetadataStorage { public retrieveOne(id: string): Promise { return new Promise((resolve, reject) => { - this.db.findOne({ id }, (err: Error, doc: IAppStorageItem) => { + this.db.findOne({ id }, (err, doc: IAppStorageItem) => { if (err) { reject(err); } else if (doc) { @@ -83,7 +84,7 @@ export class TestsAppStorage extends AppMetadataStorage { public update(item: IAppStorageItem): Promise { return new Promise((resolve, reject) => { - this.db.update({ id: item.id }, item, {}, (err: Error, numOfUpdated: number) => { + this.db.update({ id: item.id }, item, {}, (err, _numOfUpdated: number) => { if (err) { reject(err); } else { @@ -97,7 +98,7 @@ export class TestsAppStorage extends AppMetadataStorage { public remove(id: string): Promise<{ success: boolean }> { return new Promise((resolve, reject) => { - this.db.remove({ id }, (err: Error) => { + this.db.remove({ id }, (err) => { if (err) { reject(err); } else { diff --git a/yarn.lock b/yarn.lock index 6bdfd64bf26..e9f7a8c3873 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6969,10 +6969,10 @@ __metadata: "@msgpack/msgpack": "npm:3.0.0-beta2" "@rocket.chat/eslint-config": "workspace:~" "@rocket.chat/ui-kit": "workspace:~" + "@seald-io/nedb": "npm:^4.1.2" "@types/adm-zip": "npm:^0.5.7" "@types/debug": "npm:^4.1.12" "@types/lodash.clonedeep": "npm:^4.5.9" - "@types/nedb": "npm:^1.8.16" "@types/node": "npm:~22.16.1" "@types/semver": "npm:^7.5.8" "@types/stack-trace": "npm:0.0.33" @@ -6988,7 +6988,6 @@ __metadata: jose: "npm:^4.15.9" jsonrpc-lite: "npm:^2.2.0" lodash.clonedeep: "npm:^4.5.0" - nedb: "npm:^1.8.0" npm-run-all: "npm:^4.1.5" nyc: "npm:^17.1.0" rimraf: "npm:^6.0.1" @@ -7971,7 +7970,6 @@ __metadata: "@types/meteor-collection-hooks": "npm:^0.8.9" "@types/mkdirp": "npm:^1.0.2" "@types/mocha": "github:whitecolor/mocha-types" - "@types/nedb": "npm:^1" "@types/node": "npm:~22.16.1" "@types/node-rsa": "npm:^1.1.4" "@types/nodemailer": "npm:^6.4.17" @@ -8122,7 +8120,6 @@ __metadata: mongo-message-queue: "npm:^1.1.0" mongodb: "npm:6.10.0" nats: "npm:^2.28.2" - nedb: "npm:~1.8.0" node-dogstatsd: "npm:^0.0.7" node-fetch: "npm:2.7.0" node-rsa: "npm:^1.1.1" @@ -9483,6 +9480,24 @@ __metadata: languageName: node linkType: hard +"@seald-io/binary-search-tree@npm:^1.0.3": + version: 1.0.3 + resolution: "@seald-io/binary-search-tree@npm:1.0.3" + checksum: 10/0eecd682f56b93557e0cbe4a5b55f48e31f217cae350a5000d397b3ea17a67da62e48dba665f1a9e28345a0d1eb92d287511c1af1dc9e32725157fd181ce7f19 + languageName: node + linkType: hard + +"@seald-io/nedb@npm:^4.1.2": + version: 4.1.2 + resolution: "@seald-io/nedb@npm:4.1.2" + dependencies: + "@seald-io/binary-search-tree": "npm:^1.0.3" + localforage: "npm:^1.10.0" + util: "npm:^0.12.5" + checksum: 10/9d78476bb2af52b18fb781e385a48dd3d4e8f6c40846e47ec499c6ff9e0c7db2f597fd4fcb1bf0e2f6d6096a8c6153fb84106109de01cfcfa583eb77f2bc1e74 + languageName: node + linkType: hard + "@selderee/plugin-htmlparser2@npm:^0.11.0": version: 0.11.0 resolution: "@selderee/plugin-htmlparser2@npm:0.11.0" @@ -11832,7 +11847,7 @@ __metadata: languageName: node linkType: hard -"@types/nedb@npm:^1, @types/nedb@npm:^1.8.16": +"@types/nedb@npm:^1.8.16": version: 1.8.16 resolution: "@types/nedb@npm:1.8.16" dependencies: @@ -14080,13 +14095,6 @@ __metadata: languageName: node linkType: hard -"async@npm:0.2.10": - version: 0.2.10 - resolution: "async@npm:0.2.10" - checksum: 10/b3b92bd0257dafc1b8c4b87dcf36aea70ed36fd179797d725d564b5deec07246d4afa222c3d5f1b6009e579aeab0a6aa03b56869906a7e8ff46e7d33e4f2e879 - languageName: node - linkType: hard - "async@npm:^3.2.3, async@npm:^3.2.4": version: 3.2.6 resolution: "async@npm:3.2.6" @@ -14780,15 +14788,6 @@ __metadata: languageName: node linkType: hard -"binary-search-tree@npm:0.2.5": - version: 0.2.5 - resolution: "binary-search-tree@npm:0.2.5" - dependencies: - underscore: "npm:~1.4.4" - checksum: 10/3c54292fd5f58f31fb5ab267b0604552ee5da6f2098c2a0d4f57b56a32cb394d1d6db369eafef741719c210b48979d652ec964677593e52a0c4bd7061cd9824e - languageName: node - linkType: hard - "bintrees@npm:1.0.1": version: 1.0.1 resolution: "bintrees@npm:1.0.1" @@ -25070,7 +25069,7 @@ __metadata: languageName: node linkType: hard -"localforage@npm:^1.10.0, localforage@npm:^1.3.0": +"localforage@npm:^1.10.0": version: 1.10.0 resolution: "localforage@npm:1.10.0" dependencies: @@ -26332,7 +26331,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^0.5.1, mkdirp@npm:~0.5.1": +"mkdirp@npm:^0.5.1": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" dependencies: @@ -26747,19 +26746,6 @@ __metadata: languageName: node linkType: hard -"nedb@npm:^1.8.0, nedb@npm:~1.8.0": - version: 1.8.0 - resolution: "nedb@npm:1.8.0" - dependencies: - async: "npm:0.2.10" - binary-search-tree: "npm:0.2.5" - localforage: "npm:^1.3.0" - mkdirp: "npm:~0.5.1" - underscore: "npm:~1.4.4" - checksum: 10/192d6f5c59ca6ba739aa88a2466f4bdee7e9e3c3a4ffde0898ec6c01dd18e3e0f572d146d7333a6acf85ba59bd2ab8f1d621d561e02d048b0421783594a51fc6 - languageName: node - linkType: hard - "negotiator@npm:0.6.3, negotiator@npm:^0.6.3": version: 0.6.3 resolution: "negotiator@npm:0.6.3"