From 226649f928e7735ab7474d6b19f20f5ef8ac67f9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 4 Nov 2022 10:56:19 +0000 Subject: [PATCH 01/16] v2.1.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 c1993aa774..4b9e956a03 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.13", + "version": "2.1.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 29eaa2aeaf..5443e0e0d3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.13", + "version": "2.1.14", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.13", + "@budibase/types": "^2.1.14", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 025f71911d..60ac7396ea 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.1.13", + "version": "2.1.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.1.13", + "@budibase/string-templates": "^2.1.14", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 267a130f08..6a2912df82 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.13", + "version": "2.1.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.13", - "@budibase/client": "^2.1.13", - "@budibase/frontend-core": "^2.1.13", - "@budibase/string-templates": "^2.1.13", + "@budibase/bbui": "^2.1.14", + "@budibase/client": "^2.1.14", + "@budibase/frontend-core": "^2.1.14", + "@budibase/string-templates": "^2.1.14", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index cd932beb05..e89f92f156 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.13", + "version": "2.1.14", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.13", - "@budibase/string-templates": "^2.1.13", - "@budibase/types": "^2.1.13", + "@budibase/backend-core": "^2.1.14", + "@budibase/string-templates": "^2.1.14", + "@budibase/types": "^2.1.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 aad893a625..9ea58f0e4c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.13", + "version": "2.1.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.1.13", - "@budibase/frontend-core": "^2.1.13", - "@budibase/string-templates": "^2.1.13", + "@budibase/bbui": "^2.1.14", + "@budibase/frontend-core": "^2.1.14", + "@budibase/string-templates": "^2.1.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 913da674bd..eabe420b96 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.13", + "version": "2.1.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.1.13", + "@budibase/bbui": "^2.1.14", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index afee578675..d639d074f8 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.13", + "version": "2.1.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 3b403afd62..0a58621e32 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.13", + "version": "2.1.14", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.13", - "@budibase/client": "^2.1.13", + "@budibase/backend-core": "^2.1.14", + "@budibase/client": "^2.1.14", "@budibase/pro": "2.1.13", - "@budibase/string-templates": "^2.1.13", - "@budibase/types": "^2.1.13", + "@budibase/string-templates": "^2.1.14", + "@budibase/types": "^2.1.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 db0930541a..98e1410cb3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.13", + "version": "2.1.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 0015a9fb3d..caffc3e006 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.13", + "version": "2.1.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 03dfdfb233..e51426a1c8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.13", + "version": "2.1.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.1.13", + "@budibase/backend-core": "^2.1.14", "@budibase/pro": "2.1.13", - "@budibase/string-templates": "^2.1.13", - "@budibase/types": "^2.1.13", + "@budibase/string-templates": "^2.1.14", + "@budibase/types": "^2.1.14", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 841b3b62c0f4b9d0ca6c04626435ace5120d2cac Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 4 Nov 2022 10:59:28 +0000 Subject: [PATCH 02/16] Update pro version to 2.1.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 0a58621e32..624c5f949a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.14", "@budibase/client": "^2.1.14", - "@budibase/pro": "2.1.13", + "@budibase/pro": "2.1.14", "@budibase/string-templates": "^2.1.14", "@budibase/types": "^2.1.14", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ea3db6c79c..d177ae9b7e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.13.tgz#d0c4b126c87aa7e48864821bd40ba6523cfcca1f" - integrity sha512-6dxl1tdndO+Zj3uacTY33cXbfve90q5AvOjyZihkkh4e/MEZwLU81BD8Be7rAwaPM94hHu7VvHYkGqs9QnGG9Q== +"@budibase/backend-core@2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14.tgz#1e0f33c054b556c54b6c776296f4c47b0181cd9d" + integrity sha512-i5KEG3Vy/lnWS8X3jBIjRxNVVsKLCkRPB7VYKyZL6yMn7F1BEa3nGP8ahrw3A1ODmuvg5nYsD6/O/QqfSjUuVg== dependencies: - "@budibase/types" "^2.1.13" + "@budibase/types" "^2.1.14" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.13.tgz#c1f6264493652fa7372a97d0c034104ccec25f23" - integrity sha512-/1Niv6ywTG3W6zC6cWFqvb5Mup8UR7YKqVCMVzFaQwV2eR+QBSlsTZKHneFpJuFFA/tlQsOpnVYKvpVZCYbViA== +"@budibase/pro@2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14.tgz#760c144226a8bf9b1f50de944364f2d92bcb3ba5" + integrity sha512-hQmVTFSOvUwjSoCwkkj/MkkxeI3vsaY1dk4/ZOhIrIPQsV/S2HIkINqaGKJkTKL2rLmJLq2PKUy/HZhHabgWrQ== dependencies: - "@budibase/backend-core" "2.1.13" - "@budibase/types" "2.1.13" + "@budibase/backend-core" "2.1.14" + "@budibase/types" "2.1.14" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.13", "@budibase/types@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.13.tgz#d65adfe0e9fb645701be63bc9b728d5e2b7bb726" - integrity sha512-kBUoUxPaVh7YW+0OS5pJ56Rar35n6uct1sEsA14uXErOQ33VssHJjIiYZL1DnlE+4PT5xpmW8fAUQiTz4PYBnw== +"@budibase/types@2.1.14", "@budibase/types@^2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14.tgz#8e6343c25fc3dd7dae2530aafb83223c2044e64c" + integrity sha512-LW7MyISpFmI0mk0WGZYCR0dJYk2ifXbr76eUY4lSe8BKbpLvceby2m6JxExCc4z+5VvrZ1+7AHIr6MpQrgvr9A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e51426a1c8..389b312421 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.14", - "@budibase/pro": "2.1.13", + "@budibase/pro": "2.1.14", "@budibase/string-templates": "^2.1.14", "@budibase/types": "^2.1.14", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 221eb9050a..386f1ab468 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.13.tgz#d0c4b126c87aa7e48864821bd40ba6523cfcca1f" - integrity sha512-6dxl1tdndO+Zj3uacTY33cXbfve90q5AvOjyZihkkh4e/MEZwLU81BD8Be7rAwaPM94hHu7VvHYkGqs9QnGG9Q== +"@budibase/backend-core@2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14.tgz#1e0f33c054b556c54b6c776296f4c47b0181cd9d" + integrity sha512-i5KEG3Vy/lnWS8X3jBIjRxNVVsKLCkRPB7VYKyZL6yMn7F1BEa3nGP8ahrw3A1ODmuvg5nYsD6/O/QqfSjUuVg== dependencies: - "@budibase/types" "^2.1.13" + "@budibase/types" "^2.1.14" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.13.tgz#c1f6264493652fa7372a97d0c034104ccec25f23" - integrity sha512-/1Niv6ywTG3W6zC6cWFqvb5Mup8UR7YKqVCMVzFaQwV2eR+QBSlsTZKHneFpJuFFA/tlQsOpnVYKvpVZCYbViA== +"@budibase/pro@2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14.tgz#760c144226a8bf9b1f50de944364f2d92bcb3ba5" + integrity sha512-hQmVTFSOvUwjSoCwkkj/MkkxeI3vsaY1dk4/ZOhIrIPQsV/S2HIkINqaGKJkTKL2rLmJLq2PKUy/HZhHabgWrQ== dependencies: - "@budibase/backend-core" "2.1.13" - "@budibase/types" "2.1.13" + "@budibase/backend-core" "2.1.14" + "@budibase/types" "2.1.14" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.13", "@budibase/types@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.13.tgz#d65adfe0e9fb645701be63bc9b728d5e2b7bb726" - integrity sha512-kBUoUxPaVh7YW+0OS5pJ56Rar35n6uct1sEsA14uXErOQ33VssHJjIiYZL1DnlE+4PT5xpmW8fAUQiTz4PYBnw== +"@budibase/types@2.1.14", "@budibase/types@^2.1.14": + version "2.1.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14.tgz#8e6343c25fc3dd7dae2530aafb83223c2044e64c" + integrity sha512-LW7MyISpFmI0mk0WGZYCR0dJYk2ifXbr76eUY4lSe8BKbpLvceby2m6JxExCc4z+5VvrZ1+7AHIr6MpQrgvr9A== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 40dfa8c0495dc904aa254afca85000e52ae110da Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 4 Nov 2022 18:50:47 +0000 Subject: [PATCH 03/16] Check schema exists for default value --- packages/client/src/components/app/forms/InnerForm.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 0c512bbe0f..00bcf19548 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -131,7 +131,7 @@ const getDefault = (defaultValue, schema, type) => { // Remove any values not present in the field schema // Convert any values supplied to string - if (Array.isArray(defaultValue) && type == "array") { + if (Array.isArray(defaultValue) && type == "array" && schema) { return defaultValue.reduce((acc, entry) => { let processedOption = String(entry) let schemaOptions = schema.constraints.inclusion From 51d2e36f712ad3161556b9b8049c84debead7e46 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 4 Nov 2022 20:40:02 +0000 Subject: [PATCH 04/16] v2.1.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 4b9e956a03..f9dda4cb3d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.14", + "version": "2.1.15", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5443e0e0d3..0d2b770e46 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.14", + "version": "2.1.15", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.14", + "@budibase/types": "^2.1.15", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 60ac7396ea..4deb25169c 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.1.14", + "version": "2.1.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.1.14", + "@budibase/string-templates": "^2.1.15", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6a2912df82..bf027767bd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.14", + "version": "2.1.15", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.14", - "@budibase/client": "^2.1.14", - "@budibase/frontend-core": "^2.1.14", - "@budibase/string-templates": "^2.1.14", + "@budibase/bbui": "^2.1.15", + "@budibase/client": "^2.1.15", + "@budibase/frontend-core": "^2.1.15", + "@budibase/string-templates": "^2.1.15", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e89f92f156..cddebf2507 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.14", + "version": "2.1.15", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.14", - "@budibase/string-templates": "^2.1.14", - "@budibase/types": "^2.1.14", + "@budibase/backend-core": "^2.1.15", + "@budibase/string-templates": "^2.1.15", + "@budibase/types": "^2.1.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 9ea58f0e4c..4467f6a9b4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.14", + "version": "2.1.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.1.14", - "@budibase/frontend-core": "^2.1.14", - "@budibase/string-templates": "^2.1.14", + "@budibase/bbui": "^2.1.15", + "@budibase/frontend-core": "^2.1.15", + "@budibase/string-templates": "^2.1.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 eabe420b96..117321769b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.14", + "version": "2.1.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.1.14", + "@budibase/bbui": "^2.1.15", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d639d074f8..e6d6574627 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.14", + "version": "2.1.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 624c5f949a..29eed9f2e7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.14", + "version": "2.1.15", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.14", - "@budibase/client": "^2.1.14", + "@budibase/backend-core": "^2.1.15", + "@budibase/client": "^2.1.15", "@budibase/pro": "2.1.14", - "@budibase/string-templates": "^2.1.14", - "@budibase/types": "^2.1.14", + "@budibase/string-templates": "^2.1.15", + "@budibase/types": "^2.1.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 98e1410cb3..8ccdf35149 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.14", + "version": "2.1.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 caffc3e006..271f0ddfe0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.14", + "version": "2.1.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 389b312421..a61e9592c2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.14", + "version": "2.1.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.1.14", + "@budibase/backend-core": "^2.1.15", "@budibase/pro": "2.1.14", - "@budibase/string-templates": "^2.1.14", - "@budibase/types": "^2.1.14", + "@budibase/string-templates": "^2.1.15", + "@budibase/types": "^2.1.15", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2561b0a70d3fc87fc688d620ef9e28247643c8f4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 4 Nov 2022 20:43:24 +0000 Subject: [PATCH 05/16] Update pro version to 2.1.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 29eed9f2e7..dbdcfde3f3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.15", "@budibase/client": "^2.1.15", - "@budibase/pro": "2.1.14", + "@budibase/pro": "2.1.15", "@budibase/string-templates": "^2.1.15", "@budibase/types": "^2.1.15", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d177ae9b7e..03de39115b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14.tgz#1e0f33c054b556c54b6c776296f4c47b0181cd9d" - integrity sha512-i5KEG3Vy/lnWS8X3jBIjRxNVVsKLCkRPB7VYKyZL6yMn7F1BEa3nGP8ahrw3A1ODmuvg5nYsD6/O/QqfSjUuVg== +"@budibase/backend-core@2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.15.tgz#5129333c13e1b7178c002af310886f64522b70df" + integrity sha512-N+9Ta2v3RxgyARBIbsrWIYLxJ3nwImXakDwURV8z4oDDp3uxPuPgSzhraJrjTsMzZpPMVTDnQEO5c6GpvmDhBA== dependencies: - "@budibase/types" "^2.1.14" + "@budibase/types" "^2.1.15" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14.tgz#760c144226a8bf9b1f50de944364f2d92bcb3ba5" - integrity sha512-hQmVTFSOvUwjSoCwkkj/MkkxeI3vsaY1dk4/ZOhIrIPQsV/S2HIkINqaGKJkTKL2rLmJLq2PKUy/HZhHabgWrQ== +"@budibase/pro@2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.15.tgz#04f688859be389baffe55f39097dcd9d4d6a88c6" + integrity sha512-QDJFG/f/kv/L9sTnE5OxnCU83qblqLqLJ4r+SCjInV8x7RVZNaqeU4Qi7GI4/36pqjpgVSispQRrpNGNe4858g== dependencies: - "@budibase/backend-core" "2.1.14" - "@budibase/types" "2.1.14" + "@budibase/backend-core" "2.1.15" + "@budibase/types" "2.1.15" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.14", "@budibase/types@^2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14.tgz#8e6343c25fc3dd7dae2530aafb83223c2044e64c" - integrity sha512-LW7MyISpFmI0mk0WGZYCR0dJYk2ifXbr76eUY4lSe8BKbpLvceby2m6JxExCc4z+5VvrZ1+7AHIr6MpQrgvr9A== +"@budibase/types@2.1.15", "@budibase/types@^2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.15.tgz#2d8d39702b1e4cadf6a05415f8185b43d913a111" + integrity sha512-pn/aM4uYq6jKnkfWfTZDqnUabnaAyrwDUUMnnKAL/0ppYYwJRG3s4IwTh3YcJsUvhtizOb2GgFLyqUNna3fisQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a61e9592c2..f73e0c1c55 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.15", - "@budibase/pro": "2.1.14", + "@budibase/pro": "2.1.15", "@budibase/string-templates": "^2.1.15", "@budibase/types": "^2.1.15", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 386f1ab468..f22ef2ea3c 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14.tgz#1e0f33c054b556c54b6c776296f4c47b0181cd9d" - integrity sha512-i5KEG3Vy/lnWS8X3jBIjRxNVVsKLCkRPB7VYKyZL6yMn7F1BEa3nGP8ahrw3A1ODmuvg5nYsD6/O/QqfSjUuVg== +"@budibase/backend-core@2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.15.tgz#5129333c13e1b7178c002af310886f64522b70df" + integrity sha512-N+9Ta2v3RxgyARBIbsrWIYLxJ3nwImXakDwURV8z4oDDp3uxPuPgSzhraJrjTsMzZpPMVTDnQEO5c6GpvmDhBA== dependencies: - "@budibase/types" "^2.1.14" + "@budibase/types" "^2.1.15" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14.tgz#760c144226a8bf9b1f50de944364f2d92bcb3ba5" - integrity sha512-hQmVTFSOvUwjSoCwkkj/MkkxeI3vsaY1dk4/ZOhIrIPQsV/S2HIkINqaGKJkTKL2rLmJLq2PKUy/HZhHabgWrQ== +"@budibase/pro@2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.15.tgz#04f688859be389baffe55f39097dcd9d4d6a88c6" + integrity sha512-QDJFG/f/kv/L9sTnE5OxnCU83qblqLqLJ4r+SCjInV8x7RVZNaqeU4Qi7GI4/36pqjpgVSispQRrpNGNe4858g== dependencies: - "@budibase/backend-core" "2.1.14" - "@budibase/types" "2.1.14" + "@budibase/backend-core" "2.1.15" + "@budibase/types" "2.1.15" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.14", "@budibase/types@^2.1.14": - version "2.1.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14.tgz#8e6343c25fc3dd7dae2530aafb83223c2044e64c" - integrity sha512-LW7MyISpFmI0mk0WGZYCR0dJYk2ifXbr76eUY4lSe8BKbpLvceby2m6JxExCc4z+5VvrZ1+7AHIr6MpQrgvr9A== +"@budibase/types@2.1.15", "@budibase/types@^2.1.15": + version "2.1.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.15.tgz#2d8d39702b1e4cadf6a05415f8185b43d913a111" + integrity sha512-pn/aM4uYq6jKnkfWfTZDqnUabnaAyrwDUUMnnKAL/0ppYYwJRG3s4IwTh3YcJsUvhtizOb2GgFLyqUNna3fisQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From b4ee385abad5eca78bdb100d7e00c1259123fc30 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sat, 5 Nov 2022 13:55:17 +0000 Subject: [PATCH 06/16] ensure /app prefix gets stripped from website templates --- packages/builder/src/pages/builder/portal/apps/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 562434eaf1..04b7619412 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -167,7 +167,7 @@ const autoCreateApp = async () => { try { // Auto name app if has same name - let appName = template.key + let appName = template.key.replace("app/", "") const appsWithSameName = $apps.filter(app => app.name?.startsWith(appName) ) From e44fd24633be85652df3258b5d9c8cf187f6ed2b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sat, 5 Nov 2022 14:11:32 +0000 Subject: [PATCH 07/16] v2.1.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 f9dda4cb3d..76f749817f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.15", + "version": "2.1.16", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0d2b770e46..90c10cc0bc 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.15", + "version": "2.1.16", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.15", + "@budibase/types": "^2.1.16", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4deb25169c..220a44d1f9 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.1.15", + "version": "2.1.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.1.15", + "@budibase/string-templates": "^2.1.16", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index bf027767bd..11bf44228c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.15", + "version": "2.1.16", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.15", - "@budibase/client": "^2.1.15", - "@budibase/frontend-core": "^2.1.15", - "@budibase/string-templates": "^2.1.15", + "@budibase/bbui": "^2.1.16", + "@budibase/client": "^2.1.16", + "@budibase/frontend-core": "^2.1.16", + "@budibase/string-templates": "^2.1.16", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index cddebf2507..b6d457ba7d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.15", + "version": "2.1.16", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.15", - "@budibase/string-templates": "^2.1.15", - "@budibase/types": "^2.1.15", + "@budibase/backend-core": "^2.1.16", + "@budibase/string-templates": "^2.1.16", + "@budibase/types": "^2.1.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 4467f6a9b4..a3fe362a2a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.15", + "version": "2.1.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.1.15", - "@budibase/frontend-core": "^2.1.15", - "@budibase/string-templates": "^2.1.15", + "@budibase/bbui": "^2.1.16", + "@budibase/frontend-core": "^2.1.16", + "@budibase/string-templates": "^2.1.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 117321769b..4d9339f02d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.15", + "version": "2.1.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.1.15", + "@budibase/bbui": "^2.1.16", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e6d6574627..ea8a97dc37 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.15", + "version": "2.1.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 dbdcfde3f3..c80e1e345c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.15", + "version": "2.1.16", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.15", - "@budibase/client": "^2.1.15", + "@budibase/backend-core": "^2.1.16", + "@budibase/client": "^2.1.16", "@budibase/pro": "2.1.15", - "@budibase/string-templates": "^2.1.15", - "@budibase/types": "^2.1.15", + "@budibase/string-templates": "^2.1.16", + "@budibase/types": "^2.1.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 8ccdf35149..81bd2cde40 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.15", + "version": "2.1.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 271f0ddfe0..ec3c77c5e7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.15", + "version": "2.1.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 f73e0c1c55..a5a0410a7e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.15", + "version": "2.1.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.1.15", + "@budibase/backend-core": "^2.1.16", "@budibase/pro": "2.1.15", - "@budibase/string-templates": "^2.1.15", - "@budibase/types": "^2.1.15", + "@budibase/string-templates": "^2.1.16", + "@budibase/types": "^2.1.16", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 60f63b7013a1a0ef6f1cbada9a9a7d089e162370 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sat, 5 Nov 2022 14:14:51 +0000 Subject: [PATCH 08/16] Update pro version to 2.1.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 c80e1e345c..117474f34a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.16", "@budibase/client": "^2.1.16", - "@budibase/pro": "2.1.15", + "@budibase/pro": "2.1.16", "@budibase/string-templates": "^2.1.16", "@budibase/types": "^2.1.16", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 03de39115b..cdf9290f5d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.15.tgz#5129333c13e1b7178c002af310886f64522b70df" - integrity sha512-N+9Ta2v3RxgyARBIbsrWIYLxJ3nwImXakDwURV8z4oDDp3uxPuPgSzhraJrjTsMzZpPMVTDnQEO5c6GpvmDhBA== +"@budibase/backend-core@2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.16.tgz#452ab7b93cdfc27cfb41247f8832b5c162220300" + integrity sha512-y383gvLabisOc0kmUDBJnvWJU44Ya26H+hvw8XknOUP3OJZ1+7tSkp1rvaMmH5lHXwXVKW0d8em5YLAMEvlxzQ== dependencies: - "@budibase/types" "^2.1.15" + "@budibase/types" "^2.1.16" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.15.tgz#04f688859be389baffe55f39097dcd9d4d6a88c6" - integrity sha512-QDJFG/f/kv/L9sTnE5OxnCU83qblqLqLJ4r+SCjInV8x7RVZNaqeU4Qi7GI4/36pqjpgVSispQRrpNGNe4858g== +"@budibase/pro@2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.16.tgz#bb8aba9dabcccf9e8670288a73339cd379706c5a" + integrity sha512-dPXEz5sQ0miWrQSCpIAJyyYc3LFMa+IqAtPKjH0Fx3ZicGSIxHhoJPJDFoPYgQAnJumYmXNU/pVCZmZyVbbtqA== dependencies: - "@budibase/backend-core" "2.1.15" - "@budibase/types" "2.1.15" + "@budibase/backend-core" "2.1.16" + "@budibase/types" "2.1.16" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.15", "@budibase/types@^2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.15.tgz#2d8d39702b1e4cadf6a05415f8185b43d913a111" - integrity sha512-pn/aM4uYq6jKnkfWfTZDqnUabnaAyrwDUUMnnKAL/0ppYYwJRG3s4IwTh3YcJsUvhtizOb2GgFLyqUNna3fisQ== +"@budibase/types@2.1.16", "@budibase/types@^2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.16.tgz#5bf30bd21f4ca2bfaf219e7999d3c116312d7bca" + integrity sha512-/d3R2OHRNRRqk7ICgoruISgCL6NLOTGUiqyI+sgQgs6uI0iMQjHcBt/ALgklpv5Ms5d54asE8JtuTrhZPBgAYg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a5a0410a7e..588998238b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.16", - "@budibase/pro": "2.1.15", + "@budibase/pro": "2.1.16", "@budibase/string-templates": "^2.1.16", "@budibase/types": "^2.1.16", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f22ef2ea3c..210fe1107d 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.15.tgz#5129333c13e1b7178c002af310886f64522b70df" - integrity sha512-N+9Ta2v3RxgyARBIbsrWIYLxJ3nwImXakDwURV8z4oDDp3uxPuPgSzhraJrjTsMzZpPMVTDnQEO5c6GpvmDhBA== +"@budibase/backend-core@2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.16.tgz#452ab7b93cdfc27cfb41247f8832b5c162220300" + integrity sha512-y383gvLabisOc0kmUDBJnvWJU44Ya26H+hvw8XknOUP3OJZ1+7tSkp1rvaMmH5lHXwXVKW0d8em5YLAMEvlxzQ== dependencies: - "@budibase/types" "^2.1.15" + "@budibase/types" "^2.1.16" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.15.tgz#04f688859be389baffe55f39097dcd9d4d6a88c6" - integrity sha512-QDJFG/f/kv/L9sTnE5OxnCU83qblqLqLJ4r+SCjInV8x7RVZNaqeU4Qi7GI4/36pqjpgVSispQRrpNGNe4858g== +"@budibase/pro@2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.16.tgz#bb8aba9dabcccf9e8670288a73339cd379706c5a" + integrity sha512-dPXEz5sQ0miWrQSCpIAJyyYc3LFMa+IqAtPKjH0Fx3ZicGSIxHhoJPJDFoPYgQAnJumYmXNU/pVCZmZyVbbtqA== dependencies: - "@budibase/backend-core" "2.1.15" - "@budibase/types" "2.1.15" + "@budibase/backend-core" "2.1.16" + "@budibase/types" "2.1.16" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.15", "@budibase/types@^2.1.15": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.15.tgz#2d8d39702b1e4cadf6a05415f8185b43d913a111" - integrity sha512-pn/aM4uYq6jKnkfWfTZDqnUabnaAyrwDUUMnnKAL/0ppYYwJRG3s4IwTh3YcJsUvhtizOb2GgFLyqUNna3fisQ== +"@budibase/types@2.1.16", "@budibase/types@^2.1.16": + version "2.1.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.16.tgz#5bf30bd21f4ca2bfaf219e7999d3c116312d7bca" + integrity sha512-/d3R2OHRNRRqk7ICgoruISgCL6NLOTGUiqyI+sgQgs6uI0iMQjHcBt/ALgklpv5Ms5d54asE8JtuTrhZPBgAYg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From f07774a6baf2dc9bf6962336eb7bf1d14190a72c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sat, 5 Nov 2022 14:43:07 +0000 Subject: [PATCH 09/16] stripping - from additional app name number --- packages/builder/src/pages/builder/portal/apps/index.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 04b7619412..4ca67d83be 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -167,11 +167,13 @@ const autoCreateApp = async () => { try { // Auto name app if has same name - let appName = template.key.replace("app/", "") + const templateKey = template.key.split("/")[1] + + let appName = templateKey.replace(/-/g, " ") const appsWithSameName = $apps.filter(app => app.name?.startsWith(appName) ) - appName = `${appName}-${appsWithSameName.length + 1}` + appName = `${appName} ${appsWithSameName.length + 1}` // Create form data to create app let data = new FormData() From f13fc9cd82db61af9474e1070071cafefdfed42d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sat, 5 Nov 2022 15:13:19 +0000 Subject: [PATCH 10/16] v2.1.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 76f749817f..4413112aa1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.16", + "version": "2.1.17", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 90c10cc0bc..403b1d0ac8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.16", + "version": "2.1.17", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.16", + "@budibase/types": "^2.1.17", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 220a44d1f9..2b1b86ffc5 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.1.16", + "version": "2.1.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.1.16", + "@budibase/string-templates": "^2.1.17", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 11bf44228c..419f12dfe6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.16", + "version": "2.1.17", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.16", - "@budibase/client": "^2.1.16", - "@budibase/frontend-core": "^2.1.16", - "@budibase/string-templates": "^2.1.16", + "@budibase/bbui": "^2.1.17", + "@budibase/client": "^2.1.17", + "@budibase/frontend-core": "^2.1.17", + "@budibase/string-templates": "^2.1.17", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index b6d457ba7d..e85a03d410 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.16", + "version": "2.1.17", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.16", - "@budibase/string-templates": "^2.1.16", - "@budibase/types": "^2.1.16", + "@budibase/backend-core": "^2.1.17", + "@budibase/string-templates": "^2.1.17", + "@budibase/types": "^2.1.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 a3fe362a2a..866b8edfb9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.16", + "version": "2.1.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.1.16", - "@budibase/frontend-core": "^2.1.16", - "@budibase/string-templates": "^2.1.16", + "@budibase/bbui": "^2.1.17", + "@budibase/frontend-core": "^2.1.17", + "@budibase/string-templates": "^2.1.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 4d9339f02d..494aa59ad3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.16", + "version": "2.1.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.1.16", + "@budibase/bbui": "^2.1.17", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ea8a97dc37..5c3e1b0636 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.16", + "version": "2.1.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 117474f34a..aea313a689 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.16", + "version": "2.1.17", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.16", - "@budibase/client": "^2.1.16", + "@budibase/backend-core": "^2.1.17", + "@budibase/client": "^2.1.17", "@budibase/pro": "2.1.16", - "@budibase/string-templates": "^2.1.16", - "@budibase/types": "^2.1.16", + "@budibase/string-templates": "^2.1.17", + "@budibase/types": "^2.1.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 81bd2cde40..aaef3fb685 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.16", + "version": "2.1.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 ec3c77c5e7..bbd8b7adc4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.16", + "version": "2.1.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 588998238b..6f550c7984 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.16", + "version": "2.1.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.1.16", + "@budibase/backend-core": "^2.1.17", "@budibase/pro": "2.1.16", - "@budibase/string-templates": "^2.1.16", - "@budibase/types": "^2.1.16", + "@budibase/string-templates": "^2.1.17", + "@budibase/types": "^2.1.17", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d2bcec8054490fc4b0f95cc8c703c900ee4307b2 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sat, 5 Nov 2022 15:16:36 +0000 Subject: [PATCH 11/16] Update pro version to 2.1.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 aea313a689..b80c714cfd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.17", "@budibase/client": "^2.1.17", - "@budibase/pro": "2.1.16", + "@budibase/pro": "2.1.17", "@budibase/string-templates": "^2.1.17", "@budibase/types": "^2.1.17", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index cdf9290f5d..f789dab1c0 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.16.tgz#452ab7b93cdfc27cfb41247f8832b5c162220300" - integrity sha512-y383gvLabisOc0kmUDBJnvWJU44Ya26H+hvw8XknOUP3OJZ1+7tSkp1rvaMmH5lHXwXVKW0d8em5YLAMEvlxzQ== +"@budibase/backend-core@2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.17.tgz#f59edd87a8bb2bce74ff8eac49e68859e3a8f8de" + integrity sha512-CBzRh8AV5/+Dumm+s29qf5nE8NMsDDYnuS8rOXCC0cSs0JMG/QevndAF/0ORCOQzL/78w8i58XWTW2h0qOlAJQ== dependencies: - "@budibase/types" "^2.1.16" + "@budibase/types" "^2.1.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.16.tgz#bb8aba9dabcccf9e8670288a73339cd379706c5a" - integrity sha512-dPXEz5sQ0miWrQSCpIAJyyYc3LFMa+IqAtPKjH0Fx3ZicGSIxHhoJPJDFoPYgQAnJumYmXNU/pVCZmZyVbbtqA== +"@budibase/pro@2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.17.tgz#a6676acd6967633e8eed4325ac02782491c3b416" + integrity sha512-yODXAVLlGZnPbfGT16xbZG8wV1jnA7H5+yyuCpY+IylKywh/EDra9bwXyl1sh8pxHLStO90cC6ANawbLhJjrCw== dependencies: - "@budibase/backend-core" "2.1.16" - "@budibase/types" "2.1.16" + "@budibase/backend-core" "2.1.17" + "@budibase/types" "2.1.17" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.16", "@budibase/types@^2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.16.tgz#5bf30bd21f4ca2bfaf219e7999d3c116312d7bca" - integrity sha512-/d3R2OHRNRRqk7ICgoruISgCL6NLOTGUiqyI+sgQgs6uI0iMQjHcBt/ALgklpv5Ms5d54asE8JtuTrhZPBgAYg== +"@budibase/types@2.1.17", "@budibase/types@^2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.17.tgz#2164953d99132505ab6b05342fb5d5f55f35ba4a" + integrity sha512-1HwuoF0aM4D5zZRRq6bgLO0dZBXKr6TWSpn/3wRL698p8K7NEcCPKk8nZn/S9L44EIUVKxkCwbmiiC1fisI61A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6f550c7984..4f18611ae0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.17", - "@budibase/pro": "2.1.16", + "@budibase/pro": "2.1.17", "@budibase/string-templates": "^2.1.17", "@budibase/types": "^2.1.17", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 210fe1107d..855b2d3efe 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.16.tgz#452ab7b93cdfc27cfb41247f8832b5c162220300" - integrity sha512-y383gvLabisOc0kmUDBJnvWJU44Ya26H+hvw8XknOUP3OJZ1+7tSkp1rvaMmH5lHXwXVKW0d8em5YLAMEvlxzQ== +"@budibase/backend-core@2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.17.tgz#f59edd87a8bb2bce74ff8eac49e68859e3a8f8de" + integrity sha512-CBzRh8AV5/+Dumm+s29qf5nE8NMsDDYnuS8rOXCC0cSs0JMG/QevndAF/0ORCOQzL/78w8i58XWTW2h0qOlAJQ== dependencies: - "@budibase/types" "^2.1.16" + "@budibase/types" "^2.1.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.16.tgz#bb8aba9dabcccf9e8670288a73339cd379706c5a" - integrity sha512-dPXEz5sQ0miWrQSCpIAJyyYc3LFMa+IqAtPKjH0Fx3ZicGSIxHhoJPJDFoPYgQAnJumYmXNU/pVCZmZyVbbtqA== +"@budibase/pro@2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.17.tgz#a6676acd6967633e8eed4325ac02782491c3b416" + integrity sha512-yODXAVLlGZnPbfGT16xbZG8wV1jnA7H5+yyuCpY+IylKywh/EDra9bwXyl1sh8pxHLStO90cC6ANawbLhJjrCw== dependencies: - "@budibase/backend-core" "2.1.16" - "@budibase/types" "2.1.16" + "@budibase/backend-core" "2.1.17" + "@budibase/types" "2.1.17" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.16", "@budibase/types@^2.1.16": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.16.tgz#5bf30bd21f4ca2bfaf219e7999d3c116312d7bca" - integrity sha512-/d3R2OHRNRRqk7ICgoruISgCL6NLOTGUiqyI+sgQgs6uI0iMQjHcBt/ALgklpv5Ms5d54asE8JtuTrhZPBgAYg== +"@budibase/types@2.1.17", "@budibase/types@^2.1.17": + version "2.1.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.17.tgz#2164953d99132505ab6b05342fb5d5f55f35ba4a" + integrity sha512-1HwuoF0aM4D5zZRRq6bgLO0dZBXKr6TWSpn/3wRL698p8K7NEcCPKk8nZn/S9L44EIUVKxkCwbmiiC1fisI61A== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 85dbf90e5d23b95c145834b460476f55f9e619d9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 7 Nov 2022 09:45:00 +0000 Subject: [PATCH 12/16] Configurable CDN --- packages/server/src/environment.js | 1 + packages/server/src/utilities/index.js | 4 +--- packages/server/src/utilities/plugins.js | 2 +- packages/worker/src/api/controllers/global/configs.js | 4 +--- packages/worker/src/environment.ts | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index ef8e674a86..72baab9167 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -46,6 +46,7 @@ module.exports = { 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/server/src/utilities/index.js b/packages/server/src/utilities/index.js index 38e15b5f58..9b51e0e628 100644 --- a/packages/server/src/utilities/index.js +++ b/packages/server/src/utilities/index.js @@ -5,8 +5,6 @@ const { generateMetadataID } = require("../db/utils") const Readable = require("stream").Readable const { getAppDB } = require("@budibase/backend-core/context") -const BB_CDN = "https://cdn.budi.live" - exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms)) exports.isDev = env.isDev @@ -40,7 +38,7 @@ exports.objectStoreUrl = () => { // can use a relative url for this as all goes through the proxy (this is hosted in minio) return OBJ_STORE_DIRECTORY } else { - return BB_CDN + return env.CDN_URL } } diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.js index 202a349b16..139639e814 100644 --- a/packages/server/src/utilities/plugins.js +++ b/packages/server/src/utilities/plugins.js @@ -13,7 +13,7 @@ exports.enrichPluginURLs = plugins => { // In self host we need to prefix the path, as the bucket name is not part // of the bucket path. In cloud, it's already part of the bucket path. - let jsUrl = cloud ? "https://cdn.budi.live/" : `/${bucket}/` + let jsUrl = cloud ? `${env.CDN_URL}/` : `/${bucket}/` jsUrl += ProPlugins.getBucketPath(plugin.name) jsUrl += jsFileName return { ...plugin, jsUrl } diff --git a/packages/worker/src/api/controllers/global/configs.js b/packages/worker/src/api/controllers/global/configs.js index 54de62a2aa..5be6141c3f 100644 --- a/packages/worker/src/api/controllers/global/configs.js +++ b/packages/worker/src/api/controllers/global/configs.js @@ -22,8 +22,6 @@ const { const { events } = require("@budibase/backend-core") const { checkAnyUserExists } = require("../../../utilities/users") -const BB_TENANT_CDN = "https://tenants.cdn.budi.live" - const getEventFns = async (db, config) => { const fns = [] const type = config.type @@ -350,7 +348,7 @@ exports.upload = async function (ctx) { if (env.SELF_HOSTED) { url = `/${bucket}/${key}` } else { - url = `${BB_TENANT_CDN}/${key}` + url = `${env.CDN_URL}/${key}` } cfgStructure.config[`${name}`] = url diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index 5b39ce6655..c9eabdfdb4 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -42,6 +42,7 @@ const env = { 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 0766883ff3cff5d44edc93e105ef7379bfb9717f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 7 Nov 2022 12:33:21 +0000 Subject: [PATCH 13/16] Add CDN_URL to k8s templates --- charts/budibase/templates/app-service-deployment.yaml | 2 ++ charts/budibase/templates/worker-service-deployment.yaml | 2 ++ charts/budibase/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 492f244d79..bf1b672d37 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -158,6 +158,8 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + - name: CDN_URL + value: {{ .Values.globals.cdnUrl }} image: budibase/apps:{{ .Values.globals.appVersion }} imagePullPolicy: Always diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index c72398f825..df692a0723 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -147,6 +147,8 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + - name: CDN_URL + value: {{ .Values.globals.cdnUrl }} image: budibase/worker:{{ .Values.globals.appVersion }} imagePullPolicy: Always diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 5c4004cb57..a2a761aa86 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -98,6 +98,7 @@ globals: # if createSecrets is set to false, you can hard-code your secrets here internalApiKey: "" jwtSecret: "" + cdnUrl: "" smtp: enabled: false From 4f24bccda415d607f091f1923eceb122aec4f4a4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 7 Nov 2022 15:45:04 +0000 Subject: [PATCH 14/16] v2.1.18 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 4413112aa1..34c7d66763 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.17", + "version": "2.1.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 403b1d0ac8..63306c1050 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.17", + "version": "2.1.18", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.17", + "@budibase/types": "^2.1.18", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2b1b86ffc5..af2eba9fec 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.1.17", + "version": "2.1.18", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.17", + "@budibase/string-templates": "^2.1.18", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 419f12dfe6..7e4047e70b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.17", + "version": "2.1.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.17", - "@budibase/client": "^2.1.17", - "@budibase/frontend-core": "^2.1.17", - "@budibase/string-templates": "^2.1.17", + "@budibase/bbui": "^2.1.18", + "@budibase/client": "^2.1.18", + "@budibase/frontend-core": "^2.1.18", + "@budibase/string-templates": "^2.1.18", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e85a03d410..2ff3601a1a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.17", + "version": "2.1.18", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.17", - "@budibase/string-templates": "^2.1.17", - "@budibase/types": "^2.1.17", + "@budibase/backend-core": "^2.1.18", + "@budibase/string-templates": "^2.1.18", + "@budibase/types": "^2.1.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 866b8edfb9..084c1c2982 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.17", + "version": "2.1.18", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.17", - "@budibase/frontend-core": "^2.1.17", - "@budibase/string-templates": "^2.1.17", + "@budibase/bbui": "^2.1.18", + "@budibase/frontend-core": "^2.1.18", + "@budibase/string-templates": "^2.1.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 494aa59ad3..d1184a4824 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.17", + "version": "2.1.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.1.17", + "@budibase/bbui": "^2.1.18", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5c3e1b0636..ab6b9873f8 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.17", + "version": "2.1.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 b80c714cfd..5e0ab61193 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.17", + "version": "2.1.18", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.17", - "@budibase/client": "^2.1.17", + "@budibase/backend-core": "^2.1.18", + "@budibase/client": "^2.1.18", "@budibase/pro": "2.1.17", - "@budibase/string-templates": "^2.1.17", - "@budibase/types": "^2.1.17", + "@budibase/string-templates": "^2.1.18", + "@budibase/types": "^2.1.18", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aaef3fb685..d222fadae3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.17", + "version": "2.1.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 bbd8b7adc4..3ec352a4a0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.17", + "version": "2.1.18", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4f18611ae0..f235dd27ad 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.17", + "version": "2.1.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.1.17", + "@budibase/backend-core": "^2.1.18", "@budibase/pro": "2.1.17", - "@budibase/string-templates": "^2.1.17", - "@budibase/types": "^2.1.17", + "@budibase/string-templates": "^2.1.18", + "@budibase/types": "^2.1.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ff50b50cda6c7ea4794f609a9c640e8ff5591fbc Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 7 Nov 2022 15:48:53 +0000 Subject: [PATCH 15/16] Update pro version to 2.1.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 5e0ab61193..dcefeb4b1d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.18", "@budibase/client": "^2.1.18", - "@budibase/pro": "2.1.17", + "@budibase/pro": "2.1.18", "@budibase/string-templates": "^2.1.18", "@budibase/types": "^2.1.18", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f789dab1c0..cea5e673ae 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.17.tgz#f59edd87a8bb2bce74ff8eac49e68859e3a8f8de" - integrity sha512-CBzRh8AV5/+Dumm+s29qf5nE8NMsDDYnuS8rOXCC0cSs0JMG/QevndAF/0ORCOQzL/78w8i58XWTW2h0qOlAJQ== +"@budibase/backend-core@2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.18.tgz#fdc63f7b1a9213b09f5b25bce101cca828a04f6c" + integrity sha512-3Mihsv1Vk0wXjWLBV9p9KuAzMxoCkMUvIUYl07Ovhldsj0nxYbDiANX+vK5LjF4CYHjbvtntjR0ExfaZB9LbXQ== dependencies: - "@budibase/types" "^2.1.17" + "@budibase/types" "^2.1.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.17.tgz#a6676acd6967633e8eed4325ac02782491c3b416" - integrity sha512-yODXAVLlGZnPbfGT16xbZG8wV1jnA7H5+yyuCpY+IylKywh/EDra9bwXyl1sh8pxHLStO90cC6ANawbLhJjrCw== +"@budibase/pro@2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.18.tgz#7f7b6b9205767cda3d640353e2cb2ce34fb3e1ac" + integrity sha512-6i+bwJYs92+v7DPX7TZ4drpa8BQrb1w5catZ1f4e/9A0UqEVnE1BiX8wJx3pD7PhLHUGXKz+BaKS+oaHusHkQQ== dependencies: - "@budibase/backend-core" "2.1.17" - "@budibase/types" "2.1.17" + "@budibase/backend-core" "2.1.18" + "@budibase/types" "2.1.18" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.17", "@budibase/types@^2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.17.tgz#2164953d99132505ab6b05342fb5d5f55f35ba4a" - integrity sha512-1HwuoF0aM4D5zZRRq6bgLO0dZBXKr6TWSpn/3wRL698p8K7NEcCPKk8nZn/S9L44EIUVKxkCwbmiiC1fisI61A== +"@budibase/types@2.1.18", "@budibase/types@^2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.18.tgz#4c7859fdc815044b12c4ac7b5e09e5c920150c81" + integrity sha512-rZMqx0QtWKaaPWP7V7j2Il8xm7XZ5RvpN7xw/evOp8Jw3DuLe709Zt6teLt8uvsDuI0rEIC3XNNWQSXHxOhGzQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f235dd27ad..bdbb5c2867 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.18", - "@budibase/pro": "2.1.17", + "@budibase/pro": "2.1.18", "@budibase/string-templates": "^2.1.18", "@budibase/types": "^2.1.18", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 855b2d3efe..ed02c447ad 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.17.tgz#f59edd87a8bb2bce74ff8eac49e68859e3a8f8de" - integrity sha512-CBzRh8AV5/+Dumm+s29qf5nE8NMsDDYnuS8rOXCC0cSs0JMG/QevndAF/0ORCOQzL/78w8i58XWTW2h0qOlAJQ== +"@budibase/backend-core@2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.18.tgz#fdc63f7b1a9213b09f5b25bce101cca828a04f6c" + integrity sha512-3Mihsv1Vk0wXjWLBV9p9KuAzMxoCkMUvIUYl07Ovhldsj0nxYbDiANX+vK5LjF4CYHjbvtntjR0ExfaZB9LbXQ== dependencies: - "@budibase/types" "^2.1.17" + "@budibase/types" "^2.1.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.17.tgz#a6676acd6967633e8eed4325ac02782491c3b416" - integrity sha512-yODXAVLlGZnPbfGT16xbZG8wV1jnA7H5+yyuCpY+IylKywh/EDra9bwXyl1sh8pxHLStO90cC6ANawbLhJjrCw== +"@budibase/pro@2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.18.tgz#7f7b6b9205767cda3d640353e2cb2ce34fb3e1ac" + integrity sha512-6i+bwJYs92+v7DPX7TZ4drpa8BQrb1w5catZ1f4e/9A0UqEVnE1BiX8wJx3pD7PhLHUGXKz+BaKS+oaHusHkQQ== dependencies: - "@budibase/backend-core" "2.1.17" - "@budibase/types" "2.1.17" + "@budibase/backend-core" "2.1.18" + "@budibase/types" "2.1.18" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.17", "@budibase/types@^2.1.17": - version "2.1.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.17.tgz#2164953d99132505ab6b05342fb5d5f55f35ba4a" - integrity sha512-1HwuoF0aM4D5zZRRq6bgLO0dZBXKr6TWSpn/3wRL698p8K7NEcCPKk8nZn/S9L44EIUVKxkCwbmiiC1fisI61A== +"@budibase/types@2.1.18", "@budibase/types@^2.1.18": + version "2.1.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.18.tgz#4c7859fdc815044b12c4ac7b5e09e5c920150c81" + integrity sha512-rZMqx0QtWKaaPWP7V7j2Il8xm7XZ5RvpN7xw/evOp8Jw3DuLe709Zt6teLt8uvsDuI0rEIC3XNNWQSXHxOhGzQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 4c91c51443557467ed51badac60accab4bbbbf7b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 8 Nov 2022 10:22:26 +0000 Subject: [PATCH 16/16] Add budibase.net to CSP --- hosting/nginx.prod.conf.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/nginx.prod.conf.hbs b/hosting/nginx.prod.conf.hbs index 114a4575d0..b2a0f00320 100644 --- a/hosting/nginx.prod.conf.hbs +++ b/hosting/nginx.prod.conf.hbs @@ -51,11 +51,11 @@ http { proxy_buffering off; set $csp_default "default-src 'self'"; - set $csp_script "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io"; + set $csp_script "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.budibase.net https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io"; set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com"; set $csp_object "object-src 'none'"; set $csp_base_uri "base-uri 'self'"; - set $csp_connect "connect-src 'self' https://api-iam.intercom.io https://api-iam.intercom.io https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io https://uploads.intercomcdn.com https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com"; + set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io https://uploads.intercomcdn.com https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com"; set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com https://js.intercomcdn.com https://fonts.intercomcdn.com"; set $csp_frame "frame-src 'self' https:"; set $csp_img "img-src http: https: data: blob:";