From 4fb3d103be8a57aa5281589c8276bdee9815d834 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 23 Feb 2023 08:09:18 +0000 Subject: [PATCH 01/14] Fix error being thrown when attempting to change query parameters (#9782) --- .../controls/ButtonActionEditor/actions/ExecuteQuery.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte index 840a639fb4..ba72fd2ed7 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte @@ -20,6 +20,12 @@ x => x._id !== BUDIBASE_INTERNAL_DB_ID && x.type !== BUDIBASE_DATASOURCE_TYPE ) + // Ensure query params exist so they can be bound + $: { + if (!parameters.queryParams) { + parameters.queryParams = {} + } + } function fetchQueryDefinition(query) { const source = $datasources.list.find( From df0fc15c3a18d2d842e07d799613762467dd7b70 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 23 Feb 2023 16:20:44 +0000 Subject: [PATCH 02/14] set couchDB chart version to 3.1.1 --- charts/budibase/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index dd75b2daa3..536af8560f 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -245,7 +245,7 @@ couchdb: ## The CouchDB image image: repository: couchdb - tag: 3.2.1 + tag: 3.1.1 pullPolicy: IfNotPresent ## Experimental integration with Lucene-powered fulltext search From 1e222d2c4e3b162bbd6e03601bee589d9b47cf17 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 24 Feb 2023 16:27:50 +0000 Subject: [PATCH 03/14] Downgrade glopezep/helm to 1.7.0 (#9803) --- .github/workflows/deploy-preprod.yml | 2 +- .github/workflows/deploy-release.yml | 2 +- .github/workflows/release-develop.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index cef47636ee..5ce27b08d9 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -37,7 +37,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.7.1 + uses: glopezep/helm@v1.7.0 with: release: budibase-preprod namespace: budibase diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index cff26fd7c8..b4653e5a4e 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -38,7 +38,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.7.1 + uses: glopezep/helm@v1.7.0 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 1ac6b20003..bbb1be0878 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -98,7 +98,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.7.1 + uses: glopezep/helm@v1.7.0 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a28150891..7f522244e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.7.1 + uses: glopezep/helm@v1.7.0 with: release: budibase-preprod namespace: budibase From d8be15cb77ea562765d3475ec345ceb654386ef1 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 24 Feb 2023 16:34:13 +0000 Subject: [PATCH 04/14] Fix helm action (#9804) * Downgrade glopezep/helm to 1.7.0 * Downgrade glopezep/helm to 1.6.1 --- .github/workflows/deploy-preprod.yml | 2 +- .github/workflows/deploy-release.yml | 2 +- .github/workflows/release-develop.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 5ce27b08d9..583d83dc5d 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -37,7 +37,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.7.0 + uses: glopezep/helm@v1.6.1 with: release: budibase-preprod namespace: budibase diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index b4653e5a4e..fcc29fcd7d 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -38,7 +38,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.7.0 + uses: glopezep/helm@v1.6.1 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index bbb1be0878..3201ecb1c9 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -98,7 +98,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.7.0 + uses: glopezep/helm@v1.6.1 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f522244e0..28da63aadf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.7.0 + uses: glopezep/helm@v1.6.1 with: release: budibase-preprod namespace: budibase From 388ac5117c2079eb240446274a55e87c1a1fc33c Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 27 Feb 2023 10:01:43 +0000 Subject: [PATCH 05/14] Use forked helm action (#9814) --- .github/workflows/deploy-preprod.yml | 2 +- .github/workflows/deploy-release.yml | 2 +- .github/workflows/release-develop.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 583d83dc5d..eec5546444 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -37,7 +37,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.6.1 + uses: budibase/helm@v1.8.0 with: release: budibase-preprod namespace: budibase diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index fcc29fcd7d..1f7a5ebfd4 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -38,7 +38,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.6.1 + uses: budibase/helm@v1.8.0 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 3201ecb1c9..193f736b5f 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -98,7 +98,7 @@ jobs: wc -l values.release.yaml - name: Deploy to Release Environment - uses: glopezep/helm@v1.6.1 + uses: budibase/helm@v1.8.0 with: release: budibase-release namespace: budibase diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28da63aadf..a24537ccd4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: wc -l values.preprod.yaml - name: Deploy to Preprod Environment - uses: glopezep/helm@v1.6.1 + uses: budibase/helm@v1.8.0 with: release: budibase-preprod namespace: budibase From 7a59ee813fc92b82f415225421ff10e5f53a6b81 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 27 Feb 2023 10:12:47 +0000 Subject: [PATCH 06/14] v2.3.18 --- 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 cfbed56e23..dc96b47dea 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.17", + "version": "2.3.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 25e73b9e4d..e4b47dd0a1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.3.17", + "version": "2.3.18", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.3.17", + "@budibase/types": "^2.3.18", "@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 8c9629b314..b2903c4811 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.3.17", + "version": "2.3.18", "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.3.17", + "@budibase/string-templates": "^2.3.18", "@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 5e968c23a3..39435e2fd2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.3.17", + "version": "2.3.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.3.17", - "@budibase/client": "^2.3.17", - "@budibase/frontend-core": "^2.3.17", - "@budibase/string-templates": "^2.3.17", + "@budibase/bbui": "^2.3.18", + "@budibase/client": "^2.3.18", + "@budibase/frontend-core": "^2.3.18", + "@budibase/string-templates": "^2.3.18", "@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 fb08c290fc..edebd25e3a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.3.17", + "version": "2.3.18", "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.3.17", - "@budibase/string-templates": "^2.3.17", - "@budibase/types": "^2.3.17", + "@budibase/backend-core": "^2.3.18", + "@budibase/string-templates": "^2.3.18", + "@budibase/types": "^2.3.18", "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 78df2b67f7..f11fe4360d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.3.17", + "version": "2.3.18", "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.3.17", - "@budibase/frontend-core": "^2.3.17", - "@budibase/string-templates": "^2.3.17", + "@budibase/bbui": "^2.3.18", + "@budibase/frontend-core": "^2.3.18", + "@budibase/string-templates": "^2.3.18", "@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 502df0fbd4..723560309f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.3.17", + "version": "2.3.18", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.3.17", + "@budibase/bbui": "^2.3.18", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d8a5c44c5b..4b84e6d726 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.3.17", + "version": "2.3.18", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index f5787302fe..2d4a8814f8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.3.17", + "version": "2.3.18", "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.3.17", - "@budibase/client": "^2.3.17", + "@budibase/backend-core": "^2.3.18", + "@budibase/client": "^2.3.18", "@budibase/pro": "2.3.17", - "@budibase/string-templates": "^2.3.17", - "@budibase/types": "^2.3.17", + "@budibase/string-templates": "^2.3.18", + "@budibase/types": "^2.3.18", "@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 87b7c69dbb..f3f8c67fab 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.3.17", + "version": "2.3.18", "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 8417cadc06..c674aedc53 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.3.17", + "version": "2.3.18", "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 71b8ed6e9c..d3331d7223 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.3.17", + "version": "2.3.18", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.3.17", + "@budibase/backend-core": "^2.3.18", "@budibase/pro": "2.3.17", - "@budibase/string-templates": "^2.3.17", - "@budibase/types": "^2.3.17", + "@budibase/string-templates": "^2.3.18", + "@budibase/types": "^2.3.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8dd34984b2f77bd4f781522a9f8dd535c03f5a5e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 27 Feb 2023 10:16:38 +0000 Subject: [PATCH 07/14] Update pro version to 2.3.18 --- 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 2d4a8814f8..edee3c2634 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.3.18", "@budibase/client": "^2.3.18", - "@budibase/pro": "2.3.17", + "@budibase/pro": "2.3.18", "@budibase/string-templates": "^2.3.18", "@budibase/types": "^2.3.18", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 31a5b3350e..3304ea07a4 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.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5" - integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw== +"@budibase/backend-core@2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50" + integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.17" + "@budibase/types" "^2.3.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8" - integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA== +"@budibase/pro@2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3" + integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw== dependencies: - "@budibase/backend-core" "2.3.17" - "@budibase/types" "2.3.17" + "@budibase/backend-core" "2.3.18" + "@budibase/types" "2.3.18" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.3.17", "@budibase/types@^2.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995" - integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA== +"@budibase/types@2.3.18", "@budibase/types@^2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329" + integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d3331d7223..8e781bf5d7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.3.18", - "@budibase/pro": "2.3.17", + "@budibase/pro": "2.3.18", "@budibase/string-templates": "^2.3.18", "@budibase/types": "^2.3.18", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 43d5ffb1bd..9197f589f5 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.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5" - integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw== +"@budibase/backend-core@2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50" + integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.17" + "@budibase/types" "^2.3.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8" - integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA== +"@budibase/pro@2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3" + integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw== dependencies: - "@budibase/backend-core" "2.3.17" - "@budibase/types" "2.3.17" + "@budibase/backend-core" "2.3.18" + "@budibase/types" "2.3.18" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.3.17", "@budibase/types@^2.3.17": - version "2.3.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995" - integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA== +"@budibase/types@2.3.18", "@budibase/types@^2.3.18": + version "2.3.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329" + integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From acda2d0be20db65b1072fe19ce568aebb3d0925a Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 1 Mar 2023 17:40:33 +0000 Subject: [PATCH 08/14] Fix for group picker in the user details page to accommodate missing userGroups value on a user --- packages/builder/src/components/settings/UserGroupPicker.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/settings/UserGroupPicker.svelte b/packages/builder/src/components/settings/UserGroupPicker.svelte index 1c69e48da1..b1b59cda7a 100644 --- a/packages/builder/src/components/settings/UserGroupPicker.svelte +++ b/packages/builder/src/components/settings/UserGroupPicker.svelte @@ -18,7 +18,7 @@ return list.map(item => { return { ...item, - selected: selected.find(x => x === item._id) != null, + selected: selected?.find(x => x === item._id) != null, } }) } From 5bd2dfa4b69c4c8c91c2d9eb4f3f00a2bab29084 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 1 Mar 2023 18:33:37 +0000 Subject: [PATCH 09/14] allow proxy service rate limits to be controlled with helm --- charts/budibase/templates/proxy-service-deployment.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml index 6064905c4c..dfddee8ba0 100644 --- a/charts/budibase/templates/proxy-service-deployment.yaml +++ b/charts/budibase/templates/proxy-service-deployment.yaml @@ -42,6 +42,14 @@ spec: value: {{ tpl .Values.services.proxy.upstreams.minio . | quote }} - name: COUCHDB_UPSTREAM_URL value: {{ .Values.services.couchdb.url | default (tpl .Values.services.proxy.upstreams.couchdb .) | quote }} + {{ if .Values.services.proxy.proxyRateLimitWebhooksPerSecond }} + - name: PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND + value: {{ .Values.services.proxy.proxyRateLimitWebhooksPerSecond | quote }} + {{ end }} + {{ if .Values.services.proxy.proxyRateLimitApiPerSecond }} + - name: PROXY_RATE_LIMIT_API_PER_SECOND + value: {{ .Values.services.proxy.proxyRateLimitApiPerSecond | quote }} + {{ end }} - name: RESOLVER {{ if .Values.services.proxy.resolver }} value: {{ .Values.services.proxy.resolver }} From dfb412df1e5ae11e6d0772a83d4add7c4ee7d1d2 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 1 Mar 2023 19:55:26 +0000 Subject: [PATCH 10/14] v2.3.19 --- 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 dc96b47dea..e10bd71048 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.18", + "version": "2.3.19", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e4b47dd0a1..5d9f19dcc1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.3.18", + "version": "2.3.19", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.3.18", + "@budibase/types": "^2.3.19", "@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 b2903c4811..4f9e56912f 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.3.18", + "version": "2.3.19", "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.3.18", + "@budibase/string-templates": "^2.3.19", "@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 39435e2fd2..3f86a5e012 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.3.18", + "version": "2.3.19", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.3.18", - "@budibase/client": "^2.3.18", - "@budibase/frontend-core": "^2.3.18", - "@budibase/string-templates": "^2.3.18", + "@budibase/bbui": "^2.3.19", + "@budibase/client": "^2.3.19", + "@budibase/frontend-core": "^2.3.19", + "@budibase/string-templates": "^2.3.19", "@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 edebd25e3a..57ed1764e0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.3.18", + "version": "2.3.19", "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.3.18", - "@budibase/string-templates": "^2.3.18", - "@budibase/types": "^2.3.18", + "@budibase/backend-core": "^2.3.19", + "@budibase/string-templates": "^2.3.19", + "@budibase/types": "^2.3.19", "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 f11fe4360d..0b780f55cd 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.3.18", + "version": "2.3.19", "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.3.18", - "@budibase/frontend-core": "^2.3.18", - "@budibase/string-templates": "^2.3.18", + "@budibase/bbui": "^2.3.19", + "@budibase/frontend-core": "^2.3.19", + "@budibase/string-templates": "^2.3.19", "@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 723560309f..28a486038c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.3.18", + "version": "2.3.19", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.3.18", + "@budibase/bbui": "^2.3.19", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4b84e6d726..7c04aab3ae 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.3.18", + "version": "2.3.19", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index edee3c2634..8b9f39c83f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.3.18", + "version": "2.3.19", "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.3.18", - "@budibase/client": "^2.3.18", + "@budibase/backend-core": "^2.3.19", + "@budibase/client": "^2.3.19", "@budibase/pro": "2.3.18", - "@budibase/string-templates": "^2.3.18", - "@budibase/types": "^2.3.18", + "@budibase/string-templates": "^2.3.19", + "@budibase/types": "^2.3.19", "@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 f3f8c67fab..79010f1674 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.3.18", + "version": "2.3.19", "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 c674aedc53..d73a3e2231 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.3.18", + "version": "2.3.19", "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 8e781bf5d7..c85e209056 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.3.18", + "version": "2.3.19", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.3.18", + "@budibase/backend-core": "^2.3.19", "@budibase/pro": "2.3.18", - "@budibase/string-templates": "^2.3.18", - "@budibase/types": "^2.3.18", + "@budibase/string-templates": "^2.3.19", + "@budibase/types": "^2.3.19", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 52530800c9b9805a6100f896d8e41bdc6b4c33a5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 1 Mar 2023 19:59:11 +0000 Subject: [PATCH 11/14] Update pro version to 2.3.19 --- 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 8b9f39c83f..2863b6d970 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.3.19", "@budibase/client": "^2.3.19", - "@budibase/pro": "2.3.18", + "@budibase/pro": "2.3.19", "@budibase/string-templates": "^2.3.19", "@budibase/types": "^2.3.19", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3304ea07a4..128879a9dd 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.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50" - integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw== +"@budibase/backend-core@2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5" + integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.18" + "@budibase/types" "^2.3.19" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3" - integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw== +"@budibase/pro@2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4" + integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw== dependencies: - "@budibase/backend-core" "2.3.18" - "@budibase/types" "2.3.18" + "@budibase/backend-core" "2.3.19" + "@budibase/types" "2.3.19" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.3.18", "@budibase/types@^2.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329" - integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw== +"@budibase/types@2.3.19", "@budibase/types@^2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a" + integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index c85e209056..afa445ba9f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.3.19", - "@budibase/pro": "2.3.18", + "@budibase/pro": "2.3.19", "@budibase/string-templates": "^2.3.19", "@budibase/types": "^2.3.19", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 9197f589f5..00af12a1b9 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.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50" - integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw== +"@budibase/backend-core@2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5" + integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.18" + "@budibase/types" "^2.3.19" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3" - integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw== +"@budibase/pro@2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4" + integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw== dependencies: - "@budibase/backend-core" "2.3.18" - "@budibase/types" "2.3.18" + "@budibase/backend-core" "2.3.19" + "@budibase/types" "2.3.19" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.3.18", "@budibase/types@^2.3.18": - version "2.3.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329" - integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw== +"@budibase/types@2.3.19", "@budibase/types@^2.3.19": + version "2.3.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a" + integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From c709d73a9e83bc80566729dc6fb7da7f9b647c85 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 1 Mar 2023 22:03:34 +0000 Subject: [PATCH 12/14] Pin node version in release-selfhost job --- .github/workflows/release-selfhost.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 12fb8f5a9d..f5a2f643c3 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -16,9 +16,13 @@ jobs: - uses: actions/checkout@v2 with: - node-version: 14.x fetch_depth: 0 + - name: Use Node.js 14.x + uses: actions/setup-node@v1 + with: + node-version: 14.x + - name: Get the latest budibase release version id: version run: | From 6963c46ab30c99df435ec7674b515f714ea5f896 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 1 Mar 2023 22:19:27 +0000 Subject: [PATCH 13/14] v2.3.20 --- 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 e10bd71048..1aee9f2bad 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.19", + "version": "2.3.20", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5d9f19dcc1..8e8ec24808 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.3.19", + "version": "2.3.20", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.3.19", + "@budibase/types": "^2.3.20", "@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 4f9e56912f..5668cadb01 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.3.19", + "version": "2.3.20", "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.3.19", + "@budibase/string-templates": "^2.3.20", "@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 3f86a5e012..4bcc1d3f34 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.3.19", + "version": "2.3.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.3.19", - "@budibase/client": "^2.3.19", - "@budibase/frontend-core": "^2.3.19", - "@budibase/string-templates": "^2.3.19", + "@budibase/bbui": "^2.3.20", + "@budibase/client": "^2.3.20", + "@budibase/frontend-core": "^2.3.20", + "@budibase/string-templates": "^2.3.20", "@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 57ed1764e0..253ecb4991 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.3.19", + "version": "2.3.20", "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.3.19", - "@budibase/string-templates": "^2.3.19", - "@budibase/types": "^2.3.19", + "@budibase/backend-core": "^2.3.20", + "@budibase/string-templates": "^2.3.20", + "@budibase/types": "^2.3.20", "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 0b780f55cd..79ef96bd4b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.3.19", + "version": "2.3.20", "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.3.19", - "@budibase/frontend-core": "^2.3.19", - "@budibase/string-templates": "^2.3.19", + "@budibase/bbui": "^2.3.20", + "@budibase/frontend-core": "^2.3.20", + "@budibase/string-templates": "^2.3.20", "@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 28a486038c..873c37e448 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.3.19", + "version": "2.3.20", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.3.19", + "@budibase/bbui": "^2.3.20", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7c04aab3ae..dc98d62eb4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.3.19", + "version": "2.3.20", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 2863b6d970..0f08df6e5c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.3.19", + "version": "2.3.20", "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.3.19", - "@budibase/client": "^2.3.19", + "@budibase/backend-core": "^2.3.20", + "@budibase/client": "^2.3.20", "@budibase/pro": "2.3.19", - "@budibase/string-templates": "^2.3.19", - "@budibase/types": "^2.3.19", + "@budibase/string-templates": "^2.3.20", + "@budibase/types": "^2.3.20", "@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 79010f1674..4381fbf553 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.3.19", + "version": "2.3.20", "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 d73a3e2231..04eb024cd1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.3.19", + "version": "2.3.20", "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 afa445ba9f..534a780cc9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.3.19", + "version": "2.3.20", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.3.19", + "@budibase/backend-core": "^2.3.20", "@budibase/pro": "2.3.19", - "@budibase/string-templates": "^2.3.19", - "@budibase/types": "^2.3.19", + "@budibase/string-templates": "^2.3.20", + "@budibase/types": "^2.3.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6c7e27b0849438c7d0d11a82fdd712a9b50c4129 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 1 Mar 2023 22:23:56 +0000 Subject: [PATCH 14/14] Update pro version to 2.3.20 --- 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 0f08df6e5c..861fd483a0 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.3.20", "@budibase/client": "^2.3.20", - "@budibase/pro": "2.3.19", + "@budibase/pro": "2.3.20", "@budibase/string-templates": "^2.3.20", "@budibase/types": "^2.3.20", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 128879a9dd..6cd14fb4a3 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.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5" - integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA== +"@budibase/backend-core@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c" + integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.19" + "@budibase/types" "^2.3.20" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4" - integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw== +"@budibase/pro@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e" + integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw== dependencies: - "@budibase/backend-core" "2.3.19" - "@budibase/types" "2.3.19" + "@budibase/backend-core" "2.3.20" + "@budibase/types" "2.3.20" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.3.19", "@budibase/types@^2.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a" - integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w== +"@budibase/types@2.3.20", "@budibase/types@^2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126" + integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 534a780cc9..57dd890ed8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.3.20", - "@budibase/pro": "2.3.19", + "@budibase/pro": "2.3.20", "@budibase/string-templates": "^2.3.20", "@budibase/types": "^2.3.20", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 00af12a1b9..0fb6ceac67 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.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5" - integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA== +"@budibase/backend-core@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c" + integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.19" + "@budibase/types" "^2.3.20" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4" - integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw== +"@budibase/pro@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e" + integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw== dependencies: - "@budibase/backend-core" "2.3.19" - "@budibase/types" "2.3.19" + "@budibase/backend-core" "2.3.20" + "@budibase/types" "2.3.20" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.3.19", "@budibase/types@^2.3.19": - version "2.3.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a" - integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w== +"@budibase/types@2.3.20", "@budibase/types@^2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126" + integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"