MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore/npmless-builds

This commit is contained in:
Adria Navarro 2023-05-03 18:00:12 +01:00
parent 00cd09d6d4 7facf0c9ea
commit ba41fe97e1
27 changed files with 265 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosting/proxy/nginx.prod.conf
View File

@ -222,9 +222,9 @@ http {
rewrite ^/files/signed/(.*)$ /$1 break; rewrite ^/files/signed/(.*)$ /$1 break;
} }
client_header_timeout 60; client_header_timeout 120;
client_body_timeout 60; client_body_timeout 120;
keepalive_timeout 60; keepalive_timeout 120;
# gzip # gzip
gzip on; gzip on;

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/backend-core", "packages/backend-core",

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -22,7 +22,7 @@
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.2", "@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10", "@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.5.6-alpha.42", "@budibase/types": "2.5.10-alpha.0",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

3
packages/backend-core/src/cache/writethrough.ts vendored
View File

@ -47,7 +47,7 @@ async function put(
type: LockType.TRY_ONCE, type: LockType.TRY_ONCE,
name: LockName.PERSIST_WRITETHROUGH, name: LockName.PERSIST_WRITETHROUGH,
resource: key, resource: key,
ttl: 1000, ttl: 15000,
}, },
async () => { async () => {
const writeDb = async (toWrite: any) => { const writeDb = async (toWrite: any) => {
@ -71,6 +71,7 @@ async function put(
} }
} }
) )
if (!lockResponse.executed) { if (!lockResponse.executed) {
logWarn(`Ignoring redlock conflict in write-through cache`) logWarn(`Ignoring redlock conflict in write-through cache`)
} }

2
packages/backend-core/src/db/lucene.ts
View File

@ -434,7 +434,7 @@ export class QueryBuilder<T> {
}) })
} }
if (this.#query.empty) { if (this.#query.empty) {
build(this.#query.empty, (key: string) => `!${key}:["" TO *]`) build(this.#query.empty, (key: string) => `(*:* -${key}:["" TO *])`)
} }
if (this.#query.notEmpty) { if (this.#query.notEmpty) {
build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`) build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`)

1
packages/backend-core/src/environment.ts
View File

