From a0d477fea4c389f9d99137f241aa16e2638a6ec7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 8 Mar 2023 13:58:09 +0000 Subject: [PATCH 01/54] v2.4.8 --- 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 95b5da6a10..463d894889 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.7", + "version": "2.4.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8cf1563a60..4986d12978 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.7", + "version": "2.4.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.4.7", + "@budibase/types": "^2.4.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 cc9a0c8531..5cc72c9cba 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.7", + "version": "2.4.8", "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.7", + "@budibase/string-templates": "^2.4.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 bc60cd2c87..53dfffa3f3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.7", + "version": "2.4.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.7", - "@budibase/client": "^2.4.7", - "@budibase/frontend-core": "^2.4.7", - "@budibase/string-templates": "^2.4.7", + "@budibase/bbui": "^2.4.8", + "@budibase/client": "^2.4.8", + "@budibase/frontend-core": "^2.4.8", + "@budibase/string-templates": "^2.4.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 3509ed67f4..96d600bf24 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.7", + "version": "2.4.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.4.7", - "@budibase/string-templates": "^2.4.7", - "@budibase/types": "^2.4.7", + "@budibase/backend-core": "^2.4.8", + "@budibase/string-templates": "^2.4.8", + "@budibase/types": "^2.4.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 d186dbcc8f..16766a318a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.7", + "version": "2.4.8", "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.7", - "@budibase/frontend-core": "^2.4.7", - "@budibase/string-templates": "^2.4.7", + "@budibase/bbui": "^2.4.8", + "@budibase/frontend-core": "^2.4.8", + "@budibase/string-templates": "^2.4.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 16a035a041..f33b70070a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.7", + "version": "2.4.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.4.7", + "@budibase/bbui": "^2.4.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 60d46772c5..972af74500 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.7", + "version": "2.4.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 92739a0398..2230428903 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.7", + "version": "2.4.8", "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.7", - "@budibase/client": "^2.4.7", + "@budibase/backend-core": "^2.4.8", + "@budibase/client": "^2.4.8", "@budibase/pro": "2.4.6", - "@budibase/string-templates": "^2.4.7", - "@budibase/types": "^2.4.7", + "@budibase/string-templates": "^2.4.8", + "@budibase/types": "^2.4.8", "@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 8f17a9c99f..63d083f169 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.7", + "version": "2.4.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 3e5950c90a..21d90dace5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.7", + "version": "2.4.8", "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 8e572e2b52..96e643da41 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.7", + "version": "2.4.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.4.7", + "@budibase/backend-core": "^2.4.8", "@budibase/pro": "2.4.6", - "@budibase/string-templates": "^2.4.7", - "@budibase/types": "^2.4.7", + "@budibase/string-templates": "^2.4.8", + "@budibase/types": "^2.4.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d20724cec9d36b3894344c5aed5592a0a6124757 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 8 Mar 2023 14:00:46 +0000 Subject: [PATCH 02/54] Update pro version to 2.4.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 2230428903..01f8392831 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.8", "@budibase/client": "^2.4.8", - "@budibase/pro": "2.4.6", + "@budibase/pro": "2.4.8", "@budibase/string-templates": "^2.4.8", "@budibase/types": "^2.4.8", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6f274217fc..6fa40b890d 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.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== +"@budibase/backend-core@2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9" + integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.6" + "@budibase/types" "^2.4.8" "@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.6": - version "2.4.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8" - integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA== +"@budibase/pro@2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46" + integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ== dependencies: - "@budibase/backend-core" "2.4.6" + "@budibase/backend-core" "2.4.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.6" + "@budibase/types" "2.4.8" "@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.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== +"@budibase/types@2.4.8", "@budibase/types@^2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14" + integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 96e643da41..777726a189 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.8", - "@budibase/pro": "2.4.6", + "@budibase/pro": "2.4.8", "@budibase/string-templates": "^2.4.8", "@budibase/types": "^2.4.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 633db56a1b..01d44c3c69 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.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== +"@budibase/backend-core@2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9" + integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.6" + "@budibase/types" "^2.4.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.4.6": - version "2.4.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8" - integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA== +"@budibase/pro@2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46" + integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ== dependencies: - "@budibase/backend-core" "2.4.6" + "@budibase/backend-core" "2.4.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.6" + "@budibase/types" "2.4.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.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== +"@budibase/types@2.4.8", "@budibase/types@^2.4.8": + version "2.4.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14" + integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 467ef04078af0660d0db8d0d215c13e2777a61a2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 8 Mar 2023 16:27:35 +0000 Subject: [PATCH 03/54] Allow Is in for _id SQL --- packages/frontend-core/src/utils/lucene.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index 427d8f8b97..744440e61b 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -54,7 +54,7 @@ export const getValidOperatorsForType = (type, field, datasource) => { // Only allow equal/not equal for _id in SQL tables if (field === "_id" && externalTable) { - ops = [Op.Equals, Op.NotEquals] + ops = [Op.Equals, Op.NotEquals, Op.In] } return ops From 0f981f33c4f618efb16f8c2c7436902fcf2fdf1f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 11:02:09 +0000 Subject: [PATCH 04/54] Re-add legacy preprod (#9953) * Re-add legacy preprod * Remove needs images --- .github/workflows/deploy-preprod.yml | 53 ++++++++++++++++++++++++++++ .github/workflows/release-master.yml | 3 ++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/deploy-preprod.yml diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml new file mode 100644 index 0000000000..91797b24e6 --- /dev/null +++ b/.github/workflows/deploy-preprod.yml @@ -0,0 +1,53 @@ +name: "deploy-preprod" +on: + workflow_dispatch: + workflow_call: + +jobs: + deploy-to-legacy-preprod-env: + runs-on: ubuntu-latest + steps: + - name: 'Get Previous tag' + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: eu-west-1 + + - name: Pull values.yaml from budibase-infra + run: | + curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ + -H 'Accept: application/vnd.github.v3.raw' \ + -o values.preprod.yaml \ + -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml + wc -l values.preprod.yaml + + - name: Deploy to Preprod Environment + uses: budibase/helm@v1.8.0 + with: + release: budibase-preprod + namespace: budibase + chart: charts/budibase + token: ${{ github.token }} + helm: helm3 + values: | + globals: + appVersion: ${{ steps.previoustag.outputs.tag }} + ingress: + enabled: true + nginx: true + value-files: >- + [ + "values.preprod.yaml" + ] + + - name: Discord Webhook Action + uses: tsickert/discord-webhook@v4.0.0 + with: + webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} + content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod." + embed-title: ${{ steps.previoustag.outputs.tag }} \ No newline at end of file diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 7d113a3719..e8bd2fddd4 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -119,6 +119,9 @@ jobs: env: RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }} + deploy-to-legacy-preprod-env: + uses: ./.github/workflows/deploy-preprod.yml + secrets: inherit # Trigger deploy to new EKS preprod environment trigger-deploy-to-preprod-env: From 01d304435a9154ab91bf80be41682c164e2d873e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 11:10:29 +0000 Subject: [PATCH 05/54] v2.4.9 --- 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 463d894889..a39a3befa5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.8", + "version": "2.4.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4986d12978..1e7251b17b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.8", + "version": "2.4.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.4.8", + "@budibase/types": "^2.4.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 5cc72c9cba..8e86288ec8 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.8", + "version": "2.4.9", "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.8", + "@budibase/string-templates": "^2.4.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 53dfffa3f3..1ee03e158c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.8", + "version": "2.4.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.8", - "@budibase/client": "^2.4.8", - "@budibase/frontend-core": "^2.4.8", - "@budibase/string-templates": "^2.4.8", + "@budibase/bbui": "^2.4.9", + "@budibase/client": "^2.4.9", + "@budibase/frontend-core": "^2.4.9", + "@budibase/string-templates": "^2.4.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 96d600bf24..bf7aae222b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.8", + "version": "2.4.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.4.8", - "@budibase/string-templates": "^2.4.8", - "@budibase/types": "^2.4.8", + "@budibase/backend-core": "^2.4.9", + "@budibase/string-templates": "^2.4.9", + "@budibase/types": "^2.4.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 16766a318a..f699a1047d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.8", + "version": "2.4.9", "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.8", - "@budibase/frontend-core": "^2.4.8", - "@budibase/string-templates": "^2.4.8", + "@budibase/bbui": "^2.4.9", + "@budibase/frontend-core": "^2.4.9", + "@budibase/string-templates": "^2.4.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 f33b70070a..8ee73b24cc 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.8", + "version": "2.4.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.4.8", + "@budibase/bbui": "^2.4.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 972af74500..e5be9ccc28 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.8", + "version": "2.4.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 01f8392831..8c8ddb00b4 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.8", + "version": "2.4.9", "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.8", - "@budibase/client": "^2.4.8", + "@budibase/backend-core": "^2.4.9", + "@budibase/client": "^2.4.9", "@budibase/pro": "2.4.8", - "@budibase/string-templates": "^2.4.8", - "@budibase/types": "^2.4.8", + "@budibase/string-templates": "^2.4.9", + "@budibase/types": "^2.4.9", "@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 63d083f169..73efd72ce8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.8", + "version": "2.4.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 21d90dace5..dfe3f75ddd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.8", + "version": "2.4.9", "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 777726a189..77d409bc4d 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.8", + "version": "2.4.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.4.8", + "@budibase/backend-core": "^2.4.9", "@budibase/pro": "2.4.8", - "@budibase/string-templates": "^2.4.8", - "@budibase/types": "^2.4.8", + "@budibase/string-templates": "^2.4.9", + "@budibase/types": "^2.4.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7eac28087d3d410bdd97d19ce2232982ca8d9348 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 11:13:12 +0000 Subject: [PATCH 06/54] Update pro version to 2.4.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 8c8ddb00b4..e516c81147 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.9", "@budibase/client": "^2.4.9", - "@budibase/pro": "2.4.8", + "@budibase/pro": "2.4.9", "@budibase/string-templates": "^2.4.9", "@budibase/types": "^2.4.9", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6fa40b890d..3e09330fa8 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.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9" - integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag== +"@budibase/backend-core@2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.9.tgz#a5d6846d1c665e0f5c965bf9ac686d5cc74fb6ac" + integrity sha512-gp30brn+7TWpjTJniO3n2cXKBKJDJM/WkmUbTX5V+8ynONbU5qSHiHmdHdLWq/ypZaOcFbKxM3fZQsMiJ0CAMQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.8" + "@budibase/types" "^2.4.9" "@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.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46" - integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ== +"@budibase/pro@2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.9.tgz#7e10725d574136691594dfb4e24724edc8b1bbe5" + integrity sha512-5cb5q+VPFCXCXL+Ao8gsrMSJmJ57w73q76dLa9+h9b9AjKAX2Ib0zaduJ3OvRJTqfYvH7bMAD9wpIWEyPc+aXA== dependencies: - "@budibase/backend-core" "2.4.8" + "@budibase/backend-core" "2.4.9" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.8" + "@budibase/types" "2.4.9" "@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.8", "@budibase/types@^2.4.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14" - integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA== +"@budibase/types@2.4.9", "@budibase/types@^2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.9.tgz#5660cfcbc9508cb3823070f0369fd876644da896" + integrity sha512-jBEBS3IryPJSX3yURGUFWV6iAcZk7Nmpz5eOsnJcILoGqXPQ897t/R/eT+k9vsE+lqGkaJtUOQIpOd3r4ZfLOQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 77d409bc4d..da68d0c001 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.9", - "@budibase/pro": "2.4.8", + "@budibase/pro": "2.4.9", "@budibase/string-templates": "^2.4.9", "@budibase/types": "^2.4.9", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 01d44c3c69..309f4fa38e 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.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9" - integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag== +"@budibase/backend-core@2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.9.tgz#a5d6846d1c665e0f5c965bf9ac686d5cc74fb6ac" + integrity sha512-gp30brn+7TWpjTJniO3n2cXKBKJDJM/WkmUbTX5V+8ynONbU5qSHiHmdHdLWq/ypZaOcFbKxM3fZQsMiJ0CAMQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.8" + "@budibase/types" "^2.4.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.4.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46" - integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ== +"@budibase/pro@2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.9.tgz#7e10725d574136691594dfb4e24724edc8b1bbe5" + integrity sha512-5cb5q+VPFCXCXL+Ao8gsrMSJmJ57w73q76dLa9+h9b9AjKAX2Ib0zaduJ3OvRJTqfYvH7bMAD9wpIWEyPc+aXA== dependencies: - "@budibase/backend-core" "2.4.8" + "@budibase/backend-core" "2.4.9" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.8" + "@budibase/types" "2.4.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.4.8", "@budibase/types@^2.4.8": - version "2.4.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14" - integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA== +"@budibase/types@2.4.9", "@budibase/types@^2.4.9": + version "2.4.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.9.tgz#5660cfcbc9508cb3823070f0369fd876644da896" + integrity sha512-jBEBS3IryPJSX3yURGUFWV6iAcZk7Nmpz5eOsnJcILoGqXPQ897t/R/eT+k9vsE+lqGkaJtUOQIpOd3r4ZfLOQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From df3b6add17a7ab933039ebcbd4c3fdbc49137ce7 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 11:16:08 +0000 Subject: [PATCH 07/54] fix-preprod-deploy (#9955) --- .github/workflows/deploy-preprod.yml | 1 + .github/workflows/release-master.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 91797b24e6..a742a5e375 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -7,6 +7,7 @@ jobs: deploy-to-legacy-preprod-env: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - name: 'Get Previous tag' id: previoustag uses: "WyriHaximus/github-action-get-previous-tag@v1" diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index e8bd2fddd4..3ae265fa21 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -120,6 +120,7 @@ jobs: RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }} deploy-to-legacy-preprod-env: + needs: [release-images] uses: ./.github/workflows/deploy-preprod.yml secrets: inherit From ee66d69a1123a9d3274b3bb7cc910550faacdbca Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 11:32:18 +0000 Subject: [PATCH 08/54] v2.4.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 a39a3befa5..528f911154 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.9", + "version": "2.4.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1e7251b17b..cfb5654d37 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.9", + "version": "2.4.10", "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.9", + "@budibase/types": "^2.4.10", "@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 8e86288ec8..2fea58dfdf 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.9", + "version": "2.4.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.4.9", + "@budibase/string-templates": "^2.4.10", "@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 1ee03e158c..62daf42a99 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.9", + "version": "2.4.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.9", - "@budibase/client": "^2.4.9", - "@budibase/frontend-core": "^2.4.9", - "@budibase/string-templates": "^2.4.9", + "@budibase/bbui": "^2.4.10", + "@budibase/client": "^2.4.10", + "@budibase/frontend-core": "^2.4.10", + "@budibase/string-templates": "^2.4.10", "@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 bf7aae222b..c0132a2cd1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.9", + "version": "2.4.10", "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.9", - "@budibase/string-templates": "^2.4.9", - "@budibase/types": "^2.4.9", + "@budibase/backend-core": "^2.4.10", + "@budibase/string-templates": "^2.4.10", + "@budibase/types": "^2.4.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 f699a1047d..ffc2c6523d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.9", + "version": "2.4.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.4.9", - "@budibase/frontend-core": "^2.4.9", - "@budibase/string-templates": "^2.4.9", + "@budibase/bbui": "^2.4.10", + "@budibase/frontend-core": "^2.4.10", + "@budibase/string-templates": "^2.4.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 8ee73b24cc..00d9d3c6e8 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.9", + "version": "2.4.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.4.9", + "@budibase/bbui": "^2.4.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e5be9ccc28..69006561fa 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.9", + "version": "2.4.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 e516c81147..37178d0e8c 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.9", + "version": "2.4.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.4.9", - "@budibase/client": "^2.4.9", + "@budibase/backend-core": "^2.4.10", + "@budibase/client": "^2.4.10", "@budibase/pro": "2.4.9", - "@budibase/string-templates": "^2.4.9", - "@budibase/types": "^2.4.9", + "@budibase/string-templates": "^2.4.10", + "@budibase/types": "^2.4.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 73efd72ce8..c418f2cb50 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.9", + "version": "2.4.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 dfe3f75ddd..025f518825 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.9", + "version": "2.4.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 da68d0c001..27a3465330 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.9", + "version": "2.4.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.4.9", + "@budibase/backend-core": "^2.4.10", "@budibase/pro": "2.4.9", - "@budibase/string-templates": "^2.4.9", - "@budibase/types": "^2.4.9", + "@budibase/string-templates": "^2.4.10", + "@budibase/types": "^2.4.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0ed988015febf4d8db73670c6b53dd98ce933085 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 11:35:02 +0000 Subject: [PATCH 09/54] Update pro version to 2.4.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 37178d0e8c..6937e5b319 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.10", "@budibase/client": "^2.4.10", - "@budibase/pro": "2.4.9", + "@budibase/pro": "2.4.10", "@budibase/string-templates": "^2.4.10", "@budibase/types": "^2.4.10", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3e09330fa8..ada6589c37 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.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.9.tgz#a5d6846d1c665e0f5c965bf9ac686d5cc74fb6ac" - integrity sha512-gp30brn+7TWpjTJniO3n2cXKBKJDJM/WkmUbTX5V+8ynONbU5qSHiHmdHdLWq/ypZaOcFbKxM3fZQsMiJ0CAMQ== +"@budibase/backend-core@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.10.tgz#1736643ccb6e4d9c2fd22b1d6d0eea1fbe35199a" + integrity sha512-MdEwsoAPg1EoNjLfeX0QNUJrpZIsOx8kL92iui8L4Lfv009SV26ndQXe96f/1w/kEqMBvErQiSfl87AVjq3uPw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.9" + "@budibase/types" "^2.4.10" "@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.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.9.tgz#7e10725d574136691594dfb4e24724edc8b1bbe5" - integrity sha512-5cb5q+VPFCXCXL+Ao8gsrMSJmJ57w73q76dLa9+h9b9AjKAX2Ib0zaduJ3OvRJTqfYvH7bMAD9wpIWEyPc+aXA== +"@budibase/pro@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.10.tgz#5d4da85bc802540d9d92a4321471a7b65f2031f5" + integrity sha512-wRKCyBbKo78ovScdhbpDc4Ras2VPgdukFSUvUv5YvjBHdU1xinu2qHxP5EJG/Q83UAzIoLilWYZqmKvEE1Zi3Q== dependencies: - "@budibase/backend-core" "2.4.9" + "@budibase/backend-core" "2.4.10" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.9" + "@budibase/types" "2.4.10" "@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.9", "@budibase/types@^2.4.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.9.tgz#5660cfcbc9508cb3823070f0369fd876644da896" - integrity sha512-jBEBS3IryPJSX3yURGUFWV6iAcZk7Nmpz5eOsnJcILoGqXPQ897t/R/eT+k9vsE+lqGkaJtUOQIpOd3r4ZfLOQ== +"@budibase/types@2.4.10", "@budibase/types@^2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.10.tgz#39d5eb77d3628707145b312fc365f9e10012d35b" + integrity sha512-rfMwYmeaCU6tgp/ZLRSURheRReKvWIyhq/T66sVr+sOVNSLc64mNmuuBG4VBAzrc6xKPufy9R0srYMFlicVc3g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 27a3465330..e90354f1e6 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.10", - "@budibase/pro": "2.4.9", + "@budibase/pro": "2.4.10", "@budibase/string-templates": "^2.4.10", "@budibase/types": "^2.4.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 309f4fa38e..43505760a8 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.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.9.tgz#a5d6846d1c665e0f5c965bf9ac686d5cc74fb6ac" - integrity sha512-gp30brn+7TWpjTJniO3n2cXKBKJDJM/WkmUbTX5V+8ynONbU5qSHiHmdHdLWq/ypZaOcFbKxM3fZQsMiJ0CAMQ== +"@budibase/backend-core@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.10.tgz#1736643ccb6e4d9c2fd22b1d6d0eea1fbe35199a" + integrity sha512-MdEwsoAPg1EoNjLfeX0QNUJrpZIsOx8kL92iui8L4Lfv009SV26ndQXe96f/1w/kEqMBvErQiSfl87AVjq3uPw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.9" + "@budibase/types" "^2.4.10" "@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.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.9.tgz#7e10725d574136691594dfb4e24724edc8b1bbe5" - integrity sha512-5cb5q+VPFCXCXL+Ao8gsrMSJmJ57w73q76dLa9+h9b9AjKAX2Ib0zaduJ3OvRJTqfYvH7bMAD9wpIWEyPc+aXA== +"@budibase/pro@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.10.tgz#5d4da85bc802540d9d92a4321471a7b65f2031f5" + integrity sha512-wRKCyBbKo78ovScdhbpDc4Ras2VPgdukFSUvUv5YvjBHdU1xinu2qHxP5EJG/Q83UAzIoLilWYZqmKvEE1Zi3Q== dependencies: - "@budibase/backend-core" "2.4.9" + "@budibase/backend-core" "2.4.10" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.9" + "@budibase/types" "2.4.10" "@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.9", "@budibase/types@^2.4.9": - version "2.4.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.9.tgz#5660cfcbc9508cb3823070f0369fd876644da896" - integrity sha512-jBEBS3IryPJSX3yURGUFWV6iAcZk7Nmpz5eOsnJcILoGqXPQ897t/R/eT+k9vsE+lqGkaJtUOQIpOd3r4ZfLOQ== +"@budibase/types@2.4.10", "@budibase/types@^2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.10.tgz#39d5eb77d3628707145b312fc365f9e10012d35b" + integrity sha512-rfMwYmeaCU6tgp/ZLRSURheRReKvWIyhq/T66sVr+sOVNSLc64mNmuuBG4VBAzrc6xKPufy9R0srYMFlicVc3g== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 57850c7b8e3dd26e5128ec60365bcfb764099c70 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 12:12:01 +0000 Subject: [PATCH 10/54] Supply kubeconfig to preprod deploy job (#9957) --- .github/workflows/deploy-preprod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index a742a5e375..1bf7afbeb9 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -45,6 +45,8 @@ jobs: [ "values.preprod.yaml" ] + env: + KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' - name: Discord Webhook Action uses: tsickert/discord-webhook@v4.0.0 From 37fa491ef076e0dd19e10773bb04d8f95f205033 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 12:20:21 +0000 Subject: [PATCH 11/54] v2.4.11 --- 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 528f911154..f2a0fd957e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.10", + "version": "2.4.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cfb5654d37..011fb86184 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.10", + "version": "2.4.11", "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.10", + "@budibase/types": "^2.4.11", "@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 2fea58dfdf..9694dcb74c 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.10", + "version": "2.4.11", "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.10", + "@budibase/string-templates": "^2.4.11", "@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 62daf42a99..a48094827d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.10", + "version": "2.4.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.10", - "@budibase/client": "^2.4.10", - "@budibase/frontend-core": "^2.4.10", - "@budibase/string-templates": "^2.4.10", + "@budibase/bbui": "^2.4.11", + "@budibase/client": "^2.4.11", + "@budibase/frontend-core": "^2.4.11", + "@budibase/string-templates": "^2.4.11", "@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 c0132a2cd1..cc5cbcb577 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.10", + "version": "2.4.11", "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.10", - "@budibase/string-templates": "^2.4.10", - "@budibase/types": "^2.4.10", + "@budibase/backend-core": "^2.4.11", + "@budibase/string-templates": "^2.4.11", + "@budibase/types": "^2.4.11", "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 ffc2c6523d..afca35305a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.10", + "version": "2.4.11", "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.10", - "@budibase/frontend-core": "^2.4.10", - "@budibase/string-templates": "^2.4.10", + "@budibase/bbui": "^2.4.11", + "@budibase/frontend-core": "^2.4.11", + "@budibase/string-templates": "^2.4.11", "@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 00d9d3c6e8..88370e573e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.10", + "version": "2.4.11", "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.10", + "@budibase/bbui": "^2.4.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 69006561fa..ad087ea6f5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.10", + "version": "2.4.11", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6937e5b319..d462fd5fd1 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.10", + "version": "2.4.11", "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.10", - "@budibase/client": "^2.4.10", + "@budibase/backend-core": "^2.4.11", + "@budibase/client": "^2.4.11", "@budibase/pro": "2.4.10", - "@budibase/string-templates": "^2.4.10", - "@budibase/types": "^2.4.10", + "@budibase/string-templates": "^2.4.11", + "@budibase/types": "^2.4.11", "@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 c418f2cb50..dd7c49914b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.10", + "version": "2.4.11", "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 025f518825..9f35b487dd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.10", + "version": "2.4.11", "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 e90354f1e6..e692296af5 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.10", + "version": "2.4.11", "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.10", + "@budibase/backend-core": "^2.4.11", "@budibase/pro": "2.4.10", - "@budibase/string-templates": "^2.4.10", - "@budibase/types": "^2.4.10", + "@budibase/string-templates": "^2.4.11", + "@budibase/types": "^2.4.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8cb88024c091534a501ba3a7a28403b400055af6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 12:23:08 +0000 Subject: [PATCH 12/54] Update pro version to 2.4.11 --- 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 d462fd5fd1..a6339be540 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.11", "@budibase/client": "^2.4.11", - "@budibase/pro": "2.4.10", + "@budibase/pro": "2.4.11", "@budibase/string-templates": "^2.4.11", "@budibase/types": "^2.4.11", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ada6589c37..bb42d58f8a 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.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.10.tgz#1736643ccb6e4d9c2fd22b1d6d0eea1fbe35199a" - integrity sha512-MdEwsoAPg1EoNjLfeX0QNUJrpZIsOx8kL92iui8L4Lfv009SV26ndQXe96f/1w/kEqMBvErQiSfl87AVjq3uPw== +"@budibase/backend-core@2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4" + integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.10" + "@budibase/types" "^2.4.11" "@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.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.10.tgz#5d4da85bc802540d9d92a4321471a7b65f2031f5" - integrity sha512-wRKCyBbKo78ovScdhbpDc4Ras2VPgdukFSUvUv5YvjBHdU1xinu2qHxP5EJG/Q83UAzIoLilWYZqmKvEE1Zi3Q== +"@budibase/pro@2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a" + integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg== dependencies: - "@budibase/backend-core" "2.4.10" + "@budibase/backend-core" "2.4.11" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.10" + "@budibase/types" "2.4.11" "@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.10", "@budibase/types@^2.4.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.10.tgz#39d5eb77d3628707145b312fc365f9e10012d35b" - integrity sha512-rfMwYmeaCU6tgp/ZLRSURheRReKvWIyhq/T66sVr+sOVNSLc64mNmuuBG4VBAzrc6xKPufy9R0srYMFlicVc3g== +"@budibase/types@2.4.11", "@budibase/types@^2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104" + integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e692296af5..7b6633ba48 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.11", - "@budibase/pro": "2.4.10", + "@budibase/pro": "2.4.11", "@budibase/string-templates": "^2.4.11", "@budibase/types": "^2.4.11", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 43505760a8..35111428ce 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.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.10.tgz#1736643ccb6e4d9c2fd22b1d6d0eea1fbe35199a" - integrity sha512-MdEwsoAPg1EoNjLfeX0QNUJrpZIsOx8kL92iui8L4Lfv009SV26ndQXe96f/1w/kEqMBvErQiSfl87AVjq3uPw== +"@budibase/backend-core@2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4" + integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.10" + "@budibase/types" "^2.4.11" "@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.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.10.tgz#5d4da85bc802540d9d92a4321471a7b65f2031f5" - integrity sha512-wRKCyBbKo78ovScdhbpDc4Ras2VPgdukFSUvUv5YvjBHdU1xinu2qHxP5EJG/Q83UAzIoLilWYZqmKvEE1Zi3Q== +"@budibase/pro@2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a" + integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg== dependencies: - "@budibase/backend-core" "2.4.10" + "@budibase/backend-core" "2.4.11" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.10" + "@budibase/types" "2.4.11" "@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.10", "@budibase/types@^2.4.10": - version "2.4.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.10.tgz#39d5eb77d3628707145b312fc365f9e10012d35b" - integrity sha512-rfMwYmeaCU6tgp/ZLRSURheRReKvWIyhq/T66sVr+sOVNSLc64mNmuuBG4VBAzrc6xKPufy9R0srYMFlicVc3g== +"@budibase/types@2.4.11", "@budibase/types@^2.4.11": + version "2.4.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104" + integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 63afd34eb26eccb0b2acd76349cb9304a3af5772 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Mar 2023 08:50:26 +0000 Subject: [PATCH 13/54] Bug - BUDI-6068 filters do not work for google sheets (#9886) * Add data-utils with filters * Create data-utils * Add data-utils to compiled code * Reuse constants * Fix tests * Rename package to shared-core * Namespace export shared-core * Rely on rollup to bundle shared-core * Revert "Rely on rollup to bundle shared-core" This reverts commit e8b5a2bb9a5f5cfe41b5540737ac3ab64677cf1c. * Updating version and removing private. * Update version * Increment versions. * Implement sort * Enabling sort * v2.3.21-alpha.2 * Fix build * Improve readability * Move deepGet to shared helper * Better type usage * Fix types * Configure types * Fix vite refs * Add dep * Fixing depencencies on client * Add missing dev command * Fix loading issues * Update versions to latest * Multiple es6 and commonjs configs * Config * Use local packages on rollup for client * Change shared-core and types entry points --------- Co-authored-by: mike12345567 --- packages/bbui/package.json | 3 +- packages/bbui/src/helpers.js | 27 +- packages/builder/package.json | 9 +- packages/client/package.json | 8 +- packages/client/rollup.config.js | 14 + packages/frontend-core/package.json | 3 +- packages/frontend-core/src/constants.js | 72 +---- packages/frontend-core/src/fetch/DataFetch.js | 10 +- packages/frontend-core/src/utils/index.js | 2 +- packages/server/jest.config.ts | 1 + packages/server/package.json | 9 +- .../api/controllers/row/ExternalRequest.ts | 14 +- .../src/api/controllers/row/external.ts | 6 +- packages/server/src/integrations/base/sql.ts | 3 +- .../server/src/integrations/googlesheets.ts | 34 ++- packages/server/tsconfig.json | 15 +- packages/shared-core/.gitignore | 2 + packages/shared-core/package.json | 30 ++ packages/shared-core/src/constants.ts | 69 +++++ .../lucene.js => shared-core/src/filters.ts} | 236 ++++++++++----- packages/shared-core/src/helpers.ts | 23 ++ packages/shared-core/src/index.ts | 4 + packages/shared-core/src/utils.ts | 6 + packages/shared-core/tsconfig-base.build.json | 25 ++ packages/shared-core/tsconfig-cjs.build.json | 8 + packages/shared-core/tsconfig.build.json | 8 + packages/shared-core/tsconfig.json | 11 + packages/shared-core/yarn.lock | 277 ++++++++++++++++++ packages/types/package.json | 16 +- packages/types/src/sdk/search.ts | 6 +- packages/types/tsconfig-base.build.json | 14 + packages/types/tsconfig-cjs.build.json | 8 + packages/types/tsconfig.build.json | 26 +- packages/types/yarn.lock | 185 ++++++++++++ scripts/link-dependencies.sh | 6 + 35 files changed, 962 insertions(+), 228 deletions(-) create mode 100644 packages/shared-core/.gitignore create mode 100644 packages/shared-core/package.json create mode 100644 packages/shared-core/src/constants.ts rename packages/{frontend-core/src/utils/lucene.js => shared-core/src/filters.ts} (60%) create mode 100644 packages/shared-core/src/helpers.ts create mode 100644 packages/shared-core/src/index.ts create mode 100644 packages/shared-core/src/utils.ts create mode 100644 packages/shared-core/tsconfig-base.build.json create mode 100644 packages/shared-core/tsconfig-cjs.build.json create mode 100644 packages/shared-core/tsconfig.build.json create mode 100644 packages/shared-core/tsconfig.json create mode 100644 packages/shared-core/yarn.lock create mode 100644 packages/types/tsconfig-base.build.json create mode 100644 packages/types/tsconfig-cjs.build.json diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5cc72c9cba..39cacfdb22 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,7 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "^2.4.8", + "@budibase/shared-core": "2.4.8", + "@budibase/string-templates": "2.4.8", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js index f2246fbb49..32030322d9 100644 --- a/packages/bbui/src/helpers.js +++ b/packages/bbui/src/helpers.js @@ -1,3 +1,6 @@ +import { helpers } from "@budibase/shared-core" +export const deepGet = helpers.deepGet + /** * Generates a DOM safe UUID. * Starting with a letter is important to make it DOM safe. @@ -41,30 +44,6 @@ export const hashString = string => { return hash.toString() } -/** - * Gets a key within an object. The key supports dot syntax for retrieving deep - * fields - e.g. "a.b.c". - * Exact matches of keys with dots in them take precedence over nested keys of - * the same path - e.g. getting "a.b" from { "a.b": "foo", a: { b: "bar" } } - * will return "foo" over "bar". - * @param obj the object - * @param key the key - * @return {*|null} the value or null if a value was not found for this key - */ -export const deepGet = (obj, key) => { - if (!obj || !key) { - return null - } - if (Object.prototype.hasOwnProperty.call(obj, key)) { - return obj[key] - } - const split = key.split(".") - for (let i = 0; i < split.length; i++) { - obj = obj?.[split[i]] - } - return obj -} - /** * Sets a key within an object. The key supports dot syntax for retrieving deep * fields - e.g. "a.b.c". diff --git a/packages/builder/package.json b/packages/builder/package.json index 53dfffa3f3..c28e6ab2c9 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,10 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.8", - "@budibase/client": "^2.4.8", - "@budibase/frontend-core": "^2.4.8", - "@budibase/string-templates": "^2.4.8", + "@budibase/bbui": "2.4.8", + "@budibase/client": "2.4.8", + "@budibase/frontend-core": "2.4.8", + "@budibase/shared-core": "2.4.8", + "@budibase/string-templates": "2.4.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/client/package.json b/packages/client/package.json index 16766a318a..f114ff3fa5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,9 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.8", - "@budibase/frontend-core": "^2.4.8", - "@budibase/string-templates": "^2.4.8", + "@budibase/bbui": "2.4.8", + "@budibase/frontend-core": "2.4.8", + "@budibase/shared-core": "2.4.8", + "@budibase/string-templates": "2.4.8", + "@budibase/types": "2.4.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js index f56714b51a..c22b928f10 100644 --- a/packages/client/rollup.config.js +++ b/packages/client/rollup.config.js @@ -20,6 +20,19 @@ const ignoredWarnings = [ "a11y-click-events-have-key-events", ] +const devPaths = production + ? [] + : [ + { + find: "@budibase/shared-core", + replacement: path.resolve("../shared-core/dist/mjs/src/index"), + }, + { + find: "@budibase/types", + replacement: path.resolve("../types/dist/mjs/index"), + }, + ] + export default { input: "src/index.js", output: [ @@ -69,6 +82,7 @@ export default { find: "sdk", replacement: path.resolve("./src/sdk"), }, + ...devPaths, ], }), svelte({ diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f33b70070a..2d3ecbfdd6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,7 +6,8 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.8", + "@budibase/bbui": "2.4.8", + "@budibase/shared-core": "2.4.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 09b7a00aec..bdf7abe36f 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -1,56 +1,7 @@ /** * Operator options for lucene queries */ -export const OperatorOptions = { - Equals: { - value: "equal", - label: "Equals", - }, - NotEquals: { - value: "notEqual", - label: "Not equals", - }, - Empty: { - value: "empty", - label: "Is empty", - }, - NotEmpty: { - value: "notEmpty", - label: "Is not empty", - }, - StartsWith: { - value: "string", - label: "Starts with", - }, - Like: { - value: "fuzzy", - label: "Like", - }, - MoreThan: { - value: "rangeLow", - label: "More than or equal to", - }, - LessThan: { - value: "rangeHigh", - label: "Less than or equal to", - }, - Contains: { - value: "contains", - label: "Contains", - }, - NotContains: { - value: "notContains", - label: "Does not contain", - }, - In: { - value: "oneOf", - label: "Is in", - }, - ContainsAny: { - value: "containsAny", - label: "Has any", - }, -} +export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/shared-core" // Cookie names export const Cookies = { @@ -127,27 +78,6 @@ export const Roles = { PUBLIC: "PUBLIC", BUILDER: "BUILDER", } -/** - * Maximum minimum range for SQL number values - */ -export const SqlNumberTypeRangeMap = { - integer: { - max: 2147483647, - min: -2147483648, - }, - int: { - max: 2147483647, - min: -2147483648, - }, - smallint: { - max: 32767, - min: -32768, - }, - mediumint: { - max: 8388607, - min: -8388608, - }, -} export const Themes = [ { diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index 37e300e354..9b687e9844 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -1,13 +1,11 @@ import { writable, derived, get } from "svelte/store" import { cloneDeep } from "lodash/fp" -import { - buildLuceneQuery, - luceneLimit, - runLuceneQuery, - luceneSort, -} from "../utils/lucene" +import { LuceneUtils } from "../utils" import { convertJSONSchemaToTableSchema } from "../utils/json" +const { buildLuceneQuery, luceneLimit, runLuceneQuery, luceneSort } = + LuceneUtils + /** * Parent class which handles the implementation of fetching data from an * internal table or datasource plus. diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js index 3ba3bf0fd4..6ac7c65c62 100644 --- a/packages/frontend-core/src/utils/index.js +++ b/packages/frontend-core/src/utils/index.js @@ -1,4 +1,4 @@ -export * as LuceneUtils from "./lucene" +export { dataFilters as LuceneUtils } from "@budibase/shared-core" export * as JSONUtils from "./json" export * as CookieUtils from "./cookies" export * as RoleUtils from "./roles" diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index f247e90bd1..03eca3705b 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -14,6 +14,7 @@ const baseConfig: Config.InitialProjectOptions = { moduleNameMapper: { "@budibase/backend-core/(.*)": "/../backend-core/$1", "@budibase/backend-core": "/../backend-core/src", + "@budibase/shared-core": "/../shared-core/src", "@budibase/types": "/../types/src", }, } diff --git a/packages/server/package.json b/packages/server/package.json index 01f8392831..718a311b84 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -43,11 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.8", - "@budibase/client": "^2.4.8", + "@budibase/backend-core": "2.4.8", + "@budibase/client": "2.4.8", "@budibase/pro": "2.4.8", - "@budibase/string-templates": "^2.4.8", - "@budibase/types": "^2.4.8", + "@budibase/shared-core": "2.4.8", + "@budibase/string-templates": "2.4.8", + "@budibase/types": "2.4.8", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index bdf8d485f2..44b38bbeac 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -11,6 +11,8 @@ import { Row, Table, RelationshipTypes, + FieldType, + SortType, } from "@budibase/types" import { breakRowIdField, @@ -749,8 +751,16 @@ export class ExternalRequest { ) //if the sort column is a formula, remove it for (let sortColumn of Object.keys(sort || {})) { - if (table.schema[sortColumn]?.type === "formula") { - delete sort?.[sortColumn] + if (!sort?.[sortColumn]) { + continue + } + switch (table.schema[sortColumn]?.type) { + case FieldType.FORMULA: + delete sort?.[sortColumn] + break + case FieldType.NUMBER: + sort[sortColumn].type = SortType.number + break } } filters = buildFilters(id, filters || {}, table) diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 1b2301f139..8a7a9a6c69 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -8,7 +8,6 @@ import { breakRowIdField, } from "../../../integrations/utils" import { ExternalRequest, RunConfig } from "./ExternalRequest" -import { context } from "@budibase/backend-core" import * as exporters from "../view/exporters" import { apiFileReturn } from "../../../utilities/fileSystem" import { @@ -19,6 +18,7 @@ import { Table, Datasource, IncludeRelationship, + SortJson, } from "@budibase/types" import sdk from "../../../sdk" @@ -142,14 +142,14 @@ export async function search(ctx: BBContext) { limit: limit, } } - let sort + let sort: SortJson | undefined if (params.sort) { const direction = params.sortOrder === "descending" ? SortDirection.DESCENDING : SortDirection.ASCENDING sort = { - [params.sort]: direction, + [params.sort]: { direction }, } } try { diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 00e62d3ce4..a21c8e7d54 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -317,7 +317,8 @@ class InternalBuilder { const table = json.meta?.table if (sort) { for (let [key, value] of Object.entries(sort)) { - const direction = value === SortDirection.ASCENDING ? "asc" : "desc" + const direction = + value.direction === SortDirection.ASCENDING ? "asc" : "desc" query = query.orderBy(`${table?.name}.${key}`, direction) } } else if (this.client === SqlClient.MS_SQL && paginate?.limit) { diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 6f202f9c3a..0c658df0f5 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -2,8 +2,11 @@ import { DatasourceFieldType, DatasourcePlus, Integration, + PaginationJson, QueryJson, QueryType, + SearchFilters, + SortJson, Table, TableSchema, } from "@budibase/types" @@ -13,6 +16,7 @@ import { DataSourceOperation, FieldTypes } from "../constants" import { GoogleSpreadsheet } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" +import { dataFilters } from "@budibase/shared-core" interface GoogleSheetsConfig { spreadsheetId: string @@ -237,7 +241,7 @@ class GoogleSheetsIntegration implements DatasourcePlus { const handlers = { [DataSourceOperation.CREATE]: () => this.create({ sheet, row: json.body }), - [DataSourceOperation.READ]: () => this.read({ sheet }), + [DataSourceOperation.READ]: () => this.read({ ...json, sheet }), [DataSourceOperation.UPDATE]: () => this.update({ // exclude the header row and zero index @@ -345,18 +349,40 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - async read(query: { sheet: string }) { + async read(query: { + sheet: string + filters?: SearchFilters + sort?: SortJson + paginate?: PaginationJson + }) { try { await this.connect() const sheet = this.client.sheetsByTitle[query.sheet] const rows = await sheet.getRows() + const filtered = dataFilters.runLuceneQuery(rows, query.filters) const headerValues = sheet.headerValues - const response = [] - for (let row of rows) { + let response = [] + for (let row of filtered) { response.push( this.buildRowObject(headerValues, row._rawData, row._rowNumber) ) } + + if (query.sort) { + if (Object.keys(query.sort).length !== 1) { + console.warn("Googlesheets does not support multiple sorting", { + sortInfo: query.sort, + }) + } + const [sortField, sortInfo] = Object.entries(query.sort)[0] + response = dataFilters.luceneSort( + response, + sortField, + sortInfo.direction, + sortInfo.type + ) + } + return response } catch (err) { console.error("Error reading from google sheets", err) diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index dba0d6328a..5f4ee1a701 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -9,6 +9,7 @@ "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], + "@budibase/shared-core": ["../shared-core/src"], "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] } }, @@ -19,15 +20,9 @@ "references": [ { "path": "../types" }, { "path": "../backend-core" }, + { "path": "../shared-core" }, { "path": "../../../budibase-pro/packages/pro" } ], - "include": [ - "src/**/*", - "specs", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*", "specs", "package.json"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/shared-core/.gitignore b/packages/shared-core/.gitignore new file mode 100644 index 0000000000..04c01ba7ba --- /dev/null +++ b/packages/shared-core/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +dist/ \ No newline at end of file diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json new file mode 100644 index 0000000000..096eddc697 --- /dev/null +++ b/packages/shared-core/package.json @@ -0,0 +1,30 @@ +{ + "name": "@budibase/shared-core", + "version": "2.4.8", + "description": "Shared data utils", + "main": "dist/cjs/src/index.js", + "types": "dist/mjs/src/index.d.ts", + "exports": { + ".": { + "import": "./dist/mjs/src/index.js", + "require": "./dist/cjs/src/index.js" + }, + "./package.json": "./dist/mjs/package.json" + }, + "author": "Budibase", + "license": "GPL-3.0", + "scripts": { + "prebuild": "rimraf dist/", + "build": "tsc -p tsconfig.build.json && tsc -p tsconfig-cjs.build.json", + "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", + "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" + }, + "dependencies": { + "@budibase/types": "2.4.5-alpha.0" + }, + "devDependencies": { + "concurrently": "^7.6.0", + "typescript": "4.7.3", + "rimraf": "3.0.2" + } +} diff --git a/packages/shared-core/src/constants.ts b/packages/shared-core/src/constants.ts new file mode 100644 index 0000000000..35b02d1e15 --- /dev/null +++ b/packages/shared-core/src/constants.ts @@ -0,0 +1,69 @@ +export const OperatorOptions = { + Equals: { + value: "equal", + label: "Equals", + }, + NotEquals: { + value: "notEqual", + label: "Not equals", + }, + Empty: { + value: "empty", + label: "Is empty", + }, + NotEmpty: { + value: "notEmpty", + label: "Is not empty", + }, + StartsWith: { + value: "string", + label: "Starts with", + }, + Like: { + value: "fuzzy", + label: "Like", + }, + MoreThan: { + value: "rangeLow", + label: "More than or equal to", + }, + LessThan: { + value: "rangeHigh", + label: "Less than or equal to", + }, + Contains: { + value: "contains", + label: "Contains", + }, + NotContains: { + value: "notContains", + label: "Does not contain", + }, + In: { + value: "oneOf", + label: "Is in", + }, + ContainsAny: { + value: "containsAny", + label: "Has any", + }, +} + +export const SqlNumberTypeRangeMap = { + integer: { + max: 2147483647, + min: -2147483648, + }, + int: { + max: 2147483647, + min: -2147483648, + }, + smallint: { + max: 32767, + min: -32768, + }, + mediumint: { + max: 8388607, + min: -8388608, + }, +} diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/shared-core/src/filters.ts similarity index 60% rename from packages/frontend-core/src/utils/lucene.js rename to packages/shared-core/src/filters.ts index 427d8f8b97..2486ca1050 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/shared-core/src/filters.ts @@ -1,5 +1,6 @@ -import { Helpers } from "@budibase/bbui" -import { OperatorOptions, SqlNumberTypeRangeMap } from "../constants" +import { Datasource, FieldType, SortDirection, SortType } from "@budibase/types" +import { OperatorOptions, SqlNumberTypeRangeMap } from "./constants" +import { deepGet } from "./helpers" const HBS_REGEX = /{{([^{].*?)}}/g @@ -7,7 +8,11 @@ const HBS_REGEX = /{{([^{].*?)}}/g * Returns the valid operator options for a certain data type * @param type the data type */ -export const getValidOperatorsForType = (type, field, datasource) => { +export const getValidOperatorsForType = ( + type: FieldType, + field: string, + datasource: Datasource & { tableId: any } // TODO: is this table id ever populated? +) => { const Op = OperatorOptions const stringOps = [ Op.Equals, @@ -27,7 +32,10 @@ export const getValidOperatorsForType = (type, field, datasource) => { Op.NotEmpty, Op.In, ] - let ops = [] + let ops: { + value: string + label: string + }[] = [] if (type === "string") { ops = stringOps } else if (type === "number") { @@ -70,13 +78,13 @@ export const NoEmptyFilterStrings = [ OperatorOptions.NotEquals.value, OperatorOptions.Contains.value, OperatorOptions.NotContains.value, -] +] as (keyof QueryFields)[] /** * Removes any fields that contain empty strings that would cause inconsistent * behaviour with how backend tables are filtered (no value means no filter). */ -const cleanupQuery = query => { +const cleanupQuery = (query: Query) => { if (!query) { return query } @@ -84,9 +92,10 @@ const cleanupQuery = query => { if (!query[filterField]) { continue } - for (let [key, value] of Object.entries(query[filterField])) { + + for (let [key, value] of Object.entries(query[filterField]!)) { if (value == null || value === "") { - delete query[filterField][key] + delete query[filterField]![key] } } } @@ -96,7 +105,7 @@ const cleanupQuery = query => { /** * Removes a numeric prefix on field names designed to give fields uniqueness */ -const removeKeyNumbering = key => { +const removeKeyNumbering = (key: string) => { if (typeof key === "string" && key.match(/\d[0-9]*:/g) != null) { const parts = key.split(":") parts.shift() @@ -106,12 +115,66 @@ const removeKeyNumbering = key => { } } +type Filter = { + operator: keyof Query + field: string + type: any + value: any + externalType: keyof typeof SqlNumberTypeRangeMap +} + +type Query = QueryFields & QueryConfig +type QueryFields = { + string?: { + [key: string]: string + } + fuzzy?: { + [key: string]: string + } + range?: { + [key: string]: { + high: number | string + low: number | string + } + } + equal?: { + [key: string]: any + } + notEqual?: { + [key: string]: any + } + empty?: { + [key: string]: any + } + notEmpty?: { + [key: string]: any + } + oneOf?: { + [key: string]: any[] + } + contains?: { + [key: string]: any[] + } + notContains?: { + [key: string]: any[] + } + containsAny?: { + [key: string]: any[] + } +} + +type QueryConfig = { + allOr?: boolean +} + +type QueryFieldsType = keyof QueryFields + /** * Builds a lucene JSON query from the filter structure generated in the builder * @param filter the builder filter structure */ -export const buildLuceneQuery = filter => { - let query = { +export const buildLuceneQuery = (filter: Filter[]) => { + let query: Query = { string: {}, fuzzy: {}, range: {}, @@ -128,7 +191,7 @@ export const buildLuceneQuery = filter => { filter.forEach(expression => { let { operator, field, type, value, externalType } = expression const isHbs = - typeof value === "string" && value.match(HBS_REGEX)?.length > 0 + typeof value === "string" && (value.match(HBS_REGEX) || []).length > 0 // Parse all values into correct types if (operator === "allOr") { query.allOr = true @@ -167,7 +230,7 @@ export const buildLuceneQuery = filter => { ) { value = value.split(",") } - if (operator.startsWith("range")) { + if (operator.startsWith("range") && query.range) { const minint = SqlNumberTypeRangeMap[externalType]?.min || Number.MIN_SAFE_INTEGER const maxint = @@ -178,9 +241,13 @@ export const buildLuceneQuery = filter => { high: type === "number" ? maxint : "9999-00-00T00:00:00.000Z", } } - if (operator === "rangeLow" && value != null && value !== "") { + if ((operator as any) === "rangeLow" && value != null && value !== "") { query.range[field].low = value - } else if (operator === "rangeHigh" && value != null && value !== "") { + } else if ( + (operator as any) === "rangeHigh" && + value != null && + value !== "" + ) { query.range[field].high = value } } else if (query[operator]) { @@ -189,14 +256,18 @@ export const buildLuceneQuery = filter => { // "equals false" needs to be "not equals true" // "not equals false" needs to be "equals true" if (operator === "equal" && value === false) { + query.notEqual = query.notEqual || {} query.notEqual[field] = true } else if (operator === "notEqual" && value === false) { + query.equal = query.equal || {} query.equal[field] = true } else { - query[operator][field] = value + query[operator] = query[operator] || {} + query[operator]![field] = value } } else { - query[operator][field] = value + query[operator] = query[operator] || {} + query[operator]![field] = value } } }) @@ -209,7 +280,7 @@ export const buildLuceneQuery = filter => { * @param docs the data * @param query the JSON lucene query */ -export const runLuceneQuery = (docs, query) => { +export const runLuceneQuery = (docs: any[], query?: Query) => { if (!docs || !Array.isArray(docs)) { return [] } @@ -221,87 +292,110 @@ export const runLuceneQuery = (docs, query) => { query = cleanupQuery(query) // Iterates over a set of filters and evaluates a fail function against a doc - const match = (type, failFn) => doc => { - const filters = Object.entries(query[type] || {}) - for (let i = 0; i < filters.length; i++) { - const [key, testValue] = filters[i] - const docValue = Helpers.deepGet(doc, removeKeyNumbering(key)) - if (failFn(docValue, testValue)) { - return false + const match = + ( + type: QueryFieldsType, + failFn: (docValue: any, testValue: any) => boolean + ) => + (doc: any) => { + const filters = Object.entries(query![type] || {}) + for (let i = 0; i < filters.length; i++) { + const [key, testValue] = filters[i] + const docValue = deepGet(doc, removeKeyNumbering(key)) + if (failFn(docValue, testValue)) { + return false + } } + return true } - return true - } // Process a string match (fails if the value does not start with the string) - const stringMatch = match("string", (docValue, testValue) => { + const stringMatch = match("string", (docValue: string, testValue: string) => { return ( !docValue || !docValue?.toLowerCase().startsWith(testValue?.toLowerCase()) ) }) // Process a fuzzy match (treat the same as starts with when running locally) - const fuzzyMatch = match("fuzzy", (docValue, testValue) => { + const fuzzyMatch = match("fuzzy", (docValue: string, testValue: string) => { return ( !docValue || !docValue?.toLowerCase().startsWith(testValue?.toLowerCase()) ) }) // Process a range match - const rangeMatch = match("range", (docValue, testValue) => { - return ( - docValue == null || - docValue === "" || - docValue < testValue.low || - docValue > testValue.high - ) - }) + const rangeMatch = match( + "range", + ( + docValue: string | number | null, + testValue: { low: number; high: number } + ) => { + return ( + docValue == null || + docValue === "" || + docValue < testValue.low || + docValue > testValue.high + ) + } + ) // Process an equal match (fails if the value is different) - const equalMatch = match("equal", (docValue, testValue) => { - return testValue != null && testValue !== "" && docValue !== testValue - }) + const equalMatch = match( + "equal", + (docValue: any, testValue: string | null) => { + return testValue != null && testValue !== "" && docValue !== testValue + } + ) // Process a not-equal match (fails if the value is the same) - const notEqualMatch = match("notEqual", (docValue, testValue) => { - return testValue != null && testValue !== "" && docValue === testValue - }) + const notEqualMatch = match( + "notEqual", + (docValue: any, testValue: string | null) => { + return testValue != null && testValue !== "" && docValue === testValue + } + ) // Process an empty match (fails if the value is not empty) - const emptyMatch = match("empty", docValue => { + const emptyMatch = match("empty", (docValue: string | null) => { return docValue != null && docValue !== "" }) // Process a not-empty match (fails is the value is empty) - const notEmptyMatch = match("notEmpty", docValue => { + const notEmptyMatch = match("notEmpty", (docValue: string | null) => { return docValue == null || docValue === "" }) // Process an includes match (fails if the value is not included) - const oneOf = match("oneOf", (docValue, testValue) => { + const oneOf = match("oneOf", (docValue: any, testValue: any) => { if (typeof testValue === "string") { testValue = testValue.split(",") if (typeof docValue === "number") { - testValue = testValue.map(item => parseFloat(item)) + testValue = testValue.map((item: string) => parseFloat(item)) } } return !testValue?.includes(docValue) }) - const containsAny = match("containsAny", (docValue, testValue) => { + const containsAny = match("containsAny", (docValue: any, testValue: any) => { return !docValue?.includes(...testValue) }) - const contains = match("contains", (docValue, testValue) => { - return !testValue?.every(item => docValue?.includes(item)) - }) + const contains = match( + "contains", + (docValue: string | any[], testValue: any[]) => { + return !testValue?.every((item: any) => docValue?.includes(item)) + } + ) - const notContains = match("notContains", (docValue, testValue) => { - return testValue?.every(item => docValue?.includes(item)) - }) + const notContains = match( + "notContains", + (docValue: string | any[], testValue: any[]) => { + return testValue?.every((item: any) => docValue?.includes(item)) + } + ) // Match a document against all criteria - const docMatch = doc => { + const docMatch = (doc: any) => { return ( stringMatch(doc) && fuzzyMatch(doc) && @@ -329,20 +423,28 @@ export const runLuceneQuery = (docs, query) => { * @param sortOrder the sort order ("ascending" or "descending") * @param sortType the type of sort ("string" or "number") */ -export const luceneSort = (docs, sort, sortOrder, sortType = "string") => { +export const luceneSort = ( + docs: any[], + sort: string, + sortOrder: SortDirection, + sortType = SortType.STRING +) => { if (!sort || !sortOrder || !sortType) { return docs } - const parse = sortType === "string" ? x => `${x}` : x => parseFloat(x) - return docs.slice().sort((a, b) => { - const colA = parse(a[sort]) - const colB = parse(b[sort]) - if (sortOrder === "Descending") { - return colA > colB ? -1 : 1 - } else { - return colA > colB ? 1 : -1 - } - }) + const parse = + sortType === "string" ? (x: any) => `${x}` : (x: string) => parseFloat(x) + return docs + .slice() + .sort((a: { [x: string]: any }, b: { [x: string]: any }) => { + const colA = parse(a[sort]) + const colB = parse(b[sort]) + if (sortOrder.toLowerCase() === "descending") { + return colA > colB ? -1 : 1 + } else { + return colA > colB ? 1 : -1 + } + }) } /** @@ -351,7 +453,7 @@ export const luceneSort = (docs, sort, sortOrder, sortType = "string") => { * @param docs the data * @param limit the number of docs to limit to */ -export const luceneLimit = (docs, limit) => { +export const luceneLimit = (docs: any[], limit: string) => { const numLimit = parseFloat(limit) if (isNaN(numLimit)) { return docs diff --git a/packages/shared-core/src/helpers.ts b/packages/shared-core/src/helpers.ts new file mode 100644 index 0000000000..8ecfc24b56 --- /dev/null +++ b/packages/shared-core/src/helpers.ts @@ -0,0 +1,23 @@ +/** + * Gets a key within an object. The key supports dot syntax for retrieving deep + * fields - e.g. "a.b.c". + * Exact matches of keys with dots in them take precedence over nested keys of + * the same path - e.g. getting "a.b" from { "a.b": "foo", a: { b: "bar" } } + * will return "foo" over "bar". + * @param obj the object + * @param key the key + * @return {*|null} the value or null if a value was not found for this key + */ +export const deepGet = (obj: { [x: string]: any }, key: string) => { + if (!obj || !key) { + return null + } + if (Object.prototype.hasOwnProperty.call(obj, key)) { + return obj[key] + } + const split = key.split(".") + for (let i = 0; i < split.length; i++) { + obj = obj?.[split[i]] + } + return obj +} diff --git a/packages/shared-core/src/index.ts b/packages/shared-core/src/index.ts new file mode 100644 index 0000000000..21f2f2c639 --- /dev/null +++ b/packages/shared-core/src/index.ts @@ -0,0 +1,4 @@ +export * from "./constants" +export * as dataFilters from "./filters" +export * as helpers from "./helpers" +export * as utils from "./utils" diff --git a/packages/shared-core/src/utils.ts b/packages/shared-core/src/utils.ts new file mode 100644 index 0000000000..720027d6a7 --- /dev/null +++ b/packages/shared-core/src/utils.ts @@ -0,0 +1,6 @@ +export function unreachable( + value: never, + message = `No such case in exhaustive switch: ${value}` +) { + throw new Error(message) +} diff --git a/packages/shared-core/tsconfig-base.build.json b/packages/shared-core/tsconfig-base.build.json new file mode 100644 index 0000000000..9715eb06cf --- /dev/null +++ b/packages/shared-core/tsconfig-base.build.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "es6", + "moduleResolution": "node", + "lib": ["es2020"], + "strict": true, + "noImplicitAny": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "incremental": true, + "sourceMap": true, + "declaration": true, + "types": ["node"], + "outDir": "dist", + "skipLibCheck": true + }, + "include": ["**/*.js", "**/*.ts", "package.json"], + "exclude": [ + "node_modules", + "dist", + "**/*.spec.ts", + "**/*.spec.js", + "__mocks__" + ] +} diff --git a/packages/shared-core/tsconfig-cjs.build.json b/packages/shared-core/tsconfig-cjs.build.json new file mode 100644 index 0000000000..9b479b7b34 --- /dev/null +++ b/packages/shared-core/tsconfig-cjs.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig-base.build.json", + "compilerOptions": { + "module": "commonjs", + "outDir": "dist/cjs", + "target": "es2015" + } +} diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json new file mode 100644 index 0000000000..4d3c9fc2e0 --- /dev/null +++ b/packages/shared-core/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig-base.build.json", + "compilerOptions": { + "module": "esnext", + "outDir": "dist/mjs", + "target": "esnext" + } +} diff --git a/packages/shared-core/tsconfig.json b/packages/shared-core/tsconfig.json new file mode 100644 index 0000000000..58c9a25d5e --- /dev/null +++ b/packages/shared-core/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.build.json", + "compilerOptions": { + "composite": true, + "baseUrl": ".", + "paths": { + "@budibase/types": ["../types/src"] + } + }, + "references": [{ "path": "../types" }] +} diff --git a/packages/shared-core/yarn.lock b/packages/shared-core/yarn.lock new file mode 100644 index 0000000000..c1578954fc --- /dev/null +++ b/packages/shared-core/yarn.lock @@ -0,0 +1,277 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@budibase/types@2.4.5-alpha.0": + version "2.4.5-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5-alpha.0.tgz#70fea09b5e471fe8fa6a760a1a2dd0dd74caac3a" + integrity sha512-tVFM9XnKwcCOo7nw6v7C8ZsK9hQLQBv3kHDn7/MFWnDMFCj72pUdtP/iFrAKr2c3tE84lkkWJfNHIolMSktHZA== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +concurrently@^7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.6.0.tgz#531a6f5f30cf616f355a4afb8f8fcb2bba65a49a" + integrity sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw== + dependencies: + chalk "^4.1.0" + date-fns "^2.29.1" + lodash "^4.17.21" + rxjs "^7.0.0" + shell-quote "^1.7.3" + spawn-command "^0.0.2-1" + supports-color "^8.1.0" + tree-kill "^1.2.2" + yargs "^17.3.1" + +date-fns@^2.29.1: + version "2.29.3" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" + integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +glob@^7.1.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +rimraf@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rxjs@^7.0.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + dependencies: + tslib "^2.1.0" + +shell-quote@^1.7.3: + version "1.8.0" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" + integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== + +spawn-command@^0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg== + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + +tslib@^2.1.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + +typescript@4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" + integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^17.3.1: + version "17.7.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" + integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" diff --git a/packages/types/package.json b/packages/types/package.json index 21d90dace5..b305eb905b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -2,14 +2,21 @@ "name": "@budibase/types", "version": "2.4.8", "description": "Budibase types", - "main": "dist/index.js", - "types": "dist/index.d.ts", + "main": "dist/cjs/index.js", + "types": "dist/mjs/index.d.ts", + "exports": { + ".": { + "import": "./dist/mjs/index.js", + "require": "./dist/cjs/index.js" + } + }, "author": "Budibase", "license": "GPL-3.0", "scripts": { "prebuild": "rimraf dist/", - "build": "tsc -p tsconfig.build.json", - "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput" + "build": "tsc -p tsconfig.build.json && tsc -p tsconfig-cjs.build.json", + "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", + "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "jest": {}, "devDependencies": { @@ -18,6 +25,7 @@ "@types/koa": "2.13.4", "@types/node": "14.18.20", "@types/pouchdb": "6.4.0", + "concurrently": "^7.6.0", "koa-body": "4.2.0", "rimraf": "3.0.2", "typescript": "4.7.3" diff --git a/packages/types/src/sdk/search.ts b/packages/types/src/sdk/search.ts index d5ea664c6b..d4c5135038 100644 --- a/packages/types/src/sdk/search.ts +++ b/packages/types/src/sdk/search.ts @@ -1,5 +1,6 @@ import { Operation, SortDirection } from "./datasources" import { Row, Table } from "../documents" +import { SortType } from "../api" export interface SearchFilters { allOr?: boolean @@ -42,7 +43,10 @@ export interface SearchFilters { } export interface SortJson { - [key: string]: SortDirection + [key: string]: { + direction: SortDirection + type?: SortType + } } export interface PaginationJson { diff --git a/packages/types/tsconfig-base.build.json b/packages/types/tsconfig-base.build.json new file mode 100644 index 0000000000..a955d2a179 --- /dev/null +++ b/packages/types/tsconfig-base.build.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "lib": ["es2020"], + "strict": true, + "noImplicitAny": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "incremental": true, + "sourceMap": true, + "declaration": true + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"] +} diff --git a/packages/types/tsconfig-cjs.build.json b/packages/types/tsconfig-cjs.build.json new file mode 100644 index 0000000000..9b479b7b34 --- /dev/null +++ b/packages/types/tsconfig-cjs.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig-base.build.json", + "compilerOptions": { + "module": "commonjs", + "outDir": "dist/cjs", + "target": "es2015" + } +} diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 86f128c056..9643676b52 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -1,24 +1,8 @@ { + "extends": "./tsconfig-base.build.json", "compilerOptions": { "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "sourceMap": true, - "declaration": true, - "outDir": "dist" - }, - "include": [ - "src/**/*" - ], - "exclude": [ - "node_modules", - "dist", - "**/*.spec.ts", - "**/*.spec.js" - ] -} \ No newline at end of file + "moduleResolution": "node", + "outDir": "dist/mjs" + } +} diff --git a/packages/types/yarn.lock b/packages/types/yarn.lock index 4b45eb90ed..64aaf584a4 100644 --- a/packages/types/yarn.lock +++ b/packages/types/yarn.lock @@ -337,6 +337,18 @@ agent-base@^6.0.2: dependencies: debug "4" +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -377,6 +389,23 @@ call-bind@^1.0.0: function-bind "^1.1.1" get-intrinsic "^1.0.2" +chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + co-body@^5.1.1: version "5.2.0" resolved "https://registry.yarnpkg.com/co-body/-/co-body-5.2.0.tgz#5a0a658c46029131e0e3a306f67647302f71c124" @@ -387,6 +416,18 @@ co-body@^5.1.1: raw-body "^2.2.0" type-is "^1.6.14" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -399,6 +440,26 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concurrently@^7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.6.0.tgz#531a6f5f30cf616f355a4afb8f8fcb2bba65a49a" + integrity sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw== + dependencies: + chalk "^4.1.0" + date-fns "^2.29.1" + lodash "^4.17.21" + rxjs "^7.0.0" + shell-quote "^1.7.3" + spawn-command "^0.0.2-1" + supports-color "^8.1.0" + tree-kill "^1.2.2" + yargs "^17.3.1" + +date-fns@^2.29.1: + version "2.29.3" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" + integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== + debug@4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -416,6 +477,16 @@ depd@2.0.0: resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" @@ -445,6 +516,11 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-intrinsic@^1.0.2: version "1.1.3" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" @@ -466,6 +542,11 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -521,6 +602,11 @@ inherits@2, inherits@2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + json5@*: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" @@ -535,6 +621,11 @@ koa-body@4.2.0: co-body "^5.1.1" formidable "^1.1.1" +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -623,6 +714,11 @@ raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -635,6 +731,13 @@ rimraf@3.0.2: dependencies: glob "^7.1.3" +rxjs@^7.0.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + dependencies: + tslib "^2.1.0" + "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -645,6 +748,11 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== +shell-quote@^1.7.3: + version "1.8.0" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" + integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -654,11 +762,46 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +spawn-command@^0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg== + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -674,6 +817,16 @@ tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + +tslib@^2.1.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + type-is@^1.6.14: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -705,7 +858,39 @@ url-parse@^1.5.3: querystringify "^2.1.1" requires-port "^1.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^17.3.1: + version "17.7.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" + integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 9926f3dd2b..31d99fda3c 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -28,6 +28,12 @@ yarn unlink yarn link cd - +echo "Linking shared-core" +cd packages/shared-core +yarn unlink +yarn link +cd - + if [ -d "../budibase-pro" ]; then cd ../budibase-pro echo "Bootstrapping budibase-pro" From a7e34c0829751ed0dc3f8f1d94028db744d678cc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 9 Mar 2023 13:52:35 +0000 Subject: [PATCH 14/54] Minor fix for CLI - to preserve the MinIO image, meaning that new installations will always use the minio/minio image, whereas older installations can use the RELEASE.2022-10-24T18-35-07Z version which still supports the FS system. --- packages/cli/src/hosting/update.ts | 6 +++++ packages/cli/src/hosting/utils.ts | 43 +++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/hosting/update.ts b/packages/cli/src/hosting/update.ts index 161cc04ae1..ca0ecce615 100644 --- a/packages/cli/src/hosting/update.ts +++ b/packages/cli/src/hosting/update.ts @@ -4,6 +4,8 @@ import { downloadDockerCompose, handleError, getServices, + getServiceImage, + setServiceImage, } from "./utils" import { confirmation } from "../questions" import compose from "docker-compose" @@ -23,7 +25,11 @@ export async function update() { !isSingle && (await confirmation("Do you wish to update you docker-compose.yaml?")) ) { + // get current MinIO image + const image = await getServiceImage("minio") await downloadDockerCompose() + // replace MinIO image + setServiceImage("minio", image) } await handleError(async () => { const status = await compose.ps() diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts index 9e5bd367ed..93e31b8aea 100644 --- a/packages/cli/src/hosting/utils.ts +++ b/packages/cli/src/hosting/utils.ts @@ -9,10 +9,44 @@ const ERROR_FILE = "docker-error.log" const COMPOSE_URL = "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml" -export async function downloadDockerCompose() { - const fileName = COMPOSE_URL.split("/").slice(-1)[0] +function composeFilename() { + return COMPOSE_URL.split("/").slice(-1)[0] +} + +export function getServiceImage(service: string) { + const filename = composeFilename() try { - await downloadFile(COMPOSE_URL, `./${fileName}`) + const { services } = getServices(filename) + const serviceKey = Object.keys(services).find(name => + name.includes(service) + ) + if (serviceKey) { + return services[serviceKey].image + } else { + return null + } + } catch (err) { + return null + } +} + +export function setServiceImage(service: string, image: string) { + const filename = composeFilename() + if (!fs.existsSync(filename)) { + throw new Error( + `File ${filename} not found, cannot update ${service} image.` + ) + } + const current = getServiceImage(service)! + let contents = fs.readFileSync(filename, "utf8") + contents = contents.replace(`image: ${current}`, `image: ${image}`) + fs.writeFileSync(filename, contents) +} + +export async function downloadDockerCompose() { + const filename = composeFilename() + try { + await downloadFile(COMPOSE_URL, `./${filename}`) } catch (err) { console.error(error(`Failed to retrieve compose file - ${err}`)) } @@ -49,6 +83,9 @@ export async function handleError(func: Function) { } export function getServices(path: string) { + if (!fs.existsSync(path)) { + throw new Error(`No yaml found at path: ${path}`) + } const dockerYaml = fs.readFileSync(path, "utf8") const parsedYaml = yaml.parse(dockerYaml) return { yaml: parsedYaml, services: parsedYaml.services } From 3ee07d39495251846f7ffcbb34548d8fb2b03b63 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 15:22:29 +0000 Subject: [PATCH 15/54] Replace GH_PERSONAL_TOKEN with GH_ACCESS_TOKEN for pulling values from infra (#9962) --- .github/workflows/deploy-cloud.yaml | 2 +- .github/workflows/deploy-preprod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 644eb5f1be..fa80da846f 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -22,7 +22,7 @@ jobs: - name: Pull values.yaml from budibase-infra run: | - curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ + curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \ -H 'Accept: application/vnd.github.v3.raw' \ -o values.production.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 1bf7afbeb9..803dd6af52 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -21,7 +21,7 @@ jobs: - name: Pull values.yaml from budibase-infra run: | - curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ + curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \ -H 'Accept: application/vnd.github.v3.raw' \ -o values.preprod.yaml \ -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml From 8790672d4264b63c049b8af8a0b6fe8e661fd4b6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 15:33:38 +0000 Subject: [PATCH 16/54] v2.4.12 --- 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 f2a0fd957e..bb28106648 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.11", + "version": "2.4.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 011fb86184..8707c1af3c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.11", + "version": "2.4.12", "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.11", + "@budibase/types": "^2.4.12", "@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 9694dcb74c..a262dc10e9 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.11", + "version": "2.4.12", "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.11", + "@budibase/string-templates": "^2.4.12", "@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 a48094827d..47aeb794e6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.11", + "version": "2.4.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.11", - "@budibase/client": "^2.4.11", - "@budibase/frontend-core": "^2.4.11", - "@budibase/string-templates": "^2.4.11", + "@budibase/bbui": "^2.4.12", + "@budibase/client": "^2.4.12", + "@budibase/frontend-core": "^2.4.12", + "@budibase/string-templates": "^2.4.12", "@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 cc5cbcb577..10eaa0f8b3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.11", + "version": "2.4.12", "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.11", - "@budibase/string-templates": "^2.4.11", - "@budibase/types": "^2.4.11", + "@budibase/backend-core": "^2.4.12", + "@budibase/string-templates": "^2.4.12", + "@budibase/types": "^2.4.12", "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 afca35305a..dadb81e1c0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.11", + "version": "2.4.12", "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.11", - "@budibase/frontend-core": "^2.4.11", - "@budibase/string-templates": "^2.4.11", + "@budibase/bbui": "^2.4.12", + "@budibase/frontend-core": "^2.4.12", + "@budibase/string-templates": "^2.4.12", "@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 88370e573e..b151d46f45 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.11", + "version": "2.4.12", "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.11", + "@budibase/bbui": "^2.4.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ad087ea6f5..c825b01328 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.11", + "version": "2.4.12", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a6339be540..714d9d6c5a 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.11", + "version": "2.4.12", "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.11", - "@budibase/client": "^2.4.11", + "@budibase/backend-core": "^2.4.12", + "@budibase/client": "^2.4.12", "@budibase/pro": "2.4.11", - "@budibase/string-templates": "^2.4.11", - "@budibase/types": "^2.4.11", + "@budibase/string-templates": "^2.4.12", + "@budibase/types": "^2.4.12", "@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 dd7c49914b..6622312548 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.11", + "version": "2.4.12", "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 9f35b487dd..50c40f1173 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.11", + "version": "2.4.12", "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 7b6633ba48..82cc373f77 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.11", + "version": "2.4.12", "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.11", + "@budibase/backend-core": "^2.4.12", "@budibase/pro": "2.4.11", - "@budibase/string-templates": "^2.4.11", - "@budibase/types": "^2.4.11", + "@budibase/string-templates": "^2.4.12", + "@budibase/types": "^2.4.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fa877c8a6b07a74a4617b3c51ce316e8e79cb40d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 15:37:11 +0000 Subject: [PATCH 17/54] Update pro version to 2.4.12 --- 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 714d9d6c5a..1ddbfeb08a 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.12", "@budibase/client": "^2.4.12", - "@budibase/pro": "2.4.11", + "@budibase/pro": "2.4.12", "@budibase/string-templates": "^2.4.12", "@budibase/types": "^2.4.12", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index bb42d58f8a..1f2f2b079c 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.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4" - integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A== +"@budibase/backend-core@2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.12.tgz#83df57bb7bc53f90e3ca674c494c6d126ac817dc" + integrity sha512-L9KOw7UQ8Ts1AMUGlf8KMbGnExFiEQ3m21lKaywfLG6kG9X8fcw/dJDzbYsm3/KOl7AOAz32SWsIXJhw3kUAjw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.11" + "@budibase/types" "^2.4.12" "@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.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a" - integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg== +"@budibase/pro@2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.12.tgz#caaa97b01d1cd1ca05e628da5954dd5e963a1be7" + integrity sha512-jxVeiqqFJaVabw9Rp5fpM/9eYId0ONguTUv7YIg/JLmaKpOpUjtMlydZDc9N+6wAskvYBUxcdEKiwR+8invKIw== dependencies: - "@budibase/backend-core" "2.4.11" + "@budibase/backend-core" "2.4.12" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.11" + "@budibase/types" "2.4.12" "@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.11", "@budibase/types@^2.4.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104" - integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og== +"@budibase/types@2.4.12", "@budibase/types@^2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.12.tgz#110fe3cade01123370b58c699b1821dfea794963" + integrity sha512-W9SBr33hJTdwG+i/WOFwSWLQwX5jyGHOmDPGT33SnJ4wLlwB1at50iwxDLg7D1Lk4kn680stdGMEBsnxtVbjXg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 82cc373f77..799624e6f7 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.12", - "@budibase/pro": "2.4.11", + "@budibase/pro": "2.4.12", "@budibase/string-templates": "^2.4.12", "@budibase/types": "^2.4.12", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 35111428ce..de4cdbf046 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.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4" - integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A== +"@budibase/backend-core@2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.12.tgz#83df57bb7bc53f90e3ca674c494c6d126ac817dc" + integrity sha512-L9KOw7UQ8Ts1AMUGlf8KMbGnExFiEQ3m21lKaywfLG6kG9X8fcw/dJDzbYsm3/KOl7AOAz32SWsIXJhw3kUAjw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.11" + "@budibase/types" "^2.4.12" "@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.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a" - integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg== +"@budibase/pro@2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.12.tgz#caaa97b01d1cd1ca05e628da5954dd5e963a1be7" + integrity sha512-jxVeiqqFJaVabw9Rp5fpM/9eYId0ONguTUv7YIg/JLmaKpOpUjtMlydZDc9N+6wAskvYBUxcdEKiwR+8invKIw== dependencies: - "@budibase/backend-core" "2.4.11" + "@budibase/backend-core" "2.4.12" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.11" + "@budibase/types" "2.4.12" "@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.11", "@budibase/types@^2.4.11": - version "2.4.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104" - integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og== +"@budibase/types@2.4.12", "@budibase/types@^2.4.12": + version "2.4.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.12.tgz#110fe3cade01123370b58c699b1821dfea794963" + integrity sha512-W9SBr33hJTdwG+i/WOFwSWLQwX5jyGHOmDPGT33SnJ4wLlwB1at50iwxDLg7D1Lk4kn680stdGMEBsnxtVbjXg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From ad7bda17bb0b2656ee26ae0c51393b744ab4dd2a Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 9 Mar 2023 15:52:16 +0000 Subject: [PATCH 18/54] Change database to Service Name in oracle --- .../IntegrationConfigForm.svelte | 12 ++++++++++-- packages/server/src/integrations/oracle.ts | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 53d50d57a3..3bc1a1cdd9 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -74,6 +74,14 @@ } return capitalise(name) } + + function getDisplayError(error, configKey) { + return error?.replace( + new RegExp(`${configKey}`, "i"), + getDisplayName(configKey) + ) + } + function getFieldGroupKeys(fieldGroup) { return Object.entries(schema[fieldGroup].fields || {}) .filter(el => filter(el)) @@ -147,7 +155,7 @@ type={schema[configKey].type} on:change bind:value={config[configKey]} - error={$validation.errors[configKey]} + error={getDisplayError($validation.errors[configKey], configKey)} /> {:else if schema[configKey].type === "fieldGroup"} @@ -180,7 +188,7 @@ type={configKey === "port" ? "string" : schema[configKey].type} on:change bind:value={config[configKey]} - error={$validation.errors[configKey]} + error={getDisplayError($validation.errors[configKey], configKey)} environmentVariablesEnabled={$licensing.environmentVariablesEnabled} {handleUpgradePanel} /> diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index abf9bcbbe3..65e0829905 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -67,6 +67,7 @@ const SCHEMA: Integration = { database: { type: DatasourceFieldType.STRING, required: true, + display: "Service Name", }, user: { type: DatasourceFieldType.STRING, From c33ea4dcfe0cbf9c54deb56edb09bbdb76c557a9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 16:13:26 +0000 Subject: [PATCH 19/54] Update deployment templates to remove unused cdn url and fix empty env vars (#9967) --- charts/budibase/templates/app-service-deployment.yaml | 6 ++---- charts/budibase/templates/worker-service-deployment.yaml | 2 -- packages/server/src/environment.ts | 1 - packages/worker/src/environment.ts | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 6b0a0338d6..89e7db7796 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -125,9 +125,9 @@ spec: - name: SELF_HOSTED value: {{ .Values.globals.selfHosted | quote }} - name: SENTRY_DSN - value: {{ .Values.globals.sentryDSN }} + value: {{ .Values.globals.sentryDSN | quote }} - name: POSTHOG_TOKEN - value: {{ .Values.globals.posthogToken }} + value: {{ .Values.globals.posthogToken | quote }} - name: WORKER_URL value: http://worker-service:{{ .Values.services.worker.port }} - name: PLATFORM_URL @@ -198,8 +198,6 @@ spec: - name: GLOBAL_AGENT_NO_PROXY value: {{ .Values.globals.globalAgentNoProxy | quote }} {{ end }} - - name: CDN_URL - value: {{ .Values.globals.cdnUrl }} {{ if .Values.services.tlsRejectUnauthorized }} - name: NODE_TLS_REJECT_UNAUTHORIZED value: {{ .Values.services.tlsRejectUnauthorized }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index f4305fbb00..0e053dfb5a 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -188,8 +188,6 @@ spec: - name: GLOBAL_AGENT_NO_PROXY value: {{ .Values.globals.globalAgentNoProxy | quote }} {{ end }} - - name: CDN_URL - value: {{ .Values.globals.cdnUrl }} {{ if .Values.services.tlsRejectUnauthorized }} - name: NODE_TLS_REJECT_UNAUTHORIZED value: {{ .Values.services.tlsRejectUnauthorized }} diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index 256d8d10c3..715715e42b 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -46,7 +46,6 @@ const environment = { AWS_REGION: process.env.AWS_REGION, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, - CDN_URL: process.env.CDN_URL || "https://cdn.budi.live", REDIS_URL: process.env.REDIS_URL, REDIS_PASSWORD: process.env.REDIS_PASSWORD, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index cd5360f7f7..c6618a75df 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -42,7 +42,6 @@ const environment = { ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL, PLATFORM_URL: process.env.PLATFORM_URL, APPS_URL: process.env.APPS_URL, - CDN_URL: process.env.CDN_URL || "https://tenants.cdn.budi.live", // ports // prefer worker port to generic port PORT: process.env.WORKER_PORT || process.env.PORT, From a1b409d15d88964775e6a6086c674d07dfa7b054 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 16:23:20 +0000 Subject: [PATCH 20/54] v2.4.13 --- 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 bb28106648..3966f30e38 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.12", + "version": "2.4.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8707c1af3c..e418a4ab9a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.12", + "version": "2.4.13", "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.12", + "@budibase/types": "^2.4.13", "@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 a262dc10e9..3eaf154331 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.12", + "version": "2.4.13", "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.12", + "@budibase/string-templates": "^2.4.13", "@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 47aeb794e6..4a13c0752a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.12", + "version": "2.4.13", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.12", - "@budibase/client": "^2.4.12", - "@budibase/frontend-core": "^2.4.12", - "@budibase/string-templates": "^2.4.12", + "@budibase/bbui": "^2.4.13", + "@budibase/client": "^2.4.13", + "@budibase/frontend-core": "^2.4.13", + "@budibase/string-templates": "^2.4.13", "@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 10eaa0f8b3..dc438bc499 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.12", + "version": "2.4.13", "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.12", - "@budibase/string-templates": "^2.4.12", - "@budibase/types": "^2.4.12", + "@budibase/backend-core": "^2.4.13", + "@budibase/string-templates": "^2.4.13", + "@budibase/types": "^2.4.13", "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 dadb81e1c0..4ebea2a3b6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.12", + "version": "2.4.13", "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.12", - "@budibase/frontend-core": "^2.4.12", - "@budibase/string-templates": "^2.4.12", + "@budibase/bbui": "^2.4.13", + "@budibase/frontend-core": "^2.4.13", + "@budibase/string-templates": "^2.4.13", "@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 b151d46f45..b588245da7 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.12", + "version": "2.4.13", "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.12", + "@budibase/bbui": "^2.4.13", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c825b01328..11155c2c15 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.12", + "version": "2.4.13", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1ddbfeb08a..7fc1f14e5f 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.12", + "version": "2.4.13", "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.12", - "@budibase/client": "^2.4.12", + "@budibase/backend-core": "^2.4.13", + "@budibase/client": "^2.4.13", "@budibase/pro": "2.4.12", - "@budibase/string-templates": "^2.4.12", - "@budibase/types": "^2.4.12", + "@budibase/string-templates": "^2.4.13", + "@budibase/types": "^2.4.13", "@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 6622312548..c978553282 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.12", + "version": "2.4.13", "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 50c40f1173..7d832aa8b7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.12", + "version": "2.4.13", "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 799624e6f7..c8024bd197 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.12", + "version": "2.4.13", "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.12", + "@budibase/backend-core": "^2.4.13", "@budibase/pro": "2.4.12", - "@budibase/string-templates": "^2.4.12", - "@budibase/types": "^2.4.12", + "@budibase/string-templates": "^2.4.13", + "@budibase/types": "^2.4.13", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 05709cc0d422e08ff48567f75a678ade5c8a4336 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 16:26:22 +0000 Subject: [PATCH 21/54] Update pro version to 2.4.13 --- 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 7fc1f14e5f..e7358fbcea 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.13", "@budibase/client": "^2.4.13", - "@budibase/pro": "2.4.12", + "@budibase/pro": "2.4.13", "@budibase/string-templates": "^2.4.13", "@budibase/types": "^2.4.13", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 1f2f2b079c..fedada9660 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.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.12.tgz#83df57bb7bc53f90e3ca674c494c6d126ac817dc" - integrity sha512-L9KOw7UQ8Ts1AMUGlf8KMbGnExFiEQ3m21lKaywfLG6kG9X8fcw/dJDzbYsm3/KOl7AOAz32SWsIXJhw3kUAjw== +"@budibase/backend-core@2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.13.tgz#1446cb3092b94432f3f8ca25a310d45e52298d15" + integrity sha512-MdK4nbQKKjyXDt0E0yerSLJytQFNOrAvaaqai6jO/ie0+Uweu6Ek3uWJ0ZwW+HijvbLZNuYpAVmJ7RZLvZ3rjQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.12" + "@budibase/types" "^2.4.13" "@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.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.12.tgz#caaa97b01d1cd1ca05e628da5954dd5e963a1be7" - integrity sha512-jxVeiqqFJaVabw9Rp5fpM/9eYId0ONguTUv7YIg/JLmaKpOpUjtMlydZDc9N+6wAskvYBUxcdEKiwR+8invKIw== +"@budibase/pro@2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.13.tgz#b41fc1e027f7a0f342bada98e92b7709ee45f4e6" + integrity sha512-66RyBTQU6XPpS0TH2lpHb63hOUzWyK3Kw9y/plSbNkZlFnMvEzWiXBXxBwMR7H+AtJ/Mu8MokR6ikZPILR6Fgw== dependencies: - "@budibase/backend-core" "2.4.12" + "@budibase/backend-core" "2.4.13" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.12" + "@budibase/types" "2.4.13" "@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.12", "@budibase/types@^2.4.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.12.tgz#110fe3cade01123370b58c699b1821dfea794963" - integrity sha512-W9SBr33hJTdwG+i/WOFwSWLQwX5jyGHOmDPGT33SnJ4wLlwB1at50iwxDLg7D1Lk4kn680stdGMEBsnxtVbjXg== +"@budibase/types@2.4.13", "@budibase/types@^2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.13.tgz#55439214276830599041d705c125d3891a845a27" + integrity sha512-6ayvo9zonS9PW+ULmSkEwQn/p3JTl3QCtMnyYhyhTKDBfiM5cTye1jccCIdTnZO8+z+btslqDKLfcTIyZSdTvQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index c8024bd197..4e7295c5c3 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.13", - "@budibase/pro": "2.4.12", + "@budibase/pro": "2.4.13", "@budibase/string-templates": "^2.4.13", "@budibase/types": "^2.4.13", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index de4cdbf046..dc3b677f5f 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.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.12.tgz#83df57bb7bc53f90e3ca674c494c6d126ac817dc" - integrity sha512-L9KOw7UQ8Ts1AMUGlf8KMbGnExFiEQ3m21lKaywfLG6kG9X8fcw/dJDzbYsm3/KOl7AOAz32SWsIXJhw3kUAjw== +"@budibase/backend-core@2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.13.tgz#1446cb3092b94432f3f8ca25a310d45e52298d15" + integrity sha512-MdK4nbQKKjyXDt0E0yerSLJytQFNOrAvaaqai6jO/ie0+Uweu6Ek3uWJ0ZwW+HijvbLZNuYpAVmJ7RZLvZ3rjQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.12" + "@budibase/types" "^2.4.13" "@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.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.12.tgz#caaa97b01d1cd1ca05e628da5954dd5e963a1be7" - integrity sha512-jxVeiqqFJaVabw9Rp5fpM/9eYId0ONguTUv7YIg/JLmaKpOpUjtMlydZDc9N+6wAskvYBUxcdEKiwR+8invKIw== +"@budibase/pro@2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.13.tgz#b41fc1e027f7a0f342bada98e92b7709ee45f4e6" + integrity sha512-66RyBTQU6XPpS0TH2lpHb63hOUzWyK3Kw9y/plSbNkZlFnMvEzWiXBXxBwMR7H+AtJ/Mu8MokR6ikZPILR6Fgw== dependencies: - "@budibase/backend-core" "2.4.12" + "@budibase/backend-core" "2.4.13" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.12" + "@budibase/types" "2.4.13" "@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.12", "@budibase/types@^2.4.12": - version "2.4.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.12.tgz#110fe3cade01123370b58c699b1821dfea794963" - integrity sha512-W9SBr33hJTdwG+i/WOFwSWLQwX5jyGHOmDPGT33SnJ4wLlwB1at50iwxDLg7D1Lk4kn680stdGMEBsnxtVbjXg== +"@budibase/types@2.4.13", "@budibase/types@^2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.13.tgz#55439214276830599041d705c125d3891a845a27" + integrity sha512-6ayvo9zonS9PW+ULmSkEwQn/p3JTl3QCtMnyYhyhTKDBfiM5cTye1jccCIdTnZO8+z+btslqDKLfcTIyZSdTvQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From acc193aa878b146614196c936c2a1ab1a02e30ca Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 16:33:48 +0000 Subject: [PATCH 22/54] Replace get previous tag with package version (#9968) --- .github/workflows/deploy-preprod.yml | 23 +++++++++++++++++------ .github/workflows/release-master.yml | 21 ++++++++++++--------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 803dd6af52..2d06212765 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -1,6 +1,10 @@ name: "deploy-preprod" on: workflow_dispatch: + inputs: + version: + description: Budibase release version. For example - 1.0.0 + required: false workflow_call: jobs: @@ -8,9 +12,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: 'Get Previous tag' - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v1" + + - name: Get the latest budibase release version + id: version + run: | + if [ -z "${{ github.event.inputs.version }}" ]; then + release_version=$(cat lerna.json | jq -r '.version') + else + release_version=${{ github.event.inputs.version }} + fi + echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 @@ -37,7 +48,7 @@ jobs: helm: helm3 values: | globals: - appVersion: ${{ steps.previoustag.outputs.tag }} + appVersion: ${{ env.RELEASE_VERSION }} ingress: enabled: true nginx: true @@ -52,5 +63,5 @@ jobs: uses: tsickert/discord-webhook@v4.0.0 with: webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} - content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod." - embed-title: ${{ steps.previoustag.outputs.tag }} \ No newline at end of file + content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." + embed-title: ${{ env.RELEASE_VERSION }} \ No newline at end of file diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 3ae265fa21..20a48f5802 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -91,9 +91,11 @@ jobs: uses: azure/setup-helm@v1 id: helm-install - - name: 'Get Previous tag' - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v1" + - name: Get the latest budibase release version + id: version + run: | + release_version=$(cat lerna.json | jq -r '.version') + echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV # due to helm repo index issue: https://github.com/helm/helm/issues/7363 # we need to create new package in a different dir, merge the index and move the package back @@ -116,8 +118,6 @@ jobs: git add -A git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}" git push - env: - RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }} deploy-to-legacy-preprod-env: needs: [release-images] @@ -130,13 +130,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: 'Get Previous tag' - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v1" + + - name: Get the latest budibase release version + id: version + run: | + release_version=$(cat lerna.json | jq -r '.version') + echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - uses: passeidireto/trigger-external-workflow-action@main env: - PAYLOAD_VERSION: ${{ steps.previoustag.outputs.tag }} + PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }} with: repository: budibase/budibase-deploys event: budicloud-preprod-deploy From feecb53017d5a8bc96ea410603b38ff67ec36de0 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 16:40:32 +0000 Subject: [PATCH 23/54] Fix app version tag (#9969) --- .github/workflows/deploy-preprod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 2d06212765..3015a9ad27 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -48,7 +48,7 @@ jobs: helm: helm3 values: | globals: - appVersion: ${{ env.RELEASE_VERSION }} + appVersion: v${{ env.RELEASE_VERSION }} ingress: enabled: true nginx: true From 874ce9bb1316db6290d99cc689c6e286debdcd73 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 16:51:20 +0000 Subject: [PATCH 24/54] v2.4.14 --- 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 3966f30e38..6cbe243b3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.13", + "version": "2.4.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e418a4ab9a..4833868729 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.13", + "version": "2.4.14", "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.13", + "@budibase/types": "^2.4.14", "@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 3eaf154331..b81ee128b2 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.13", + "version": "2.4.14", "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.13", + "@budibase/string-templates": "^2.4.14", "@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 4a13c0752a..624b308867 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.13", + "version": "2.4.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.13", - "@budibase/client": "^2.4.13", - "@budibase/frontend-core": "^2.4.13", - "@budibase/string-templates": "^2.4.13", + "@budibase/bbui": "^2.4.14", + "@budibase/client": "^2.4.14", + "@budibase/frontend-core": "^2.4.14", + "@budibase/string-templates": "^2.4.14", "@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 dc438bc499..374ee8cdf6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.13", + "version": "2.4.14", "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.13", - "@budibase/string-templates": "^2.4.13", - "@budibase/types": "^2.4.13", + "@budibase/backend-core": "^2.4.14", + "@budibase/string-templates": "^2.4.14", + "@budibase/types": "^2.4.14", "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 4ebea2a3b6..b48ceb54b7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.13", + "version": "2.4.14", "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.13", - "@budibase/frontend-core": "^2.4.13", - "@budibase/string-templates": "^2.4.13", + "@budibase/bbui": "^2.4.14", + "@budibase/frontend-core": "^2.4.14", + "@budibase/string-templates": "^2.4.14", "@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 b588245da7..04e2adb17d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.13", + "version": "2.4.14", "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.13", + "@budibase/bbui": "^2.4.14", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 11155c2c15..9ac7b642c0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.13", + "version": "2.4.14", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index e7358fbcea..38d020c49e 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.13", + "version": "2.4.14", "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.13", - "@budibase/client": "^2.4.13", + "@budibase/backend-core": "^2.4.14", + "@budibase/client": "^2.4.14", "@budibase/pro": "2.4.13", - "@budibase/string-templates": "^2.4.13", - "@budibase/types": "^2.4.13", + "@budibase/string-templates": "^2.4.14", + "@budibase/types": "^2.4.14", "@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 c978553282..a57a466095 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.13", + "version": "2.4.14", "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 7d832aa8b7..246a640f6c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.13", + "version": "2.4.14", "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 4e7295c5c3..fe668dcdc5 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.13", + "version": "2.4.14", "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.13", + "@budibase/backend-core": "^2.4.14", "@budibase/pro": "2.4.13", - "@budibase/string-templates": "^2.4.13", - "@budibase/types": "^2.4.13", + "@budibase/string-templates": "^2.4.14", + "@budibase/types": "^2.4.14", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9efe5cfa9290da57b9d52a371e324d579fd1587c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 9 Mar 2023 16:54:23 +0000 Subject: [PATCH 25/54] Update pro version to 2.4.14 --- 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 38d020c49e..2ff4779902 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.14", "@budibase/client": "^2.4.14", - "@budibase/pro": "2.4.13", + "@budibase/pro": "2.4.14", "@budibase/string-templates": "^2.4.14", "@budibase/types": "^2.4.14", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index fedada9660..c72076044c 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.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.13.tgz#1446cb3092b94432f3f8ca25a310d45e52298d15" - integrity sha512-MdK4nbQKKjyXDt0E0yerSLJytQFNOrAvaaqai6jO/ie0+Uweu6Ek3uWJ0ZwW+HijvbLZNuYpAVmJ7RZLvZ3rjQ== +"@budibase/backend-core@2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.14.tgz#010cc6c3689b0b916c29ef703476611c80b0f537" + integrity sha512-xuLGAnrZX4IL4heVYI4UEtkCcLc2oD6z0MijBri38ysfDJ2tnnrvhd2UWVD8FU0FTtQs/hqa6Y8jtg+99hE6/Q== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.13" + "@budibase/types" "^2.4.14" "@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.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.13.tgz#b41fc1e027f7a0f342bada98e92b7709ee45f4e6" - integrity sha512-66RyBTQU6XPpS0TH2lpHb63hOUzWyK3Kw9y/plSbNkZlFnMvEzWiXBXxBwMR7H+AtJ/Mu8MokR6ikZPILR6Fgw== +"@budibase/pro@2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.14.tgz#629dd84c6a3cbe07c14983231f99686917baaa4f" + integrity sha512-d8KnLBF6A8PGxmSZJVlRo2wYd6ulG2Yx4+W5I1sXZOJjmdDHcMRW3ICEcJlgUIOxRSVnUFswA0Yu3cTphojTaQ== dependencies: - "@budibase/backend-core" "2.4.13" + "@budibase/backend-core" "2.4.14" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.13" + "@budibase/types" "2.4.14" "@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.13", "@budibase/types@^2.4.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.13.tgz#55439214276830599041d705c125d3891a845a27" - integrity sha512-6ayvo9zonS9PW+ULmSkEwQn/p3JTl3QCtMnyYhyhTKDBfiM5cTye1jccCIdTnZO8+z+btslqDKLfcTIyZSdTvQ== +"@budibase/types@2.4.14", "@budibase/types@^2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.14.tgz#159b6c17c3929a7449a995e525e31b9a5de4df6e" + integrity sha512-rh9mPU6fQgd5GmbelePAg0dobcmmLyiPdeTabbKTXxEEAK3yqMT3f3bAMxm67B/IX+QDxLi4GLBMFQbdLs+hxQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index fe668dcdc5..48dba1f428 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.14", - "@budibase/pro": "2.4.13", + "@budibase/pro": "2.4.14", "@budibase/string-templates": "^2.4.14", "@budibase/types": "^2.4.14", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index dc3b677f5f..46d04f4ae8 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.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.13.tgz#1446cb3092b94432f3f8ca25a310d45e52298d15" - integrity sha512-MdK4nbQKKjyXDt0E0yerSLJytQFNOrAvaaqai6jO/ie0+Uweu6Ek3uWJ0ZwW+HijvbLZNuYpAVmJ7RZLvZ3rjQ== +"@budibase/backend-core@2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.14.tgz#010cc6c3689b0b916c29ef703476611c80b0f537" + integrity sha512-xuLGAnrZX4IL4heVYI4UEtkCcLc2oD6z0MijBri38ysfDJ2tnnrvhd2UWVD8FU0FTtQs/hqa6Y8jtg+99hE6/Q== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.13" + "@budibase/types" "^2.4.14" "@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.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.13.tgz#b41fc1e027f7a0f342bada98e92b7709ee45f4e6" - integrity sha512-66RyBTQU6XPpS0TH2lpHb63hOUzWyK3Kw9y/plSbNkZlFnMvEzWiXBXxBwMR7H+AtJ/Mu8MokR6ikZPILR6Fgw== +"@budibase/pro@2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.14.tgz#629dd84c6a3cbe07c14983231f99686917baaa4f" + integrity sha512-d8KnLBF6A8PGxmSZJVlRo2wYd6ulG2Yx4+W5I1sXZOJjmdDHcMRW3ICEcJlgUIOxRSVnUFswA0Yu3cTphojTaQ== dependencies: - "@budibase/backend-core" "2.4.13" + "@budibase/backend-core" "2.4.14" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.13" + "@budibase/types" "2.4.14" "@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.13", "@budibase/types@^2.4.13": - version "2.4.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.13.tgz#55439214276830599041d705c125d3891a845a27" - integrity sha512-6ayvo9zonS9PW+ULmSkEwQn/p3JTl3QCtMnyYhyhTKDBfiM5cTye1jccCIdTnZO8+z+btslqDKLfcTIyZSdTvQ== +"@budibase/types@2.4.14", "@budibase/types@^2.4.14": + version "2.4.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.14.tgz#159b6c17c3929a7449a995e525e31b9a5de4df6e" + integrity sha512-rh9mPU6fQgd5GmbelePAg0dobcmmLyiPdeTabbKTXxEEAK3yqMT3f3bAMxm67B/IX+QDxLi4GLBMFQbdLs+hxQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 4906e5c3a01072b2e570839d7d72144c6b563a1f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 10:57:52 +0000 Subject: [PATCH 26/54] v2.4.15 --- 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 6cbe243b3e..9ceaed3a7d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.14", + "version": "2.4.15", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4833868729..3dfc96fbe3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.14", + "version": "2.4.15", "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.14", + "@budibase/types": "^2.4.15", "@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 b81ee128b2..8d5353d50e 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.14", + "version": "2.4.15", "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.14", + "@budibase/string-templates": "^2.4.15", "@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 624b308867..1f685f7480 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.14", + "version": "2.4.15", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.14", - "@budibase/client": "^2.4.14", - "@budibase/frontend-core": "^2.4.14", - "@budibase/string-templates": "^2.4.14", + "@budibase/bbui": "^2.4.15", + "@budibase/client": "^2.4.15", + "@budibase/frontend-core": "^2.4.15", + "@budibase/string-templates": "^2.4.15", "@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 374ee8cdf6..aa6b65ff8c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.14", + "version": "2.4.15", "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.14", - "@budibase/string-templates": "^2.4.14", - "@budibase/types": "^2.4.14", + "@budibase/backend-core": "^2.4.15", + "@budibase/string-templates": "^2.4.15", + "@budibase/types": "^2.4.15", "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 b48ceb54b7..1fd82a82d2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.14", + "version": "2.4.15", "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.14", - "@budibase/frontend-core": "^2.4.14", - "@budibase/string-templates": "^2.4.14", + "@budibase/bbui": "^2.4.15", + "@budibase/frontend-core": "^2.4.15", + "@budibase/string-templates": "^2.4.15", "@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 04e2adb17d..e244fe6328 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.14", + "version": "2.4.15", "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.14", + "@budibase/bbui": "^2.4.15", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9ac7b642c0..438ffe1f99 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.14", + "version": "2.4.15", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 2ff4779902..abd20ae026 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.14", + "version": "2.4.15", "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.14", - "@budibase/client": "^2.4.14", + "@budibase/backend-core": "^2.4.15", + "@budibase/client": "^2.4.15", "@budibase/pro": "2.4.14", - "@budibase/string-templates": "^2.4.14", - "@budibase/types": "^2.4.14", + "@budibase/string-templates": "^2.4.15", + "@budibase/types": "^2.4.15", "@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 a57a466095..bf01cd41e6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.14", + "version": "2.4.15", "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 246a640f6c..f29fabf308 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.14", + "version": "2.4.15", "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 48dba1f428..cd50d7fb90 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.14", + "version": "2.4.15", "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.14", + "@budibase/backend-core": "^2.4.15", "@budibase/pro": "2.4.14", - "@budibase/string-templates": "^2.4.14", - "@budibase/types": "^2.4.14", + "@budibase/string-templates": "^2.4.15", + "@budibase/types": "^2.4.15", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 96c6a6558405f952ccd506de8a78ed422b34bfd7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 11:00:36 +0000 Subject: [PATCH 27/54] Update pro version to 2.4.15 --- 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 abd20ae026..c196445f5d 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.15", "@budibase/client": "^2.4.15", - "@budibase/pro": "2.4.14", + "@budibase/pro": "2.4.15", "@budibase/string-templates": "^2.4.15", "@budibase/types": "^2.4.15", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index c72076044c..21894c4601 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.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.14.tgz#010cc6c3689b0b916c29ef703476611c80b0f537" - integrity sha512-xuLGAnrZX4IL4heVYI4UEtkCcLc2oD6z0MijBri38ysfDJ2tnnrvhd2UWVD8FU0FTtQs/hqa6Y8jtg+99hE6/Q== +"@budibase/backend-core@2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.15.tgz#54d2fd229399ba65cd7b6e06d0fcef8f22e6d7be" + integrity sha512-XDQRDsQ41YjFBWz+r1MAZMYTIB4r0owh++mgW6OFyukDgH4DkK2fdAFMOtoZQXuC19xJpg/xaCbuNp+ckdcelw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.14" + "@budibase/types" "^2.4.15" "@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.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.14.tgz#629dd84c6a3cbe07c14983231f99686917baaa4f" - integrity sha512-d8KnLBF6A8PGxmSZJVlRo2wYd6ulG2Yx4+W5I1sXZOJjmdDHcMRW3ICEcJlgUIOxRSVnUFswA0Yu3cTphojTaQ== +"@budibase/pro@2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.15.tgz#2605cb069c25ec35fd17eebe9ed4159e8c0ac08f" + integrity sha512-vp2vikl3f0FkWC2TzQnpq0NDbpSoeTWg5UJq0NV9E28prsXK17Uayrlzw/b/p9IkJaLiL4dihcQqzOnj/sasfA== dependencies: - "@budibase/backend-core" "2.4.14" + "@budibase/backend-core" "2.4.15" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.14" + "@budibase/types" "2.4.15" "@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.14", "@budibase/types@^2.4.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.14.tgz#159b6c17c3929a7449a995e525e31b9a5de4df6e" - integrity sha512-rh9mPU6fQgd5GmbelePAg0dobcmmLyiPdeTabbKTXxEEAK3yqMT3f3bAMxm67B/IX+QDxLi4GLBMFQbdLs+hxQ== +"@budibase/types@2.4.15", "@budibase/types@^2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.15.tgz#6cac50b868a0b03e7b38e7ca3d06d747b62f194a" + integrity sha512-ZFFn7gMvPJaC+IMhYzyAT4d6iHsrxgvzKZIliOHGhOMgpirDjxAbADPhSPm8SNXZKUu6v3mdGkF3wtpdDo7fYA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index cd50d7fb90..eea21ecf1c 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.15", - "@budibase/pro": "2.4.14", + "@budibase/pro": "2.4.15", "@budibase/string-templates": "^2.4.15", "@budibase/types": "^2.4.15", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 46d04f4ae8..4023b94985 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.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.14.tgz#010cc6c3689b0b916c29ef703476611c80b0f537" - integrity sha512-xuLGAnrZX4IL4heVYI4UEtkCcLc2oD6z0MijBri38ysfDJ2tnnrvhd2UWVD8FU0FTtQs/hqa6Y8jtg+99hE6/Q== +"@budibase/backend-core@2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.15.tgz#54d2fd229399ba65cd7b6e06d0fcef8f22e6d7be" + integrity sha512-XDQRDsQ41YjFBWz+r1MAZMYTIB4r0owh++mgW6OFyukDgH4DkK2fdAFMOtoZQXuC19xJpg/xaCbuNp+ckdcelw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.14" + "@budibase/types" "^2.4.15" "@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.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.14.tgz#629dd84c6a3cbe07c14983231f99686917baaa4f" - integrity sha512-d8KnLBF6A8PGxmSZJVlRo2wYd6ulG2Yx4+W5I1sXZOJjmdDHcMRW3ICEcJlgUIOxRSVnUFswA0Yu3cTphojTaQ== +"@budibase/pro@2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.15.tgz#2605cb069c25ec35fd17eebe9ed4159e8c0ac08f" + integrity sha512-vp2vikl3f0FkWC2TzQnpq0NDbpSoeTWg5UJq0NV9E28prsXK17Uayrlzw/b/p9IkJaLiL4dihcQqzOnj/sasfA== dependencies: - "@budibase/backend-core" "2.4.14" + "@budibase/backend-core" "2.4.15" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.14" + "@budibase/types" "2.4.15" "@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.14", "@budibase/types@^2.4.14": - version "2.4.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.14.tgz#159b6c17c3929a7449a995e525e31b9a5de4df6e" - integrity sha512-rh9mPU6fQgd5GmbelePAg0dobcmmLyiPdeTabbKTXxEEAK3yqMT3f3bAMxm67B/IX+QDxLi4GLBMFQbdLs+hxQ== +"@budibase/types@2.4.15", "@budibase/types@^2.4.15": + version "2.4.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.15.tgz#6cac50b868a0b03e7b38e7ca3d06d747b62f194a" + integrity sha512-ZFFn7gMvPJaC+IMhYzyAT4d6iHsrxgvzKZIliOHGhOMgpirDjxAbADPhSPm8SNXZKUu6v3mdGkF3wtpdDo7fYA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 93f4e3b0b7e800fa332e01bd65698178eb004cc5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 12:27:38 +0000 Subject: [PATCH 28/54] v2.4.16 --- 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 9ceaed3a7d..fc77f5f676 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.15", + "version": "2.4.16", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3dfc96fbe3..0fff5baf55 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.15", + "version": "2.4.16", "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.15", + "@budibase/types": "^2.4.16", "@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 8d5353d50e..663f583110 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.15", + "version": "2.4.16", "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.15", + "@budibase/string-templates": "^2.4.16", "@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 1f685f7480..6f96448c6b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.15", + "version": "2.4.16", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.15", - "@budibase/client": "^2.4.15", - "@budibase/frontend-core": "^2.4.15", - "@budibase/string-templates": "^2.4.15", + "@budibase/bbui": "^2.4.16", + "@budibase/client": "^2.4.16", + "@budibase/frontend-core": "^2.4.16", + "@budibase/string-templates": "^2.4.16", "@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 aa6b65ff8c..e0cab09d83 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.15", + "version": "2.4.16", "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.15", - "@budibase/string-templates": "^2.4.15", - "@budibase/types": "^2.4.15", + "@budibase/backend-core": "^2.4.16", + "@budibase/string-templates": "^2.4.16", + "@budibase/types": "^2.4.16", "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 1fd82a82d2..334e837ef7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.15", + "version": "2.4.16", "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.15", - "@budibase/frontend-core": "^2.4.15", - "@budibase/string-templates": "^2.4.15", + "@budibase/bbui": "^2.4.16", + "@budibase/frontend-core": "^2.4.16", + "@budibase/string-templates": "^2.4.16", "@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 e244fe6328..7e810b3c6d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.15", + "version": "2.4.16", "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.15", + "@budibase/bbui": "^2.4.16", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 438ffe1f99..adaa63201c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.15", + "version": "2.4.16", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c196445f5d..1d8754f56f 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.15", + "version": "2.4.16", "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.15", - "@budibase/client": "^2.4.15", + "@budibase/backend-core": "^2.4.16", + "@budibase/client": "^2.4.16", "@budibase/pro": "2.4.15", - "@budibase/string-templates": "^2.4.15", - "@budibase/types": "^2.4.15", + "@budibase/string-templates": "^2.4.16", + "@budibase/types": "^2.4.16", "@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 bf01cd41e6..6507ac6c7e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.15", + "version": "2.4.16", "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 f29fabf308..2a7d8ef782 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.15", + "version": "2.4.16", "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 eea21ecf1c..dd3cf8fb1e 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.15", + "version": "2.4.16", "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.15", + "@budibase/backend-core": "^2.4.16", "@budibase/pro": "2.4.15", - "@budibase/string-templates": "^2.4.15", - "@budibase/types": "^2.4.15", + "@budibase/string-templates": "^2.4.16", + "@budibase/types": "^2.4.16", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 90c20206b3826b108985d38cd43b6a0184a721ff Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 12:30:27 +0000 Subject: [PATCH 29/54] Update pro version to 2.4.16 --- 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 1d8754f56f..68bb6c11ef 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.16", "@budibase/client": "^2.4.16", - "@budibase/pro": "2.4.15", + "@budibase/pro": "2.4.16", "@budibase/string-templates": "^2.4.16", "@budibase/types": "^2.4.16", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 21894c4601..86a141e296 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.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.15.tgz#54d2fd229399ba65cd7b6e06d0fcef8f22e6d7be" - integrity sha512-XDQRDsQ41YjFBWz+r1MAZMYTIB4r0owh++mgW6OFyukDgH4DkK2fdAFMOtoZQXuC19xJpg/xaCbuNp+ckdcelw== +"@budibase/backend-core@2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" + integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.15" + "@budibase/types" "^2.4.16" "@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.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.15.tgz#2605cb069c25ec35fd17eebe9ed4159e8c0ac08f" - integrity sha512-vp2vikl3f0FkWC2TzQnpq0NDbpSoeTWg5UJq0NV9E28prsXK17Uayrlzw/b/p9IkJaLiL4dihcQqzOnj/sasfA== +"@budibase/pro@2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" + integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== dependencies: - "@budibase/backend-core" "2.4.15" + "@budibase/backend-core" "2.4.16" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.15" + "@budibase/types" "2.4.16" "@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.15", "@budibase/types@^2.4.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.15.tgz#6cac50b868a0b03e7b38e7ca3d06d747b62f194a" - integrity sha512-ZFFn7gMvPJaC+IMhYzyAT4d6iHsrxgvzKZIliOHGhOMgpirDjxAbADPhSPm8SNXZKUu6v3mdGkF3wtpdDo7fYA== +"@budibase/types@2.4.16", "@budibase/types@^2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" + integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index dd3cf8fb1e..8302234267 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.16", - "@budibase/pro": "2.4.15", + "@budibase/pro": "2.4.16", "@budibase/string-templates": "^2.4.16", "@budibase/types": "^2.4.16", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4023b94985..2a7365dd52 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.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.15.tgz#54d2fd229399ba65cd7b6e06d0fcef8f22e6d7be" - integrity sha512-XDQRDsQ41YjFBWz+r1MAZMYTIB4r0owh++mgW6OFyukDgH4DkK2fdAFMOtoZQXuC19xJpg/xaCbuNp+ckdcelw== +"@budibase/backend-core@2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" + integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.15" + "@budibase/types" "^2.4.16" "@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.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.15.tgz#2605cb069c25ec35fd17eebe9ed4159e8c0ac08f" - integrity sha512-vp2vikl3f0FkWC2TzQnpq0NDbpSoeTWg5UJq0NV9E28prsXK17Uayrlzw/b/p9IkJaLiL4dihcQqzOnj/sasfA== +"@budibase/pro@2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" + integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== dependencies: - "@budibase/backend-core" "2.4.15" + "@budibase/backend-core" "2.4.16" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.15" + "@budibase/types" "2.4.16" "@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.15", "@budibase/types@^2.4.15": - version "2.4.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.15.tgz#6cac50b868a0b03e7b38e7ca3d06d747b62f194a" - integrity sha512-ZFFn7gMvPJaC+IMhYzyAT4d6iHsrxgvzKZIliOHGhOMgpirDjxAbADPhSPm8SNXZKUu6v3mdGkF3wtpdDo7fYA== +"@budibase/types@2.4.16", "@budibase/types@^2.4.16": + version "2.4.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" + integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 51c63d72589b44bc4d27b2e120e71242cdf8f191 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 10 Mar 2023 15:19:46 +0000 Subject: [PATCH 30/54] Disable google auth if no config found (#9983) * Fix for #9937 - Google config was pre-activated always, even if no google config had been created. * Fixing test case. --- packages/worker/src/api/controllers/global/configs.ts | 2 +- packages/worker/src/api/routes/global/tests/configs.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 02459855c2..4f4575074b 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -287,7 +287,7 @@ export async function publicSettings( // google const googleConfig = await configs.getGoogleConfig() - const preActivated = googleConfig?.activated == null + const preActivated = googleConfig && googleConfig.activated == null const google = preActivated || !!googleConfig?.activated const _googleCallbackUrl = await googleCallbackUrl(googleConfig) diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts index 892fe8a67b..1abe575b02 100644 --- a/packages/worker/src/api/routes/global/tests/configs.spec.ts +++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts @@ -288,7 +288,7 @@ describe("configs", () => { company: "Budibase", logoUrl: "", analyticsEnabled: false, - google: true, + google: false, googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`, isSSOEnforced: false, oidc: false, From d799db5a0f54ee5c709640df5e330f9206cc3a09 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 15:28:16 +0000 Subject: [PATCH 31/54] v2.4.17 --- 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 fc77f5f676..9dcbea2a82 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.16", + "version": "2.4.17", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0fff5baf55..4943da163f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.16", + "version": "2.4.17", "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.16", + "@budibase/types": "^2.4.17", "@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 663f583110..c25c82fce2 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.16", + "version": "2.4.17", "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.16", + "@budibase/string-templates": "^2.4.17", "@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 6f96448c6b..b8c56b8619 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.16", + "version": "2.4.17", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.16", - "@budibase/client": "^2.4.16", - "@budibase/frontend-core": "^2.4.16", - "@budibase/string-templates": "^2.4.16", + "@budibase/bbui": "^2.4.17", + "@budibase/client": "^2.4.17", + "@budibase/frontend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", "@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 e0cab09d83..fb58d7c80b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.16", + "version": "2.4.17", "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.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/backend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "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 334e837ef7..cff9fec5d8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.16", + "version": "2.4.17", "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.16", - "@budibase/frontend-core": "^2.4.16", - "@budibase/string-templates": "^2.4.16", + "@budibase/bbui": "^2.4.17", + "@budibase/frontend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", "@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 7e810b3c6d..4aa44b38e9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.16", + "version": "2.4.17", "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.16", + "@budibase/bbui": "^2.4.17", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index adaa63201c..f8ea22e71c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 68bb6c11ef..36ab2163ee 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.16", + "version": "2.4.17", "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.16", - "@budibase/client": "^2.4.16", + "@budibase/backend-core": "^2.4.17", + "@budibase/client": "^2.4.17", "@budibase/pro": "2.4.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "@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 6507ac6c7e..f91f498f7c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.16", + "version": "2.4.17", "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 2a7d8ef782..d1c1208234 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.16", + "version": "2.4.17", "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 8302234267..df17ce1f16 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.16", + "version": "2.4.17", "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.16", + "@budibase/backend-core": "^2.4.17", "@budibase/pro": "2.4.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6f4d8dfab8191f6797f35c5d392716dc2151bad9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 15:31:01 +0000 Subject: [PATCH 32/54] Update pro version to 2.4.17 --- 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 36ab2163ee..af22352b94 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.17", "@budibase/client": "^2.4.17", - "@budibase/pro": "2.4.16", + "@budibase/pro": "2.4.17", "@budibase/string-templates": "^2.4.17", "@budibase/types": "^2.4.17", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 86a141e296..bce54edcb4 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.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" - integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== +"@budibase/backend-core@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" + integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.16" + "@budibase/types" "^2.4.17" "@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.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" - integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== +"@budibase/pro@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" + integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== dependencies: - "@budibase/backend-core" "2.4.16" + "@budibase/backend-core" "2.4.17" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.16" + "@budibase/types" "2.4.17" "@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.16", "@budibase/types@^2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" - integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== +"@budibase/types@2.4.17", "@budibase/types@^2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" + integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index df17ce1f16..8ca304b922 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.17", - "@budibase/pro": "2.4.16", + "@budibase/pro": "2.4.17", "@budibase/string-templates": "^2.4.17", "@budibase/types": "^2.4.17", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2a7365dd52..35e7ab001b 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.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" - integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== +"@budibase/backend-core@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" + integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.16" + "@budibase/types" "^2.4.17" "@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.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" - integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== +"@budibase/pro@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" + integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== dependencies: - "@budibase/backend-core" "2.4.16" + "@budibase/backend-core" "2.4.17" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.16" + "@budibase/types" "2.4.17" "@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.16", "@budibase/types@^2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" - integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== +"@budibase/types@2.4.17", "@budibase/types@^2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" + integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From ad4fa5354f872f29cb35d4aeb05bae0fa12ee321 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 16:23:32 +0000 Subject: [PATCH 33/54] v2.4.18 --- 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 | 6 +++--- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lerna.json b/lerna.json index 9dcbea2a82..1f4b691e2f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.17", + "version": "2.4.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4943da163f..29a21087b3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.17", + "version": "2.4.18", "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.17", + "@budibase/types": "^2.4.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 44053c8ad0..887950dbdf 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.17", + "version": "2.4.18", "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.4.17", - "@budibase/string-templates": "2.4.17", + "@budibase/shared-core": "^2.4.18", + "@budibase/string-templates": "^2.4.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 a0dd02097d..4df2d7b7bb 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.17", + "version": "2.4.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.17", - "@budibase/client": "2.4.17", - "@budibase/frontend-core": "2.4.17", - "@budibase/shared-core": "2.4.17", - "@budibase/string-templates": "2.4.17", + "@budibase/bbui": "^2.4.18", + "@budibase/client": "^2.4.18", + "@budibase/frontend-core": "^2.4.18", + "@budibase/shared-core": "^2.4.18", + "@budibase/string-templates": "^2.4.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 fb58d7c80b..baa617ba75 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.17", + "version": "2.4.18", "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.17", - "@budibase/string-templates": "^2.4.17", - "@budibase/types": "^2.4.17", + "@budibase/backend-core": "^2.4.18", + "@budibase/string-templates": "^2.4.18", + "@budibase/types": "^2.4.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 e9b0509379..cb0600d117 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.17", + "version": "2.4.18", "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.4.17", - "@budibase/frontend-core": "2.4.17", - "@budibase/shared-core": "2.4.17", - "@budibase/string-templates": "2.4.17", - "@budibase/types": "2.4.17", + "@budibase/bbui": "^2.4.18", + "@budibase/frontend-core": "^2.4.18", + "@budibase/shared-core": "^2.4.18", + "@budibase/string-templates": "^2.4.18", + "@budibase/types": "^2.4.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 81e82f2337..ec52bac999 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.17", + "version": "2.4.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.4.17", - "@budibase/shared-core": "2.4.17", + "@budibase/bbui": "^2.4.18", + "@budibase/shared-core": "^2.4.18", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index f8ea22e71c..a421ea0bad 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.17", + "version": "2.4.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 361e022a93..e54e1471bb 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.17", + "version": "2.4.18", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.17", - "@budibase/client": "2.4.17", + "@budibase/backend-core": "^2.4.18", + "@budibase/client": "^2.4.18", "@budibase/pro": "2.4.17", - "@budibase/shared-core": "2.4.17", - "@budibase/string-templates": "2.4.17", - "@budibase/types": "2.4.17", + "@budibase/shared-core": "^2.4.18", + "@budibase/string-templates": "^2.4.18", + "@budibase/types": "^2.4.18", "@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 b4aa22468a..d2fffa10d2 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.17", + "version": "2.4.18", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -24,7 +24,7 @@ }, "devDependencies": { "concurrently": "^7.6.0", - "typescript": "4.7.3", - "rimraf": "3.0.2" + "rimraf": "3.0.2", + "typescript": "4.7.3" } } diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f91f498f7c..d557e000c0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.17", + "version": "2.4.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 a00a8e4f5b..a21bb78490 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.17", + "version": "2.4.18", "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 8ca304b922..6f075ca1c8 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.17", + "version": "2.4.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.4.17", + "@budibase/backend-core": "^2.4.18", "@budibase/pro": "2.4.17", - "@budibase/string-templates": "^2.4.17", - "@budibase/types": "^2.4.17", + "@budibase/string-templates": "^2.4.18", + "@budibase/types": "^2.4.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a53e131441217601af0081ce228a5bc24d5a9736 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 16:26:29 +0000 Subject: [PATCH 34/54] Update pro version to 2.4.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 e54e1471bb..a22dff29f0 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.18", "@budibase/client": "^2.4.18", - "@budibase/pro": "2.4.17", + "@budibase/pro": "2.4.18", "@budibase/shared-core": "^2.4.18", "@budibase/string-templates": "^2.4.18", "@budibase/types": "^2.4.18", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index bce54edcb4..88555d7f25 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.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" - integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== +"@budibase/backend-core@2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.18.tgz#3781346b68d90cfb643b755a359886ed0a4aeaab" + integrity sha512-cvY4XgSWS3q5WMN9BPEGDa1B6T0TMTUUw0hSn737fXks3EGD4RFk64KidhJHUEpBn5TvMQ006GCU9I+xsLLZyw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.17" + "@budibase/types" "^2.4.18" "@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.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" - integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== +"@budibase/pro@2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.18.tgz#03ad34e85c5d92aeaa8f91f3341c0e4ea1556823" + integrity sha512-XJYj9Qry+xno2w7d1kPikwt95beaJSon6OXAO7irtIhxd/jersTZKabVl4Bupct7V0NRHHFitQCrm8t1q8AVvw== dependencies: - "@budibase/backend-core" "2.4.17" + "@budibase/backend-core" "2.4.18" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.17" + "@budibase/types" "2.4.18" "@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.17", "@budibase/types@^2.4.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" - integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== +"@budibase/types@2.4.18", "@budibase/types@^2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.18.tgz#dd8c2ab00d337352819327433dbd1f8dfff90b24" + integrity sha512-mzqrmOWpboStKQue4GKZPd4QSV6QILaDhrV4qhuHaiNRdVWk7HX1/klIMssj9RIQaxbjME8Yr4hrRypC9fNmWw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6f075ca1c8..a05beca8d4 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.18", - "@budibase/pro": "2.4.17", + "@budibase/pro": "2.4.18", "@budibase/string-templates": "^2.4.18", "@budibase/types": "^2.4.18", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 35e7ab001b..60b0cbc274 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.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" - integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== +"@budibase/backend-core@2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.18.tgz#3781346b68d90cfb643b755a359886ed0a4aeaab" + integrity sha512-cvY4XgSWS3q5WMN9BPEGDa1B6T0TMTUUw0hSn737fXks3EGD4RFk64KidhJHUEpBn5TvMQ006GCU9I+xsLLZyw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.17" + "@budibase/types" "^2.4.18" "@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.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" - integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== +"@budibase/pro@2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.18.tgz#03ad34e85c5d92aeaa8f91f3341c0e4ea1556823" + integrity sha512-XJYj9Qry+xno2w7d1kPikwt95beaJSon6OXAO7irtIhxd/jersTZKabVl4Bupct7V0NRHHFitQCrm8t1q8AVvw== dependencies: - "@budibase/backend-core" "2.4.17" + "@budibase/backend-core" "2.4.18" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.17" + "@budibase/types" "2.4.18" "@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.17", "@budibase/types@^2.4.17": - version "2.4.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" - integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== +"@budibase/types@2.4.18", "@budibase/types@^2.4.18": + version "2.4.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.18.tgz#dd8c2ab00d337352819327433dbd1f8dfff90b24" + integrity sha512-mzqrmOWpboStKQue4GKZPd4QSV6QILaDhrV4qhuHaiNRdVWk7HX1/klIMssj9RIQaxbjME8Yr4hrRypC9fNmWw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From be3156635bd06b12b44ea8fa9a30f410489f0b3f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 16:47:16 +0000 Subject: [PATCH 35/54] v2.4.19 --- 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 | 2 +- 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 1f4b691e2f..bd7e8f16bf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.18", + "version": "2.4.19", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 29a21087b3..208b7a6c15 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.18", + "version": "2.4.19", "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.18", + "@budibase/types": "^2.4.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 887950dbdf..d94fb88a90 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.18", + "version": "2.4.19", "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.4.18", - "@budibase/string-templates": "^2.4.18", + "@budibase/shared-core": "^2.4.19", + "@budibase/string-templates": "^2.4.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 4df2d7b7bb..7bd226c645 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.18", + "version": "2.4.19", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.18", - "@budibase/client": "^2.4.18", - "@budibase/frontend-core": "^2.4.18", - "@budibase/shared-core": "^2.4.18", - "@budibase/string-templates": "^2.4.18", + "@budibase/bbui": "^2.4.19", + "@budibase/client": "^2.4.19", + "@budibase/frontend-core": "^2.4.19", + "@budibase/shared-core": "^2.4.19", + "@budibase/string-templates": "^2.4.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 baa617ba75..4252fb1fc9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.18", + "version": "2.4.19", "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.18", - "@budibase/string-templates": "^2.4.18", - "@budibase/types": "^2.4.18", + "@budibase/backend-core": "^2.4.19", + "@budibase/string-templates": "^2.4.19", + "@budibase/types": "^2.4.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 cb0600d117..098cddee20 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.18", + "version": "2.4.19", "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.4.18", - "@budibase/frontend-core": "^2.4.18", - "@budibase/shared-core": "^2.4.18", - "@budibase/string-templates": "^2.4.18", - "@budibase/types": "^2.4.18", + "@budibase/bbui": "^2.4.19", + "@budibase/frontend-core": "^2.4.19", + "@budibase/shared-core": "^2.4.19", + "@budibase/string-templates": "^2.4.19", + "@budibase/types": "^2.4.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 ec52bac999..e85c5e4cc2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.18", + "version": "2.4.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.4.18", - "@budibase/shared-core": "^2.4.18", + "@budibase/bbui": "^2.4.19", + "@budibase/shared-core": "^2.4.19", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a421ea0bad..48e2221dcc 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.18", + "version": "2.4.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 a22dff29f0..686cc13876 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.18", + "version": "2.4.19", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.18", - "@budibase/client": "^2.4.18", + "@budibase/backend-core": "^2.4.19", + "@budibase/client": "^2.4.19", "@budibase/pro": "2.4.18", - "@budibase/shared-core": "^2.4.18", - "@budibase/string-templates": "^2.4.18", - "@budibase/types": "^2.4.18", + "@budibase/shared-core": "^2.4.19", + "@budibase/string-templates": "^2.4.19", + "@budibase/types": "^2.4.19", "@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 d2fffa10d2..945688960e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.18", + "version": "2.4.19", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d557e000c0..fc7ed5bf7b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.18", + "version": "2.4.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 a21bb78490..280e4df11b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.18", + "version": "2.4.19", "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 a05beca8d4..9511387ec1 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.18", + "version": "2.4.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.4.18", + "@budibase/backend-core": "^2.4.19", "@budibase/pro": "2.4.18", - "@budibase/string-templates": "^2.4.18", - "@budibase/types": "^2.4.18", + "@budibase/string-templates": "^2.4.19", + "@budibase/types": "^2.4.19", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ca33fe7439f34d44b9fcd6c21d23bef164483fc6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 16:50:13 +0000 Subject: [PATCH 36/54] Update pro version to 2.4.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 686cc13876..3e7cb2e2f4 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.19", "@budibase/client": "^2.4.19", - "@budibase/pro": "2.4.18", + "@budibase/pro": "2.4.19", "@budibase/shared-core": "^2.4.19", "@budibase/string-templates": "^2.4.19", "@budibase/types": "^2.4.19", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 88555d7f25..5f30327ea7 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.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.18.tgz#3781346b68d90cfb643b755a359886ed0a4aeaab" - integrity sha512-cvY4XgSWS3q5WMN9BPEGDa1B6T0TMTUUw0hSn737fXks3EGD4RFk64KidhJHUEpBn5TvMQ006GCU9I+xsLLZyw== +"@budibase/backend-core@2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.19.tgz#f57863ffeb0e27b978eb26de8704973b2a4f3835" + integrity sha512-q1/nhG/PI4IA+mf/7mSY+zUZLva3Bhat0iR+t8YIoio7Vq6OUNh9JdA3fz4H4hRINw3uepzS4g+vUP3xE82Wig== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.18" + "@budibase/types" "^2.4.19" "@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.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.18.tgz#03ad34e85c5d92aeaa8f91f3341c0e4ea1556823" - integrity sha512-XJYj9Qry+xno2w7d1kPikwt95beaJSon6OXAO7irtIhxd/jersTZKabVl4Bupct7V0NRHHFitQCrm8t1q8AVvw== +"@budibase/pro@2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.19.tgz#e7cdf9fae66be5687c7fd3618e879b5a3aa903d8" + integrity sha512-W/et5C2K1SSMBDHi1ePu621ZOsk0hjgPxxqnr7lvbYUrqJlsOqaqTnZ06+4Ak5HTe5YNjsz/v06DCqO7HsYZiQ== dependencies: - "@budibase/backend-core" "2.4.18" + "@budibase/backend-core" "2.4.19" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.18" + "@budibase/types" "2.4.19" "@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.18", "@budibase/types@^2.4.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.18.tgz#dd8c2ab00d337352819327433dbd1f8dfff90b24" - integrity sha512-mzqrmOWpboStKQue4GKZPd4QSV6QILaDhrV4qhuHaiNRdVWk7HX1/klIMssj9RIQaxbjME8Yr4hrRypC9fNmWw== +"@budibase/types@2.4.19", "@budibase/types@^2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.19.tgz#4be639332ee8e3e9a37a313412cea11660a0319e" + integrity sha512-50bK/2Mw6hqOunXRDzJ1JzWXmbL1jOlUOTrhYuGMkojxyOUr4+S1wRFl+wV4WWWv8eD8FrT2ad+8d0wJgD1zTw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9511387ec1..894d5206dc 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.19", - "@budibase/pro": "2.4.18", + "@budibase/pro": "2.4.19", "@budibase/string-templates": "^2.4.19", "@budibase/types": "^2.4.19", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 60b0cbc274..b4dcaae801 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.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.18.tgz#3781346b68d90cfb643b755a359886ed0a4aeaab" - integrity sha512-cvY4XgSWS3q5WMN9BPEGDa1B6T0TMTUUw0hSn737fXks3EGD4RFk64KidhJHUEpBn5TvMQ006GCU9I+xsLLZyw== +"@budibase/backend-core@2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.19.tgz#f57863ffeb0e27b978eb26de8704973b2a4f3835" + integrity sha512-q1/nhG/PI4IA+mf/7mSY+zUZLva3Bhat0iR+t8YIoio7Vq6OUNh9JdA3fz4H4hRINw3uepzS4g+vUP3xE82Wig== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.18" + "@budibase/types" "^2.4.19" "@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.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.18.tgz#03ad34e85c5d92aeaa8f91f3341c0e4ea1556823" - integrity sha512-XJYj9Qry+xno2w7d1kPikwt95beaJSon6OXAO7irtIhxd/jersTZKabVl4Bupct7V0NRHHFitQCrm8t1q8AVvw== +"@budibase/pro@2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.19.tgz#e7cdf9fae66be5687c7fd3618e879b5a3aa903d8" + integrity sha512-W/et5C2K1SSMBDHi1ePu621ZOsk0hjgPxxqnr7lvbYUrqJlsOqaqTnZ06+4Ak5HTe5YNjsz/v06DCqO7HsYZiQ== dependencies: - "@budibase/backend-core" "2.4.18" + "@budibase/backend-core" "2.4.19" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.18" + "@budibase/types" "2.4.19" "@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.18", "@budibase/types@^2.4.18": - version "2.4.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.18.tgz#dd8c2ab00d337352819327433dbd1f8dfff90b24" - integrity sha512-mzqrmOWpboStKQue4GKZPd4QSV6QILaDhrV4qhuHaiNRdVWk7HX1/klIMssj9RIQaxbjME8Yr4hrRypC9fNmWw== +"@budibase/types@2.4.19", "@budibase/types@^2.4.19": + version "2.4.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.19.tgz#4be639332ee8e3e9a37a313412cea11660a0319e" + integrity sha512-50bK/2Mw6hqOunXRDzJ1JzWXmbL1jOlUOTrhYuGMkojxyOUr4+S1wRFl+wV4WWWv8eD8FrT2ad+8d0wJgD1zTw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 956d8f1ae341448bcb3bce9e07de11fc06ae0ca2 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 13 Mar 2023 11:44:15 +0000 Subject: [PATCH 37/54] Background image component can have children (#9981) --- packages/client/manifest.json | 334 ++++-------------- .../src/components/app/BackgroundImage.svelte | 4 +- 2 files changed, 73 insertions(+), 265 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index e24fa3a68a..2579cdedaa 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -17,10 +17,7 @@ "description": "This component is specific only to layouts", "icon": "Sandbox", "hasChildren": true, - "styles": [ - "padding", - "background" - ], + "styles": ["padding", "background"], "settings": [ { "type": "text", @@ -36,23 +33,14 @@ "type": "select", "label": "Navigation", "key": "navigation", - "options": [ - "Top", - "Left", - "None" - ], + "options": ["Top", "Left", "None"], "defaultValue": "Top" }, { "type": "select", "label": "Width", "key": "width", - "options": [ - "Small", - "Medium", - "Large", - "Max" - ], + "options": ["Small", "Medium", "Large", "Max"], "defaultValue": "Large" }, { @@ -89,13 +77,7 @@ "width": 400, "height": 200 }, - "styles": [ - "padding", - "size", - "background", - "border", - "shadow" - ], + "styles": ["padding", "size", "background", "border", "shadow"], "settings": [ { "type": "select", @@ -255,9 +237,7 @@ "description": "Add a section to your application", "icon": "ColumnTwoB", "hasChildren": true, - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "showEmptyState": false, "size": { "width": 400, @@ -376,9 +356,7 @@ "name": "Divider", "description": "A basic divider", "icon": "Separator", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "size": { "width": 400, "height": 10 @@ -415,9 +393,7 @@ "name": "Repeater", "description": "A configurable data list that attaches to your backend tables.", "icon": "JourneyData", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "hasChildren": true, "size": { "width": 400, @@ -574,9 +550,7 @@ "name": "Stacked List", "icon": "TaskList", "description": "A basic card component that can contain content and actions.", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "settings": [ { "type": "text", @@ -606,9 +580,7 @@ "name": "Vertical Card", "description": "A basic card component that can contain content and actions.", "icon": "ViewColumn", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "settings": [ { "type": "text", @@ -652,24 +624,14 @@ "type": "select", "label": "Image Height", "key": "imageHeight", - "options": [ - "auto", - "12rem", - "16rem", - "20rem", - "24rem" - ], + "options": ["auto", "12rem", "16rem", "20rem", "24rem"], "defaultValue": "auto" }, { "type": "select", "label": "Card Width", "key": "cardWidth", - "options": [ - "16rem", - "20rem", - "24rem" - ], + "options": ["16rem", "20rem", "24rem"], "defaultValue": "20rem" } ] @@ -678,9 +640,7 @@ "name": "Paragraph", "description": "A component for displaying paragraph text.", "icon": "TextParagraph", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "editable": true, "size": { "width": 400, @@ -803,9 +763,7 @@ "name": "Headline", "icon": "TextBold", "description": "A component for displaying heading text", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "editable": true, "size": { "width": 400, @@ -982,9 +940,7 @@ "name": "Image", "description": "A basic component for displaying images", "icon": "Image", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 400, "height": 300 @@ -1002,9 +958,8 @@ "name": "Background Image", "description": "A background image", "icon": "Images", - "styles": [ - "size" - ], + "hasChildren": true, + "styles": ["size"], "size": { "width": 400, "height": 300 @@ -1162,9 +1117,7 @@ "name": "Nav Bar", "description": "A component for handling the navigation within your app.", "icon": "BreadcrumbNavigation", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "hasChildren": true, "settings": [ { @@ -1365,25 +1318,14 @@ "type": "select", "label": "Image Width", "key": "imageWidth", - "options": [ - "auto", - "8rem", - "12rem", - "16rem" - ], + "options": ["auto", "8rem", "12rem", "16rem"], "defaultValue": "8rem" }, { "type": "select", "label": "Image Height", "key": "imageHeight", - "options": [ - "auto", - "8rem", - "12rem", - "16rem", - "auto" - ], + "options": ["auto", "8rem", "12rem", "16rem", "auto"], "defaultValue": "auto" } ] @@ -1424,9 +1366,7 @@ "name": "Embed", "icon": "Code", "description": "Embed content from 3rd party sources", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 400, "height": 100 @@ -1478,11 +1418,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -1640,11 +1576,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -1736,11 +1668,7 @@ "type": "select", "label": "Curve", "key": "curve", - "options": [ - "Smooth", - "Straight", - "Stepline" - ], + "options": ["Smooth", "Straight", "Stepline"], "defaultValue": "Smooth" }, { @@ -1801,11 +1729,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -1897,11 +1821,7 @@ "type": "select", "label": "Curve", "key": "curve", - "options": [ - "Smooth", - "Straight", - "Stepline" - ], + "options": ["Smooth", "Straight", "Stepline"], "defaultValue": "Smooth" }, { @@ -2253,11 +2173,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -2293,19 +2209,14 @@ "name": "Form", "icon": "Form", "hasChildren": true, - "illegalChildren": [ - "section", - "form" - ], + "illegalChildren": ["section", "form"], "actions": [ "ValidateForm", "ClearForm", "ChangeFormStep", "UpdateFieldValue" ], - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 400, "height": 400 @@ -2315,10 +2226,7 @@ "type": "select", "label": "Type", "key": "actionType", - "options": [ - "Create", - "Update" - ], + "options": ["Create", "Update"], "defaultValue": "Create" }, { @@ -2388,14 +2296,8 @@ "name": "Form Step", "icon": "AssetsAdded", "hasChildren": true, - "illegalChildren": [ - "section", - "form", - "form step" - ], - "styles": [ - "size" - ], + "illegalChildren": ["section", "form", "form step"], + "styles": ["size"], "size": { "width": 400, "height": 400 @@ -2413,12 +2315,8 @@ "fieldgroup": { "name": "Field Group", "icon": "Group", - "illegalChildren": [ - "section" - ], - "styles": [ - "size" - ], + "illegalChildren": ["section"], + "styles": ["size"], "hasChildren": true, "size": { "width": 400, @@ -2451,9 +2349,7 @@ "skeleton": false, "name": "Text Field", "icon": "Text", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -2543,9 +2439,7 @@ "skeleton": false, "name": "Number Field", "icon": "123", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -2601,9 +2495,7 @@ "skeleton": false, "name": "Password Field", "icon": "LockClosed", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -2659,9 +2551,7 @@ "skeleton": false, "name": "Options Picker", "icon": "Menu", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -2828,9 +2718,7 @@ "skeleton": false, "name": "Multi-select Picker", "icon": "ViewList", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3070,9 +2958,7 @@ "skeleton": false, "name": "Long Form Field", "icon": "TextAlignLeft", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3150,9 +3036,7 @@ "skeleton": false, "name": "Date Picker", "icon": "Date", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3232,9 +3116,7 @@ "skeleton": false, "name": "Barcode/QR Scanner", "icon": "Camera", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 400, "height": 50 @@ -3283,9 +3165,7 @@ "embeddedmap": { "name": "Embedded Map", "icon": "Location", - "styles": [ - "size" - ], + "styles": ["size"], "draggable": false, "size": { "width": 400, @@ -3398,9 +3278,7 @@ "skeleton": false, "name": "Attachment", "icon": "Attach", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3463,9 +3341,7 @@ "skeleton": false, "name": "Relationship Picker", "icon": "TaskList", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3527,9 +3403,7 @@ "skeleton": false, "name": "JSON Field", "icon": "Brackets", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3579,9 +3453,7 @@ "s3upload": { "name": "S3 File Upload", "icon": "UploadToCloud", - "styles": [ - "size" - ], + "styles": ["size"], "editable": true, "size": { "width": 400, @@ -3642,13 +3514,9 @@ "dataprovider": { "name": "Data Provider", "icon": "Data", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "hasChildren": true, - "actions": [ - "RefreshDatasource" - ], + "actions": ["RefreshDatasource"], "size": { "width": 400, "height": 100 @@ -3674,10 +3542,7 @@ "type": "select", "label": "Sort Order", "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], + "options": ["Ascending", "Descending"], "defaultValue": "Ascending" }, { @@ -3729,9 +3594,7 @@ "skeleton": false, "name": "Table", "icon": "Table", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "hasChildren": true, "showEmptyState": false, "size": { @@ -3815,9 +3678,7 @@ "daterangepicker": { "name": "Date Range", "icon": "Calendar", - "styles": [ - "size" - ], + "styles": ["size"], "hasChildren": false, "size": { "width": 200, @@ -3856,9 +3717,7 @@ "spectrumcard": { "name": "Card", "icon": "PersonalizationField", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 300, "height": 120 @@ -4031,10 +3890,7 @@ "type": "select", "label": "Sort Order", "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], + "options": ["Ascending", "Descending"], "defaultValue": "Ascending" }, { @@ -4213,11 +4069,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -4271,11 +4123,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -4292,11 +4140,7 @@ "type": "select", "label": "Curve", "key": "curve", - "options": [ - "Smooth", - "Straight", - "Stepline" - ], + "options": ["Smooth", "Straight", "Stepline"], "defaultValue": "Smooth" } ] @@ -4328,11 +4172,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -4349,11 +4189,7 @@ "type": "select", "label": "Curve", "key": "curve", - "options": [ - "Smooth", - "Straight", - "Stepline" - ], + "options": ["Smooth", "Straight", "Stepline"], "defaultValue": "Smooth" }, { @@ -4418,11 +4254,7 @@ "type": "select", "label": "Format", "key": "yAxisUnits", - "options": [ - "Default", - "Thousands", - "Millions" - ], + "options": ["Default", "Thousands", "Millions"], "defaultValue": "Default" }, { @@ -4443,9 +4275,7 @@ "block": true, "name": "Table block", "icon": "Table", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 600, "height": 400 @@ -4483,10 +4313,7 @@ "type": "select", "label": "Sort Order", "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], + "options": ["Ascending", "Descending"], "defaultValue": "Ascending" }, { @@ -4638,9 +4465,7 @@ "block": true, "name": "Cards block", "icon": "PersonalizationField", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 600, "height": 400 @@ -4679,10 +4504,7 @@ "type": "select", "label": "Sort Order", "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], + "options": ["Ascending", "Descending"], "defaultValue": "Descending" }, { @@ -4816,9 +4638,7 @@ "block": true, "name": "Repeater block", "icon": "ViewList", - "illegalChildren": [ - "section" - ], + "illegalChildren": ["section"], "hasChildren": true, "size": { "width": 400, @@ -4846,10 +4666,7 @@ "type": "select", "label": "Sort Order", "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], + "options": ["Ascending", "Descending"], "defaultValue": "Descending" }, { @@ -5044,9 +4861,7 @@ "markdownviewer": { "name": "Markdown Viewer", "icon": "Preview", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 400, "height": 100 @@ -5063,9 +4878,7 @@ "formblock": { "name": "Form Block", "icon": "Form", - "styles": [ - "size" - ], + "styles": ["size"], "block": true, "info": "Form blocks are only compatible with internal or SQL tables", "size": { @@ -5077,11 +4890,7 @@ "type": "select", "label": "Type", "key": "actionType", - "options": [ - "Create", - "Update", - "View" - ], + "options": ["Create", "Update", "View"], "defaultValue": "Create" }, { @@ -5215,10 +5024,7 @@ "name": "Side Panel", "icon": "RailRight", "hasChildren": true, - "illegalChildren": [ - "section", - "sidepanel" - ], + "illegalChildren": ["section", "sidepanel"], "showEmptyState": false, "draggable": false, "info": "Side panels are hidden by default. They will only be revealed when triggered by the 'Open Side Panel' action." @@ -5307,4 +5113,4 @@ "suffix": "repeater" } } -} \ No newline at end of file +} diff --git a/packages/client/src/components/app/BackgroundImage.svelte b/packages/client/src/components/app/BackgroundImage.svelte index 909e0fd3fd..df6459c417 100644 --- a/packages/client/src/components/app/BackgroundImage.svelte +++ b/packages/client/src/components/app/BackgroundImage.svelte @@ -21,7 +21,9 @@ {#if url}
-
+
+ +
{:else if $builderStore.inBuilder}
Date: Mon, 13 Mar 2023 11:52:47 +0000 Subject: [PATCH 38/54] v2.4.20 --- 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 | 2 +- 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 bd7e8f16bf..45ebb41470 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.19", + "version": "2.4.20", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 208b7a6c15..be57c3bc94 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.19", + "version": "2.4.20", "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.19", + "@budibase/types": "^2.4.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 d94fb88a90..1145483efe 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.19", + "version": "2.4.20", "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.4.19", - "@budibase/string-templates": "^2.4.19", + "@budibase/shared-core": "^2.4.20", + "@budibase/string-templates": "^2.4.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 7bd226c645..9eed56143d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.19", + "version": "2.4.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.19", - "@budibase/client": "^2.4.19", - "@budibase/frontend-core": "^2.4.19", - "@budibase/shared-core": "^2.4.19", - "@budibase/string-templates": "^2.4.19", + "@budibase/bbui": "^2.4.20", + "@budibase/client": "^2.4.20", + "@budibase/frontend-core": "^2.4.20", + "@budibase/shared-core": "^2.4.20", + "@budibase/string-templates": "^2.4.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 4252fb1fc9..4b441da7e2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.19", + "version": "2.4.20", "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.19", - "@budibase/string-templates": "^2.4.19", - "@budibase/types": "^2.4.19", + "@budibase/backend-core": "^2.4.20", + "@budibase/string-templates": "^2.4.20", + "@budibase/types": "^2.4.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 098cddee20..fd38977e1d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.19", + "version": "2.4.20", "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.4.19", - "@budibase/frontend-core": "^2.4.19", - "@budibase/shared-core": "^2.4.19", - "@budibase/string-templates": "^2.4.19", - "@budibase/types": "^2.4.19", + "@budibase/bbui": "^2.4.20", + "@budibase/frontend-core": "^2.4.20", + "@budibase/shared-core": "^2.4.20", + "@budibase/string-templates": "^2.4.20", + "@budibase/types": "^2.4.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 e85c5e4cc2..32084d427a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.19", + "version": "2.4.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.4.19", - "@budibase/shared-core": "^2.4.19", + "@budibase/bbui": "^2.4.20", + "@budibase/shared-core": "^2.4.20", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 48e2221dcc..d5202fde64 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.19", + "version": "2.4.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 3e7cb2e2f4..a66f3084a0 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.19", + "version": "2.4.20", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.19", - "@budibase/client": "^2.4.19", + "@budibase/backend-core": "^2.4.20", + "@budibase/client": "^2.4.20", "@budibase/pro": "2.4.19", - "@budibase/shared-core": "^2.4.19", - "@budibase/string-templates": "^2.4.19", - "@budibase/types": "^2.4.19", + "@budibase/shared-core": "^2.4.20", + "@budibase/string-templates": "^2.4.20", + "@budibase/types": "^2.4.20", "@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 945688960e..d7c87f456f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.19", + "version": "2.4.20", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fc7ed5bf7b..595df8fbec 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.19", + "version": "2.4.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 280e4df11b..4074c8c34a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.19", + "version": "2.4.20", "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 894d5206dc..70ff18339f 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.19", + "version": "2.4.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.4.19", + "@budibase/backend-core": "^2.4.20", "@budibase/pro": "2.4.19", - "@budibase/string-templates": "^2.4.19", - "@budibase/types": "^2.4.19", + "@budibase/string-templates": "^2.4.20", + "@budibase/types": "^2.4.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e74f80742e0344f59e0a06ba6c6c7bee305d73df Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 11:55:39 +0000 Subject: [PATCH 39/54] Update pro version to 2.4.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 a66f3084a0..4c36e24f13 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.20", "@budibase/client": "^2.4.20", - "@budibase/pro": "2.4.19", + "@budibase/pro": "2.4.20", "@budibase/shared-core": "^2.4.20", "@budibase/string-templates": "^2.4.20", "@budibase/types": "^2.4.20", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5f30327ea7..06f4863a26 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.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.19.tgz#f57863ffeb0e27b978eb26de8704973b2a4f3835" - integrity sha512-q1/nhG/PI4IA+mf/7mSY+zUZLva3Bhat0iR+t8YIoio7Vq6OUNh9JdA3fz4H4hRINw3uepzS4g+vUP3xE82Wig== +"@budibase/backend-core@2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.20.tgz#cd48ad052458bc2e2a5a04a91538988a56c37bc3" + integrity sha512-5gxLmE1mmqgY70CA55FA7hBAyWp8tLr0gzWvkBCb7Eakbb8f1Z1gkEhG9c/XTA+6x73XuUp8RL+fWIazmpS6AQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.19" + "@budibase/types" "^2.4.20" "@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.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.19.tgz#e7cdf9fae66be5687c7fd3618e879b5a3aa903d8" - integrity sha512-W/et5C2K1SSMBDHi1ePu621ZOsk0hjgPxxqnr7lvbYUrqJlsOqaqTnZ06+4Ak5HTe5YNjsz/v06DCqO7HsYZiQ== +"@budibase/pro@2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.20.tgz#b4dc91c9c38471d9655173b52ac17308db74eb55" + integrity sha512-0NjnvXjSEDzYT6L76uhlmN3Ty1F3ajhnLGO0JI2UndkdiGgefYhHPZiKF5d0wUk9kwwxxw5fbV0moyG182xmYw== dependencies: - "@budibase/backend-core" "2.4.19" + "@budibase/backend-core" "2.4.20" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.19" + "@budibase/types" "2.4.20" "@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.19", "@budibase/types@^2.4.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.19.tgz#4be639332ee8e3e9a37a313412cea11660a0319e" - integrity sha512-50bK/2Mw6hqOunXRDzJ1JzWXmbL1jOlUOTrhYuGMkojxyOUr4+S1wRFl+wV4WWWv8eD8FrT2ad+8d0wJgD1zTw== +"@budibase/types@2.4.20", "@budibase/types@^2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.20.tgz#ff35fe91936a6254c7802c79b7e57d2cff98ca91" + integrity sha512-xUedzq4Hc1mQ9nhXZ7X+SU9oBHjiz5w9F6QitUmdIaVaad79tF88a9a/sLtkT/poXbdWcNBLnDg7ILwR/SMmtQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 70ff18339f..6b6ca42d97 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.20", - "@budibase/pro": "2.4.19", + "@budibase/pro": "2.4.20", "@budibase/string-templates": "^2.4.20", "@budibase/types": "^2.4.20", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b4dcaae801..0484d66cc0 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.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.19.tgz#f57863ffeb0e27b978eb26de8704973b2a4f3835" - integrity sha512-q1/nhG/PI4IA+mf/7mSY+zUZLva3Bhat0iR+t8YIoio7Vq6OUNh9JdA3fz4H4hRINw3uepzS4g+vUP3xE82Wig== +"@budibase/backend-core@2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.20.tgz#cd48ad052458bc2e2a5a04a91538988a56c37bc3" + integrity sha512-5gxLmE1mmqgY70CA55FA7hBAyWp8tLr0gzWvkBCb7Eakbb8f1Z1gkEhG9c/XTA+6x73XuUp8RL+fWIazmpS6AQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.19" + "@budibase/types" "^2.4.20" "@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.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.19.tgz#e7cdf9fae66be5687c7fd3618e879b5a3aa903d8" - integrity sha512-W/et5C2K1SSMBDHi1ePu621ZOsk0hjgPxxqnr7lvbYUrqJlsOqaqTnZ06+4Ak5HTe5YNjsz/v06DCqO7HsYZiQ== +"@budibase/pro@2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.20.tgz#b4dc91c9c38471d9655173b52ac17308db74eb55" + integrity sha512-0NjnvXjSEDzYT6L76uhlmN3Ty1F3ajhnLGO0JI2UndkdiGgefYhHPZiKF5d0wUk9kwwxxw5fbV0moyG182xmYw== dependencies: - "@budibase/backend-core" "2.4.19" + "@budibase/backend-core" "2.4.20" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.19" + "@budibase/types" "2.4.20" "@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.19", "@budibase/types@^2.4.19": - version "2.4.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.19.tgz#4be639332ee8e3e9a37a313412cea11660a0319e" - integrity sha512-50bK/2Mw6hqOunXRDzJ1JzWXmbL1jOlUOTrhYuGMkojxyOUr4+S1wRFl+wV4WWWv8eD8FrT2ad+8d0wJgD1zTw== +"@budibase/types@2.4.20", "@budibase/types@^2.4.20": + version "2.4.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.20.tgz#ff35fe91936a6254c7802c79b7e57d2cff98ca91" + integrity sha512-xUedzq4Hc1mQ9nhXZ7X+SU9oBHjiz5w9F6QitUmdIaVaad79tF88a9a/sLtkT/poXbdWcNBLnDg7ILwR/SMmtQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From e1169417509d4338581aff8ea644cd7cd22add6e Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 13 Mar 2023 15:02:59 +0000 Subject: [PATCH 40/54] Rotatable secrets (#9982) * Rotatable secrets * Set new api encryption key var * Lint * Use fallback keys instead of array * Point api encryption key to dedicated value * Add API_ENCRYPTION_KEY to cli * Lint + add api encryption key to env files --- .../templates/app-service-deployment.yaml | 15 ++++++++++ charts/budibase/templates/secrets.yaml | 6 ++++ .../templates/worker-service-deployment.yaml | 15 ++++++++++ charts/budibase/values.yaml | 4 +++ hosting/.env | 1 + hosting/docker-compose.yaml | 2 ++ hosting/hosting.properties | 1 + packages/backend-core/src/auth/auth.ts | 24 ---------------- packages/backend-core/src/environment.ts | 9 ++++++ .../src/middleware/authenticated.ts | 11 ++++++-- packages/backend-core/src/middleware/index.ts | 1 - .../src/middleware/internalApi.ts | 12 ++++++-- .../src/middleware/passport/jwt.ts | 19 ------------- .../backend-core/src/security/encryption.ts | 12 ++++---- packages/backend-core/src/utils/utils.ts | 28 +++++++++++++++++-- packages/cli/src/hosting/makeFiles.ts | 1 + packages/server/src/api/index.ts | 7 ----- packages/server/src/environment.ts | 2 -- .../src/tests/utilities/TestConfiguration.ts | 9 +++--- .../server/src/utilities/workerRequests.ts | 3 +- packages/worker/src/environment.ts | 2 -- .../worker/src/middleware/cloudRestricted.ts | 12 ++++++-- packages/worker/src/sdk/auth/auth.ts | 4 +-- .../worker/src/tests/TestConfiguration.ts | 7 ++--- packages/worker/src/utilities/appService.ts | 9 ++++-- 25 files changed, 132 insertions(+), 84 deletions(-) delete mode 100644 packages/backend-core/src/middleware/passport/jwt.ts diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 89e7db7796..4371d27283 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -62,16 +62,31 @@ spec: {{ end }} - name: ENABLE_ANALYTICS value: {{ .Values.globals.enableAnalytics | quote }} + - name: API_ENCRYPTION_KEY + valueFrom: + secretKeyRef: + name: budibase-budibase {{ template "budibase.fullname" . }} + key: apiEncryptionKey - name: INTERNAL_API_KEY valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: internalApiKey + - name: INTERNAL_API_KEY_FALLBACK + valueFrom: + secretKeyRef: + name: {{ template "budibase.fullname" . }} + key: internalApiKeyFallback - name: JWT_SECRET valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: jwtSecret + - name: JWT_SECRET_FALLBACK + valueFrom: + secretKeyRef: + name: {{ template "budibase.fullname" . }} + key: jwtSecretFallback {{ if .Values.services.objectStore.region }} - name: AWS_REGION value: {{ .Values.services.objectStore.region }} diff --git a/charts/budibase/templates/secrets.yaml b/charts/budibase/templates/secrets.yaml index 1c0a914ed3..3c3ca9bfa8 100644 --- a/charts/budibase/templates/secrets.yaml +++ b/charts/budibase/templates/secrets.yaml @@ -10,8 +10,14 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: + {{/* For new installations this can be any value. For existing installations this must match the first used jwtSecret */}} + apiEncryptionKey: {{ .Values.globals.apiEncryptionKey }} internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }} + {{/* Fallback value auto generated */}} + internalApiKeyFallback: {{ .Values.globals.internalApiKeyFallback }} jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }} + {{/* Falback value never auto generated */}} + jwtSecretFallback: {{ .Values.globals.jwtSecretFallback }} objectStoreAccess: {{ template "budibase.defaultsecret" .Values.services.objectStore.accessKey }} objectStoreSecret: {{ template "budibase.defaultsecret" .Values.services.objectStore.secretKey }} {{- end -}} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 0e053dfb5a..f41c7d548b 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -62,16 +62,31 @@ spec: {{ else }} value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }} {{ end }} + - name: API_ENCRYPTION_KEY + valueFrom: + secretKeyRef: + name: budibase-budibase {{ template "budibase.fullname" . }} + key: apiEncryptionKey - name: INTERNAL_API_KEY valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: internalApiKey + - name: INTERNAL_API_KEY_FALLBACK + valueFrom: + secretKeyRef: + name: {{ template "budibase.fullname" . }} + key: internalApiKeyFallback - name: JWT_SECRET valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: jwtSecret + - name: JWT_SECRET_FALLBACK + valueFrom: + secretKeyRef: + name: {{ template "budibase.fullname" . }} + key: jwtSecretFallback {{ if .Values.services.objectStore.region }} - name: AWS_REGION value: {{ .Values.services.objectStore.region }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 536af8560f..ed4ff014a9 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -96,9 +96,13 @@ globals: createSecrets: true # creates an internal API key, JWT secrets and redis password for you # if createSecrets is set to false, you can hard-code your secrets here + apiEncryptionKey: "" internalApiKey: "" jwtSecret: "" cdnUrl: "" + # fallback values used during live rotation + internalApiKeyFallback: "" + jwtSecretFallback: "" smtp: enabled: false diff --git a/hosting/.env b/hosting/.env index 07b506a6b2..c2b6d55eef 100644 --- a/hosting/.env +++ b/hosting/.env @@ -3,6 +3,7 @@ MAIN_PORT=10000 # This section contains all secrets pertaining to the system # These should be updated +API_ENCRYPTION_KEY=testsecret JWT_SECRET=testsecret MINIO_ACCESS_KEY=budibase MINIO_SECRET_KEY=budibase diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index d36937910f..bad34a20ea 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -17,6 +17,7 @@ services: INTERNAL_API_KEY: ${INTERNAL_API_KEY} BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT} PORT: 4002 + API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} JWT_SECRET: ${JWT_SECRET} LOG_LEVEL: info SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 @@ -40,6 +41,7 @@ services: SELF_HOSTED: 1 PORT: 4003 CLUSTER_PORT: ${MAIN_PORT} + API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} JWT_SECRET: ${JWT_SECRET} MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} diff --git a/hosting/hosting.properties b/hosting/hosting.properties index c5638a266f..6c1d9e5dbd 100644 --- a/hosting/hosting.properties +++ b/hosting/hosting.properties @@ -3,6 +3,7 @@ MAIN_PORT=10000 # This section contains all secrets pertaining to the system # These should be updated +API_ENCRYPTION_KEY=testsecret JWT_SECRET=testsecret MINIO_ACCESS_KEY=budibase MINIO_SECRET_KEY=budibase diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts index 7e6fe4bcee..26c7cd4e26 100644 --- a/packages/backend-core/src/auth/auth.ts +++ b/packages/backend-core/src/auth/auth.ts @@ -1,6 +1,5 @@ const _passport = require("koa-passport") const LocalStrategy = require("passport-local").Strategy -const JwtStrategy = require("passport-jwt").Strategy import { getGlobalDB } from "../context" import { Cookie } from "../constants" import { getSessionsForUser, invalidateSessions } from "../security/sessions" @@ -8,7 +7,6 @@ import { authenticated, csrf, google, - jwt as jwtPassport, local, oidc, tenancy, @@ -21,14 +19,11 @@ import { OIDCInnerConfig, PlatformLogoutOpts, SSOProviderType, - User, } from "@budibase/types" -import { logAlert } from "../logging" import * as events from "../events" import * as configs from "../configs" import { clearCookie, getCookie } from "../utils" import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso" -import env from "../environment" const refresh = require("passport-oauth2-refresh") export { @@ -51,25 +46,6 @@ export const jwt = require("jsonwebtoken") // Strategies _passport.use(new LocalStrategy(local.options, local.authenticate)) -if (jwtPassport.options.secretOrKey) { - _passport.use(new JwtStrategy(jwtPassport.options, jwtPassport.authenticate)) -} else if (!env.DISABLE_JWT_WARNING) { - logAlert("No JWT Secret supplied, cannot configure JWT strategy") -} - -_passport.serializeUser((user: User, done: any) => done(null, user)) - -_passport.deserializeUser(async (user: User, done: any) => { - const db = getGlobalDB() - - try { - const dbUser = await db.get(user._id) - return done(null, dbUser) - } catch (err) { - console.error(`User not found`, err) - return done(null, false, { message: "User not found" }) - } -}) async function refreshOIDCAccessToken( chosenConfig: OIDCInnerConfig, diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 8dc2cce487..f1c96c7fec 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -30,6 +30,12 @@ const DefaultBucketName = { const selfHosted = !!parseInt(process.env.SELF_HOSTED || "") +function getAPIEncryptionKey() { + return process.env.API_ENCRYPTION_KEY + ? process.env.API_ENCRYPTION_KEY + : process.env.JWT_SECRET // fallback to the JWT_SECRET used historically +} + const environment = { isTest, isJest, @@ -39,7 +45,9 @@ const environment = { }, JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET, + JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, + API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD, @@ -55,6 +63,7 @@ const environment = { MINIO_URL: process.env.MINIO_URL, MINIO_ENABLED: process.env.MINIO_ENABLED || 1, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, + INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK, MULTI_TENANCY: process.env.MULTI_TENANCY, ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app", diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts index 0708581570..5e546b4c1c 100644 --- a/packages/backend-core/src/middleware/authenticated.ts +++ b/packages/backend-core/src/middleware/authenticated.ts @@ -1,5 +1,10 @@ import { Cookie, Header } from "../constants" -import { getCookie, clearCookie, openJwt } from "../utils" +import { + getCookie, + clearCookie, + openJwt, + isValidInternalAPIKey, +} from "../utils" import { getUser } from "../cache/user" import { getSession, updateSessionTTL } from "../security/sessions" import { buildMatcherRegex, matches } from "./matchers" @@ -35,7 +40,9 @@ function finalise(ctx: any, opts: FinaliseOpts = {}) { } async function checkApiKey(apiKey: string, populateUser?: Function) { - if (apiKey === env.INTERNAL_API_KEY) { + // check both the primary and the fallback internal api keys + // this allows for rotation + if (isValidInternalAPIKey(apiKey)) { return { valid: true } } const decrypted = decrypt(apiKey) diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts index addeac6a1a..dce07168d4 100644 --- a/packages/backend-core/src/middleware/index.ts +++ b/packages/backend-core/src/middleware/index.ts @@ -1,4 +1,3 @@ -export * as jwt from "./passport/jwt" export * as local from "./passport/local" export * as google from "./passport/sso/google" export * as oidc from "./passport/sso/oidc" diff --git a/packages/backend-core/src/middleware/internalApi.ts b/packages/backend-core/src/middleware/internalApi.ts index fff761928b..dc73cd6b66 100644 --- a/packages/backend-core/src/middleware/internalApi.ts +++ b/packages/backend-core/src/middleware/internalApi.ts @@ -1,13 +1,21 @@ -import env from "../environment" import { Header } from "../constants" import { BBContext } from "@budibase/types" +import { isValidInternalAPIKey } from "../utils" /** * API Key only endpoint. */ export default async (ctx: BBContext, next: any) => { const apiKey = ctx.request.headers[Header.API_KEY] - if (apiKey !== env.INTERNAL_API_KEY) { + if (!apiKey) { + ctx.throw(403, "Unauthorized") + } + + if (Array.isArray(apiKey)) { + ctx.throw(403, "Unauthorized") + } + + if (!isValidInternalAPIKey(apiKey)) { ctx.throw(403, "Unauthorized") } diff --git a/packages/backend-core/src/middleware/passport/jwt.ts b/packages/backend-core/src/middleware/passport/jwt.ts deleted file mode 100644 index 95dc8f2656..0000000000 --- a/packages/backend-core/src/middleware/passport/jwt.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Cookie } from "../../constants" -import env from "../../environment" -import { authError } from "./utils" -import { BBContext } from "@budibase/types" - -export const options = { - secretOrKey: env.JWT_SECRET, - jwtFromRequest: function (ctx: BBContext) { - return ctx.cookies.get(Cookie.Auth) - }, -} - -export async function authenticate(jwt: Function, done: Function) { - try { - return done(null, jwt) - } catch (err) { - return authError(done, "JWT invalid", err) - } -} diff --git a/packages/backend-core/src/security/encryption.ts b/packages/backend-core/src/security/encryption.ts index d0707cb850..d2c8f18f73 100644 --- a/packages/backend-core/src/security/encryption.ts +++ b/packages/backend-core/src/security/encryption.ts @@ -8,7 +8,7 @@ const RANDOM_BYTES = 16 const STRETCH_LENGTH = 32 export enum SecretOption { - JWT = "jwt", + API = "api", ENCRYPTION = "encryption", } @@ -19,10 +19,10 @@ function getSecret(secretOption: SecretOption): string { secret = env.ENCRYPTION_KEY secretName = "ENCRYPTION_KEY" break - case SecretOption.JWT: + case SecretOption.API: default: - secret = env.JWT_SECRET - secretName = "JWT_SECRET" + secret = env.API_ENCRYPTION_KEY + secretName = "API_ENCRYPTION_KEY" break } if (!secret) { @@ -37,7 +37,7 @@ function stretchString(string: string, salt: Buffer) { export function encrypt( input: string, - secretOption: SecretOption = SecretOption.JWT + secretOption: SecretOption = SecretOption.API ) { const salt = crypto.randomBytes(RANDOM_BYTES) const stretched = stretchString(getSecret(secretOption), salt) @@ -50,7 +50,7 @@ export function encrypt( export function decrypt( input: string, - secretOption: SecretOption = SecretOption.JWT + secretOption: SecretOption = SecretOption.API ) { const [salt, encrypted] = input.split(SEPARATOR) const saltBuffer = Buffer.from(salt, "hex") diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts index 3efd40ca80..7c222a9831 100644 --- a/packages/backend-core/src/utils/utils.ts +++ b/packages/backend-core/src/utils/utils.ts @@ -1,5 +1,4 @@ import { getAllApps, queryGlobalView } from "../db" -import { options } from "../middleware/passport/jwt" import { Header, MAX_VALID_DATE, @@ -133,7 +132,30 @@ export function openJwt(token: string) { if (!token) { return token } - return jwt.verify(token, options.secretOrKey) + try { + return jwt.verify(token, env.JWT_SECRET) + } catch (e) { + if (env.JWT_SECRET_FALLBACK) { + // fallback to enable rotation + return jwt.verify(token, env.JWT_SECRET_FALLBACK) + } else { + throw e + } + } +} + +export function isValidInternalAPIKey(apiKey: string) { + if (env.INTERNAL_API_KEY && env.INTERNAL_API_KEY === apiKey) { + return true + } + // fallback to enable rotation + if ( + env.INTERNAL_API_KEY_FALLBACK && + env.INTERNAL_API_KEY_FALLBACK === apiKey + ) { + return true + } + return false } /** @@ -165,7 +187,7 @@ export function setCookie( opts = { sign: true } ) { if (value && opts && opts.sign) { - value = jwt.sign(value, options.secretOrKey) + value = jwt.sign(value, env.JWT_SECRET) } const config: SetOption = { diff --git a/packages/cli/src/hosting/makeFiles.ts b/packages/cli/src/hosting/makeFiles.ts index 9574e107a6..b11a07c107 100644 --- a/packages/cli/src/hosting/makeFiles.ts +++ b/packages/cli/src/hosting/makeFiles.ts @@ -13,6 +13,7 @@ export const ENV_PATH = path.resolve("./.env") function getSecrets(opts = { single: false }) { const secrets = [ + "API_ENCRYPTION_KEY", "JWT_SECRET", "MINIO_ACCESS_KEY", "MINIO_SECRET_KEY", diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts index 78a6056366..656596a198 100644 --- a/packages/server/src/api/index.ts +++ b/packages/server/src/api/index.ts @@ -29,13 +29,6 @@ router br: false, }) ) - .use(async (ctx, next) => { - ctx.config = { - jwtSecret: env.JWT_SECRET, - useAppRootPath: true, - } - await next() - }) // re-direct before any middlewares occur .redirect("/", "/builder") .use( diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index 715715e42b..058e8bdff8 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -39,7 +39,6 @@ let inThread = false const environment = { // important - prefer app port to generic port PORT: process.env.APP_PORT || process.env.PORT, - JWT_SECRET: process.env.JWT_SECRET, COUCH_DB_URL: process.env.COUCH_DB_URL, MINIO_URL: process.env.MINIO_URL, WORKER_URL: process.env.WORKER_URL, @@ -48,7 +47,6 @@ const environment = { MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, REDIS_URL: process.env.REDIS_URL, REDIS_PASSWORD: process.env.REDIS_PASSWORD, - INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS, API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 9aab76ba4d..cf0585efd1 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -205,7 +205,6 @@ class TestConfiguration { request.appId = appId // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } - request.config = { jwtSecret: env.JWT_SECRET } request.user = { appId, tenantId: this.getTenantId() } request.query = {} request.request = { @@ -332,8 +331,8 @@ class TestConfiguration { roleId: roleId, appId, } - const authToken = auth.jwt.sign(authObj, env.JWT_SECRET) - const appToken = auth.jwt.sign(app, env.JWT_SECRET) + const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET) + const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET) // returning necessary request headers await cache.user.invalidateUser(userId) @@ -361,8 +360,8 @@ class TestConfiguration { roleId: roles.BUILTIN_ROLE_IDS.ADMIN, appId: this.appId, } - const authToken = auth.jwt.sign(authObj, env.JWT_SECRET) - const appToken = auth.jwt.sign(app, env.JWT_SECRET) + const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET) + const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET) const headers: any = { Accept: "application/json", Cookie: [ diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts index e318b12f82..82e1aac428 100644 --- a/packages/server/src/utilities/workerRequests.ts +++ b/packages/server/src/utilities/workerRequests.ts @@ -6,6 +6,7 @@ import { constants, tenancy, logging, + env as coreEnv, } from "@budibase/backend-core" import { updateAppRole } from "./global" import { BBContext, User } from "@budibase/types" @@ -15,7 +16,7 @@ export function request(ctx?: BBContext, request?: any) { request.headers = {} } if (!ctx) { - request.headers[constants.Header.API_KEY] = env.INTERNAL_API_KEY + request.headers[constants.Header.API_KEY] = coreEnv.INTERNAL_API_KEY if (tenancy.isTenantIdSet()) { request.headers[constants.Header.TENANT_ID] = tenancy.getTenantId() } diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index c6618a75df..3f762ea5ab 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -30,10 +30,8 @@ const environment = { // auth MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, - JWT_SECRET: process.env.JWT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_PASSWORD: process.env.REDIS_PASSWORD, - INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, // urls MINIO_URL: process.env.MINIO_URL, diff --git a/packages/worker/src/middleware/cloudRestricted.ts b/packages/worker/src/middleware/cloudRestricted.ts index 5440629de3..f9ab86e2e9 100644 --- a/packages/worker/src/middleware/cloudRestricted.ts +++ b/packages/worker/src/middleware/cloudRestricted.ts @@ -1,5 +1,5 @@ import env from "../environment" -import { constants } from "@budibase/backend-core" +import { constants, utils } from "@budibase/backend-core" import { BBContext } from "@budibase/types" /** @@ -9,7 +9,15 @@ import { BBContext } from "@budibase/types" export default async (ctx: BBContext, next: any) => { if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) { const apiKey = ctx.request.headers[constants.Header.API_KEY] - if (apiKey !== env.INTERNAL_API_KEY) { + if (!apiKey) { + ctx.throw(403, "Unauthorized") + } + + if (Array.isArray(apiKey)) { + ctx.throw(403, "Unauthorized") + } + + if (!utils.isValidInternalAPIKey(apiKey)) { ctx.throw(403, "Unauthorized") } } diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts index 98830c576d..2e716426d5 100644 --- a/packages/worker/src/sdk/auth/auth.ts +++ b/packages/worker/src/sdk/auth/auth.ts @@ -5,10 +5,10 @@ import { sessions, events, HTTPError, + env as coreEnv, } from "@budibase/backend-core" import { PlatformLogoutOpts, User } from "@budibase/types" import jwt from "jsonwebtoken" -import env from "../../environment" import * as userSdk from "../users" import * as emails from "../../utilities/email" import * as redis from "../../utilities/redis" @@ -26,7 +26,7 @@ export async function loginUser(user: User) { sessionId, tenantId, }, - env.JWT_SECRET! + coreEnv.JWT_SECRET! ) return token } diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index 3004d0aed4..e5ed9e8141 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -74,7 +74,6 @@ class TestConfiguration { const request: any = {} // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } - request.config = { jwtSecret: env.JWT_SECRET } request.user = { tenantId: this.getTenantId() } request.query = {} request.request = { @@ -180,7 +179,7 @@ class TestConfiguration { sessionId: "sessionid", tenantId: user.tenantId, } - const authCookie = auth.jwt.sign(authToken, env.JWT_SECRET) + const authCookie = auth.jwt.sign(authToken, coreEnv.JWT_SECRET) return { Accept: "application/json", ...this.cookieHeader([`${constants.Cookie.Auth}=${authCookie}`]), @@ -197,7 +196,7 @@ class TestConfiguration { } internalAPIHeaders() { - return { [constants.Header.API_KEY]: env.INTERNAL_API_KEY } + return { [constants.Header.API_KEY]: coreEnv.INTERNAL_API_KEY } } adminOnlyResponse = () => { @@ -277,7 +276,7 @@ class TestConfiguration { // CONFIGS - OIDC getOIDConfigCookie(configId: string) { - const token = auth.jwt.sign(configId, env.JWT_SECRET) + const token = auth.jwt.sign(configId, coreEnv.JWT_SECRET) return this.cookieHeader([[`${constants.Cookie.OIDC_CONFIG}=${token}`]]) } diff --git a/packages/worker/src/utilities/appService.ts b/packages/worker/src/utilities/appService.ts index 478e986fe8..8f411d58fa 100644 --- a/packages/worker/src/utilities/appService.ts +++ b/packages/worker/src/utilities/appService.ts @@ -1,5 +1,10 @@ import fetch from "node-fetch" -import { constants, tenancy, logging } from "@budibase/backend-core" +import { + constants, + tenancy, + logging, + env as coreEnv, +} from "@budibase/backend-core" import { checkSlashesInUrl } from "../utilities" import env from "../environment" import { SyncUserRequest, User } from "@budibase/types" @@ -9,7 +14,7 @@ async function makeAppRequest(url: string, method: string, body: any) { return } const request: any = { headers: {} } - request.headers[constants.Header.API_KEY] = env.INTERNAL_API_KEY + request.headers[constants.Header.API_KEY] = coreEnv.INTERNAL_API_KEY if (tenancy.isTenantIdSet()) { request.headers[constants.Header.TENANT_ID] = tenancy.getTenantId() } From 7227bb6a9162c43cae780ab7da210ecd0c69c41b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 15:11:44 +0000 Subject: [PATCH 41/54] v2.4.21 --- 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 | 2 +- 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 45ebb41470..739cde8251 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.20", + "version": "2.4.21", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index be57c3bc94..36060ec4f8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.20", + "version": "2.4.21", "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.20", + "@budibase/types": "^2.4.21", "@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 1145483efe..99e546d4a9 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.20", + "version": "2.4.21", "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.4.20", - "@budibase/string-templates": "^2.4.20", + "@budibase/shared-core": "^2.4.21", + "@budibase/string-templates": "^2.4.21", "@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 9eed56143d..38f48c58d2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.20", + "version": "2.4.21", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.20", - "@budibase/client": "^2.4.20", - "@budibase/frontend-core": "^2.4.20", - "@budibase/shared-core": "^2.4.20", - "@budibase/string-templates": "^2.4.20", + "@budibase/bbui": "^2.4.21", + "@budibase/client": "^2.4.21", + "@budibase/frontend-core": "^2.4.21", + "@budibase/shared-core": "^2.4.21", + "@budibase/string-templates": "^2.4.21", "@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 4b441da7e2..79bbd96704 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.20", + "version": "2.4.21", "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.20", - "@budibase/string-templates": "^2.4.20", - "@budibase/types": "^2.4.20", + "@budibase/backend-core": "^2.4.21", + "@budibase/string-templates": "^2.4.21", + "@budibase/types": "^2.4.21", "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 fd38977e1d..a2159fb5d8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.20", + "version": "2.4.21", "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.4.20", - "@budibase/frontend-core": "^2.4.20", - "@budibase/shared-core": "^2.4.20", - "@budibase/string-templates": "^2.4.20", - "@budibase/types": "^2.4.20", + "@budibase/bbui": "^2.4.21", + "@budibase/frontend-core": "^2.4.21", + "@budibase/shared-core": "^2.4.21", + "@budibase/string-templates": "^2.4.21", + "@budibase/types": "^2.4.21", "@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 32084d427a..054a83018a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.20", + "version": "2.4.21", "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.20", - "@budibase/shared-core": "^2.4.20", + "@budibase/bbui": "^2.4.21", + "@budibase/shared-core": "^2.4.21", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d5202fde64..57ab824b5d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.20", + "version": "2.4.21", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4c36e24f13..4b06eaa7f7 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.20", + "version": "2.4.21", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.20", - "@budibase/client": "^2.4.20", + "@budibase/backend-core": "^2.4.21", + "@budibase/client": "^2.4.21", "@budibase/pro": "2.4.20", - "@budibase/shared-core": "^2.4.20", - "@budibase/string-templates": "^2.4.20", - "@budibase/types": "^2.4.20", + "@budibase/shared-core": "^2.4.21", + "@budibase/string-templates": "^2.4.21", + "@budibase/types": "^2.4.21", "@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 d7c87f456f..7c0bb68787 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.20", + "version": "2.4.21", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 595df8fbec..998cc9f6d6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.20", + "version": "2.4.21", "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 4074c8c34a..2dbf78bf9c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.20", + "version": "2.4.21", "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 6b6ca42d97..b0f865c002 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.20", + "version": "2.4.21", "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.20", + "@budibase/backend-core": "^2.4.21", "@budibase/pro": "2.4.20", - "@budibase/string-templates": "^2.4.20", - "@budibase/types": "^2.4.20", + "@budibase/string-templates": "^2.4.21", + "@budibase/types": "^2.4.21", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 00145fd0161df99620b06de9f44cf869ffa38dc6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 15:15:01 +0000 Subject: [PATCH 42/54] Update pro version to 2.4.21 --- 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 4b06eaa7f7..9c0e8a8667 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.21", "@budibase/client": "^2.4.21", - "@budibase/pro": "2.4.20", + "@budibase/pro": "2.4.21", "@budibase/shared-core": "^2.4.21", "@budibase/string-templates": "^2.4.21", "@budibase/types": "^2.4.21", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 06f4863a26..4c19c2bc0a 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.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.20.tgz#cd48ad052458bc2e2a5a04a91538988a56c37bc3" - integrity sha512-5gxLmE1mmqgY70CA55FA7hBAyWp8tLr0gzWvkBCb7Eakbb8f1Z1gkEhG9c/XTA+6x73XuUp8RL+fWIazmpS6AQ== +"@budibase/backend-core@2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.21.tgz#7480608649b93dec700e302bb4736a1ce547b7c5" + integrity sha512-LuywEZ8yt8mAWM16xK5Mj6/IT/6rncQaf8IYmQUf1jZmszQlEKw3LW5ES9NodkPdV7H7jzSjnhjw2KVFPbVznw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.20" + "@budibase/types" "^2.4.21" "@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.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.20.tgz#b4dc91c9c38471d9655173b52ac17308db74eb55" - integrity sha512-0NjnvXjSEDzYT6L76uhlmN3Ty1F3ajhnLGO0JI2UndkdiGgefYhHPZiKF5d0wUk9kwwxxw5fbV0moyG182xmYw== +"@budibase/pro@2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.21.tgz#6d516b75eb471239aac791b5dd45422cb9554fda" + integrity sha512-sVMAOm3GkFNK0XLUUIyRDila3Ola+pw0iJSYMJtKlUC7CZCK9QqZXkVdnT0WuEESPsSEGDvUBXLV4mTS41lSFw== dependencies: - "@budibase/backend-core" "2.4.20" + "@budibase/backend-core" "2.4.21" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.20" + "@budibase/types" "2.4.21" "@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.20", "@budibase/types@^2.4.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.20.tgz#ff35fe91936a6254c7802c79b7e57d2cff98ca91" - integrity sha512-xUedzq4Hc1mQ9nhXZ7X+SU9oBHjiz5w9F6QitUmdIaVaad79tF88a9a/sLtkT/poXbdWcNBLnDg7ILwR/SMmtQ== +"@budibase/types@2.4.21", "@budibase/types@^2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.21.tgz#499884c4cf97a90912ca5bef00acf9b0f0ff90fe" + integrity sha512-FTiOl9d9bEWcQeAJPYZt4bj4vi7bmU78OgEqPc4q+sAuGrieFk8Xy6VNZiLeHMKAzfuuYsjfieVzG2IwRklIMQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b0f865c002..c59a62de64 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.21", - "@budibase/pro": "2.4.20", + "@budibase/pro": "2.4.21", "@budibase/string-templates": "^2.4.21", "@budibase/types": "^2.4.21", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0484d66cc0..eb98e8dac1 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.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.20.tgz#cd48ad052458bc2e2a5a04a91538988a56c37bc3" - integrity sha512-5gxLmE1mmqgY70CA55FA7hBAyWp8tLr0gzWvkBCb7Eakbb8f1Z1gkEhG9c/XTA+6x73XuUp8RL+fWIazmpS6AQ== +"@budibase/backend-core@2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.21.tgz#7480608649b93dec700e302bb4736a1ce547b7c5" + integrity sha512-LuywEZ8yt8mAWM16xK5Mj6/IT/6rncQaf8IYmQUf1jZmszQlEKw3LW5ES9NodkPdV7H7jzSjnhjw2KVFPbVznw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.20" + "@budibase/types" "^2.4.21" "@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.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.20.tgz#b4dc91c9c38471d9655173b52ac17308db74eb55" - integrity sha512-0NjnvXjSEDzYT6L76uhlmN3Ty1F3ajhnLGO0JI2UndkdiGgefYhHPZiKF5d0wUk9kwwxxw5fbV0moyG182xmYw== +"@budibase/pro@2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.21.tgz#6d516b75eb471239aac791b5dd45422cb9554fda" + integrity sha512-sVMAOm3GkFNK0XLUUIyRDila3Ola+pw0iJSYMJtKlUC7CZCK9QqZXkVdnT0WuEESPsSEGDvUBXLV4mTS41lSFw== dependencies: - "@budibase/backend-core" "2.4.20" + "@budibase/backend-core" "2.4.21" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.20" + "@budibase/types" "2.4.21" "@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.20", "@budibase/types@^2.4.20": - version "2.4.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.20.tgz#ff35fe91936a6254c7802c79b7e57d2cff98ca91" - integrity sha512-xUedzq4Hc1mQ9nhXZ7X+SU9oBHjiz5w9F6QitUmdIaVaad79tF88a9a/sLtkT/poXbdWcNBLnDg7ILwR/SMmtQ== +"@budibase/types@2.4.21", "@budibase/types@^2.4.21": + version "2.4.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.21.tgz#499884c4cf97a90912ca5bef00acf9b0f0ff90fe" + integrity sha512-FTiOl9d9bEWcQeAJPYZt4bj4vi7bmU78OgEqPc4q+sAuGrieFk8Xy6VNZiLeHMKAzfuuYsjfieVzG2IwRklIMQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 3ad91ec0189026c7463805396cee9dd97eb51a69 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 15:30:10 +0000 Subject: [PATCH 43/54] v2.4.22 --- 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 | 2 +- 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 739cde8251..14e7fb63d1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.21", + "version": "2.4.22", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 36060ec4f8..a35daa4d3a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.21", + "version": "2.4.22", "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.21", + "@budibase/types": "^2.4.22", "@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 99e546d4a9..ec8f8a9e6c 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.21", + "version": "2.4.22", "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.4.21", - "@budibase/string-templates": "^2.4.21", + "@budibase/shared-core": "^2.4.22", + "@budibase/string-templates": "^2.4.22", "@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 38f48c58d2..7ef6fefe85 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.21", + "version": "2.4.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.21", - "@budibase/client": "^2.4.21", - "@budibase/frontend-core": "^2.4.21", - "@budibase/shared-core": "^2.4.21", - "@budibase/string-templates": "^2.4.21", + "@budibase/bbui": "^2.4.22", + "@budibase/client": "^2.4.22", + "@budibase/frontend-core": "^2.4.22", + "@budibase/shared-core": "^2.4.22", + "@budibase/string-templates": "^2.4.22", "@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 79bbd96704..6ea2e4c999 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.21", + "version": "2.4.22", "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.21", - "@budibase/string-templates": "^2.4.21", - "@budibase/types": "^2.4.21", + "@budibase/backend-core": "^2.4.22", + "@budibase/string-templates": "^2.4.22", + "@budibase/types": "^2.4.22", "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 a2159fb5d8..e81542ca6e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.21", + "version": "2.4.22", "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.4.21", - "@budibase/frontend-core": "^2.4.21", - "@budibase/shared-core": "^2.4.21", - "@budibase/string-templates": "^2.4.21", - "@budibase/types": "^2.4.21", + "@budibase/bbui": "^2.4.22", + "@budibase/frontend-core": "^2.4.22", + "@budibase/shared-core": "^2.4.22", + "@budibase/string-templates": "^2.4.22", + "@budibase/types": "^2.4.22", "@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 054a83018a..133c63a649 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.21", + "version": "2.4.22", "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.21", - "@budibase/shared-core": "^2.4.21", + "@budibase/bbui": "^2.4.22", + "@budibase/shared-core": "^2.4.22", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 57ab824b5d..e451aff885 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.21", + "version": "2.4.22", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9c0e8a8667..591763ee81 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.21", + "version": "2.4.22", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.21", - "@budibase/client": "^2.4.21", + "@budibase/backend-core": "^2.4.22", + "@budibase/client": "^2.4.22", "@budibase/pro": "2.4.21", - "@budibase/shared-core": "^2.4.21", - "@budibase/string-templates": "^2.4.21", - "@budibase/types": "^2.4.21", + "@budibase/shared-core": "^2.4.22", + "@budibase/string-templates": "^2.4.22", + "@budibase/types": "^2.4.22", "@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 7c0bb68787..77e68063ef 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.21", + "version": "2.4.22", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 998cc9f6d6..74fd0dc774 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.21", + "version": "2.4.22", "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 2dbf78bf9c..0962350689 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.21", + "version": "2.4.22", "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 c59a62de64..d1ae096a9f 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.21", + "version": "2.4.22", "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.21", + "@budibase/backend-core": "^2.4.22", "@budibase/pro": "2.4.21", - "@budibase/string-templates": "^2.4.21", - "@budibase/types": "^2.4.21", + "@budibase/string-templates": "^2.4.22", + "@budibase/types": "^2.4.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From aa4c9f6fcb79c3146e2974778e71326e62cbc439 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 15:42:10 +0000 Subject: [PATCH 44/54] v2.4.23 --- 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 | 2 +- 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 14e7fb63d1..8d9411f0dd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.22", + "version": "2.4.23", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a35daa4d3a..f0eae5160c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.22", + "version": "2.4.23", "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.22", + "@budibase/types": "^2.4.23", "@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 ec8f8a9e6c..752ff99079 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.22", + "version": "2.4.23", "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.4.22", - "@budibase/string-templates": "^2.4.22", + "@budibase/shared-core": "^2.4.23", + "@budibase/string-templates": "^2.4.23", "@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 7ef6fefe85..84c0d04f32 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.22", + "version": "2.4.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.22", - "@budibase/client": "^2.4.22", - "@budibase/frontend-core": "^2.4.22", - "@budibase/shared-core": "^2.4.22", - "@budibase/string-templates": "^2.4.22", + "@budibase/bbui": "^2.4.23", + "@budibase/client": "^2.4.23", + "@budibase/frontend-core": "^2.4.23", + "@budibase/shared-core": "^2.4.23", + "@budibase/string-templates": "^2.4.23", "@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 6ea2e4c999..2c7f864e10 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.22", + "version": "2.4.23", "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.22", - "@budibase/string-templates": "^2.4.22", - "@budibase/types": "^2.4.22", + "@budibase/backend-core": "^2.4.23", + "@budibase/string-templates": "^2.4.23", + "@budibase/types": "^2.4.23", "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 e81542ca6e..04cb2eb924 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.22", + "version": "2.4.23", "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.4.22", - "@budibase/frontend-core": "^2.4.22", - "@budibase/shared-core": "^2.4.22", - "@budibase/string-templates": "^2.4.22", - "@budibase/types": "^2.4.22", + "@budibase/bbui": "^2.4.23", + "@budibase/frontend-core": "^2.4.23", + "@budibase/shared-core": "^2.4.23", + "@budibase/string-templates": "^2.4.23", + "@budibase/types": "^2.4.23", "@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 133c63a649..0eb9ac531a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.22", + "version": "2.4.23", "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.22", - "@budibase/shared-core": "^2.4.22", + "@budibase/bbui": "^2.4.23", + "@budibase/shared-core": "^2.4.23", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e451aff885..753a19fe5d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.22", + "version": "2.4.23", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 591763ee81..cdeb5530fa 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.22", + "version": "2.4.23", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.22", - "@budibase/client": "^2.4.22", + "@budibase/backend-core": "^2.4.23", + "@budibase/client": "^2.4.23", "@budibase/pro": "2.4.21", - "@budibase/shared-core": "^2.4.22", - "@budibase/string-templates": "^2.4.22", - "@budibase/types": "^2.4.22", + "@budibase/shared-core": "^2.4.23", + "@budibase/string-templates": "^2.4.23", + "@budibase/types": "^2.4.23", "@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 77e68063ef..3b554c8fa5 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.22", + "version": "2.4.23", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 74fd0dc774..75113aa4ad 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.22", + "version": "2.4.23", "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 0962350689..bc37ccd92c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.22", + "version": "2.4.23", "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 d1ae096a9f..a656912fc7 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.22", + "version": "2.4.23", "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.22", + "@budibase/backend-core": "^2.4.23", "@budibase/pro": "2.4.21", - "@budibase/string-templates": "^2.4.22", - "@budibase/types": "^2.4.22", + "@budibase/string-templates": "^2.4.23", + "@budibase/types": "^2.4.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 12109fdb311505a29663da10084a175ac14c2e44 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Mar 2023 15:45:47 +0000 Subject: [PATCH 45/54] Update pro version to 2.4.23 --- 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 cdeb5530fa..07be8c84f7 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.23", "@budibase/client": "^2.4.23", - "@budibase/pro": "2.4.21", + "@budibase/pro": "2.4.23", "@budibase/shared-core": "^2.4.23", "@budibase/string-templates": "^2.4.23", "@budibase/types": "^2.4.23", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 4c19c2bc0a..fae9b7bb71 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.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.21.tgz#7480608649b93dec700e302bb4736a1ce547b7c5" - integrity sha512-LuywEZ8yt8mAWM16xK5Mj6/IT/6rncQaf8IYmQUf1jZmszQlEKw3LW5ES9NodkPdV7H7jzSjnhjw2KVFPbVznw== +"@budibase/backend-core@2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.23.tgz#c142808d395061d4212ead8488888d248898225a" + integrity sha512-1+4znax6pW9V+ByveC+lkHl5Kyux7XnYuGHQxJT0/gWtRf3+qY9UcNAhUtZnZAy90NKfJt0tMxCIzBRXvWedRQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.21" + "@budibase/types" "^2.4.23" "@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.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.21.tgz#6d516b75eb471239aac791b5dd45422cb9554fda" - integrity sha512-sVMAOm3GkFNK0XLUUIyRDila3Ola+pw0iJSYMJtKlUC7CZCK9QqZXkVdnT0WuEESPsSEGDvUBXLV4mTS41lSFw== +"@budibase/pro@2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.23.tgz#5aab68c633a230dadc57d9866920bd923222b322" + integrity sha512-bSRj1n4/ZpcgLGnD99R42PXVUjobNI0nI00z+Q+PgDeY3g+RlUfVIPtxJ6IZFbd5epFQolq0Q9C/OTjiSQqwXw== dependencies: - "@budibase/backend-core" "2.4.21" + "@budibase/backend-core" "2.4.23" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.21" + "@budibase/types" "2.4.23" "@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.21", "@budibase/types@^2.4.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.21.tgz#499884c4cf97a90912ca5bef00acf9b0f0ff90fe" - integrity sha512-FTiOl9d9bEWcQeAJPYZt4bj4vi7bmU78OgEqPc4q+sAuGrieFk8Xy6VNZiLeHMKAzfuuYsjfieVzG2IwRklIMQ== +"@budibase/types@2.4.23", "@budibase/types@^2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.23.tgz#2d544b53a0e55f9a0e03fd45d0970a2cd2ec9103" + integrity sha512-oULEAntFgvQXuKvWSpg1uI4LqSYvCLHalBRdrS95zoifHrSQaGWbyhdyJhWS9RP9vVrOeFbGuuw0eXqrGQfkbg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a656912fc7..68066fd607 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.23", - "@budibase/pro": "2.4.21", + "@budibase/pro": "2.4.23", "@budibase/string-templates": "^2.4.23", "@budibase/types": "^2.4.23", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index eb98e8dac1..e8c3023174 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.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.21.tgz#7480608649b93dec700e302bb4736a1ce547b7c5" - integrity sha512-LuywEZ8yt8mAWM16xK5Mj6/IT/6rncQaf8IYmQUf1jZmszQlEKw3LW5ES9NodkPdV7H7jzSjnhjw2KVFPbVznw== +"@budibase/backend-core@2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.23.tgz#c142808d395061d4212ead8488888d248898225a" + integrity sha512-1+4znax6pW9V+ByveC+lkHl5Kyux7XnYuGHQxJT0/gWtRf3+qY9UcNAhUtZnZAy90NKfJt0tMxCIzBRXvWedRQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.21" + "@budibase/types" "^2.4.23" "@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.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.21.tgz#6d516b75eb471239aac791b5dd45422cb9554fda" - integrity sha512-sVMAOm3GkFNK0XLUUIyRDila3Ola+pw0iJSYMJtKlUC7CZCK9QqZXkVdnT0WuEESPsSEGDvUBXLV4mTS41lSFw== +"@budibase/pro@2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.23.tgz#5aab68c633a230dadc57d9866920bd923222b322" + integrity sha512-bSRj1n4/ZpcgLGnD99R42PXVUjobNI0nI00z+Q+PgDeY3g+RlUfVIPtxJ6IZFbd5epFQolq0Q9C/OTjiSQqwXw== dependencies: - "@budibase/backend-core" "2.4.21" + "@budibase/backend-core" "2.4.23" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.21" + "@budibase/types" "2.4.23" "@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.21", "@budibase/types@^2.4.21": - version "2.4.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.21.tgz#499884c4cf97a90912ca5bef00acf9b0f0ff90fe" - integrity sha512-FTiOl9d9bEWcQeAJPYZt4bj4vi7bmU78OgEqPc4q+sAuGrieFk8Xy6VNZiLeHMKAzfuuYsjfieVzG2IwRklIMQ== +"@budibase/types@2.4.23", "@budibase/types@^2.4.23": + version "2.4.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.23.tgz#2d544b53a0e55f9a0e03fd45d0970a2cd2ec9103" + integrity sha512-oULEAntFgvQXuKvWSpg1uI4LqSYvCLHalBRdrS95zoifHrSQaGWbyhdyJhWS9RP9vVrOeFbGuuw0eXqrGQfkbg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From c7fb06ef393ec29fd41862394b60a394f663c365 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 08:28:08 +0000 Subject: [PATCH 46/54] v2.4.24 --- 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 | 2 +- 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 8d9411f0dd..f76eaca712 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.23", + "version": "2.4.24", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f0eae5160c..504d12dddd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.23", + "version": "2.4.24", "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.23", + "@budibase/types": "^2.4.24", "@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 752ff99079..f22355965d 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.23", + "version": "2.4.24", "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.4.23", - "@budibase/string-templates": "^2.4.23", + "@budibase/shared-core": "^2.4.24", + "@budibase/string-templates": "^2.4.24", "@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 84c0d04f32..8061fefed2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.23", + "version": "2.4.24", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.23", - "@budibase/client": "^2.4.23", - "@budibase/frontend-core": "^2.4.23", - "@budibase/shared-core": "^2.4.23", - "@budibase/string-templates": "^2.4.23", + "@budibase/bbui": "^2.4.24", + "@budibase/client": "^2.4.24", + "@budibase/frontend-core": "^2.4.24", + "@budibase/shared-core": "^2.4.24", + "@budibase/string-templates": "^2.4.24", "@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 2c7f864e10..b692a973b7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.23", + "version": "2.4.24", "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.23", - "@budibase/string-templates": "^2.4.23", - "@budibase/types": "^2.4.23", + "@budibase/backend-core": "^2.4.24", + "@budibase/string-templates": "^2.4.24", + "@budibase/types": "^2.4.24", "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 04cb2eb924..21d758c82e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.23", + "version": "2.4.24", "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.4.23", - "@budibase/frontend-core": "^2.4.23", - "@budibase/shared-core": "^2.4.23", - "@budibase/string-templates": "^2.4.23", - "@budibase/types": "^2.4.23", + "@budibase/bbui": "^2.4.24", + "@budibase/frontend-core": "^2.4.24", + "@budibase/shared-core": "^2.4.24", + "@budibase/string-templates": "^2.4.24", + "@budibase/types": "^2.4.24", "@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 0eb9ac531a..cbaa5b06ec 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.23", + "version": "2.4.24", "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.23", - "@budibase/shared-core": "^2.4.23", + "@budibase/bbui": "^2.4.24", + "@budibase/shared-core": "^2.4.24", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 753a19fe5d..77bdeec580 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.23", + "version": "2.4.24", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 07be8c84f7..8a577c47e1 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.23", + "version": "2.4.24", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.23", - "@budibase/client": "^2.4.23", + "@budibase/backend-core": "^2.4.24", + "@budibase/client": "^2.4.24", "@budibase/pro": "2.4.23", - "@budibase/shared-core": "^2.4.23", - "@budibase/string-templates": "^2.4.23", - "@budibase/types": "^2.4.23", + "@budibase/shared-core": "^2.4.24", + "@budibase/string-templates": "^2.4.24", + "@budibase/types": "^2.4.24", "@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 3b554c8fa5..7fbc8387a7 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.23", + "version": "2.4.24", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 75113aa4ad..6c87a93627 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.23", + "version": "2.4.24", "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 bc37ccd92c..4cf1488920 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.23", + "version": "2.4.24", "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 68066fd607..58d22b14c1 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.23", + "version": "2.4.24", "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.23", + "@budibase/backend-core": "^2.4.24", "@budibase/pro": "2.4.23", - "@budibase/string-templates": "^2.4.23", - "@budibase/types": "^2.4.23", + "@budibase/string-templates": "^2.4.24", + "@budibase/types": "^2.4.24", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 406cecc74c9d4209cd8264121dc1c158912982c6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 08:31:01 +0000 Subject: [PATCH 47/54] Update pro version to 2.4.24 --- 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 8a577c47e1..84f4568191 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.24", "@budibase/client": "^2.4.24", - "@budibase/pro": "2.4.23", + "@budibase/pro": "2.4.24", "@budibase/shared-core": "^2.4.24", "@budibase/string-templates": "^2.4.24", "@budibase/types": "^2.4.24", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index fae9b7bb71..3eaf01ec9a 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.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.23.tgz#c142808d395061d4212ead8488888d248898225a" - integrity sha512-1+4znax6pW9V+ByveC+lkHl5Kyux7XnYuGHQxJT0/gWtRf3+qY9UcNAhUtZnZAy90NKfJt0tMxCIzBRXvWedRQ== +"@budibase/backend-core@2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.24.tgz#aab3fd1a80e4f0db9a8c38a40a92755d1404a455" + integrity sha512-/QLPkz22yOep1H1JNET3uBAxdPozab9kZUARRI3Lk2yuOtGi5Ea9gNjhnTXZkRpySjbzVDwopj9lvSPPEodCaQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.23" + "@budibase/types" "^2.4.24" "@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.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.23.tgz#5aab68c633a230dadc57d9866920bd923222b322" - integrity sha512-bSRj1n4/ZpcgLGnD99R42PXVUjobNI0nI00z+Q+PgDeY3g+RlUfVIPtxJ6IZFbd5epFQolq0Q9C/OTjiSQqwXw== +"@budibase/pro@2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.24.tgz#bbbdb5cb9ebb07f1f9320c80c0c8c57cc002b93e" + integrity sha512-WRtXaadNsfezMe8lob3d5V9VD2mWxknfkCrdqXP4YrMBaQAjFrma5gpA2M9qT0MbDjkTttG6YKN2kG3os+/vrw== dependencies: - "@budibase/backend-core" "2.4.23" + "@budibase/backend-core" "2.4.24" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.23" + "@budibase/types" "2.4.24" "@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.23", "@budibase/types@^2.4.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.23.tgz#2d544b53a0e55f9a0e03fd45d0970a2cd2ec9103" - integrity sha512-oULEAntFgvQXuKvWSpg1uI4LqSYvCLHalBRdrS95zoifHrSQaGWbyhdyJhWS9RP9vVrOeFbGuuw0eXqrGQfkbg== +"@budibase/types@2.4.24", "@budibase/types@^2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.24.tgz#504f4e3717efa37c05a2f3792b3a9ea66550084e" + integrity sha512-j6z4jIhUIaX8BnCwIDHDcfEvjBiAXVopeKvQ0e9AMdjp5Rnhr60bvRebaRiK0mhcSuJdYQFohVA3y/wLzPFkng== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 58d22b14c1..36fffb7c34 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.24", - "@budibase/pro": "2.4.23", + "@budibase/pro": "2.4.24", "@budibase/string-templates": "^2.4.24", "@budibase/types": "^2.4.24", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e8c3023174..a1cb2cb1ad 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.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.23.tgz#c142808d395061d4212ead8488888d248898225a" - integrity sha512-1+4znax6pW9V+ByveC+lkHl5Kyux7XnYuGHQxJT0/gWtRf3+qY9UcNAhUtZnZAy90NKfJt0tMxCIzBRXvWedRQ== +"@budibase/backend-core@2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.24.tgz#aab3fd1a80e4f0db9a8c38a40a92755d1404a455" + integrity sha512-/QLPkz22yOep1H1JNET3uBAxdPozab9kZUARRI3Lk2yuOtGi5Ea9gNjhnTXZkRpySjbzVDwopj9lvSPPEodCaQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.23" + "@budibase/types" "^2.4.24" "@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.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.23.tgz#5aab68c633a230dadc57d9866920bd923222b322" - integrity sha512-bSRj1n4/ZpcgLGnD99R42PXVUjobNI0nI00z+Q+PgDeY3g+RlUfVIPtxJ6IZFbd5epFQolq0Q9C/OTjiSQqwXw== +"@budibase/pro@2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.24.tgz#bbbdb5cb9ebb07f1f9320c80c0c8c57cc002b93e" + integrity sha512-WRtXaadNsfezMe8lob3d5V9VD2mWxknfkCrdqXP4YrMBaQAjFrma5gpA2M9qT0MbDjkTttG6YKN2kG3os+/vrw== dependencies: - "@budibase/backend-core" "2.4.23" + "@budibase/backend-core" "2.4.24" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.23" + "@budibase/types" "2.4.24" "@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.23", "@budibase/types@^2.4.23": - version "2.4.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.23.tgz#2d544b53a0e55f9a0e03fd45d0970a2cd2ec9103" - integrity sha512-oULEAntFgvQXuKvWSpg1uI4LqSYvCLHalBRdrS95zoifHrSQaGWbyhdyJhWS9RP9vVrOeFbGuuw0eXqrGQfkbg== +"@budibase/types@2.4.24", "@budibase/types@^2.4.24": + version "2.4.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.24.tgz#504f4e3717efa37c05a2f3792b3a9ea66550084e" + integrity sha512-j6z4jIhUIaX8BnCwIDHDcfEvjBiAXVopeKvQ0e9AMdjp5Rnhr60bvRebaRiK0mhcSuJdYQFohVA3y/wLzPFkng== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From f482dbca8bdb2f32bb037729229819d70d41c208 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 14 Mar 2023 09:41:40 +0000 Subject: [PATCH 48/54] Update fallback env vars in k8s chart (#10014) --- .../templates/app-service-deployment.yaml | 15 +++------------ charts/budibase/templates/secrets.yaml | 6 ------ .../templates/worker-service-deployment.yaml | 15 +++------------ 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 4371d27283..41b0dc48c9 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -63,30 +63,21 @@ spec: - name: ENABLE_ANALYTICS value: {{ .Values.globals.enableAnalytics | quote }} - name: API_ENCRYPTION_KEY - valueFrom: - secretKeyRef: - name: budibase-budibase {{ template "budibase.fullname" . }} - key: apiEncryptionKey + value: {{ .Values.globals.apiEncryptionKey | quote }} - name: INTERNAL_API_KEY valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: internalApiKey - name: INTERNAL_API_KEY_FALLBACK - valueFrom: - secretKeyRef: - name: {{ template "budibase.fullname" . }} - key: internalApiKeyFallback + value: {{ .Values.globals.internalApiKeyFallback | quote }} - name: JWT_SECRET valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: jwtSecret - name: JWT_SECRET_FALLBACK - valueFrom: - secretKeyRef: - name: {{ template "budibase.fullname" . }} - key: jwtSecretFallback + value: {{ .Values.globals.jwtSecretFallback | quote }} {{ if .Values.services.objectStore.region }} - name: AWS_REGION value: {{ .Values.services.objectStore.region }} diff --git a/charts/budibase/templates/secrets.yaml b/charts/budibase/templates/secrets.yaml index 3c3ca9bfa8..1c0a914ed3 100644 --- a/charts/budibase/templates/secrets.yaml +++ b/charts/budibase/templates/secrets.yaml @@ -10,14 +10,8 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - {{/* For new installations this can be any value. For existing installations this must match the first used jwtSecret */}} - apiEncryptionKey: {{ .Values.globals.apiEncryptionKey }} internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }} - {{/* Fallback value auto generated */}} - internalApiKeyFallback: {{ .Values.globals.internalApiKeyFallback }} jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }} - {{/* Falback value never auto generated */}} - jwtSecretFallback: {{ .Values.globals.jwtSecretFallback }} objectStoreAccess: {{ template "budibase.defaultsecret" .Values.services.objectStore.accessKey }} objectStoreSecret: {{ template "budibase.defaultsecret" .Values.services.objectStore.secretKey }} {{- end -}} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index f41c7d548b..7886d55b28 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -63,30 +63,21 @@ spec: value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }} {{ end }} - name: API_ENCRYPTION_KEY - valueFrom: - secretKeyRef: - name: budibase-budibase {{ template "budibase.fullname" . }} - key: apiEncryptionKey + value: {{ .Values.globals.apiEncryptionKey | quote }} - name: INTERNAL_API_KEY valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: internalApiKey - name: INTERNAL_API_KEY_FALLBACK - valueFrom: - secretKeyRef: - name: {{ template "budibase.fullname" . }} - key: internalApiKeyFallback + value: {{ .Values.globals.internalApiKeyFallback | quote }} - name: JWT_SECRET valueFrom: secretKeyRef: name: {{ template "budibase.fullname" . }} key: jwtSecret - name: JWT_SECRET_FALLBACK - valueFrom: - secretKeyRef: - name: {{ template "budibase.fullname" . }} - key: jwtSecretFallback + value: {{ .Values.globals.jwtSecretFallback | quote }} {{ if .Values.services.objectStore.region }} - name: AWS_REGION value: {{ .Values.services.objectStore.region }} From c62c6badd55b0b2356cc5722d3c5026c60b1b1a2 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 09:50:17 +0000 Subject: [PATCH 49/54] v2.4.25 --- 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 | 2 +- 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 f76eaca712..6869c2e4c7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.24", + "version": "2.4.25", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 504d12dddd..e1a3820038 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.24", + "version": "2.4.25", "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.24", + "@budibase/types": "^2.4.25", "@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 f22355965d..73172b7349 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.24", + "version": "2.4.25", "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.4.24", - "@budibase/string-templates": "^2.4.24", + "@budibase/shared-core": "^2.4.25", + "@budibase/string-templates": "^2.4.25", "@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 8061fefed2..7eaf31365b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.24", + "version": "2.4.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.24", - "@budibase/client": "^2.4.24", - "@budibase/frontend-core": "^2.4.24", - "@budibase/shared-core": "^2.4.24", - "@budibase/string-templates": "^2.4.24", + "@budibase/bbui": "^2.4.25", + "@budibase/client": "^2.4.25", + "@budibase/frontend-core": "^2.4.25", + "@budibase/shared-core": "^2.4.25", + "@budibase/string-templates": "^2.4.25", "@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 b692a973b7..3ec78bdeb9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.24", + "version": "2.4.25", "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.24", - "@budibase/string-templates": "^2.4.24", - "@budibase/types": "^2.4.24", + "@budibase/backend-core": "^2.4.25", + "@budibase/string-templates": "^2.4.25", + "@budibase/types": "^2.4.25", "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 21d758c82e..471f608445 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.24", + "version": "2.4.25", "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.4.24", - "@budibase/frontend-core": "^2.4.24", - "@budibase/shared-core": "^2.4.24", - "@budibase/string-templates": "^2.4.24", - "@budibase/types": "^2.4.24", + "@budibase/bbui": "^2.4.25", + "@budibase/frontend-core": "^2.4.25", + "@budibase/shared-core": "^2.4.25", + "@budibase/string-templates": "^2.4.25", + "@budibase/types": "^2.4.25", "@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 cbaa5b06ec..915ed436fd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.24", + "version": "2.4.25", "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.24", - "@budibase/shared-core": "^2.4.24", + "@budibase/bbui": "^2.4.25", + "@budibase/shared-core": "^2.4.25", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 77bdeec580..4046c7c078 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.24", + "version": "2.4.25", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 84f4568191..da3c1c32c0 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.24", + "version": "2.4.25", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.24", - "@budibase/client": "^2.4.24", + "@budibase/backend-core": "^2.4.25", + "@budibase/client": "^2.4.25", "@budibase/pro": "2.4.24", - "@budibase/shared-core": "^2.4.24", - "@budibase/string-templates": "^2.4.24", - "@budibase/types": "^2.4.24", + "@budibase/shared-core": "^2.4.25", + "@budibase/string-templates": "^2.4.25", + "@budibase/types": "^2.4.25", "@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 7fbc8387a7..c75aab18ac 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.24", + "version": "2.4.25", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6c87a93627..742753aeb7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.24", + "version": "2.4.25", "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 4cf1488920..65c802375c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.24", + "version": "2.4.25", "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 36fffb7c34..5d47b1d619 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.24", + "version": "2.4.25", "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.24", + "@budibase/backend-core": "^2.4.25", "@budibase/pro": "2.4.24", - "@budibase/string-templates": "^2.4.24", - "@budibase/types": "^2.4.24", + "@budibase/string-templates": "^2.4.25", + "@budibase/types": "^2.4.25", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ecc4dc6ce97e2e60fd2c38ace6e38f7815cd6915 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 09:53:06 +0000 Subject: [PATCH 50/54] Update pro version to 2.4.25 --- 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 da3c1c32c0..28539a0804 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.25", "@budibase/client": "^2.4.25", - "@budibase/pro": "2.4.24", + "@budibase/pro": "2.4.25", "@budibase/shared-core": "^2.4.25", "@budibase/string-templates": "^2.4.25", "@budibase/types": "^2.4.25", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3eaf01ec9a..75969c0270 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.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.24.tgz#aab3fd1a80e4f0db9a8c38a40a92755d1404a455" - integrity sha512-/QLPkz22yOep1H1JNET3uBAxdPozab9kZUARRI3Lk2yuOtGi5Ea9gNjhnTXZkRpySjbzVDwopj9lvSPPEodCaQ== +"@budibase/backend-core@2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.25.tgz#845b563bbf7c102926bd53a924710366a247f3cf" + integrity sha512-F0JuNZMr9aaTi6rqZHUU6btawBFh8haLZWqYRORFgBMk7+U64JVPWIOpfWRP97BYaCCNF178jGfV6I1qT3F9mA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.24" + "@budibase/types" "^2.4.25" "@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.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.24.tgz#bbbdb5cb9ebb07f1f9320c80c0c8c57cc002b93e" - integrity sha512-WRtXaadNsfezMe8lob3d5V9VD2mWxknfkCrdqXP4YrMBaQAjFrma5gpA2M9qT0MbDjkTttG6YKN2kG3os+/vrw== +"@budibase/pro@2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.25.tgz#15769d1436c30237eaf3526aefc8c9c02b7edf05" + integrity sha512-3Y6hh/WMai0TJFBnbsQFpU821q6sVut/bTq1reykGLPg9Itm/+8NvsTG45WV67WMzs1MYauJoN1lTQeaS/6c2g== dependencies: - "@budibase/backend-core" "2.4.24" + "@budibase/backend-core" "2.4.25" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.24" + "@budibase/types" "2.4.25" "@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.24", "@budibase/types@^2.4.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.24.tgz#504f4e3717efa37c05a2f3792b3a9ea66550084e" - integrity sha512-j6z4jIhUIaX8BnCwIDHDcfEvjBiAXVopeKvQ0e9AMdjp5Rnhr60bvRebaRiK0mhcSuJdYQFohVA3y/wLzPFkng== +"@budibase/types@2.4.25", "@budibase/types@^2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.25.tgz#10ccb7b8db8180ec335ef6905ba741c3507e3db7" + integrity sha512-HkCPPu0FVJvFudzCdDetD1X0JBXcg7ugJ7cULWBM04aolZMHBN0Coffi43G5J056O5RHLqKrN/BmCcJSXBP1YQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5d47b1d619..85b8f66efa 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.25", - "@budibase/pro": "2.4.24", + "@budibase/pro": "2.4.25", "@budibase/string-templates": "^2.4.25", "@budibase/types": "^2.4.25", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a1cb2cb1ad..3c10aa7e51 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.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.24.tgz#aab3fd1a80e4f0db9a8c38a40a92755d1404a455" - integrity sha512-/QLPkz22yOep1H1JNET3uBAxdPozab9kZUARRI3Lk2yuOtGi5Ea9gNjhnTXZkRpySjbzVDwopj9lvSPPEodCaQ== +"@budibase/backend-core@2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.25.tgz#845b563bbf7c102926bd53a924710366a247f3cf" + integrity sha512-F0JuNZMr9aaTi6rqZHUU6btawBFh8haLZWqYRORFgBMk7+U64JVPWIOpfWRP97BYaCCNF178jGfV6I1qT3F9mA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.24" + "@budibase/types" "^2.4.25" "@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.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.24.tgz#bbbdb5cb9ebb07f1f9320c80c0c8c57cc002b93e" - integrity sha512-WRtXaadNsfezMe8lob3d5V9VD2mWxknfkCrdqXP4YrMBaQAjFrma5gpA2M9qT0MbDjkTttG6YKN2kG3os+/vrw== +"@budibase/pro@2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.25.tgz#15769d1436c30237eaf3526aefc8c9c02b7edf05" + integrity sha512-3Y6hh/WMai0TJFBnbsQFpU821q6sVut/bTq1reykGLPg9Itm/+8NvsTG45WV67WMzs1MYauJoN1lTQeaS/6c2g== dependencies: - "@budibase/backend-core" "2.4.24" + "@budibase/backend-core" "2.4.25" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.24" + "@budibase/types" "2.4.25" "@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.24", "@budibase/types@^2.4.24": - version "2.4.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.24.tgz#504f4e3717efa37c05a2f3792b3a9ea66550084e" - integrity sha512-j6z4jIhUIaX8BnCwIDHDcfEvjBiAXVopeKvQ0e9AMdjp5Rnhr60bvRebaRiK0mhcSuJdYQFohVA3y/wLzPFkng== +"@budibase/types@2.4.25", "@budibase/types@^2.4.25": + version "2.4.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.25.tgz#10ccb7b8db8180ec335ef6905ba741c3507e3db7" + integrity sha512-HkCPPu0FVJvFudzCdDetD1X0JBXcg7ugJ7cULWBM04aolZMHBN0Coffi43G5J056O5RHLqKrN/BmCcJSXBP1YQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 878bc65eb20d116308919fe9db272052270c9099 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:06:01 +0000 Subject: [PATCH 51/54] Add missing readable flag (#10016) --- packages/server/src/integrations/s3.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index b965b177d0..ad3bb09109 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -107,6 +107,7 @@ const SCHEMA: Integration = { readCsv: { displayName: "Read CSV", type: QueryType.FIELDS, + readable: true, fields: { bucket: { type: DatasourceFieldType.STRING, From 10f1d1f142fbf43a749044e54f203233904de702 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 10:17:02 +0000 Subject: [PATCH 52/54] v2.4.26 --- 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 | 2 +- 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 6869c2e4c7..b47cca4c23 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.25", + "version": "2.4.26", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e1a3820038..c27893051d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.25", + "version": "2.4.26", "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.25", + "@budibase/types": "^2.4.26", "@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 73172b7349..6f37501ca6 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.25", + "version": "2.4.26", "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.4.25", - "@budibase/string-templates": "^2.4.25", + "@budibase/shared-core": "^2.4.26", + "@budibase/string-templates": "^2.4.26", "@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 7eaf31365b..1b910f2def 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.25", + "version": "2.4.26", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.25", - "@budibase/client": "^2.4.25", - "@budibase/frontend-core": "^2.4.25", - "@budibase/shared-core": "^2.4.25", - "@budibase/string-templates": "^2.4.25", + "@budibase/bbui": "^2.4.26", + "@budibase/client": "^2.4.26", + "@budibase/frontend-core": "^2.4.26", + "@budibase/shared-core": "^2.4.26", + "@budibase/string-templates": "^2.4.26", "@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 3ec78bdeb9..146e76f19e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.25", + "version": "2.4.26", "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.25", - "@budibase/string-templates": "^2.4.25", - "@budibase/types": "^2.4.25", + "@budibase/backend-core": "^2.4.26", + "@budibase/string-templates": "^2.4.26", + "@budibase/types": "^2.4.26", "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 471f608445..ea62d102fc 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.25", + "version": "2.4.26", "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.4.25", - "@budibase/frontend-core": "^2.4.25", - "@budibase/shared-core": "^2.4.25", - "@budibase/string-templates": "^2.4.25", - "@budibase/types": "^2.4.25", + "@budibase/bbui": "^2.4.26", + "@budibase/frontend-core": "^2.4.26", + "@budibase/shared-core": "^2.4.26", + "@budibase/string-templates": "^2.4.26", + "@budibase/types": "^2.4.26", "@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 915ed436fd..402a95474c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.25", + "version": "2.4.26", "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.25", - "@budibase/shared-core": "^2.4.25", + "@budibase/bbui": "^2.4.26", + "@budibase/shared-core": "^2.4.26", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4046c7c078..b9ee415bd5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.25", + "version": "2.4.26", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 28539a0804..918091d836 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.25", + "version": "2.4.26", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.25", - "@budibase/client": "^2.4.25", + "@budibase/backend-core": "^2.4.26", + "@budibase/client": "^2.4.26", "@budibase/pro": "2.4.25", - "@budibase/shared-core": "^2.4.25", - "@budibase/string-templates": "^2.4.25", - "@budibase/types": "^2.4.25", + "@budibase/shared-core": "^2.4.26", + "@budibase/string-templates": "^2.4.26", + "@budibase/types": "^2.4.26", "@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 c75aab18ac..ef45505af4 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.25", + "version": "2.4.26", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 742753aeb7..998715179f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.25", + "version": "2.4.26", "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 65c802375c..56f4e56dd0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.25", + "version": "2.4.26", "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 85b8f66efa..f971f9eac5 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.25", + "version": "2.4.26", "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.25", + "@budibase/backend-core": "^2.4.26", "@budibase/pro": "2.4.25", - "@budibase/string-templates": "^2.4.25", - "@budibase/types": "^2.4.25", + "@budibase/string-templates": "^2.4.26", + "@budibase/types": "^2.4.26", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From afa541eb3cd741ffd3cc864ba979a96a35ec3eeb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 10:20:20 +0000 Subject: [PATCH 53/54] Update pro version to 2.4.26 --- 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 918091d836..8a14b00fee 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.26", "@budibase/client": "^2.4.26", - "@budibase/pro": "2.4.25", + "@budibase/pro": "2.4.26", "@budibase/shared-core": "^2.4.26", "@budibase/string-templates": "^2.4.26", "@budibase/types": "^2.4.26", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 75969c0270..d09ac3c7c9 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.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.25.tgz#845b563bbf7c102926bd53a924710366a247f3cf" - integrity sha512-F0JuNZMr9aaTi6rqZHUU6btawBFh8haLZWqYRORFgBMk7+U64JVPWIOpfWRP97BYaCCNF178jGfV6I1qT3F9mA== +"@budibase/backend-core@2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.26.tgz#ae9679f20e86ce1706d6d549aed78a342365a4b4" + integrity sha512-9QYJbAT9WPiOckBIR6a/CoqqbUiP9vlmc/Iy5TR5Yj2wy1JnWsf09ReTuL3CsHmh+8bCJlUHZZC4m6PUMg7+ow== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.25" + "@budibase/types" "^2.4.26" "@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.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.25.tgz#15769d1436c30237eaf3526aefc8c9c02b7edf05" - integrity sha512-3Y6hh/WMai0TJFBnbsQFpU821q6sVut/bTq1reykGLPg9Itm/+8NvsTG45WV67WMzs1MYauJoN1lTQeaS/6c2g== +"@budibase/pro@2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.26.tgz#37ca2b94f5dfc28ee4ff0ffa088e29112de5b66f" + integrity sha512-PXpsj5DFnUaSlp3AHZRZa/N4CD02HPpvVFv35/FUGkeGwGJ5AihhmzxlD54U9Q9X3Ln8miejYTFoWvEnV5Ei8w== dependencies: - "@budibase/backend-core" "2.4.25" + "@budibase/backend-core" "2.4.26" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.25" + "@budibase/types" "2.4.26" "@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.25", "@budibase/types@^2.4.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.25.tgz#10ccb7b8db8180ec335ef6905ba741c3507e3db7" - integrity sha512-HkCPPu0FVJvFudzCdDetD1X0JBXcg7ugJ7cULWBM04aolZMHBN0Coffi43G5J056O5RHLqKrN/BmCcJSXBP1YQ== +"@budibase/types@2.4.26", "@budibase/types@^2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.26.tgz#c4efd9286e736feee56d623c21a9f6fd7c922b94" + integrity sha512-q2QfDXJAopmHNq6Y25udmVJoEtnoskZEtaMy5d7/hX4jePJX3QnBd9sjgnAoOeSC3NOuXDjmvcRGtqXz6ao/Ag== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f971f9eac5..7f4797bd1b 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.26", - "@budibase/pro": "2.4.25", + "@budibase/pro": "2.4.26", "@budibase/string-templates": "^2.4.26", "@budibase/types": "^2.4.26", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3c10aa7e51..7855e71965 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.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.25.tgz#845b563bbf7c102926bd53a924710366a247f3cf" - integrity sha512-F0JuNZMr9aaTi6rqZHUU6btawBFh8haLZWqYRORFgBMk7+U64JVPWIOpfWRP97BYaCCNF178jGfV6I1qT3F9mA== +"@budibase/backend-core@2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.26.tgz#ae9679f20e86ce1706d6d549aed78a342365a4b4" + integrity sha512-9QYJbAT9WPiOckBIR6a/CoqqbUiP9vlmc/Iy5TR5Yj2wy1JnWsf09ReTuL3CsHmh+8bCJlUHZZC4m6PUMg7+ow== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.25" + "@budibase/types" "^2.4.26" "@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.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.25.tgz#15769d1436c30237eaf3526aefc8c9c02b7edf05" - integrity sha512-3Y6hh/WMai0TJFBnbsQFpU821q6sVut/bTq1reykGLPg9Itm/+8NvsTG45WV67WMzs1MYauJoN1lTQeaS/6c2g== +"@budibase/pro@2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.26.tgz#37ca2b94f5dfc28ee4ff0ffa088e29112de5b66f" + integrity sha512-PXpsj5DFnUaSlp3AHZRZa/N4CD02HPpvVFv35/FUGkeGwGJ5AihhmzxlD54U9Q9X3Ln8miejYTFoWvEnV5Ei8w== dependencies: - "@budibase/backend-core" "2.4.25" + "@budibase/backend-core" "2.4.26" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.25" + "@budibase/types" "2.4.26" "@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.25", "@budibase/types@^2.4.25": - version "2.4.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.25.tgz#10ccb7b8db8180ec335ef6905ba741c3507e3db7" - integrity sha512-HkCPPu0FVJvFudzCdDetD1X0JBXcg7ugJ7cULWBM04aolZMHBN0Coffi43G5J056O5RHLqKrN/BmCcJSXBP1YQ== +"@budibase/types@2.4.26", "@budibase/types@^2.4.26": + version "2.4.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.26.tgz#c4efd9286e736feee56d623c21a9f6fd7c922b94" + integrity sha512-q2QfDXJAopmHNq6Y25udmVJoEtnoskZEtaMy5d7/hX4jePJX3QnBd9sjgnAoOeSC3NOuXDjmvcRGtqXz6ao/Ag== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 71a90f487395088888183a8a4e9b57a4c7472290 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 14 Mar 2023 14:04:42 +0000 Subject: [PATCH 54/54] Fixing shared-core types version. --- packages/shared-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index ef45505af4..1ed7d4243e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -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.4.5-alpha.0" + "@budibase/types": "^2.4.26" }, "devDependencies": { "concurrently": "^7.6.0",