From ead89bf0bf32f84ca9c4ef963857ed2b0297ee3f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:31:32 +0000 Subject: [PATCH 01/20] v2.5.6-alpha.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 77b105ce3c..6633dc9eee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2af6de59e5..fedb763e75 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fe0dfdc2d5..ca17df6ce2 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6983b365db..3d2a05e998 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 94bf0825ad..6a2f7bf373 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2d70e5e847..080d67e780 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2ec43faef0..fabc8b265c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7bbb57aa92..77bee658f9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a131a5dd31..a66729df54 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/client": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/client": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index e821537eac..0cbf9fe2da 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.35" + "@budibase/types": "2.5.6-alpha.36" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 023fc5d17a..0818e222f2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f284179e81..bb44434d1f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 01662722ce..1a23c490a7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1b815c363a2497bc026c59f9e134c851fad47c8c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:32:55 +0000 Subject: [PATCH 02/20] Update pro version to 2.5.6-alpha.36 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a66729df54..4390ea3882 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.36", "@budibase/client": "2.5.6-alpha.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/shared-core": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1a23c490a7..4e27f3e73c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 9020feb28a..806073b5a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.34": - version "2.5.6-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.34.tgz#b992dd7830479e1e869c03fedc11b552d0cea2ca" - integrity sha512-mK/gVZuR+3USPQidTq+xSm0H5VRX2/DgWNOoDp2b8XzrHeTDPV/Qy7yJd3Cxidemk25+ddwbU/VRrPMa+6PKSw== +"@budibase/pro@2.5.6-alpha.35": + version "2.5.6-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" + integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.34" + "@budibase/backend-core" "2.5.6-alpha.35" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.34" + "@budibase/types" "2.5.6-alpha.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5363693ac305bb28af6a34282f1525f45e050d30 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 27 Apr 2023 11:36:52 +0100 Subject: [PATCH 03/20] Removing automation logs from app exports as they are not useful - they take up space and the imported app won't have ran any automations yet. I have added it as a flag so that this does not affect backups (as you would want to maintain logs for backups). --- packages/server/src/db/utils.ts | 1 + .../server/src/sdk/app/backups/exports.ts | 23 ++++++++++++++----- yarn.lock | 12 +++++----- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts index 50341e4abc..e08392c3a1 100644 --- a/packages/server/src/db/utils.ts +++ b/packages/server/src/db/utils.ts @@ -27,6 +27,7 @@ export const isProdAppID = dbCore.isProdAppID export const USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}` +export const AUTOMATION_LOG_PREFIX = `${DocumentType.AUTOMATION_LOG}${SEPARATOR}` export const ViewName = dbCore.ViewName export const InternalTables = dbCore.InternalTable export const UNICODE_MAX = dbCore.UNICODE_MAX diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts index 27a907fceb..57342e7462 100644 --- a/packages/server/src/sdk/app/backups/exports.ts +++ b/packages/server/src/sdk/app/backups/exports.ts @@ -3,6 +3,7 @@ import { budibaseTempDir } from "../../../utilities/budibaseDir" import { streamFile, createTempFolder } from "../../../utilities/fileSystem" import { ObjectStoreBuckets } from "../../../constants" import { + AUTOMATION_LOG_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, USER_METDATA_PREFIX, @@ -20,11 +21,15 @@ const uuid = require("uuid/v4") const tar = require("tar") const MemoryStream = require("memorystream") -type ExportOpts = { +interface DBDumpOpts { filter?: any exportPath?: string +} + +interface ExportOpts extends DBDumpOpts { tar?: boolean excludeRows?: boolean + excludeLogs?: boolean } function tarFilesToTmp(tmpDir: string, files: string[]) { @@ -49,7 +54,7 @@ function tarFilesToTmp(tmpDir: string, files: string[]) { * a filter function or the name of the export. * @return {*} either a readable stream or a string */ -export async function exportDB(dbName: string, opts: ExportOpts = {}) { +export async function exportDB(dbName: string, opts: DBDumpOpts = {}) { const exportOpts = { filter: opts?.filter, batch_size: 1000, @@ -76,11 +81,14 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) { }) } -function defineFilter(excludeRows?: boolean) { +function defineFilter(excludeRows?: boolean, excludeLogs?: boolean) { const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX] if (excludeRows) { ids.push(TABLE_ROW_PREFIX) } + if (excludeLogs) { + ids.push(AUTOMATION_LOG_PREFIX) + } return (doc: any) => !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr) } @@ -130,8 +138,7 @@ export async function exportApp(appId: string, config?: ExportOpts) { // enforce an export of app DB to the tmp path const dbPath = join(tmpPath, DB_EXPORT_FILE) await exportDB(appId, { - ...config, - filter: defineFilter(config?.excludeRows), + filter: defineFilter(config?.excludeRows, config?.excludeLogs), exportPath: dbPath, }) // if tar requested, return where the tarball is @@ -155,6 +162,10 @@ export async function exportApp(appId: string, config?: ExportOpts) { * @returns {*} a readable stream of the backup which is written in real time */ export async function streamExportApp(appId: string, excludeRows: boolean) { - const tmpPath = await exportApp(appId, { excludeRows, tar: true }) + const tmpPath = await exportApp(appId, { + excludeRows, + excludeLogs: true, + tar: true, + }) return streamFile(tmpPath) } diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5728cf9b2a66e42b7a886c3d6915d7c527069478 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 11:55:03 +0100 Subject: [PATCH 04/20] Add clickoutside handlers to options, long form and relationship cells --- .../src/components/grid/cells/LongFormCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 3 ++- .../src/components/grid/cells/RelationshipCell.svelte | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte index 00e12dc6a3..886d4ef8b0 100644 --- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte @@ -1,5 +1,6 @@ - + From 06cdb7c20267fd607a8c132ec1ed3d09102e8ce7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:47:04 +0000 Subject: [PATCH 06/20] v2.5.6-alpha.37 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 6633dc9eee..ad2dcaee32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fedb763e75..aa558ba75c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.37", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ca17df6ce2..fe9787e689 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3d2a05e998..5dd65a613c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6a2f7bf373..8858872699 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 080d67e780..2a9750fa47 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index fabc8b265c..28e78c05a0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 77bee658f9..a270fe9a55 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4390ea3882..201135eae8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/client": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/client": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 0cbf9fe2da..4f7c40b73f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.36" + "@budibase/types": "2.5.6-alpha.37" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0818e222f2..aeed9aca4c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index bb44434d1f..1b228362a9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4e27f3e73c..05b0fc1846 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a896a75f8fd36bd4eb3d6d9a87cb5b36b19953bc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:48:47 +0000 Subject: [PATCH 07/20] Update pro version to 2.5.6-alpha.37 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 201135eae8..561104bca1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/client": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/shared-core": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", diff --git a/packages/worker/package.json b/packages/worker/package.json index 05b0fc1846..30e5a15432 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 47933b9a92bfd2a392c49f6c823698717531d763 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 16:08:25 +0100 Subject: [PATCH 08/20] Hide manage or renew button when customer uses invoicing + css updates (#10436) * Hide manage or renew button when customer uses invoicing + css updates * Remove usages of 'pro' and 'pro plan' from ui * Enterprise plan -> Enterprise on enforce single sign on * lint --- .../pages/builder/portal/account/usage.svelte | 50 +++++++++---------- .../overview/[appId]/backups/index.svelte | 2 +- .../builder/portal/settings/auth/index.svelte | 2 +- .../builder/portal/settings/branding.svelte | 2 +- .../builder/portal/users/groups/index.svelte | 2 +- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 80e42d52a8..8dc02c6c80 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -43,12 +43,18 @@ } $: quotaUsage = $licensing.quotaUsage + $: license = $auth.user?.license + $: plan = license?.plan + $: usesInvoicing = plan?.usesInvoicing + $: accountPortalAccess = $auth?.user?.accountPortalAccess $: quotaReset = quotaUsage?.quotaReset $: canManagePlan = ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin) + $: showButton = !usesInvoicing && accountPortalAccess + const setMonthlyUsage = () => { monthlyUsage = [] if (quotaUsage.monthly) { @@ -121,7 +127,7 @@ const setTextRows = () => { textRows = [] - if (cancelAt) { + if (cancelAt && !usesInvoicing) { textRows.push({ message: "Subscription has been cancelled" }) textRows.push({ message: `${getDaysRemaining(cancelAt)} days remaining`, @@ -213,7 +219,7 @@ description="YOUR CURRENT PLAN" title={planTitle()} {primaryActionText} - primaryAction={accountPortalAccess ? goToAccountPortal : undefined} + primaryAction={showButton ? goToAccountPortal : undefined} {textRows} >
@@ -224,33 +230,23 @@
{/each} + + Monthly limits +
+ + + Resets in {daysRemainingInMonth} days + + +
+ + + {#each monthlyUsage as usage} + + {/each} + - - {#if monthlyUsage.length} -
- - - Monthly limits -
- - - Resets in {daysRemainingInMonth} days - - -
- - - {#each monthlyUsage as usage} - - {/each} - - -
- {/if} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte index 4ff9ea386a..77d76c9609 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte @@ -176,7 +176,7 @@ Backups {#if !$licensing.backupsEnabled} - Pro plan + Premium {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 60f84049a3..38f5e0788b 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -378,7 +378,7 @@ {#if !$licensing.enforceableSSO} - Enterprise plan + Enterprise {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte index 2184280e89..ae22d310a1 100644 --- a/packages/builder/src/pages/builder/portal/settings/branding.svelte +++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte @@ -213,7 +213,7 @@ {/if} {#if isCloud && !brandingEnabled} - Pro + Premium {/if} diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte index 1a0bad7b11..6abc63811f 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte @@ -94,7 +94,7 @@ Groups {#if !$licensing.groupsEnabled} - Pro plan + Business {/if} From d223643e93776efa0fd06014ebb576af4996719f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:16:50 +0000 Subject: [PATCH 09/20] v2.5.6-alpha.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index ad2dcaee32..7ce908a52e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index aa558ba75c..291bed47dd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fe9787e689..04f18d2666 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5dd65a613c..43a4da9b4a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8858872699..553362761f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2a9750fa47..f84545f649 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 28e78c05a0..50d266859a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a270fe9a55..8977131c1a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 561104bca1..741b909326 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/client": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/client": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 4f7c40b73f..6c2725577e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.37" + "@budibase/types": "2.5.6-alpha.38" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aeed9aca4c..6f80c7bdd6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 1b228362a9..0173d89b50 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 30e5a15432..086d340417 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bea67941fe3f9d4c859b296568ac09bc9bb0e58e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:18:15 +0000 Subject: [PATCH 10/20] Update pro version to 2.5.6-alpha.38 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 741b909326..c4c35239bf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/client": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/shared-core": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", diff --git a/packages/worker/package.json b/packages/worker/package.json index 086d340417..3acc367066 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index fff37f62e4..37947af3b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.36": - version "2.5.6-alpha.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" - integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== +"@budibase/pro@2.5.6-alpha.37": + version "2.5.6-alpha.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.37.tgz#3f4c7ba36bd01e2f7cbc56461c1249cc4098bc38" + integrity sha512-D0P4ePioE43yZ+CvLE5XdO84x6/UcF8oY3rHIhd8+bS1LW1yrzAf4kG9lyBRsNUPZoTMPmJeD9zqGRw67pdjzA== dependencies: - "@budibase/backend-core" "2.5.6-alpha.36" + "@budibase/backend-core" "2.5.6-alpha.37" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.36" + "@budibase/types" "2.5.6-alpha.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From b654985ab9b8d78fc53f40bc1d5cae002f8e3d29 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 16:18:51 +0000 Subject: [PATCH 11/20] v2.5.6-alpha.39 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 7ce908a52e..7356540633 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 291bed47dd..4db1619306 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.39", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 04f18d2666..5d4b67752e 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 43a4da9b4a..5245b5dc88 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/frontend-core": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/frontend-core": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 553362761f..9efe246270 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index f84545f649..ce1bfa0e68 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/frontend-core": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/frontend-core": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 50d266859a..2f14d2eb36 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8977131c1a..0120f5df39 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c4c35239bf..a4652e6b97 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/client": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/client": "2.5.6-alpha.39", "@budibase/pro": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 6c2725577e..c342939aa9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.38" + "@budibase/types": "2.5.6-alpha.39" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6f80c7bdd6..023d9e9c2b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 0173d89b50..7bcec178a1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3acc367066..e7bb51e4eb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", "@budibase/pro": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eb86127bbea302baabea1b86a2ae25571e5d7b90 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 16:20:56 +0000 Subject: [PATCH 12/20] Update pro version to 2.5.6-alpha.39 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a4652e6b97..9d50771c8f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.39", "@budibase/client": "2.5.6-alpha.39", - "@budibase/pro": "2.5.6-alpha.38", + "@budibase/pro": "2.5.6-alpha.39", "@budibase/shared-core": "2.5.6-alpha.39", "@budibase/string-templates": "2.5.6-alpha.39", "@budibase/types": "2.5.6-alpha.39", diff --git a/packages/worker/package.json b/packages/worker/package.json index e7bb51e4eb..7c8a65caa8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/pro": "2.5.6-alpha.38", + "@budibase/pro": "2.5.6-alpha.39", "@budibase/string-templates": "2.5.6-alpha.39", "@budibase/types": "2.5.6-alpha.39", "@koa/router": "8.0.8", From a20dfa588a3a1d8fcde4b951921ee9f99eadd547 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 16:07:57 +0100 Subject: [PATCH 13/20] Type updates for plan changed event --- .../src/events/publishers/license.ts | 23 ++++++++----------- .../tests/core/utilities/mocks/events.ts | 1 - .../types/src/documents/account/account.ts | 1 + packages/types/src/sdk/events/event.ts | 2 -- packages/types/src/sdk/events/license.ts | 14 +++++------ 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index aff3286c87..d86e9f1266 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -3,30 +3,28 @@ import { Event, LicenseActivatedEvent, LicensePlanChangedEvent, - LicenseTierChangedEvent, PlanType, Account, LicensePortalOpenedEvent, LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, + LicensePaymentRecoveredEvent, PriceDuration, } from "@budibase/types" -async function tierChanged(account: Account, from: number, to: number) { - const properties: LicenseTierChangedEvent = { - accountId: account.accountId, - to, - from, - } - await publishEvent(Event.LICENSE_TIER_CHANGED, properties) -} - -async function planChanged(account: Account, from: PlanType, to: PlanType) { +async function planChanged( + account: Account, + from: PlanType, + to: PlanType, + quantity: number | undefined, + duration: PriceDuration | undefined +) { const properties: LicensePlanChangedEvent = { accountId: account.accountId, to, from, + quantity, + duration } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } @@ -74,7 +72,6 @@ async function paymentRecovered(account: Account) { } export default { - tierChanged, planChanged, activated, checkoutOpened, diff --git a/packages/backend-core/tests/core/utilities/mocks/events.ts b/packages/backend-core/tests/core/utilities/mocks/events.ts index dacf7dcce8..81de1f8175 100644 --- a/packages/backend-core/tests/core/utilities/mocks/events.ts +++ b/packages/backend-core/tests/core/utilities/mocks/events.ts @@ -123,7 +123,6 @@ beforeAll(async () => { jest.spyOn(events.plugin, "imported") jest.spyOn(events.plugin, "deleted") - jest.spyOn(events.license, "tierChanged") jest.spyOn(events.license, "planChanged") jest.spyOn(events.license, "activated") jest.spyOn(events.license, "checkoutOpened") diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index 8678085df0..62ac8ef37a 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -39,6 +39,7 @@ export interface Account extends CreateAccount { // licensing tier: string // deprecated planType?: PlanType + /** @deprecated */ planTier?: number license?: License installId?: string diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index c4990f869b..0d0b166253 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -138,7 +138,6 @@ export enum Event { // LICENSE LICENSE_PLAN_CHANGED = "license:plan:changed", - LICENSE_TIER_CHANGED = "license:tier:changed", LICENSE_ACTIVATED = "license:activated", LICENSE_PAYMENT_FAILED = "license:payment:failed", LICENSE_PAYMENT_RECOVERED = "license:payment:recovered", @@ -328,7 +327,6 @@ export const AuditedEventFriendlyName: Record = { // LICENSE - NOT AUDITED [Event.LICENSE_PLAN_CHANGED]: undefined, - [Event.LICENSE_TIER_CHANGED]: undefined, [Event.LICENSE_ACTIVATED]: undefined, [Event.LICENSE_PAYMENT_FAILED]: undefined, [Event.LICENSE_PAYMENT_RECOVERED]: undefined, diff --git a/packages/types/src/sdk/events/license.ts b/packages/types/src/sdk/events/license.ts index a12fc6bbb5..b92c556cc8 100644 --- a/packages/types/src/sdk/events/license.ts +++ b/packages/types/src/sdk/events/license.ts @@ -1,15 +1,15 @@ -import { PlanType } from "../licensing" - -export interface LicenseTierChangedEvent { - accountId: string - from: number - to: number -} +import { PlanType, PriceDuration } from "../licensing" export interface LicensePlanChangedEvent { accountId: string from: PlanType to: PlanType + // may not be on historical events + // free plans won't have a duration + duration: PriceDuration | undefined + // may not be on historical events + // free plans won't have a quantity + quantity: number | undefined } export interface LicenseActivatedEvent { From 56f43d3f45ce23c6a467b169718f962ae5b266b2 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 11:12:04 +0100 Subject: [PATCH 14/20] Hubspot updates (#10442) * Hubspot updates for per user pricing * Lint --- .../backend-core/src/events/publishers/license.ts | 5 +++-- .../tests/core/utilities/structures/licenses.ts | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index d86e9f1266..d1ff4d7609 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -9,7 +9,8 @@ import { LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, PriceDuration, + LicensePaymentRecoveredEvent, + PriceDuration, } from "@budibase/types" async function planChanged( @@ -24,7 +25,7 @@ async function planChanged( to, from, quantity, - duration + duration, } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index 24b120451e..38392925d9 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -7,16 +7,30 @@ import { PlanType, PriceDuration, PurchasedPlan, + PurchasedPrice, Quotas, Subscription, } from "@budibase/types" +export function price(): PurchasedPrice { + return { + amount: 10000, + amountMonthly: 10000, + currency: "usd", + duration: PriceDuration.MONTHLY, + priceId: "price_123", + dayPasses: undefined, + isPerUser: true, + } +} + export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => { return { type, usesInvoicing: false, minUsers: 1, model: PlanModel.PER_USER, + price: price(), } } From 0b88848277d284b0f6ef416a9486d79a9a6371bd Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 11:24:05 +0100 Subject: [PATCH 15/20] Lint --- .../backend-core/src/events/publishers/license.ts | 5 +++-- yarn.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index d86e9f1266..d1ff4d7609 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -9,7 +9,8 @@ import { LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, PriceDuration, + LicensePaymentRecoveredEvent, + PriceDuration, } from "@budibase/types" async function planChanged( @@ -24,7 +25,7 @@ async function planChanged( to, from, quantity, - duration + duration, } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } diff --git a/yarn.lock b/yarn.lock index ecdb35847a..56ca4bc340 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.38": - version "2.5.6-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.38.tgz#09e8dfbb6cefe856b5c01845a5a5c02a406faedf" - integrity sha512-CBZv6V+163USHPN0SuEIrXeGA+9gB1QNmHrMEPSmwlOCZbNW2dhniz00EVSuVh3ypHSjDECgozasDJTNRhiufQ== +"@budibase/pro@2.5.6-alpha.39": + version "2.5.6-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.39.tgz#31ff637f01936cc55a21cb39c01c26afb42a7c54" + integrity sha512-Y33wjTLJ8P1KuYdz9T0QRrFxuvCNG9J6gkzp4lPZvrYr1RLFbvDIyz2wVMe5A0379EsYzTxuca7sXNvY21np/g== dependencies: - "@budibase/backend-core" "2.5.6-alpha.38" + "@budibase/backend-core" "2.5.6-alpha.39" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.38" + "@budibase/types" "2.5.6-alpha.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From dadf6128bc5230eda3f4aa70fb979550edf8024d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 28 Apr 2023 11:05:14 +0000 Subject: [PATCH 16/20] v2.5.6-alpha.40 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 7356540633..600714ad18 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4db1619306..4519b20dbe 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.40", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5d4b67752e..a92e865e75 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5245b5dc88..065651aacf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/frontend-core": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/frontend-core": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9efe246270..2e2f4238e5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index ce1bfa0e68..5aec333011 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/frontend-core": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/frontend-core": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2f14d2eb36..6b7ac7e774 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0120f5df39..b348653568 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9d50771c8f..635630c70f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/client": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/client": "2.5.6-alpha.40", "@budibase/pro": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index c342939aa9..3b6d130527 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.39" + "@budibase/types": "2.5.6-alpha.40" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 023d9e9c2b..6526070627 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 7bcec178a1..4c6c5f6f4e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7c8a65caa8..090fcbfca9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", "@budibase/pro": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ecb12272da95867d71a0043945cd8e9e720443db Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 28 Apr 2023 11:06:45 +0000 Subject: [PATCH 17/20] Update pro version to 2.5.6-alpha.40 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 635630c70f..d4693e095c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.40", "@budibase/client": "2.5.6-alpha.40", - "@budibase/pro": "2.5.6-alpha.39", + "@budibase/pro": "2.5.6-alpha.40", "@budibase/shared-core": "2.5.6-alpha.40", "@budibase/string-templates": "2.5.6-alpha.40", "@budibase/types": "2.5.6-alpha.40", diff --git a/packages/worker/package.json b/packages/worker/package.json index 090fcbfca9..1dbe057b72 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/pro": "2.5.6-alpha.39", + "@budibase/pro": "2.5.6-alpha.40", "@budibase/string-templates": "2.5.6-alpha.40", "@budibase/types": "2.5.6-alpha.40", "@koa/router": "8.0.8", From 26fb21785024616d81767ed2ea4c70d005798112 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 22:40:06 +0100 Subject: [PATCH 18/20] Add licenseRequestedAt time to license type --- packages/types/src/documents/account/account.ts | 1 + yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index 62ac8ef37a..dad8abed30 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -48,6 +48,7 @@ export interface Account extends CreateAccount { stripeCustomerId?: string licenseKey?: string licenseKeyActivatedAt?: number + licenseRequestedAt?: number licenseOverrides?: LicenseOverrides quotaUsage?: QuotaUsage } diff --git a/yarn.lock b/yarn.lock index 56ca4bc340..cf8e311c3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.39": - version "2.5.6-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.39.tgz#31ff637f01936cc55a21cb39c01c26afb42a7c54" - integrity sha512-Y33wjTLJ8P1KuYdz9T0QRrFxuvCNG9J6gkzp4lPZvrYr1RLFbvDIyz2wVMe5A0379EsYzTxuca7sXNvY21np/g== +"@budibase/pro@2.5.6-alpha.40": + version "2.5.6-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.40.tgz#96e85d22b61425bfd055377864938245c6ef17ec" + integrity sha512-hWKPVbGbjWcO3evIViICOL6g4hsv051lwUqCLRdZnSIiKCPlrr5JSsiINFinMHof55rHK5LALbGzJL4Ju82UeQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.39" + "@budibase/backend-core" "2.5.6-alpha.40" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.39" + "@budibase/types" "2.5.6-alpha.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From a89d7f1f46aaa621ed97d9d9c39344789fb117ca Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Sat, 29 Apr 2023 09:06:58 +0000 Subject: [PATCH 19/20] v2.5.6-alpha.41 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 600714ad18..0c65845ddb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4519b20dbe..63ef522827 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.41", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a92e865e75..4b0c3cb588 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 065651aacf..8b8c5a25fe 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/frontend-core": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/frontend-core": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2e2f4238e5..96aab6c687 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 5aec333011..cc6d913791 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/frontend-core": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/frontend-core": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6b7ac7e774..22b516fb26 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b348653568..4e3128a840 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d4693e095c..5416287c88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/client": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/client": "2.5.6-alpha.41", "@budibase/pro": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 3b6d130527..1b7e52a064 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.40" + "@budibase/types": "2.5.6-alpha.41" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6526070627..606ed0c367 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4c6c5f6f4e..95573987bc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1dbe057b72..dea750f007 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", "@budibase/pro": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6026794e894c6d44b0aa19c5bafe190d4f5d5c02 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Sat, 29 Apr 2023 09:08:19 +0000 Subject: [PATCH 20/20] Update pro version to 2.5.6-alpha.41 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5416287c88..4969f7ee53 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.41", "@budibase/client": "2.5.6-alpha.41", - "@budibase/pro": "2.5.6-alpha.40", + "@budibase/pro": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.41", diff --git a/packages/worker/package.json b/packages/worker/package.json index dea750f007..e6b47c34ba 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/pro": "2.5.6-alpha.40", + "@budibase/pro": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.41", "@koa/router": "8.0.8",