From 61ed214e88ac24ee217088337d2a869eebae5ae1 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 15 Jul 2022 13:47:39 +0100 Subject: [PATCH 01/13] Replace incorrect usages of element.childNodes with element.children --- .../_components/navigation/DNDPositionIndicator.svelte | 2 +- packages/client/src/components/Component.svelte | 2 +- packages/client/src/components/preview/DNDHandler.svelte | 4 ++-- packages/client/src/components/preview/IndicatorSet.svelte | 3 +-- packages/client/src/components/preview/SettingsBar.svelte | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte index c01bcaf36f..4612440a2c 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte @@ -16,7 +16,7 @@ // Get root li element const el = document.getElementById(`component-${component?._id}`) // Get inner nav item content element - const child = el?.childNodes[0]?.childNodes[0] + const child = el?.children[0]?.children[0] if (!el) { return } diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index 808bfdae07..08407e008e 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -399,7 +399,7 @@ } const scrollIntoView = () => { - const node = document.getElementsByClassName(id)?.[0]?.childNodes[0] + const node = document.getElementsByClassName(id)?.[0]?.children[0] if (!node) { return } diff --git a/packages/client/src/components/preview/DNDHandler.svelte b/packages/client/src/components/preview/DNDHandler.svelte index 6c1922ecff..c37eb93afa 100644 --- a/packages/client/src/components/preview/DNDHandler.svelte +++ b/packages/client/src/components/preview/DNDHandler.svelte @@ -35,8 +35,8 @@ const getDOMNodeForComponent = component => { const parent = component.closest(".component") - const children = Array.from(parent.childNodes) - return children?.find(node => node?.nodeType === 1) + const children = Array.from(parent.children) + return children[0] } // Callback when initially starting a drag on a draggable component diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index b9113f9532..bbd03aa974 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -71,8 +71,7 @@ // Extract valid children // Sanity limit of 100 active indicators const children = Array.from(parents) - .map(parent => parent?.childNodes?.[0]) - .filter(node => node?.nodeType === 1) + .map(parent => parent?.children?.[0]) .slice(0, 100) // If there aren't any nodes then reset diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte index bc227c87d9..5ea9b2339f 100644 --- a/packages/client/src/components/preview/SettingsBar.svelte +++ b/packages/client/src/components/preview/SettingsBar.svelte @@ -37,7 +37,7 @@ } const id = $builderStore.selectedComponentId const parent = document.getElementsByClassName(id)?.[0] - const element = parent?.childNodes?.[0] + const element = parent?.children?.[0] // The settings bar is higher in the dom tree than the selection indicators // as we want to be able to render the settings bar wider than the screen, From ef458db8b8646cb7fe4328e9e950270ba15bf16b Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 18 Jul 2022 15:58:17 +0100 Subject: [PATCH 02/13] Fix to the default input binding to ensure new bindings are set correctly --- .../src/components/integration/QueryBindingBuilder.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte index 7f6bd5ffd5..255bee21dd 100644 --- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte +++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte @@ -58,7 +58,7 @@ thin disabled={bindable} on:change={evt => onBindingChange(binding.name, evt.detail)} - value={runtimeToReadableBinding(bindings, binding.default)} + bind:value={binding.default} /> {#if bindable} Date: Tue, 19 Jul 2022 14:39:52 +0100 Subject: [PATCH 03/13] Moving the single image healthcheck script to be within the single image directory and updating it to look for the environment variable file. --- hosting/single/Dockerfile | 2 +- hosting/{scripts => single}/healthcheck.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename hosting/{scripts => single}/healthcheck.sh (93%) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 4e3239d960..b5bf17adde 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -108,7 +108,7 @@ RUN chmod +x install.sh && ./install.sh WORKDIR / ADD hosting/single/runner.sh . RUN chmod +x ./runner.sh -ADD hosting/scripts/healthcheck.sh . +ADD hosting/single/healthcheck.sh . RUN chmod +x ./healthcheck.sh ADD hosting/scripts/build-target-paths.sh . diff --git a/hosting/scripts/healthcheck.sh b/hosting/single/healthcheck.sh similarity index 93% rename from hosting/scripts/healthcheck.sh rename to hosting/single/healthcheck.sh index 80f2ece0b6..b92cd153a3 100644 --- a/hosting/scripts/healthcheck.sh +++ b/hosting/single/healthcheck.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash healthy=true +if [ -f "/data/.env" ]; then + export $(cat /data/.env | xargs) +fi + if [[ $(curl -Lfk -s -w "%{http_code}\n" http://localhost/ -o /dev/null) -ne 200 ]]; then echo 'ERROR: Budibase is not running'; healthy=false From 08bb648771a656f6d4a6ebc7f14826a80c263b49 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 20 Jul 2022 13:09:27 +0100 Subject: [PATCH 04/13] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b4f7739293..457d2c1451 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -31,6 +31,9 @@ A clear and concise description of what you expected to happen. **Screenshots** If applicable, add screenshots to help explain your problem. + +**App Export** +If possible - please attach an export of your budibase application for debugging/reproduction purposes. **Desktop (please complete the following information):** - OS: [e.g. iOS] From 4256542aea95e73c7c67208cae90b45d057592e6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 20 Jul 2022 12:19:41 +0000 Subject: [PATCH 05/13] v1.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 | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 6647325f26..af4ca7fb18 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.17", + "version": "1.1.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c0daca06d4..ed068a42d0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.17", + "version": "1.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": "^1.1.17", + "@budibase/types": "^1.1.18", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1e10ac9d98..c286250a1e 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": "1.1.17", + "version": "1.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": "^1.1.17", + "@budibase/string-templates": "^1.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 046df61bc8..7f1c462086 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.17", + "version": "1.1.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.17", - "@budibase/client": "^1.1.17", - "@budibase/frontend-core": "^1.1.17", - "@budibase/string-templates": "^1.1.17", + "@budibase/bbui": "^1.1.18", + "@budibase/client": "^1.1.18", + "@budibase/frontend-core": "^1.1.18", + "@budibase/string-templates": "^1.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 3db63a0971..96f379f1ae 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.17", + "version": "1.1.18", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 681bef0010..627f34d1b4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.17", + "version": "1.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": "^1.1.17", - "@budibase/frontend-core": "^1.1.17", - "@budibase/string-templates": "^1.1.17", + "@budibase/bbui": "^1.1.18", + "@budibase/frontend-core": "^1.1.18", + "@budibase/string-templates": "^1.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 d3f7cd2e7a..227b4f5b12 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.17", + "version": "1.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": "^1.1.17", + "@budibase/bbui": "^1.1.18", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f5787fd963..2d7e09c2b3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.17", + "version": "1.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": "^1.1.17", - "@budibase/client": "^1.1.17", + "@budibase/backend-core": "^1.1.18", + "@budibase/client": "^1.1.18", "@budibase/pro": "1.1.17", - "@budibase/string-templates": "^1.1.17", - "@budibase/types": "^1.1.17", + "@budibase/string-templates": "^1.1.18", + "@budibase/types": "^1.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 7eacdf1fbe..5565314a8a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.17", + "version": "1.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 f177c9c96b..e05ba0989c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.17", + "version": "1.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 6aa4bc89aa..92655aaf60 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.17", + "version": "1.1.18", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.17", + "@budibase/backend-core": "^1.1.18", "@budibase/pro": "1.1.17", - "@budibase/string-templates": "^1.1.17", - "@budibase/types": "^1.1.17", + "@budibase/string-templates": "^1.1.18", + "@budibase/types": "^1.1.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 34ac28973b9634047536cac4e30535de5b1af274 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 20 Jul 2022 12:21:17 +0000 Subject: [PATCH 06/13] Update pro version to 1.1.18 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2d7e09c2b3..592ad7ee2a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.18", "@budibase/client": "^1.1.18", - "@budibase/pro": "1.1.17", + "@budibase/pro": "1.1.18", "@budibase/string-templates": "^1.1.18", "@budibase/types": "^1.1.18", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 92655aaf60..7f0a76753b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.18", - "@budibase/pro": "1.1.17", + "@budibase/pro": "1.1.18", "@budibase/string-templates": "^1.1.18", "@budibase/types": "^1.1.18", "@koa/router": "8.0.8", From af92c3d6e8bd3a100b7ed3686b8a1e9a20ffa649 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 21 Jul 2022 08:34:26 +0000 Subject: [PATCH 07/13] v1.1.19 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index af4ca7fb18..b7f4352f0b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.18", + "version": "1.1.19", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ed068a42d0..868fc3b66f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.18", + "version": "1.1.19", "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": "^1.1.18", + "@budibase/types": "^1.1.19", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c286250a1e..c49a2608c9 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": "1.1.18", + "version": "1.1.19", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.18", + "@budibase/string-templates": "^1.1.19", "@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 7f1c462086..457c88d499 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.18", + "version": "1.1.19", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.18", - "@budibase/client": "^1.1.18", - "@budibase/frontend-core": "^1.1.18", - "@budibase/string-templates": "^1.1.18", + "@budibase/bbui": "^1.1.19", + "@budibase/client": "^1.1.19", + "@budibase/frontend-core": "^1.1.19", + "@budibase/string-templates": "^1.1.19", "@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 96f379f1ae..26641ed98b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.18", + "version": "1.1.19", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 627f34d1b4..bf9b0e32f9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.18", + "version": "1.1.19", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.18", - "@budibase/frontend-core": "^1.1.18", - "@budibase/string-templates": "^1.1.18", + "@budibase/bbui": "^1.1.19", + "@budibase/frontend-core": "^1.1.19", + "@budibase/string-templates": "^1.1.19", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 227b4f5b12..9f72cdbd21 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.18", + "version": "1.1.19", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.18", + "@budibase/bbui": "^1.1.19", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 592ad7ee2a..6876d40d72 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.18", + "version": "1.1.19", "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": "^1.1.18", - "@budibase/client": "^1.1.18", + "@budibase/backend-core": "^1.1.19", + "@budibase/client": "^1.1.19", "@budibase/pro": "1.1.18", - "@budibase/string-templates": "^1.1.18", - "@budibase/types": "^1.1.18", + "@budibase/string-templates": "^1.1.19", + "@budibase/types": "^1.1.19", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5565314a8a..f0140a9d62 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.18", + "version": "1.1.19", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e05ba0989c..e231a7d59f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.18", + "version": "1.1.19", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7f0a76753b..088e7c2d20 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.18", + "version": "1.1.19", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.18", + "@budibase/backend-core": "^1.1.19", "@budibase/pro": "1.1.18", - "@budibase/string-templates": "^1.1.18", - "@budibase/types": "^1.1.18", + "@budibase/string-templates": "^1.1.19", + "@budibase/types": "^1.1.19", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5ba6b079316c2ddf50b2738cd1470934d7b2db2b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 21 Jul 2022 08:36:03 +0000 Subject: [PATCH 08/13] Update pro version to 1.1.19 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 6876d40d72..915203843f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.19", "@budibase/client": "^1.1.19", - "@budibase/pro": "1.1.18", + "@budibase/pro": "1.1.19", "@budibase/string-templates": "^1.1.19", "@budibase/types": "^1.1.19", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 088e7c2d20..6871b2ef8c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.19", - "@budibase/pro": "1.1.18", + "@budibase/pro": "1.1.19", "@budibase/string-templates": "^1.1.19", "@budibase/types": "^1.1.19", "@koa/router": "8.0.8", From 654a371df2df546a6935e4041cc977e8fc43bc10 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 21 Jul 2022 11:22:27 +0000 Subject: [PATCH 09/13] v1.1.20 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index b7f4352f0b..aa76af7300 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.19", + "version": "1.1.20", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 868fc3b66f..89779e9653 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.19", + "version": "1.1.20", "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": "^1.1.19", + "@budibase/types": "^1.1.20", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c49a2608c9..b78d84bfb5 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": "1.1.19", + "version": "1.1.20", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.19", + "@budibase/string-templates": "^1.1.20", "@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 457c88d499..7fd99cdd2f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.19", + "version": "1.1.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.19", - "@budibase/client": "^1.1.19", - "@budibase/frontend-core": "^1.1.19", - "@budibase/string-templates": "^1.1.19", + "@budibase/bbui": "^1.1.20", + "@budibase/client": "^1.1.20", + "@budibase/frontend-core": "^1.1.20", + "@budibase/string-templates": "^1.1.20", "@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 26641ed98b..0a6ae68c62 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.19", + "version": "1.1.20", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index bf9b0e32f9..c015907703 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.19", + "version": "1.1.20", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.19", - "@budibase/frontend-core": "^1.1.19", - "@budibase/string-templates": "^1.1.19", + "@budibase/bbui": "^1.1.20", + "@budibase/frontend-core": "^1.1.20", + "@budibase/string-templates": "^1.1.20", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 9f72cdbd21..283b835f27 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.19", + "version": "1.1.20", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.19", + "@budibase/bbui": "^1.1.20", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 915203843f..0264c7a810 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.19", + "version": "1.1.20", "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": "^1.1.19", - "@budibase/client": "^1.1.19", + "@budibase/backend-core": "^1.1.20", + "@budibase/client": "^1.1.20", "@budibase/pro": "1.1.19", - "@budibase/string-templates": "^1.1.19", - "@budibase/types": "^1.1.19", + "@budibase/string-templates": "^1.1.20", + "@budibase/types": "^1.1.20", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f0140a9d62..420c307f1a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.19", + "version": "1.1.20", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e231a7d59f..c57e80d9ea 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.19", + "version": "1.1.20", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6871b2ef8c..db004cbd18 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.19", + "version": "1.1.20", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.19", + "@budibase/backend-core": "^1.1.20", "@budibase/pro": "1.1.19", - "@budibase/string-templates": "^1.1.19", - "@budibase/types": "^1.1.19", + "@budibase/string-templates": "^1.1.20", + "@budibase/types": "^1.1.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 27a178a0c42912371896e34f984b8742240b49fe Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 21 Jul 2022 11:24:10 +0000 Subject: [PATCH 10/13] Update pro version to 1.1.20 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0264c7a810..98b696e2eb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.20", "@budibase/client": "^1.1.20", - "@budibase/pro": "1.1.19", + "@budibase/pro": "1.1.20", "@budibase/string-templates": "^1.1.20", "@budibase/types": "^1.1.20", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index db004cbd18..b58e89729d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.20", - "@budibase/pro": "1.1.19", + "@budibase/pro": "1.1.20", "@budibase/string-templates": "^1.1.20", "@budibase/types": "^1.1.20", "@koa/router": "8.0.8", From e8053b55e6df829925698e3bc4552d7e06a34bd8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 21 Jul 2022 16:39:55 +0100 Subject: [PATCH 11/13] Fixing issue with app DB not being in context for fetch. --- .../api/controllers/public/applications.ts | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/server/src/api/controllers/public/applications.ts b/packages/server/src/api/controllers/public/applications.ts index 6fa5185d23..c2c62ffc28 100644 --- a/packages/server/src/api/controllers/public/applications.ts +++ b/packages/server/src/api/controllers/public/applications.ts @@ -1,5 +1,5 @@ const { getAllApps } = require("@budibase/backend-core/db") -const { updateAppId } = require("@budibase/backend-core/context") +const { doInAppContext } = require("@budibase/backend-core/context") import { search as stringSearch, addRev } from "./utils" import * as controller from "../application" import { Application } from "../../../definitions/common" @@ -41,28 +41,31 @@ export async function create(ctx: any, next: any) { } export async function read(ctx: any, next: any) { - updateAppId(ctx.params.appId) - await setResponseApp(ctx) - await next() + await doInAppContext(ctx.params.appId, async () => { + await setResponseApp(ctx) + await next() + }) } export async function update(ctx: any, next: any) { ctx.request.body = await addRev(fixAppID(ctx.request.body, ctx.params)) - updateAppId(ctx.params.appId) - await controller.update(ctx) - await setResponseApp(ctx) - await next() + await doInAppContext(ctx.params.appId, async () => { + await controller.update(ctx) + await setResponseApp(ctx) + await next() + }) } export async function destroy(ctx: any, next: any) { - updateAppId(ctx.params.appId) - // get the app before deleting it - await setResponseApp(ctx) - const body = ctx.body - await controller.destroy(ctx) - // overwrite the body again - ctx.body = body - await next() + await doInAppContext(ctx.params.appId, async () => { + // get the app before deleting it + await setResponseApp(ctx) + const body = ctx.body + await controller.destroy(ctx) + // overwrite the body again + ctx.body = body + await next() + }) } export default { From bd399ecec795c702bd974c7c1c80431bf07cc815 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 22 Jul 2022 07:32:36 +0000 Subject: [PATCH 12/13] v1.1.21 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index aa76af7300..904cdf8fd6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.20", + "version": "1.1.21", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 89779e9653..6050311ca0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.20", + "version": "1.1.21", "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": "^1.1.20", + "@budibase/types": "^1.1.21", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b78d84bfb5..c049cf328e 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": "1.1.20", + "version": "1.1.21", "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": "^1.1.20", + "@budibase/string-templates": "^1.1.21", "@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 7fd99cdd2f..989e6ffc7a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.20", + "version": "1.1.21", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.20", - "@budibase/client": "^1.1.20", - "@budibase/frontend-core": "^1.1.20", - "@budibase/string-templates": "^1.1.20", + "@budibase/bbui": "^1.1.21", + "@budibase/client": "^1.1.21", + "@budibase/frontend-core": "^1.1.21", + "@budibase/string-templates": "^1.1.21", "@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 0a6ae68c62..4f98996748 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.20", + "version": "1.1.21", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c015907703..926ffe8bf7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.20", + "version": "1.1.21", "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": "^1.1.20", - "@budibase/frontend-core": "^1.1.20", - "@budibase/string-templates": "^1.1.20", + "@budibase/bbui": "^1.1.21", + "@budibase/frontend-core": "^1.1.21", + "@budibase/string-templates": "^1.1.21", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 283b835f27..d1ab255484 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.20", + "version": "1.1.21", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.20", + "@budibase/bbui": "^1.1.21", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 98b696e2eb..55d9b3f45f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.20", + "version": "1.1.21", "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": "^1.1.20", - "@budibase/client": "^1.1.20", + "@budibase/backend-core": "^1.1.21", + "@budibase/client": "^1.1.21", "@budibase/pro": "1.1.20", - "@budibase/string-templates": "^1.1.20", - "@budibase/types": "^1.1.20", + "@budibase/string-templates": "^1.1.21", + "@budibase/types": "^1.1.21", "@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 420c307f1a..7e9ff93214 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.20", + "version": "1.1.21", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c57e80d9ea..6ea09c4fd2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.20", + "version": "1.1.21", "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 b58e89729d..f25af28a5a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.20", + "version": "1.1.21", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.20", + "@budibase/backend-core": "^1.1.21", "@budibase/pro": "1.1.20", - "@budibase/string-templates": "^1.1.20", - "@budibase/types": "^1.1.20", + "@budibase/string-templates": "^1.1.21", + "@budibase/types": "^1.1.21", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From accaaed462f4e1c4e6e587b66c7ebae21cd530d1 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 22 Jul 2022 07:34:34 +0000 Subject: [PATCH 13/13] Update pro version to 1.1.21 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 55d9b3f45f..c92242507a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.21", "@budibase/client": "^1.1.21", - "@budibase/pro": "1.1.20", + "@budibase/pro": "1.1.21", "@budibase/string-templates": "^1.1.21", "@budibase/types": "^1.1.21", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index f25af28a5a..b70109d066 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.21", - "@budibase/pro": "1.1.20", + "@budibase/pro": "1.1.21", "@budibase/string-templates": "^1.1.21", "@budibase/types": "^1.1.21", "@koa/router": "8.0.8",