@ -154,6 +154,7 @@ const environment = {
? process.env.ENABLE_SSO_MAINTENANCE_MODE ? process.env.ENABLE_SSO_MAINTENANCE_MODE
: false, : false,
VERSION: findVersion(), VERSION: findVersion(),
DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
_set(key: any, value: any) { _set(key: any, value: any) {
process.env[key] = value process.env[key] = value
// @ts-ignore // @ts-ignore

17
packages/backend-core/src/events/publishers/license.ts
View File

@ -15,17 +15,18 @@ import {
async function planChanged( async function planChanged(
account: Account, account: Account,
from: PlanType, opts: {
to: PlanType, from: PlanType
quantity: number | undefined, to: PlanType
duration: PriceDuration | undefined fromQuantity: number | undefined
toQuantity: number | undefined
fromDuration: PriceDuration | undefined
toDuration: PriceDuration | undefined
}
) { ) {
const properties: LicensePlanChangedEvent = { const properties: LicensePlanChangedEvent = {
accountId: account.accountId, accountId: account.accountId,
to, ...opts,
from,
quantity,
duration,
} }
await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) await publishEvent(Event.LICENSE_PLAN_CHANGED, properties)
} }

2
packages/backend-core/src/logging/index.ts
View File

@ -1,5 +1,5 @@
export * as correlation from "./correlation/correlation" export * as correlation from "./correlation/correlation"
export { logger, disableLogger } from "./pino/logger" export { logger } from "./pino/logger"
export * from "./alerts" export * from "./alerts"
// turn off or on context logging i.e. tenantId, appId etc // turn off or on context logging i.e. tenantId, appId etc

109
packages/backend-core/src/logging/pino/logger.ts
View File

@ -5,20 +5,11 @@ import * as correlation from "../correlation"
import { IdentityType } from "@budibase/types" import { IdentityType } from "@budibase/types"
import { LOG_CONTEXT } from "../index" import { LOG_CONTEXT } from "../index"
// CORE LOGGERS - for disabling
const BUILT_INS = {
log: console.log,
error: console.error,
info: console.info,
warn: console.warn,
trace: console.trace,
debug: console.debug,
}
// LOGGER // LOGGER
const pinoOptions: LoggerOptions = { let pinoInstance: pino.Logger | undefined
if (!env.DISABLE_PINO_LOGGER) {
const pinoOptions: LoggerOptions = {
level: env.LOG_LEVEL, level: env.LOG_LEVEL,
formatters: { formatters: {
level: label => { level: label => {
@ -29,31 +20,22 @@ const pinoOptions: LoggerOptions = {
}, },
}, },
timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`, timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
} }
if (env.isDev()) { if (env.isDev()) {
pinoOptions.transport = { pinoOptions.transport = {
target: "pino-pretty", target: "pino-pretty",
options: { options: {
singleLine: true, singleLine: true,
}, },
} }
} }
export const logger = pino(pinoOptions) pinoInstance = pino(pinoOptions)
export function disableLogger() { // CONSOLE OVERRIDES
console.log = BUILT_INS.log
console.error = BUILT_INS.error
console.info = BUILT_INS.info
console.warn = BUILT_INS.warn
console.trace = BUILT_INS.trace
console.debug = BUILT_INS.debug
}
// CONSOLE OVERRIDES interface MergingObject {
interface MergingObject {
objects?: any[] objects?: any[]
tenantId?: string tenantId?: string
appId?: string appId?: string
@ -61,25 +43,25 @@ interface MergingObject {
identityType?: IdentityType identityType?: IdentityType
correlationId?: string correlationId?: string
err?: Error err?: Error
} }
function isPlainObject(obj: any) { function isPlainObject(obj: any) {
return typeof obj === "object" && obj !== null && !(obj instanceof Error) return typeof obj === "object" && obj !== null && !(obj instanceof Error)
} }
function isError(obj: any) { function isError(obj: any) {
return obj instanceof Error return obj instanceof Error
} }
function isMessage(obj: any) { function isMessage(obj: any) {
return typeof obj === "string" return typeof obj === "string"
} }
/** /**
* Backwards compatibility between console logging statements * Backwards compatibility between console logging statements
* and pino logging requirements. * and pino logging requirements.
*/ */
function getLogParams(args: any[]): [MergingObject, string] { function getLogParams(args: any[]): [MergingObject, string] {
let error = undefined let error = undefined
let objects: any[] = [] let objects: any[] = []
let message = "" let message = ""
@ -117,47 +99,47 @@ function getLogParams(args: any[]): [MergingObject, string] {
} }
return [mergingObject, message] return [mergingObject, message]
} }
console.log = (...arg: any[]) => { console.log = (...arg: any[]) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
logger.info(obj, msg) pinoInstance?.info(obj, msg)
} }
console.info = (...arg: any[]) => { console.info = (...arg: any[]) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
logger.info(obj, msg) pinoInstance?.info(obj, msg)
} }
console.warn = (...arg: any[]) => { console.warn = (...arg: any[]) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
logger.warn(obj, msg) pinoInstance?.warn(obj, msg)
} }
console.error = (...arg: any[]) => { console.error = (...arg: any[]) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
logger.error(obj, msg) pinoInstance?.error(obj, msg)
} }
/** /**
* custom trace impl - this resembles the node trace behaviour rather * custom trace impl - this resembles the node trace behaviour rather
* than traditional trace logging * than traditional trace logging
* @param arg * @param arg
*/ */
console.trace = (...arg: any[]) => { console.trace = (...arg: any[]) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
if (!obj.err) { if (!obj.err) {
// to get stack trace // to get stack trace
obj.err = new Error() obj.err = new Error()
} }
logger.trace(obj, msg) pinoInstance?.trace(obj, msg)
} }
console.debug = (...arg: any) => { console.debug = (...arg: any) => {
const [obj, msg] = getLogParams(arg) const [obj, msg] = getLogParams(arg)
logger.debug(obj, msg) pinoInstance?.debug(obj, msg)
} }
// CONTEXT // CONTEXT
const getTenantId = () => { const getTenantId = () => {
let tenantId let tenantId
try { try {
tenantId = context.getTenantId() tenantId = context.getTenantId()
@ -165,9 +147,9 @@ const getTenantId = () => {
// do nothing // do nothing
} }
return tenantId return tenantId
} }
const getAppId = () => { const getAppId = () => {
let appId let appId
try { try {
appId = context.getAppId() appId = context.getAppId()
@ -175,9 +157,9 @@ const getAppId = () => {
// do nothing // do nothing
} }
return appId return appId
} }
const getIdentity = () => { const getIdentity = () => {
let identity let identity
try { try {
identity = context.getIdentity() identity = context.getIdentity()
@ -185,4 +167,7 @@ const getIdentity = () => {
// do nothing // do nothing
} }
return identity return identity
}
} }
export const logger = pinoInstance

2
packages/backend-core/tests/core/utilities/structures/licenses.ts
View File

@ -29,7 +29,7 @@ export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => {
type, type,
usesInvoicing: false, usesInvoicing: false,
model: PlanModel.PER_USER, model: PlanModel.PER_USER,
price: price(), price: type !== PlanType.FREE ? price() : undefined,
} }
} }

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@spectrum-css/accordion": "3.0.24", "@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -58,10 +58,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.42", "@budibase/bbui": "2.5.10-alpha.0",
"@budibase/frontend-core": "2.5.6-alpha.42", "@budibase/frontend-core": "2.5.10-alpha.0",
"@budibase/shared-core": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1",

19
packages/builder/src/components/backend/TableNavigator/utils.js
View File

@ -42,16 +42,7 @@ export const parseFile = e => {
reader.addEventListener("load", function (e) { reader.addEventListener("load", function (e) {
const fileData = e.target.result const fileData = e.target.result
if (file.type?.includes("json")) {
if (file.type === "text/csv") {
API.csvToJson(fileData)
.then(rows => {
resolveRows(rows)
})
.catch(() => {
reject("can't convert csv to json")
})
} else if (file.type === "application/json") {
const parsedFileData = JSON.parse(fileData) const parsedFileData = JSON.parse(fileData)
if (Array.isArray(parsedFileData)) { if (Array.isArray(parsedFileData)) {
@ -62,7 +53,13 @@ export const parseFile = e => {
reject("invalid json format") reject("invalid json format")
} }
} else { } else {
reject("invalid file type") API.csvToJson(fileData)
.then(rows => {
resolveRows(rows)
})
.catch(() => {
reject("cannot parse csv")
})
} }
}) })

2
packages/builder/src/stores/portal/users.js
View File

@ -41,7 +41,7 @@ export function createUsersStore() {
inviteCode, inviteCode,
password, password,
firstName, firstName,
lastName, lastName: !lastName?.trim() ? undefined : lastName,
}) })
} }

10
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@ -29,14 +29,14 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.5.6-alpha.42", "@budibase/backend-core": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@budibase/types": "2.5.6-alpha.42", "@budibase/types": "2.5.10-alpha.0",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",
"commander": "7.1.0", "commander": "7.1.0",
"docker-compose": "0.23.12", "docker-compose": "0.24.0",
"dotenv": "16.0.1", "dotenv": "16.0.1",
"download": "8.0.0", "download": "8.0.0",
"find-free-port": "^2.0.0", "find-free-port": "^2.0.0",

3
packages/cli/src/index.ts
View File

@ -1,6 +1,5 @@
#!/usr/bin/env node #!/usr/bin/env node
import { logging } from "@budibase/backend-core" process.env.DISABLE_PINO_LOGGER = "1"
logging.disableLogger()
import "./prebuilds" import "./prebuilds"
import "./environment" import "./environment"
import { env } from "@budibase/backend-core" import { env } from "@budibase/backend-core"

12
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,11 +19,11 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.42", "@budibase/bbui": "2.5.10-alpha.0",
"@budibase/frontend-core": "2.5.6-alpha.42", "@budibase/frontend-core": "2.5.10-alpha.0",
"@budibase/shared-core": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@budibase/types": "2.5.6-alpha.42", "@budibase/types": "2.5.10-alpha.0",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

6
packages/frontend-core/package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.42", "@budibase/bbui": "2.5.10-alpha.0",
"@budibase/shared-core": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.10-alpha.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"socket.io-client": "^4.6.1", "socket.io-client": "^4.6.1",

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

14
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -45,12 +45,12 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.5.6-alpha.42", "@budibase/backend-core": "2.5.10-alpha.0",
"@budibase/client": "2.5.6-alpha.42", "@budibase/client": "2.5.10-alpha.0",
"@budibase/pro": "2.5.6-alpha.42", "@budibase/pro": "2.5.10-alpha.0",
"@budibase/shared-core": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@budibase/types": "2.5.6-alpha.42", "@budibase/types": "2.5.10-alpha.0",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

2
packages/server/src/api/routes/tests/internalSearch.spec.js
View File

@ -105,7 +105,7 @@ describe("internal search", () => {
"column": "", "column": "",
}, },
}, PARAMS) }, PARAMS)
checkLucene(response, `*:* AND !column:["" TO *]`, PARAMS) checkLucene(response, `*:* AND (*:* -column:["" TO *])`, PARAMS)
}) })
it("test notEmpty query", async () => { it("test notEmpty query", async () => {

4
packages/shared-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/shared-core", "name": "@budibase/shared-core",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Shared data utils", "description": "Shared data utils",
"main": "dist/cjs/src/index.js", "main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts", "types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
"dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
}, },
"dependencies": { "dependencies": {
"@budibase/types": "2.5.6-alpha.42" "@budibase/types": "2.5.10-alpha.0"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^7.6.0", "concurrently": "^7.6.0",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/cjs/index.js", "main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts", "types": "dist/mjs/index.d.ts",

9
packages/types/src/sdk/events/license.ts
View File

@ -5,11 +5,10 @@ export interface LicensePlanChangedEvent {
from: PlanType from: PlanType
to: PlanType to: PlanType
// may not be on historical events // may not be on historical events
// free plans won't have a duration fromDuration: PriceDuration | undefined
duration: PriceDuration | undefined toDuration: PriceDuration | undefined
// may not be on historical events fromQuantity: number | undefined
// free plans won't have a quantity toQuantity: number | undefined
quantity: number | undefined
} }
export interface LicenseActivatedEvent { export interface LicenseActivatedEvent {

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.5.6-alpha.42", "version": "2.5.10-alpha.0",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -37,10 +37,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.5.6-alpha.42", "@budibase/backend-core": "2.5.10-alpha.0",
"@budibase/pro": "2.5.6-alpha.42", "@budibase/pro": "2.5.10-alpha.0",
"@budibase/string-templates": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.10-alpha.0",
"@budibase/types": "2.5.6-alpha.42", "@budibase/types": "2.5.10-alpha.0",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

54
yarn.lock
View File

@ -1525,15 +1525,15 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.5.6-alpha.42": "@budibase/pro@2.5.10-alpha.0":
version "2.5.6-alpha.42" version "2.5.10-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.42.tgz#15ec86d9918b7d58e3236240afda31309f3162ae" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df"
integrity sha512-aes19IVAEGqf0YPLJMnOKHv99AR6LO8jMpPVCbSZcZODS3byxh9kC2+sWH1mAd781zymyN79HnwGrVJNOdV8jw== integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg==
dependencies: dependencies:
"@budibase/backend-core" "2.5.6-alpha.42" "@budibase/backend-core" "2.5.10-alpha.0"
"@budibase/shared-core" "2.4.44-alpha.1" "@budibase/shared-core" "2.5.9"
"@budibase/string-templates" "2.4.44-alpha.1" "@budibase/string-templates" "2.5.9"
"@budibase/types" "2.5.6-alpha.42" "@budibase/types" "2.5.10-alpha.0"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -1551,6 +1551,13 @@
dependencies: dependencies:
"@budibase/types" "2.4.44-alpha.1" "@budibase/types" "2.4.44-alpha.1"
"@budibase/shared-core@2.5.9":
version "2.5.9"
resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.9.tgz#f22f22637fb7618ded1c7292b10793d7969827ce"
integrity sha512-l417Rb2+1tuXbjNL42wJHmqIQQyla2pPglOnapxfOdRuvzng+5GqlrTV1caLNf/53TS9U6ueGJdPOtxZTTFGUA==
dependencies:
"@budibase/types" "^2.5.9"
"@budibase/standard-components@^0.9.139": "@budibase/standard-components@^0.9.139":
version "0.9.139" version "0.9.139"
resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3"
@ -1581,6 +1588,18 @@
lodash "^4.17.20" lodash "^4.17.20"
vm2 "^3.9.4" vm2 "^3.9.4"
"@budibase/string-templates@2.5.9":
version "2.5.9"
resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.9.tgz#64582730421801e1e829b430136b449b1adc0314"
integrity sha512-Szu06M0JFHuUVIil2aHZWU8hvsROYpDx9raX9uIv4DcwBOAtyvVzD16wOCHzlmj8wWeV8fbKe4JF4q4GXnilJg==
dependencies:
"@budibase/handlebars-helpers" "^0.11.8"
dayjs "^1.10.4"
handlebars "^4.7.6"
handlebars-utils "^1.0.6"
lodash "^4.17.20"
vm2 "^3.9.15"
"@budibase/types@2.4.44-alpha.1": "@budibase/types@2.4.44-alpha.1":
version "2.4.44-alpha.1" version "2.4.44-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933"
@ -1593,6 +1612,11 @@
dependencies: dependencies:
scim-patch "^0.7.0" scim-patch "^0.7.0"
"@budibase/types@^2.5.9":
version "2.5.9"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.9.tgz#4b1253e76b95cd8d6a42e86ebc3363a305c62653"
integrity sha512-7NELdWB3iV5y+pmXhm9g/v1AlN+wqHtoy67DZxKY5dlcK4DCcTdlqkToGiiw9d3sDPgDAVznjdZYnB5pGzd3TQ==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"
resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af"
@ -9607,13 +9631,6 @@ dir-glob@^3.0.1:
dependencies: dependencies:
path-type "^4.0.0" path-type "^4.0.0"
docker-compose@0.23.12:
version "0.23.12"
resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c"
integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw==
dependencies:
yaml "^1.10.2"
docker-compose@0.23.17: docker-compose@0.23.17:
version "0.23.17" version "0.23.17"
resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba"
@ -9621,6 +9638,13 @@ docker-compose@0.23.17:
dependencies: dependencies:
yaml "^1.10.2" yaml "^1.10.2"
docker-compose@0.24.0:
version "0.24.0"
resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.24.0.tgz#474cd38b05b3887a56ffb2c39f16a7ae4d7d5077"
integrity sha512-RN/oSPLPa6ZG5e4dHg8tD8EMpd1WJqomNMBQT+d2M5MwcmfrPW/xHTent4TVqX0zZvHemv7qhhNlzXjxCnFaQw==
dependencies:
yaml "^1.10.2"
docker-compose@^0.23.5: docker-compose@^0.23.5:
version "0.23.19" version "0.23.19"
resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8"