From 467ef04078af0660d0db8d0d215c13e2777a61a2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 8 Mar 2023 16:27:35 +0000 Subject: [PATCH 01/16] 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 a7e34c0829751ed0dc3f8f1d94028db744d678cc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 9 Mar 2023 13:52:35 +0000 Subject: [PATCH 02/16] 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 03/16] 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 04/16] 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 05/16] 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 c33ea4dcfe0cbf9c54deb56edb09bbdb76c557a9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 16:13:26 +0000 Subject: [PATCH 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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"