From 19dfadc43755bd76e724979c53ad0666e6374e6c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 21 Dec 2022 16:24:29 +0000 Subject: [PATCH 1/6] pinning couchDB version for closeau compatibility (#9144) --- charts/budibase/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml index 570aa04d8e..85d4165252 100644 --- a/charts/budibase/Chart.yaml +++ b/charts/budibase/Chart.yaml @@ -15,7 +15,7 @@ version: 0.2.11 appVersion: 1.0.214 dependencies: - name: couchdb - version: 3.6.1 + version: 3.3.4 repository: https://apache.github.io/couchdb-helm condition: services.couchdb.enabled - name: ingress-nginx From e561b41219643647a8ed6ed440f0e07857b31838 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 3 Jan 2023 11:51:30 +0000 Subject: [PATCH 2/6] define specific port for minio at startup --- hosting/single/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index ea825131db..6eebba62b6 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -78,7 +78,7 @@ mkdir -p ${DATA_DIR}/search chown -R couchdb:couchdb ${DATA_DIR}/couch redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & /opt/clouseau/bin/clouseau > /dev/stdout 2>&1 & -/minio/minio server ${DATA_DIR}/minio > /dev/stdout 2>&1 & +/minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 & /docker-entrypoint.sh /opt/couchdb/bin/couchdb & /etc/init.d/nginx restart if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then From 562768d61e60ff52476d3ea8101fbc617c36a378 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Jan 2023 13:40:37 +0000 Subject: [PATCH 3/6] Updating the client overlay to use the right method when event type is unknown (#9192) --- packages/client/src/components/overlay/PeekScreenDisplay.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/overlay/PeekScreenDisplay.svelte b/packages/client/src/components/overlay/PeekScreenDisplay.svelte index b9f4914624..6e0fa81b43 100644 --- a/packages/client/src/components/overlay/PeekScreenDisplay.svelte +++ b/packages/client/src/components/overlay/PeekScreenDisplay.svelte @@ -61,7 +61,7 @@ if (messageHandler) { messageHandler(message) } else { - console.warning("Unknown event type", message?.data?.type) + console.warn("Unknown event type", message?.data?.type) } } From b70fdf907ad9da0d534170947dd571925b48003f Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 4 Jan 2023 15:18:53 +0000 Subject: [PATCH 4/6] Cast bit buffer as boolean --- packages/server/src/integrations/mysql.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 136d84361a..1cd9a356b3 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -151,6 +151,9 @@ class MySQLIntegration extends Sql implements DatasourcePlus { ) { return field.string() } + if (field.type === "BIT" && field.length === 1) { + return field.buffer()?.[0] + } return next() }, } From ae7e3d498fdd1bfe5ca8c1e5f724cd652c906c38 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 5 Jan 2023 16:29:16 +0000 Subject: [PATCH 5/6] v2.2.10 --- 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 b04338d8c8..37a965a594 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.9", + "version": "2.2.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 62228af7cd..fd33bf6d85 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.9", + "version": "2.2.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.9", + "@budibase/types": "^2.2.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1ca692fa8d..9e0cfdcaa8 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.2.9", + "version": "2.2.10", "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.2.9", + "@budibase/string-templates": "^2.2.10", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index da9c912bdf..d87a45905d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.9", + "version": "2.2.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.9", - "@budibase/client": "^2.2.9", - "@budibase/frontend-core": "^2.2.9", - "@budibase/string-templates": "^2.2.9", + "@budibase/bbui": "^2.2.10", + "@budibase/client": "^2.2.10", + "@budibase/frontend-core": "^2.2.10", + "@budibase/string-templates": "^2.2.10", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d48942b9d1..6e9309de41 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.9", + "version": "2.2.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.2.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/backend-core": "^2.2.10", + "@budibase/string-templates": "^2.2.10", + "@budibase/types": "^2.2.10", "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 1b797e4bfb..dc80413566 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.9", + "version": "2.2.10", "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.2.9", - "@budibase/frontend-core": "^2.2.9", - "@budibase/string-templates": "^2.2.9", + "@budibase/bbui": "^2.2.10", + "@budibase/frontend-core": "^2.2.10", + "@budibase/string-templates": "^2.2.10", "@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 116dc8dfdc..19af2fa445 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.9", + "version": "2.2.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.2.9", + "@budibase/bbui": "^2.2.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 04d073908d..fb6647248f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.9", + "version": "2.2.10", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 2fff32198d..b44e540ece 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.9", + "version": "2.2.10", "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.2.9", - "@budibase/client": "^2.2.9", + "@budibase/backend-core": "^2.2.10", + "@budibase/client": "^2.2.10", "@budibase/pro": "2.2.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/string-templates": "^2.2.10", + "@budibase/types": "^2.2.10", "@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 f7f38ed78f..f1135031c0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.9", + "version": "2.2.10", "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 b27ac280ef..0e1e09c2ac 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.9", + "version": "2.2.10", "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 a697f45865..7fde094f02 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.9", + "version": "2.2.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.2.9", + "@budibase/backend-core": "^2.2.10", "@budibase/pro": "2.2.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/string-templates": "^2.2.10", + "@budibase/types": "^2.2.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 455871d89ab1ef7530317f25e3d6f6a5d27306dd Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 5 Jan 2023 16:33:11 +0000 Subject: [PATCH 6/6] Update pro version to 2.2.10 --- 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 b44e540ece..7949d472c4 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.2.10", "@budibase/client": "^2.2.10", - "@budibase/pro": "2.2.9", + "@budibase/pro": "2.2.10", "@budibase/string-templates": "^2.2.10", "@budibase/types": "^2.2.10", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 7eccc15433..95df35498c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" - integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== +"@budibase/backend-core@2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10.tgz#0fe86fdfa4c55e5f371f72b6f560e09b9e543f46" + integrity sha512-9+2s2yQ30MgslF/3Fdds9IrVDgf0YP7Q4KkKpmAnT0AX2i8+UFRu3DYhjXduSZ3V/RQRRliNy1HzzagmGWIQFA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.9" + "@budibase/types" "^2.2.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" - integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== +"@budibase/pro@2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10.tgz#935f4cf97288d8d4ae147107045cd3e27bbd937c" + integrity sha512-ceXFPeLqw2p3ynlDpAMlCUu86ex1PD9bwlQdsuSzXovd3Rxm3OxJ/Bw/TMayApp6gvGPsuBZIQELdrCuu4yNzg== dependencies: - "@budibase/backend-core" "2.2.9" - "@budibase/types" "2.2.9" + "@budibase/backend-core" "2.2.10" + "@budibase/types" "2.2.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.9", "@budibase/types@^2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" - integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== +"@budibase/types@2.2.10", "@budibase/types@^2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10.tgz#ca6c4f796a7ac7ca0a689147af9d0f26bef0b79e" + integrity sha512-mQAeMt++jXmPXD0RK/Hs0ScJIGtYlSTGOtm8WvNjIVMm155xHrChFVT+LObFFbQkYMI5BLJ1tmHHf21r432D5A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7fde094f02..f72e5f8c10 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.2.10", - "@budibase/pro": "2.2.9", + "@budibase/pro": "2.2.10", "@budibase/string-templates": "^2.2.10", "@budibase/types": "^2.2.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cd9c47e53a..5b459798bf 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" - integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== +"@budibase/backend-core@2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10.tgz#0fe86fdfa4c55e5f371f72b6f560e09b9e543f46" + integrity sha512-9+2s2yQ30MgslF/3Fdds9IrVDgf0YP7Q4KkKpmAnT0AX2i8+UFRu3DYhjXduSZ3V/RQRRliNy1HzzagmGWIQFA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.9" + "@budibase/types" "^2.2.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" - integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== +"@budibase/pro@2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10.tgz#935f4cf97288d8d4ae147107045cd3e27bbd937c" + integrity sha512-ceXFPeLqw2p3ynlDpAMlCUu86ex1PD9bwlQdsuSzXovd3Rxm3OxJ/Bw/TMayApp6gvGPsuBZIQELdrCuu4yNzg== dependencies: - "@budibase/backend-core" "2.2.9" - "@budibase/types" "2.2.9" + "@budibase/backend-core" "2.2.10" + "@budibase/types" "2.2.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.9", "@budibase/types@^2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" - integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== +"@budibase/types@2.2.10", "@budibase/types@^2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10.tgz#ca6c4f796a7ac7ca0a689147af9d0f26bef0b79e" + integrity sha512-mQAeMt++jXmPXD0RK/Hs0ScJIGtYlSTGOtm8WvNjIVMm155xHrChFVT+LObFFbQkYMI5BLJ1tmHHf21r432D5A== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"