Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@types/jest": "30.0.0",
"@types/node": "22.18.0",
"@types/proper-lockfile": "4.1.4",
"audit-ci": "7.1.0",
"esbuild": "0.25.0",
"esbuild-node-externals": "1.14.0",
"husky": "8.0.3",
Expand All @@ -29,7 +30,6 @@
"testcontainers": "11.13.0",
"typescript": "5.9.2",
"update-dotenv": "1.1.1",
"audit-ci": "7.1.0",
"yargs": "17.7.2"
},
"scripts": {
Expand Down Expand Up @@ -109,7 +109,8 @@
"esm": "npm:esm-wallaby@3.2.35",
"@types/koa": "3.0.1",
"brace-expansion": "5.0.5",
"@smithy/node-http-handler": "4.4.16"
"@smithy/node-http-handler": "4.4.16",
"**/lodash": "4.18.1"
},
"engines": {
"node": ">=22.0.0 <23.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/backend-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"koa-passport": "6.0.0",
"koa-pino-logger": "4.0.0",
"@koa/router": "13.1.0",
"lodash": "4.17.23",
"lodash": "4.18.1",
"node-fetch": "2.6.7",
"passport-google-oauth": "2.0.0",
"passport-local": "1.0.0",
Expand Down
24 changes: 0 additions & 24 deletions packages/backend-core/src/docUpdates/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/backend-core/src/events/asyncEvents/index.ts

This file was deleted.

12 changes: 0 additions & 12 deletions packages/backend-core/src/events/asyncEvents/publisher.ts

This file was deleted.

27 changes: 0 additions & 27 deletions packages/backend-core/src/events/asyncEvents/queue.ts

This file was deleted.

41 changes: 0 additions & 41 deletions packages/backend-core/src/events/documentId.ts

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion packages/backend-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export * as context from "./context"
export * as csv from "./csv"
export * as db from "./db"
export * as docIds from "./docIds"
export * as docUpdates from "./docUpdates"
export * from "./Endpoint"
export { default as env, setEnv, withEnv } from "./environment"
export * as errors from "./errors"
Expand Down
4 changes: 0 additions & 4 deletions packages/backend-core/src/queue/constants.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
export enum JobQueue {
AUTOMATION = "automationQueue",
APP_BACKUP = "appBackupQueue",
AUDIT_LOG = "auditLogQueue",
SYSTEM_EVENT_QUEUE = "systemEventQueue",
APP_MIGRATION = "appMigration",
DOC_WRITETHROUGH_QUEUE = "docWritethroughQueue",
DEV_REVERT_PROCESSOR = "devRevertProcessorQueue",
Expand Down
8 changes: 0 additions & 8 deletions packages/backend-core/src/queue/listeners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,13 @@ enum BullEvent {
}

enum QueueEventType {
AUTOMATION_EVENT = "automation-event",
APP_BACKUP_EVENT = "app-backup-event",
AUDIT_LOG_EVENT = "audit-log-event",
SYSTEM_EVENT = "system-event",
APP_MIGRATION = "app-migration",
DOC_WRITETHROUGH = "doc-writethrough",
DEV_REVERT_EVENT = "dev-revert-event",
BATCH_USER_SYNC_PROCESSOR = "batch-user-sync-processor",
}

const EventTypeMap: { [key in JobQueue]: QueueEventType } = {
[JobQueue.AUTOMATION]: QueueEventType.AUTOMATION_EVENT,
[JobQueue.APP_BACKUP]: QueueEventType.APP_BACKUP_EVENT,
[JobQueue.AUDIT_LOG]: QueueEventType.AUDIT_LOG_EVENT,
[JobQueue.SYSTEM_EVENT_QUEUE]: QueueEventType.SYSTEM_EVENT,
[JobQueue.APP_MIGRATION]: QueueEventType.APP_MIGRATION,
[JobQueue.DOC_WRITETHROUGH_QUEUE]: QueueEventType.DOC_WRITETHROUGH,
[JobQueue.DEV_REVERT_PROCESSOR]: QueueEventType.DEV_REVERT_EVENT,
Expand Down
7 changes: 5 additions & 2 deletions packages/backend-core/src/queue/queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class BudibaseQueue<T> {
}

private initQueue() {
const redisOpts = getRedisOptions()
const redisOpts = getRedisOptions() as QueueOptions["redis"]
const queueConfig: QueueOptions = {
redis: redisOpts,
settings: {
Expand All @@ -75,7 +75,10 @@ export class BudibaseQueue<T> {
) {
queue = new BullQueue(this.jobQueue, {
...queueConfig,
redis: { host: "localhost", port: Number(process.env.BULL_TEST_REDIS_PORT) },
redis: {
host: "localhost",
port: Number(process.env.BULL_TEST_REDIS_PORT),
},
})
} else {
queue = new InMemoryQueue(this.jobQueue, queueConfig) as any
Expand Down
12 changes: 1 addition & 11 deletions packages/backend-core/src/utils/utils.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
AuditedEventFriendlyName,
type Ctx,
type Event,
TenantResolutionStrategy,
type Workspace,
} from "@budibase/types"
import { type Ctx, TenantResolutionStrategy, type Workspace } from "@budibase/types"
import type { SetOption } from "cookies"
import jwt, { type Secret } from "jsonwebtoken"
import { DocumentType, Header, MAX_VALID_DATE, SEPARATOR } from "../constants"
Expand Down Expand Up @@ -228,10 +222,6 @@ export function timeout(timeMs: number) {
return new Promise((resolve) => setTimeout(resolve, timeMs))
}

export function isAudited(event: Event) {
return Boolean(AuditedEventFriendlyName[event])
}

export function hasCircularStructure(json: any) {
if (typeof json !== "object") {
return false
Expand Down
4 changes: 2 additions & 2 deletions packages/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
"dayjs": "1.10.8",
"downloadjs": "1.4.7",
"fast-json-patch": "^3.1.1",
"lodash": "4.17.23",
"lodash": "4.18.1",
"marked": "15.0.8",
"remixicon": "2.5.0",
"sanitize-html": "2.13.0",
"shortid": "2.2.17",
"svelte-dnd-action": "0.9.64",
"svelte-loading-spinners": "^0.3.6",
"svelte-portal": "^2.2.1",
"yup": "0.32.11"
"yup": "1.7.1"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.13.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@budibase/shared-core": "*",
"@budibase/types": "*",
"dayjs": "1.10.8",
"lodash": "4.17.23",
"lodash": "4.18.1",
"shortid": "2.2.17",
"socket.io-client": "4.7.5"
}
Expand Down
4 changes: 1 addition & 3 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"@koa/router": "13.1.0",
"@socket.io/redis-adapter": "8.2.1",
"@types/xml2js": "0.4.14",
"archiver": "7.0.1",
"bcrypt": "6.0.0",
"bson": "6.9.0",
"buffer": "6.0.3",
Expand Down Expand Up @@ -86,7 +85,7 @@
"koa-send": "5.0.1",
"koa-useragent": "4.1.0",
"koa2-ratelimit": "1.1.3",
"lodash": "4.17.23",
"lodash": "4.18.1",
"mailparser": "3.7.2",
"memorystream": "0.3.1",
"minio": "8.0.7",
Expand Down Expand Up @@ -116,7 +115,6 @@
"devDependencies": {
"@babel/core": "^7.22.5",
"@babel/preset-env": "7.16.11",
"@types/archiver": "6.0.2",
"@types/formidable": "^3.4.6",
"@types/global-agent": "2.1.1",
"@types/html-to-text": "^9.0.4",
Expand Down
Loading
Loading