From 4c4e080a64b2f6b9e91f301a667b998e085af41c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 8 Mar 2023 12:39:19 +0000 Subject: [PATCH 01/17] v2.4.6 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index d6b68b6cb7..ee197eb209 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.5", + "version": "2.4.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b658a5c591..6a7a7e5d66 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.5", + "version": "2.4.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.4.5", + "@budibase/types": "^2.4.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 2428cc6857..32365f6c02 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.4.5", + "version": "2.4.6", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "^2.4.5", + "@budibase/string-templates": "^2.4.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 bf7f19cc51..516121c781 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.5", + "version": "2.4.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.5", - "@budibase/client": "^2.4.5", - "@budibase/frontend-core": "^2.4.5", - "@budibase/string-templates": "^2.4.5", + "@budibase/bbui": "^2.4.6", + "@budibase/client": "^2.4.6", + "@budibase/frontend-core": "^2.4.6", + "@budibase/string-templates": "^2.4.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 953b727980..6eab036b0b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.5", + "version": "2.4.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.4.5", - "@budibase/string-templates": "^2.4.5", - "@budibase/types": "^2.4.5", + "@budibase/backend-core": "^2.4.6", + "@budibase/string-templates": "^2.4.6", + "@budibase/types": "^2.4.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 c049607a0e..926e631830 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.5", + "version": "2.4.6", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.5", - "@budibase/frontend-core": "^2.4.5", - "@budibase/string-templates": "^2.4.5", + "@budibase/bbui": "^2.4.6", + "@budibase/frontend-core": "^2.4.6", + "@budibase/string-templates": "^2.4.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 001f163aca..e4dbbe72c7 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.5", + "version": "2.4.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.4.5", + "@budibase/bbui": "^2.4.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a5eb64a167..7b07142090 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.5", + "version": "2.4.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 32b0ddf182..0373255796 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.5", + "version": "2.4.6", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.5", - "@budibase/client": "^2.4.5", + "@budibase/backend-core": "^2.4.6", + "@budibase/client": "^2.4.6", "@budibase/pro": "2.4.5", - "@budibase/string-templates": "^2.4.5", - "@budibase/types": "^2.4.5", + "@budibase/string-templates": "^2.4.6", + "@budibase/types": "^2.4.6", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 41acea8324..473d1163dd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.5", + "version": "2.4.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 02f31133f8..d99b1326be 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.5", + "version": "2.4.6", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index eb8977703b..38159fd9a2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.5", + "version": "2.4.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.4.5", + "@budibase/backend-core": "^2.4.6", "@budibase/pro": "2.4.5", - "@budibase/string-templates": "^2.4.5", - "@budibase/types": "^2.4.5", + "@budibase/string-templates": "^2.4.6", + "@budibase/types": "^2.4.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 33a9c8d2156d420a57b3bad3f21e622a957cf51b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 8 Mar 2023 12:41:59 +0000 Subject: [PATCH 02/17] Update pro version to 2.4.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 0373255796..1d480078df 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.6", "@budibase/client": "^2.4.6", - "@budibase/pro": "2.4.5", + "@budibase/pro": "2.4.6", "@budibase/string-templates": "^2.4.6", "@budibase/types": "^2.4.6", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ab4a919f7c..6f274217fc 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5.tgz#d748c482001a89fe6921a0a18f4f2db9ca62ca27" - integrity sha512-5mzO8NzpV41ITwqlCK+DHDTIjj2e9mcRBNyTolqfYj3PP8RmEd/tXNQFvHz6XAe3++Ow/dLkVHi/cQSPZxhvJQ== +"@budibase/backend-core@2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6.tgz#19717251ec11a391b18987aa732cf0ec2351f774" + integrity sha512-oTuW5B6GG6//vXohOAQ7Go2npv98VT8YuvOF0iQC4OeFGNpguu4azDG0I/6dCDNfR006HlR3lgO+0IvW3IXDTA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.5" + "@budibase/types" "^2.4.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5.tgz#b63e8e8ba876352679620b9d4f29c01b8438bd31" - integrity sha512-u8NKQGrpmMvleTfWVJcI3LGt1+UWNYH8/6hJrk5hmEgmP+t+wzQanz7x8OcGdN1VDNvCf8fWvTXHWk1zV1byFA== +"@budibase/pro@2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8" + integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA== dependencies: - "@budibase/backend-core" "2.4.5" + "@budibase/backend-core" "2.4.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.5" + "@budibase/types" "2.4.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.5", "@budibase/types@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5.tgz#69439ce148eca80132b72ad955a81b23e8e5de7d" - integrity sha512-rwb5xt61hh6dkk29cp8TCvKjyMrDcABe94zZr8iE2tQ+GAJnn18F5wQ4fUtC1/0MO6Kxc0gT/VT/roDH1ogv1A== +"@budibase/types@2.4.6", "@budibase/types@^2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6.tgz#1c528c4d7ca0ed81447a292a2b5569eab55b7f6a" + integrity sha512-2Y1OnrSbqDTKmyyhaHMgrQaIrkj+eNk52AuNa8mMF5ToVEmKs5W6ZJcoMVM07GgMRTf1OZUjXspm9Y5XMDOHTQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 38159fd9a2..5492c13107 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.6", - "@budibase/pro": "2.4.5", + "@budibase/pro": "2.4.6", "@budibase/string-templates": "^2.4.6", "@budibase/types": "^2.4.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a88ca01f96..633db56a1b 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.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5.tgz#d748c482001a89fe6921a0a18f4f2db9ca62ca27" - integrity sha512-5mzO8NzpV41ITwqlCK+DHDTIjj2e9mcRBNyTolqfYj3PP8RmEd/tXNQFvHz6XAe3++Ow/dLkVHi/cQSPZxhvJQ== +"@budibase/backend-core@2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6.tgz#19717251ec11a391b18987aa732cf0ec2351f774" + integrity sha512-oTuW5B6GG6//vXohOAQ7Go2npv98VT8YuvOF0iQC4OeFGNpguu4azDG0I/6dCDNfR006HlR3lgO+0IvW3IXDTA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.5" + "@budibase/types" "^2.4.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.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5.tgz#b63e8e8ba876352679620b9d4f29c01b8438bd31" - integrity sha512-u8NKQGrpmMvleTfWVJcI3LGt1+UWNYH8/6hJrk5hmEgmP+t+wzQanz7x8OcGdN1VDNvCf8fWvTXHWk1zV1byFA== +"@budibase/pro@2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8" + integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA== dependencies: - "@budibase/backend-core" "2.4.5" + "@budibase/backend-core" "2.4.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.5" + "@budibase/types" "2.4.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.4.5", "@budibase/types@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5.tgz#69439ce148eca80132b72ad955a81b23e8e5de7d" - integrity sha512-rwb5xt61hh6dkk29cp8TCvKjyMrDcABe94zZr8iE2tQ+GAJnn18F5wQ4fUtC1/0MO6Kxc0gT/VT/roDH1ogv1A== +"@budibase/types@2.4.6", "@budibase/types@^2.4.6": + version "2.4.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6.tgz#1c528c4d7ca0ed81447a292a2b5569eab55b7f6a" + integrity sha512-2Y1OnrSbqDTKmyyhaHMgrQaIrkj+eNk52AuNa8mMF5ToVEmKs5W6ZJcoMVM07GgMRTf1OZUjXspm9Y5XMDOHTQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 03ff4daca30680f91ab3071a38a387049618f79a Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Wed, 8 Mar 2023 13:35:26 +0000 Subject: [PATCH 03/17] Revert "pinning MinIO versions" --- hosting/docker-compose.yaml | 3 +-- scripts/install-minio.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 318c1577f1..d36937910f 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -59,8 +59,7 @@ services: minio-service: restart: unless-stopped - # Last version that supports the "fs" backend - image: minio/minio:RELEASE.2022-10-24T18-35-07Z + image: minio/minio volumes: - minio_data:/data environment: diff --git a/scripts/install-minio.sh b/scripts/install-minio.sh index 66eae97cba..8297593599 100755 --- a/scripts/install-minio.sh +++ b/scripts/install-minio.sh @@ -2,9 +2,9 @@ if [[ $TARGETARCH == arm* ]] ; then echo "INSTALLING ARM64 MINIO" - wget https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-10-24T18-35-07Z + wget https://dl.min.io/server/minio/release/linux-arm64/minio else echo "INSTALLING AMD64 MINIO" - wget https://dl.min.io/server/minio/release/linux-amd64/minio.RELEASE.2022-10-24T18-35-07Z + wget https://dl.min.io/server/minio/release/linux-amd64/minio fi chmod +x minio From a8f873fff398bc68e4b03a731cf35eda907e15a4 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Wed, 8 Mar 2023 13:39:18 +0000 Subject: [PATCH 04/17] Try/catch automation Create Row relationship (#9924) * Try/catch * Increase height of automation test output * Unit tests * lint --- .../AutomationBuilder/TestDisplay.svelte | 7 +- .../server/src/automations/automationUtils.ts | 8 ++- .../unitTests/automationUtils.spec.ts | 68 +++++++++++++++++++ 3 files changed, 78 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte index d74eab3622..043844b6d2 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte @@ -73,14 +73,14 @@