From fd5743a9da5bb8fca7a31a4b6c0ebd4a0218eab9 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 1 Mar 2023 12:11:51 +0000 Subject: [PATCH 01/28] Fix to clear empty lastName string when accepting an invite to budibase --- packages/builder/src/stores/portal/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index 1510207604..0f6636fbdc 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -34,7 +34,7 @@ export function createUsersStore() { inviteCode, password, firstName, - lastName, + lastName: !lastName?.trim() ? undefined : lastName, }) } From b12830626298b46b4ff5dac79eac6993dbdcba2c Mon Sep 17 00:00:00 2001 From: adrinr Date: Wed, 19 Apr 2023 16:47:48 +0100 Subject: [PATCH 02/28] Increase writethrough cache timeout --- packages/backend-core/src/cache/writethrough.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/src/cache/writethrough.ts b/packages/backend-core/src/cache/writethrough.ts index a3b1ecc08d..e64c116663 100644 --- a/packages/backend-core/src/cache/writethrough.ts +++ b/packages/backend-core/src/cache/writethrough.ts @@ -47,7 +47,7 @@ async function put( type: LockType.TRY_ONCE, name: LockName.PERSIST_WRITETHROUGH, resource: key, - ttl: 1000, + ttl: 15000, }, async () => { const writeDb = async (toWrite: any) => { @@ -71,6 +71,7 @@ async function put( } } ) + if (!lockResponse.executed) { logWarn(`Ignoring redlock conflict in write-through cache`) } From 5c292bbecdbdb0d759151125a6471c1956d2150a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 08:51:41 +0000 Subject: [PATCH 03/28] v2.5.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 19903a71a0..00ecba3818 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.4", + "version": "2.5.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7ccd1ab87c..59fa51b0d8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.4", + "version": "2.5.5", "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.4", + "@budibase/types": "^2.5.5", "@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 e8db77cd38..94fc1b88fe 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.4", + "version": "2.5.5", "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.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", "@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 622f38cd4d..f8c342ceb0 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.4", + "version": "2.5.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/client": "^2.5.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/client": "^2.5.5", + "@budibase/frontend-core": "^2.5.5", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", "@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 0f9d6af51b..a1d28a6498 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.4", + "version": "2.5.5", "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.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/backend-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "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 3f0edbf7c7..b34dd39cd1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.4", + "version": "2.5.5", "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.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/frontend-core": "^2.5.5", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@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 96bbb02e80..cd08d03463 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.4", + "version": "2.5.5", "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.4", - "@budibase/shared-core": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/shared-core": "^2.5.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c564c8f8b1..bb66f0aaa7 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8d7c733616..8d480c4c69 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.4", + "version": "2.5.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.4", - "@budibase/client": "^2.5.4", + "@budibase/backend-core": "^2.5.5", + "@budibase/client": "^2.5.5", "@budibase/pro": "2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@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 dba357b7b0..3694d98fc8 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.4", + "version": "2.5.5", "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.4" + "@budibase/types": "^2.5.5" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ed72db5200..b2aaadb78f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.4", + "version": "2.5.5", "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 3b7b501882..8848ba6b9d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.4", + "version": "2.5.5", "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 a31969aa86..705b948aad 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.4", + "version": "2.5.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.4", + "@budibase/backend-core": "^2.5.5", "@budibase/pro": "2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d21f8435d63e9a90b3adcf4c5c84fda842ddbcb7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 08:55:19 +0000 Subject: [PATCH 04/28] Update pro version to 2.5.5 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8d480c4c69..df8d6ebfd3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.5", "@budibase/client": "^2.5.5", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5", "@budibase/shared-core": "^2.5.5", "@budibase/string-templates": "^2.5.5", "@budibase/types": "^2.5.5", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index da0aa05fc6..41b372f51e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" - integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== +"@budibase/backend-core@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.4" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" - integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== +"@budibase/pro@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.4" + "@budibase/backend-core" "2.5.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.4", "@budibase/types@^2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" - integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== +"@budibase/types@2.5.5", "@budibase/types@^2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 705b948aad..d39fcb96ae 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.5", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5", "@budibase/string-templates": "^2.5.5", "@budibase/types": "^2.5.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cd6d83ec15..6c38f01998 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" - integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== +"@budibase/backend-core@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.4" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" - integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== +"@budibase/pro@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.4" + "@budibase/backend-core" "2.5.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.4", "@budibase/types@^2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" - integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== +"@budibase/types@2.5.5", "@budibase/types@^2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 145c0834bb9ead7c5c5dc26b0662a9bb8ff72853 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Thu, 20 Apr 2023 15:21:50 +0100 Subject: [PATCH 05/28] Fix for #10358 - making sure that client-side we don't check the content type for CSV, check if it might be JSON, if not assume we can try it as a CSV - this is a fix for an issue which occurs on Windows, in Firefox. (#10359) --- .../backend/TableNavigator/utils.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/backend/TableNavigator/utils.js b/packages/builder/src/components/backend/TableNavigator/utils.js index 658f037912..b7e46042be 100644 --- a/packages/builder/src/components/backend/TableNavigator/utils.js +++ b/packages/builder/src/components/backend/TableNavigator/utils.js @@ -42,16 +42,7 @@ export const parseFile = e => { reader.addEventListener("load", function (e) { const fileData = e.target.result - - 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") { + if (file.type?.includes("json")) { const parsedFileData = JSON.parse(fileData) if (Array.isArray(parsedFileData)) { @@ -62,7 +53,13 @@ export const parseFile = e => { reject("invalid json format") } } else { - reject("invalid file type") + API.csvToJson(fileData) + .then(rows => { + resolveRows(rows) + }) + .catch(() => { + reject("cannot parse csv") + }) } }) From 5a9c7d83b1864434035daf4e3a568507e685c0c8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 14:30:34 +0000 Subject: [PATCH 06/28] v2.5.6 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 00ecba3818..a2c820416b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5", + "version": "2.5.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 59fa51b0d8..33e2865c70 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5", + "version": "2.5.6", "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.5", + "@budibase/types": "^2.5.6", "@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 94fc1b88fe..1c807d89e0 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.5", + "version": "2.5.6", "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.5", - "@budibase/string-templates": "^2.5.5", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", "@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 f8c342ceb0..97a61878ac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5", + "version": "2.5.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.5", - "@budibase/client": "^2.5.5", - "@budibase/frontend-core": "^2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/client": "^2.5.6", + "@budibase/frontend-core": "^2.5.6", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", "@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 a1d28a6498..9017456266 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5", + "version": "2.5.6", "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.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/backend-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "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 b34dd39cd1..c27aee9889 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5", + "version": "2.5.6", "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.5", - "@budibase/frontend-core": "^2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/frontend-core": "^2.5.6", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@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 cd08d03463..40eaf6b25e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5", + "version": "2.5.6", "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.5", - "@budibase/shared-core": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/shared-core": "^2.5.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bb66f0aaa7..e335bcd39b 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5", + "version": "2.5.6", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df8d6ebfd3..bc138fc884 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.5", + "version": "2.5.6", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.5", - "@budibase/client": "^2.5.5", + "@budibase/backend-core": "^2.5.6", + "@budibase/client": "^2.5.6", "@budibase/pro": "2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@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 3694d98fc8..9356dbc8d3 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5", + "version": "2.5.6", "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.5" + "@budibase/types": "^2.5.6" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b2aaadb78f..fa3941f158 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5", + "version": "2.5.6", "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 8848ba6b9d..316f471001 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5", + "version": "2.5.6", "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 d39fcb96ae..3426eafbd2 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.5", + "version": "2.5.6", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.5", + "@budibase/backend-core": "^2.5.6", "@budibase/pro": "2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From cb0f321261a831ff8519e490721329338b4e726c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 14:33:28 +0000 Subject: [PATCH 07/28] Update pro version to 2.5.6 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index bc138fc884..1478976700 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.6", "@budibase/client": "^2.5.6", - "@budibase/pro": "2.5.5", + "@budibase/pro": "2.5.6", "@budibase/shared-core": "^2.5.6", "@budibase/string-templates": "^2.5.6", "@budibase/types": "^2.5.6", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 41b372f51e..2ef140b136 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== +"@budibase/backend-core@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" + "@budibase/types" "^2.5.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== +"@budibase/pro@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== dependencies: - "@budibase/backend-core" "2.5.5" + "@budibase/backend-core" "2.5.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" + "@budibase/types" "2.5.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.5", "@budibase/types@^2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== +"@budibase/types@2.5.6", "@budibase/types@^2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3426eafbd2..3a7a27d883 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.6", - "@budibase/pro": "2.5.5", + "@budibase/pro": "2.5.6", "@budibase/string-templates": "^2.5.6", "@budibase/types": "^2.5.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 6c38f01998..fd40e06293 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== +"@budibase/backend-core@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" + "@budibase/types" "^2.5.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== +"@budibase/pro@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== dependencies: - "@budibase/backend-core" "2.5.5" + "@budibase/backend-core" "2.5.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" + "@budibase/types" "2.5.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.5", "@budibase/types@^2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== +"@budibase/types@2.5.6", "@budibase/types@^2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b75caa03a6f01f89a914d399cfe1306e8fb9e29f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 21 Apr 2023 17:25:55 +0100 Subject: [PATCH 08/28] updating production timeouts --- hosting/proxy/nginx.prod.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf index 8954106feb..dce1a71918 100644 --- a/hosting/proxy/nginx.prod.conf +++ b/hosting/proxy/nginx.prod.conf @@ -222,9 +222,9 @@ http { rewrite ^/files/signed/(.*)$ /$1 break; } - client_header_timeout 60; - client_body_timeout 60; - keepalive_timeout 60; + client_header_timeout 120; + client_body_timeout 120; + keepalive_timeout 120; # gzip gzip on; From 93f7bd54d80dd8cd4e395a930bac2173741c076c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 21 Apr 2023 17:29:12 +0000 Subject: [PATCH 09/28] v2.5.7 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index a2c820416b..b9751a60cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6", + "version": "2.5.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 33e2865c70..519a237914 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", + "version": "2.5.7", "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", + "@budibase/types": "^2.5.7", "@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 1c807d89e0..3634bcb844 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", + "version": "2.5.7", "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", - "@budibase/string-templates": "^2.5.6", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", "@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 97a61878ac..3c37ebcf34 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6", + "version": "2.5.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.6", - "@budibase/client": "^2.5.6", - "@budibase/frontend-core": "^2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/client": "^2.5.7", + "@budibase/frontend-core": "^2.5.7", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", "@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 9017456266..49d81ee9b8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6", + "version": "2.5.7", "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", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/backend-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "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 c27aee9889..8a1247ee02 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6", + "version": "2.5.7", "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", - "@budibase/frontend-core": "^2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/frontend-core": "^2.5.7", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@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 40eaf6b25e..427e0a9733 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", + "version": "2.5.7", "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", - "@budibase/shared-core": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/shared-core": "^2.5.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e335bcd39b..daedad00df 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6", + "version": "2.5.7", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1478976700..5e51e91068 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", + "version": "2.5.7", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.6", - "@budibase/client": "^2.5.6", + "@budibase/backend-core": "^2.5.7", + "@budibase/client": "^2.5.7", "@budibase/pro": "2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@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 9356dbc8d3..e92306ddec 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", + "version": "2.5.7", "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" + "@budibase/types": "^2.5.7" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fa3941f158..df3c0de5c3 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", + "version": "2.5.7", "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 316f471001..0bf0c8f58f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6", + "version": "2.5.7", "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 3a7a27d883..f800c38035 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", + "version": "2.5.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.6", + "@budibase/backend-core": "^2.5.7", "@budibase/pro": "2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9aa6e1e44d4b614ac1e1300a7fd678872c2f93bb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 21 Apr 2023 17:32:17 +0000 Subject: [PATCH 10/28] Update pro version to 2.5.7 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5e51e91068..770d6748da 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.7", "@budibase/client": "^2.5.7", - "@budibase/pro": "2.5.6", + "@budibase/pro": "2.5.7", "@budibase/shared-core": "^2.5.7", "@budibase/string-templates": "^2.5.7", "@budibase/types": "^2.5.7", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2ef140b136..f27070b38d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== +"@budibase/backend-core@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" + integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" + "@budibase/types" "^2.5.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== +"@budibase/pro@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" + integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== dependencies: - "@budibase/backend-core" "2.5.6" + "@budibase/backend-core" "2.5.7" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" + "@budibase/types" "2.5.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.6", "@budibase/types@^2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== +"@budibase/types@2.5.7", "@budibase/types@^2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" + integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f800c38035..d04c8d82a3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.7", - "@budibase/pro": "2.5.6", + "@budibase/pro": "2.5.7", "@budibase/string-templates": "^2.5.7", "@budibase/types": "^2.5.7", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fd40e06293..317b95646e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== +"@budibase/backend-core@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" + integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" + "@budibase/types" "^2.5.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== +"@budibase/pro@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" + integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== dependencies: - "@budibase/backend-core" "2.5.6" + "@budibase/backend-core" "2.5.7" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" + "@budibase/types" "2.5.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.6", "@budibase/types@^2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== +"@budibase/types@2.5.7", "@budibase/types@^2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" + integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 2f2084a426f0219eb65718714798d96f946cbd71 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 24 Apr 2023 08:47:42 +0000 Subject: [PATCH 11/28] v2.5.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index b9751a60cc..b142e44eaf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.7", + "version": "2.5.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 519a237914..9aae900b3a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.7", + "version": "2.5.8", "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.7", + "@budibase/types": "^2.5.8", "@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 3634bcb844..f27dbd36f8 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.7", + "version": "2.5.8", "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.7", - "@budibase/string-templates": "^2.5.7", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", "@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 3c37ebcf34..5dc9a8ada3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.7", + "version": "2.5.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.7", - "@budibase/client": "^2.5.7", - "@budibase/frontend-core": "^2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/client": "^2.5.8", + "@budibase/frontend-core": "^2.5.8", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", "@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 49d81ee9b8..686bce341e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/backend-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "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 8a1247ee02..5f5cd9db23 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/frontend-core": "^2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/frontend-core": "^2.5.8", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@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 427e0a9733..126216e44b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/shared-core": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/shared-core": "^2.5.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index daedad00df..5ae5b2aa3e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.7", + "version": "2.5.8", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 770d6748da..9d02b6e0fd 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.7", + "version": "2.5.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.7", - "@budibase/client": "^2.5.7", + "@budibase/backend-core": "^2.5.8", + "@budibase/client": "^2.5.8", "@budibase/pro": "2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@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 e92306ddec..261d0b1794 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.7", + "version": "2.5.8", "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.7" + "@budibase/types": "^2.5.8" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index df3c0de5c3..fec938d306 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.7", + "version": "2.5.8", "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 0bf0c8f58f..d6dd143ae2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.7", + "version": "2.5.8", "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 d04c8d82a3..915d4de941 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.7", + "version": "2.5.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.7", + "@budibase/backend-core": "^2.5.8", "@budibase/pro": "2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9eef7acdb3016af76fbd88e6044afabc6d92eee7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 24 Apr 2023 08:50:28 +0000 Subject: [PATCH 12/28] Update pro version to 2.5.8 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9d02b6e0fd..b32bb6c628 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.8", "@budibase/client": "^2.5.8", - "@budibase/pro": "2.5.7", + "@budibase/pro": "2.5.8", "@budibase/shared-core": "^2.5.8", "@budibase/string-templates": "^2.5.8", "@budibase/types": "^2.5.8", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f27070b38d..0e9637194b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" - integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== +"@budibase/backend-core@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" + integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.7" + "@budibase/types" "^2.5.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" - integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== +"@budibase/pro@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" + integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== dependencies: - "@budibase/backend-core" "2.5.7" + "@budibase/backend-core" "2.5.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.7" + "@budibase/types" "2.5.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.7", "@budibase/types@^2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" - integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== +"@budibase/types@2.5.8", "@budibase/types@^2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" + integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 915d4de941..3829dba7cd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.8", - "@budibase/pro": "2.5.7", + "@budibase/pro": "2.5.8", "@budibase/string-templates": "^2.5.8", "@budibase/types": "^2.5.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 317b95646e..0861e25f33 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" - integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== +"@budibase/backend-core@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" + integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.7" + "@budibase/types" "^2.5.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" - integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== +"@budibase/pro@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" + integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== dependencies: - "@budibase/backend-core" "2.5.7" + "@budibase/backend-core" "2.5.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.7" + "@budibase/types" "2.5.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.7", "@budibase/types@^2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" - integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== +"@budibase/types@2.5.8", "@budibase/types@^2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" + integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 8742fb39d31a8a9d193cb07e05abf1c65af24f97 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:17:32 +0100 Subject: [PATCH 13/28] is empty lucene query with OR fix (#10451) * empty lucene query with OR fix * Fix unit test --- packages/backend-core/src/db/lucene.ts | 2 +- packages/server/src/api/routes/tests/internalSearch.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts index 71ce4ba9ac..fcfaecf2b4 100644 --- a/packages/backend-core/src/db/lucene.ts +++ b/packages/backend-core/src/db/lucene.ts @@ -417,7 +417,7 @@ export class QueryBuilder { }) } if (this.query.empty) { - build(this.query.empty, (key: string) => `!${key}:["" TO *]`) + build(this.query.empty, (key: string) => `(*:* -${key}:["" TO *])`) } if (this.query.notEmpty) { build(this.query.notEmpty, (key: string) => `${key}:["" TO *]`) diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js index 6ad333b87a..8d57d2ee1c 100644 --- a/packages/server/src/api/routes/tests/internalSearch.spec.js +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -105,7 +105,7 @@ describe("internal search", () => { "column": "", }, }, PARAMS) - checkLucene(response, `*:* AND !column:["" TO *]`, PARAMS) + checkLucene(response, `*:* AND (*:* -column:["" TO *])`, PARAMS) }) it("test notEmpty query", async () => { From 9e62b6dc4b99111c88a4d6cffb323db1e44efa4f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 28 Apr 2023 16:26:24 +0000 Subject: [PATCH 14/28] v2.5.9 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index b142e44eaf..8890ee0c27 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.8", + "version": "2.5.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9aae900b3a..5ac75f9181 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.8", + "version": "2.5.9", "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.8", + "@budibase/types": "^2.5.9", "@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 f27dbd36f8..4a78361d9f 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.8", + "version": "2.5.9", "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.8", - "@budibase/string-templates": "^2.5.8", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", "@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 5dc9a8ada3..fb8ba64aee 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.8", + "version": "2.5.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.8", - "@budibase/client": "^2.5.8", - "@budibase/frontend-core": "^2.5.8", - "@budibase/shared-core": "^2.5.8", - "@budibase/string-templates": "^2.5.8", + "@budibase/bbui": "^2.5.9", + "@budibase/client": "^2.5.9", + "@budibase/frontend-core": "^2.5.9", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", "@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 686bce341e..790783a66e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.8", + "version": "2.5.9", "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.8", - "@budibase/string-templates": "^2.5.8", - "@budibase/types": "^2.5.8", + "@budibase/backend-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "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 5f5cd9db23..faaf16138a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.8", + "version": "2.5.9", "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.8", - "@budibase/frontend-core": "^2.5.8", - "@budibase/shared-core": "^2.5.8", - "@budibase/string-templates": "^2.5.8", - "@budibase/types": "^2.5.8", + "@budibase/bbui": "^2.5.9", + "@budibase/frontend-core": "^2.5.9", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@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 126216e44b..18576ffe4d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.8", + "version": "2.5.9", "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.8", - "@budibase/shared-core": "^2.5.8", + "@budibase/bbui": "^2.5.9", + "@budibase/shared-core": "^2.5.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5ae5b2aa3e..75a6bc5235 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.8", + "version": "2.5.9", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b32bb6c628..86374b5dfe 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.8", + "version": "2.5.9", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.8", - "@budibase/client": "^2.5.8", + "@budibase/backend-core": "^2.5.9", + "@budibase/client": "^2.5.9", "@budibase/pro": "2.5.8", - "@budibase/shared-core": "^2.5.8", - "@budibase/string-templates": "^2.5.8", - "@budibase/types": "^2.5.8", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@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 261d0b1794..332d8b6f60 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.8", + "version": "2.5.9", "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.8" + "@budibase/types": "^2.5.9" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fec938d306..cbeb84785a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.8", + "version": "2.5.9", "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 d6dd143ae2..73561d2236 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.8", + "version": "2.5.9", "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 3829dba7cd..0a8af76128 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.8", + "version": "2.5.9", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.8", + "@budibase/backend-core": "^2.5.9", "@budibase/pro": "2.5.8", - "@budibase/string-templates": "^2.5.8", - "@budibase/types": "^2.5.8", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 778da79a5740c6a2f7cd2e8bce6087d539f54d2d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 28 Apr 2023 16:29:24 +0000 Subject: [PATCH 15/28] Update pro version to 2.5.9 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 86374b5dfe..f30aa91546 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.9", "@budibase/client": "^2.5.9", - "@budibase/pro": "2.5.8", + "@budibase/pro": "2.5.9", "@budibase/shared-core": "^2.5.9", "@budibase/string-templates": "^2.5.9", "@budibase/types": "^2.5.9", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0e9637194b..a105958eb7 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" - integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== +"@budibase/backend-core@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.9.tgz#a738e125156e1e5111609eecc72c03e0ae4f8c4c" + integrity sha512-vfDx6fJxNBSBkpslwBHMbYBAgMn/uLZiVRx8fKUDr597Zk9KJO4UxPvix7cHVLH/M7UPuSLVl83f5p7GEjPbDQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.8" + "@budibase/types" "^2.5.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" - integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== +"@budibase/pro@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc" + integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ== dependencies: - "@budibase/backend-core" "2.5.8" + "@budibase/backend-core" "2.5.9" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.8" + "@budibase/types" "2.5.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.8", "@budibase/types@^2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" - integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== +"@budibase/types@2.5.9", "@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": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0a8af76128..5102092302 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.9", - "@budibase/pro": "2.5.8", + "@budibase/pro": "2.5.9", "@budibase/string-templates": "^2.5.9", "@budibase/types": "^2.5.9", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0861e25f33..c59ea85762 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" - integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== +"@budibase/backend-core@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.9.tgz#a738e125156e1e5111609eecc72c03e0ae4f8c4c" + integrity sha512-vfDx6fJxNBSBkpslwBHMbYBAgMn/uLZiVRx8fKUDr597Zk9KJO4UxPvix7cHVLH/M7UPuSLVl83f5p7GEjPbDQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.8" + "@budibase/types" "^2.5.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" - integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== +"@budibase/pro@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc" + integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ== dependencies: - "@budibase/backend-core" "2.5.8" + "@budibase/backend-core" "2.5.9" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.8" + "@budibase/types" "2.5.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.8", "@budibase/types@^2.5.8": - version "2.5.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" - integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== +"@budibase/types@2.5.9", "@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== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 5758120eccf6b331d04b240fc386a8d41efdc00a Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 May 2023 14:58:34 +0100 Subject: [PATCH 16/28] Minor updates to CLI - incrementing docker-compose version as per #10222 as well as a fix for prebuilds when using pkg version. --- packages/cli/package.json | 2 +- packages/cli/src/index.ts | 5 ++--- yarn.lock | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 87f8885baa..6da00a3cbf 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -36,7 +36,7 @@ "chalk": "4.1.0", "cli-progress": "3.11.2", "commander": "7.1.0", - "docker-compose": "0.23.12", + "docker-compose": "0.24.0", "dotenv": "16.0.1", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index cca2c91862..47514835ed 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,9 +1,8 @@ #!/usr/bin/env node -import { logging } from "@budibase/backend-core" -logging.disableLogger() import "./prebuilds" import "./environment" -import { env } from "@budibase/backend-core" +import { env, logging } from "@budibase/backend-core" +logging.disableLogger() import { getCommands } from "./options" import { Command } from "commander" import { getHelpDescription } from "./utils" diff --git a/yarn.lock b/yarn.lock index 3b403d6444..559ee1eaa3 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.41": - version "2.5.6-alpha.41" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.41.tgz#2632b398159211bf64bf6caff9753c877b6fc09d" - integrity sha512-8Zfm+RtcXY77gdXXHti8QT+Vt+1ApuVqYL3KCkxBVbpzgQci/F3mipNXUX8bEy/y+QYAdgn6psDTWAqyr9VALg== +"@budibase/pro@2.5.6-alpha.42": + version "2.5.6-alpha.42" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.42.tgz#15ec86d9918b7d58e3236240afda31309f3162ae" + integrity sha512-aes19IVAEGqf0YPLJMnOKHv99AR6LO8jMpPVCbSZcZODS3byxh9kC2+sWH1mAd781zymyN79HnwGrVJNOdV8jw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.41" + "@budibase/backend-core" "2.5.6-alpha.42" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.41" + "@budibase/types" "2.5.6-alpha.42" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -9545,13 +9545,6 @@ dir-glob@^3.0.1: dependencies: 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: version "0.23.17" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" @@ -9559,6 +9552,13 @@ docker-compose@0.23.17: dependencies: 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: version "0.23.19" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8" From cf2488cd351e3c32926a230393c7e1e17c947052 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 14:42:41 +0000 Subject: [PATCH 17/28] v2.5.6-alpha.43 --- 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 5ad64883d4..20d6ead3ba 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1302568db5..941b4639b8 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.42", + "version": "2.5.6-alpha.43", "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.42", + "@budibase/types": "2.5.6-alpha.43", "@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 ff82bbc2c4..318c2f3172 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.42", + "version": "2.5.6-alpha.43", "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.42", - "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.43", "@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 0015174bcf..0fdbab0a67 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.42", - "@budibase/frontend-core": "2.5.6-alpha.42", - "@budibase/shared-core": "2.5.6-alpha.42", - "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/bbui": "2.5.6-alpha.43", + "@budibase/frontend-core": "2.5.6-alpha.43", + "@budibase/shared-core": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.43", "@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 6da00a3cbf..4fe0ddc637 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "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.42", - "@budibase/string-templates": "2.5.6-alpha.42", - "@budibase/types": "2.5.6-alpha.42", + "@budibase/backend-core": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/types": "2.5.6-alpha.43", "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 7ff0ddae9c..29b49c3105 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "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.42", - "@budibase/frontend-core": "2.5.6-alpha.42", - "@budibase/shared-core": "2.5.6-alpha.42", - "@budibase/string-templates": "2.5.6-alpha.42", - "@budibase/types": "2.5.6-alpha.42", + "@budibase/bbui": "2.5.6-alpha.43", + "@budibase/frontend-core": "2.5.6-alpha.43", + "@budibase/shared-core": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/types": "2.5.6-alpha.43", "@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 c0b60cb091..11cdfddfc9 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.42", + "version": "2.5.6-alpha.43", "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.42", - "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/bbui": "2.5.6-alpha.43", + "@budibase/shared-core": "2.5.6-alpha.43", "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 13cc20f9e9..9ab1a37fcb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cc8a8208dc..5e8f212055 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.42", + "version": "2.5.6-alpha.43", "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.42", - "@budibase/client": "2.5.6-alpha.42", + "@budibase/backend-core": "2.5.6-alpha.43", + "@budibase/client": "2.5.6-alpha.43", "@budibase/pro": "2.5.6-alpha.42", - "@budibase/shared-core": "2.5.6-alpha.42", - "@budibase/string-templates": "2.5.6-alpha.42", - "@budibase/types": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/types": "2.5.6-alpha.43", "@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 4ea3deea5f..43ce16b9a6 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.42", + "version": "2.5.6-alpha.43", "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.42" + "@budibase/types": "2.5.6-alpha.43" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e1397182dc..0d0bbd2ef2 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.42", + "version": "2.5.6-alpha.43", "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 3068068d4c..929b82c172 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.42", + "version": "2.5.6-alpha.43", "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 ae9358f084..5e3303f764 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.42", + "version": "2.5.6-alpha.43", "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.42", + "@budibase/backend-core": "2.5.6-alpha.43", "@budibase/pro": "2.5.6-alpha.42", - "@budibase/string-templates": "2.5.6-alpha.42", - "@budibase/types": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/types": "2.5.6-alpha.43", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7d22394d6e6afdb2e0e5eb1893317ad6915aeea1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 14:44:15 +0000 Subject: [PATCH 18/28] Update pro version to 2.5.6-alpha.43 --- 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 5e8f212055..74d6575b82 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.43", "@budibase/client": "2.5.6-alpha.43", - "@budibase/pro": "2.5.6-alpha.42", + "@budibase/pro": "2.5.6-alpha.43", "@budibase/shared-core": "2.5.6-alpha.43", "@budibase/string-templates": "2.5.6-alpha.43", "@budibase/types": "2.5.6-alpha.43", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5e3303f764..9f40685933 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.43", - "@budibase/pro": "2.5.6-alpha.42", + "@budibase/pro": "2.5.6-alpha.43", "@budibase/string-templates": "2.5.6-alpha.43", "@budibase/types": "2.5.6-alpha.43", "@koa/router": "8.0.8", From 552499b781cabc533fced825c2744182b47fe0d4 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 May 2023 16:22:43 +0100 Subject: [PATCH 19/28] Re-writing the disabling of pino/logging - it seems that the pino logger is causing a variety of issues in the built CLI version - easier to offer an environment variable for backend-core which completely removes the logger. --- packages/backend-core/src/environment.ts | 1 + packages/backend-core/src/logging/index.ts | 2 +- .../backend-core/src/logging/pino/logger.ts | 305 +++++++++--------- packages/cli/src/index.ts | 4 +- 4 files changed, 149 insertions(+), 163 deletions(-) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 0d413b8fa9..1bea1f3692 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -154,6 +154,7 @@ const environment = { ? process.env.ENABLE_SSO_MAINTENANCE_MODE : false, VERSION: findVersion(), + DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER, _set(key: any, value: any) { process.env[key] = value // @ts-ignore diff --git a/packages/backend-core/src/logging/index.ts b/packages/backend-core/src/logging/index.ts index b229f47dea..b87062c478 100644 --- a/packages/backend-core/src/logging/index.ts +++ b/packages/backend-core/src/logging/index.ts @@ -1,5 +1,5 @@ export * as correlation from "./correlation/correlation" -export { logger, disableLogger } from "./pino/logger" +export { logger } from "./pino/logger" export * from "./alerts" // turn off or on context logging i.e. tenantId, appId etc diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts index dd4b505d30..8e0ed2a8fb 100644 --- a/packages/backend-core/src/logging/pino/logger.ts +++ b/packages/backend-core/src/logging/pino/logger.ts @@ -5,184 +5,169 @@ import * as correlation from "../correlation" import { IdentityType } from "@budibase/types" 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 -const pinoOptions: LoggerOptions = { - level: env.LOG_LEVEL, - formatters: { - level: label => { - return { level: label.toUpperCase() } - }, - bindings: () => { - return {} - }, - }, - timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`, -} - -if (env.isDev()) { - pinoOptions.transport = { - target: "pino-pretty", - options: { - singleLine: true, +let pinoInstance: pino.Logger | undefined +if (!env.DISABLE_PINO_LOGGER) { + const pinoOptions: LoggerOptions = { + level: env.LOG_LEVEL, + formatters: { + level: label => { + return { level: label.toUpperCase() } + }, + bindings: () => { + return {} + }, }, + timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`, } -} -export const logger = pino(pinoOptions) + if (env.isDev()) { + pinoOptions.transport = { + target: "pino-pretty", + options: { + singleLine: true, + }, + } + } -export function disableLogger() { - 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 -} + pinoInstance = pino(pinoOptions) // CONSOLE OVERRIDES -interface MergingObject { - objects?: any[] - tenantId?: string - appId?: string - identityId?: string - identityType?: IdentityType - correlationId?: string - err?: Error -} - -function isPlainObject(obj: any) { - return typeof obj === "object" && obj !== null && !(obj instanceof Error) -} - -function isError(obj: any) { - return obj instanceof Error -} - -function isMessage(obj: any) { - return typeof obj === "string" -} - -/** - * Backwards compatibility between console logging statements - * and pino logging requirements. - */ -function getLogParams(args: any[]): [MergingObject, string] { - let error = undefined - let objects: any[] = [] - let message = "" - - args.forEach(arg => { - if (isMessage(arg)) { - message = `${message} ${arg}`.trimStart() - } - if (isPlainObject(arg)) { - objects.push(arg) - } - if (isError(arg)) { - error = arg - } - }) - - const identity = getIdentity() - - let contextObject = {} - - if (LOG_CONTEXT) { - contextObject = { - tenantId: getTenantId(), - appId: getAppId(), - identityId: identity?._id, - identityType: identity?.type, - correlationId: correlation.getId(), - } + interface MergingObject { + objects?: any[] + tenantId?: string + appId?: string + identityId?: string + identityType?: IdentityType + correlationId?: string + err?: Error } - const mergingObject = { - objects: objects.length ? objects : undefined, - err: error, - ...contextObject, + function isPlainObject(obj: any) { + return typeof obj === "object" && obj !== null && !(obj instanceof Error) } - return [mergingObject, message] -} - -console.log = (...arg: any[]) => { - const [obj, msg] = getLogParams(arg) - logger.info(obj, msg) -} -console.info = (...arg: any[]) => { - const [obj, msg] = getLogParams(arg) - logger.info(obj, msg) -} -console.warn = (...arg: any[]) => { - const [obj, msg] = getLogParams(arg) - logger.warn(obj, msg) -} -console.error = (...arg: any[]) => { - const [obj, msg] = getLogParams(arg) - logger.error(obj, msg) -} - -/** - * custom trace impl - this resembles the node trace behaviour rather - * than traditional trace logging - * @param arg - */ -console.trace = (...arg: any[]) => { - const [obj, msg] = getLogParams(arg) - if (!obj.err) { - // to get stack trace - obj.err = new Error() + function isError(obj: any) { + return obj instanceof Error } - logger.trace(obj, msg) -} -console.debug = (...arg: any) => { - const [obj, msg] = getLogParams(arg) - logger.debug(obj, msg) -} + function isMessage(obj: any) { + return typeof obj === "string" + } + + /** + * Backwards compatibility between console logging statements + * and pino logging requirements. + */ + function getLogParams(args: any[]): [MergingObject, string] { + let error = undefined + let objects: any[] = [] + let message = "" + + args.forEach(arg => { + if (isMessage(arg)) { + message = `${message} ${arg}`.trimStart() + } + if (isPlainObject(arg)) { + objects.push(arg) + } + if (isError(arg)) { + error = arg + } + }) + + const identity = getIdentity() + + let contextObject = {} + + if (LOG_CONTEXT) { + contextObject = { + tenantId: getTenantId(), + appId: getAppId(), + identityId: identity?._id, + identityType: identity?.type, + correlationId: correlation.getId(), + } + } + + const mergingObject = { + objects: objects.length ? objects : undefined, + err: error, + ...contextObject, + } + + return [mergingObject, message] + } + + console.log = (...arg: any[]) => { + const [obj, msg] = getLogParams(arg) + pinoInstance?.info(obj, msg) + } + console.info = (...arg: any[]) => { + const [obj, msg] = getLogParams(arg) + pinoInstance?.info(obj, msg) + } + console.warn = (...arg: any[]) => { + const [obj, msg] = getLogParams(arg) + pinoInstance?.warn(obj, msg) + } + console.error = (...arg: any[]) => { + const [obj, msg] = getLogParams(arg) + pinoInstance?.error(obj, msg) + } + + /** + * custom trace impl - this resembles the node trace behaviour rather + * than traditional trace logging + * @param arg + */ + console.trace = (...arg: any[]) => { + const [obj, msg] = getLogParams(arg) + if (!obj.err) { + // to get stack trace + obj.err = new Error() + } + pinoInstance?.trace(obj, msg) + } + + console.debug = (...arg: any) => { + const [obj, msg] = getLogParams(arg) + pinoInstance?.debug(obj, msg) + } // CONTEXT -const getTenantId = () => { - let tenantId - try { - tenantId = context.getTenantId() - } catch (e: any) { - // do nothing + const getTenantId = () => { + let tenantId + try { + tenantId = context.getTenantId() + } catch (e: any) { + // do nothing + } + return tenantId + } + + const getAppId = () => { + let appId + try { + appId = context.getAppId() + } catch (e) { + // do nothing + } + return appId + } + + const getIdentity = () => { + let identity + try { + identity = context.getIdentity() + } catch (e) { + // do nothing + } + return identity } - return tenantId } -const getAppId = () => { - let appId - try { - appId = context.getAppId() - } catch (e) { - // do nothing - } - return appId -} - -const getIdentity = () => { - let identity - try { - identity = context.getIdentity() - } catch (e) { - // do nothing - } - return identity -} +export const logger = pinoInstance diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 47514835ed..8082d3f0a0 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,8 +1,8 @@ #!/usr/bin/env node +process.env.DISABLE_PINO_LOGGER = "1" import "./prebuilds" import "./environment" -import { env, logging } from "@budibase/backend-core" -logging.disableLogger() +import { env } from "@budibase/backend-core" import { getCommands } from "./options" import { Command } from "commander" import { getHelpDescription } from "./utils" From f61f9eba686f5852c10a7304007a6e80954602c3 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 May 2023 16:28:56 +0100 Subject: [PATCH 20/28] Linting. --- packages/backend-core/src/logging/pino/logger.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts index 8e0ed2a8fb..276377eb00 100644 --- a/packages/backend-core/src/logging/pino/logger.ts +++ b/packages/backend-core/src/logging/pino/logger.ts @@ -33,7 +33,7 @@ if (!env.DISABLE_PINO_LOGGER) { pinoInstance = pino(pinoOptions) -// CONSOLE OVERRIDES + // CONSOLE OVERRIDES interface MergingObject { objects?: any[] @@ -137,7 +137,7 @@ if (!env.DISABLE_PINO_LOGGER) { pinoInstance?.debug(obj, msg) } -// CONTEXT + // CONTEXT const getTenantId = () => { let tenantId From b911b04a039a7969376cf1a0da06558786af8eb4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 18:09:57 +0000 Subject: [PATCH 21/28] v2.5.6-alpha.44 --- 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 20d6ead3ba..3273f7bce7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 941b4639b8..e72abc9e9d 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.43", + "version": "2.5.6-alpha.44", "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.43", + "@budibase/types": "2.5.6-alpha.44", "@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 318c2f3172..68f0db5f73 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.43", + "version": "2.5.6-alpha.44", "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.43", - "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.44", "@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 0fdbab0a67..e5434c14a2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.43", - "@budibase/frontend-core": "2.5.6-alpha.43", - "@budibase/shared-core": "2.5.6-alpha.43", - "@budibase/string-templates": "2.5.6-alpha.43", + "@budibase/bbui": "2.5.6-alpha.44", + "@budibase/frontend-core": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.44", "@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 4fe0ddc637..1424fd7021 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "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.43", - "@budibase/string-templates": "2.5.6-alpha.43", - "@budibase/types": "2.5.6-alpha.43", + "@budibase/backend-core": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/types": "2.5.6-alpha.44", "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 29b49c3105..19ba08c169 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "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.43", - "@budibase/frontend-core": "2.5.6-alpha.43", - "@budibase/shared-core": "2.5.6-alpha.43", - "@budibase/string-templates": "2.5.6-alpha.43", - "@budibase/types": "2.5.6-alpha.43", + "@budibase/bbui": "2.5.6-alpha.44", + "@budibase/frontend-core": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/types": "2.5.6-alpha.44", "@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 11cdfddfc9..414aac562e 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.43", + "version": "2.5.6-alpha.44", "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.43", - "@budibase/shared-core": "2.5.6-alpha.43", + "@budibase/bbui": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.44", "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 9ab1a37fcb..618469354a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 74d6575b82..1ea7b20752 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.43", + "version": "2.5.6-alpha.44", "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.43", - "@budibase/client": "2.5.6-alpha.43", + "@budibase/backend-core": "2.5.6-alpha.44", + "@budibase/client": "2.5.6-alpha.44", "@budibase/pro": "2.5.6-alpha.43", - "@budibase/shared-core": "2.5.6-alpha.43", - "@budibase/string-templates": "2.5.6-alpha.43", - "@budibase/types": "2.5.6-alpha.43", + "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/types": "2.5.6-alpha.44", "@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 43ce16b9a6..b4fa8ac9e5 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.43", + "version": "2.5.6-alpha.44", "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.43" + "@budibase/types": "2.5.6-alpha.44" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0d0bbd2ef2..4db78ef952 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.43", + "version": "2.5.6-alpha.44", "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 929b82c172..79a9b5d05c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.43", + "version": "2.5.6-alpha.44", "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 9f40685933..75eb339cd7 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.43", + "version": "2.5.6-alpha.44", "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.43", + "@budibase/backend-core": "2.5.6-alpha.44", "@budibase/pro": "2.5.6-alpha.43", - "@budibase/string-templates": "2.5.6-alpha.43", - "@budibase/types": "2.5.6-alpha.43", + "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/types": "2.5.6-alpha.44", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ecff055b3e726958cd3031fd4b827639d05c2485 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 18:11:31 +0000 Subject: [PATCH 22/28] Update pro version to 2.5.6-alpha.44 --- 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 1ea7b20752..34569a9727 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.44", "@budibase/client": "2.5.6-alpha.44", - "@budibase/pro": "2.5.6-alpha.43", + "@budibase/pro": "2.5.6-alpha.44", "@budibase/shared-core": "2.5.6-alpha.44", "@budibase/string-templates": "2.5.6-alpha.44", "@budibase/types": "2.5.6-alpha.44", diff --git a/packages/worker/package.json b/packages/worker/package.json index 75eb339cd7..7e6a9c5495 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.44", - "@budibase/pro": "2.5.6-alpha.43", + "@budibase/pro": "2.5.6-alpha.44", "@budibase/string-templates": "2.5.6-alpha.44", "@budibase/types": "2.5.6-alpha.44", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 559ee1eaa3..815b155ff9 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.42": - version "2.5.6-alpha.42" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.42.tgz#15ec86d9918b7d58e3236240afda31309f3162ae" - integrity sha512-aes19IVAEGqf0YPLJMnOKHv99AR6LO8jMpPVCbSZcZODS3byxh9kC2+sWH1mAd781zymyN79HnwGrVJNOdV8jw== +"@budibase/pro@2.5.6-alpha.43": + version "2.5.6-alpha.43" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.43.tgz#3273219bcb51c0dde75753d59b22698722aad673" + integrity sha512-xUU7wFLsRczmPoystg5PN4GPtks0leMrdQJpCA3hxGM09szSHEheGKRCH3fpXhwbYe8GRsJx+27xrVxkW4+9yQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.42" + "@budibase/backend-core" "2.5.6-alpha.43" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.42" + "@budibase/types" "2.5.6-alpha.43" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 9647ac5deec4c452441dc310faccd16fd087ef9f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 2 May 2023 20:08:51 +0100 Subject: [PATCH 23/28] Create hubspot expansions and churns as users are added and deleted --- .../src/events/publishers/license.ts | 17 +++++++++-------- .../tests/core/utilities/structures/licenses.ts | 2 +- packages/types/src/sdk/events/license.ts | 9 ++++----- yarn.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index d1ff4d7609..094cf7fac1 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -15,17 +15,18 @@ import { async function planChanged( account: Account, - from: PlanType, - to: PlanType, - quantity: number | undefined, - duration: PriceDuration | undefined + opts: { + from: PlanType + to: PlanType + fromQuantity: number | undefined + toQuantity: number | undefined + fromDuration: PriceDuration | undefined + toDuration: PriceDuration | undefined + } ) { const properties: LicensePlanChangedEvent = { accountId: account.accountId, - to, - from, - quantity, - duration, + ...opts, } 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 810f31cf4f..22e73f2871 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -29,7 +29,7 @@ export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => { type, usesInvoicing: false, model: PlanModel.PER_USER, - price: price(), + price: type !== PlanType.FREE ? price() : undefined, } } diff --git a/packages/types/src/sdk/events/license.ts b/packages/types/src/sdk/events/license.ts index b92c556cc8..12bdd92184 100644 --- a/packages/types/src/sdk/events/license.ts +++ b/packages/types/src/sdk/events/license.ts @@ -5,11 +5,10 @@ export interface LicensePlanChangedEvent { 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 + fromDuration: PriceDuration | undefined + toDuration: PriceDuration | undefined + fromQuantity: number | undefined + toQuantity: number | undefined } export interface LicenseActivatedEvent { diff --git a/yarn.lock b/yarn.lock index 3b403d6444..423f58780d 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.41": - version "2.5.6-alpha.41" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.41.tgz#2632b398159211bf64bf6caff9753c877b6fc09d" - integrity sha512-8Zfm+RtcXY77gdXXHti8QT+Vt+1ApuVqYL3KCkxBVbpzgQci/F3mipNXUX8bEy/y+QYAdgn6psDTWAqyr9VALg== +"@budibase/pro@2.5.6-alpha.42": + version "2.5.6-alpha.42" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.42.tgz#15ec86d9918b7d58e3236240afda31309f3162ae" + integrity sha512-aes19IVAEGqf0YPLJMnOKHv99AR6LO8jMpPVCbSZcZODS3byxh9kC2+sWH1mAd781zymyN79HnwGrVJNOdV8jw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.41" + "@budibase/backend-core" "2.5.6-alpha.42" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.41" + "@budibase/types" "2.5.6-alpha.42" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 1fcc64154ed7d88dd299e3b114477d45aec81f69 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 13:14:55 +0000 Subject: [PATCH 24/28] v2.5.6-alpha.45 --- 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 3273f7bce7..cd9b1d8e1d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e72abc9e9d..cba87923db 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.44", + "version": "2.5.6-alpha.45", "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.44", + "@budibase/types": "2.5.6-alpha.45", "@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 68f0db5f73..c375a1fa27 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.44", + "version": "2.5.6-alpha.45", "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.44", - "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", "@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 e5434c14a2..ad0856a418 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.44", - "@budibase/frontend-core": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/frontend-core": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", "@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 1424fd7021..e21f09f233 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "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.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/backend-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "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 19ba08c169..00c9268d74 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "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.44", - "@budibase/frontend-core": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/frontend-core": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@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 414aac562e..878528f75e 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.44", + "version": "2.5.6-alpha.45", "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.44", - "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", "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 618469354a..d253b9d491 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 34569a9727..48e2ea5933 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.44", + "version": "2.5.6-alpha.45", "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.44", - "@budibase/client": "2.5.6-alpha.44", + "@budibase/backend-core": "2.5.6-alpha.45", + "@budibase/client": "2.5.6-alpha.45", "@budibase/pro": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@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 b4fa8ac9e5..f78dd95c19 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.44", + "version": "2.5.6-alpha.45", "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.44" + "@budibase/types": "2.5.6-alpha.45" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4db78ef952..0226884986 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.44", + "version": "2.5.6-alpha.45", "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 79a9b5d05c..099237d2da 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "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 7e6a9c5495..0d9f642701 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.44", + "version": "2.5.6-alpha.45", "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.44", + "@budibase/backend-core": "2.5.6-alpha.45", "@budibase/pro": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eb973386d8a8aa1f4f59d199121d46ff75ccc3fd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 13:16:23 +0000 Subject: [PATCH 25/28] Update pro version to 2.5.6-alpha.45 --- 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 48e2ea5933..b41116b86c 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.45", "@budibase/client": "2.5.6-alpha.45", - "@budibase/pro": "2.5.6-alpha.44", + "@budibase/pro": "2.5.6-alpha.45", "@budibase/shared-core": "2.5.6-alpha.45", "@budibase/string-templates": "2.5.6-alpha.45", "@budibase/types": "2.5.6-alpha.45", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0d9f642701..9a1f38214f 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.45", - "@budibase/pro": "2.5.6-alpha.44", + "@budibase/pro": "2.5.6-alpha.45", "@budibase/string-templates": "2.5.6-alpha.45", "@budibase/types": "2.5.6-alpha.45", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 815b155ff9..3da316081c 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.43": - version "2.5.6-alpha.43" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.43.tgz#3273219bcb51c0dde75753d59b22698722aad673" - integrity sha512-xUU7wFLsRczmPoystg5PN4GPtks0leMrdQJpCA3hxGM09szSHEheGKRCH3fpXhwbYe8GRsJx+27xrVxkW4+9yQ== +"@budibase/pro@2.5.6-alpha.44": + version "2.5.6-alpha.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.44.tgz#f849e7bceb06144083cc4b1d406ffa195348c4f1" + integrity sha512-duU1w9OhnycNvdfJx941OwrI3siTL3bOF793/yp8GisqSH/76vEwpu1VsAV/pqRywkwpr1LkilPkPPufiNURLg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.43" + "@budibase/backend-core" "2.5.6-alpha.44" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.43" + "@budibase/types" "2.5.6-alpha.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 47a37edad7f9a56086a6097305b1aa2f3eab3349 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 3 May 2023 16:10:22 +0100 Subject: [PATCH 26/28] Update lockfiles --- yarn.lock | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index 90f1a20d88..ca3f44d9a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.45": - version "2.5.6-alpha.45" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.45.tgz#99b536f01a7f2bc291f305263fca0d42d0cf2c12" - integrity sha512-R11iRHzEwseVIH10mf7knzML2SVxnLCyyNSoTJu/xLisgn4cBUs9S+swAx6mtZ1sx6bNd7ULYzOHHAw9ATy6dg== +"@budibase/pro@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc" + integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.45" - "@budibase/shared-core" "2.4.44-alpha.1" - "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.45" + "@budibase/backend-core" "2.5.9" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1502,15 +1501,6 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" - -"@budibase/shared-core@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" - integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== - dependencies: - "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1530,10 +1520,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" - integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== +"@budibase/string-templates@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" + integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1542,11 +1532,6 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@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" - integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21642,7 +21627,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: +scim2-parse-filter@0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== From 9e986ac69d0fb10deeca5460722a06e42f708df3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 15:23:47 +0000 Subject: [PATCH 27/28] v2.5.10-alpha.0 --- 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 a6fe00fe5d..d9c7eca7ef 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.9", + "version": "2.5.10-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 633677f617..f151e75623 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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.9", + "@budibase/types": "2.5.10-alpha.0", "@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 4d50d0cdcc..6f50176780 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.9", + "version": "2.5.10-alpha.0", "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.9", - "@budibase/string-templates": "^2.5.9", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", "@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 a773b4a160..25adb35aaf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.9", - "@budibase/frontend-core": "^2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/frontend-core": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", "@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 1b264de603..6037da7e4d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/backend-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "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 faaf16138a..e8770c5cb1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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.9", - "@budibase/frontend-core": "^2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/frontend-core": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@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 2d34142771..680756aa38 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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.9", - "@budibase/shared-core": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", "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 75a6bc5235..6730ad8e76 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1929d64826..ed45bd5812 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.9", + "version": "2.5.10-alpha.0", "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.9", - "@budibase/client": "^2.5.9", + "@budibase/backend-core": "2.5.10-alpha.0", + "@budibase/client": "2.5.10-alpha.0", "@budibase/pro": "2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@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 332d8b6f60..e29fea93af 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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.9" + "@budibase/types": "2.5.10-alpha.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 624ee36f03..14af9c2afb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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 aed792b67c..0c84a25627 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "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 31a0ea1d4c..9cdd689453 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.9", + "version": "2.5.10-alpha.0", "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.9", + "@budibase/backend-core": "2.5.10-alpha.0", "@budibase/pro": "2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7facf0c9ea8325ba2c0b4f29aef15a6a728ec4e5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 15:25:16 +0000 Subject: [PATCH 28/28] Update pro version to 2.5.10-alpha.0 --- 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 ed45bd5812..5003e6bdc5 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.10-alpha.0", "@budibase/client": "2.5.10-alpha.0", - "@budibase/pro": "2.5.9", + "@budibase/pro": "2.5.10-alpha.0", "@budibase/shared-core": "2.5.10-alpha.0", "@budibase/string-templates": "2.5.10-alpha.0", "@budibase/types": "2.5.10-alpha.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9cdd689453..104ca9db31 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.10-alpha.0", - "@budibase/pro": "2.5.9", + "@budibase/pro": "2.5.10-alpha.0", "@budibase/string-templates": "2.5.10-alpha.0", "@budibase/types": "2.5.10-alpha.0", "@koa/router": "8.0.8",