From 7ce00430745ae348751d59d1ff80e5cd97122f26 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 15:58:56 +0100 Subject: [PATCH 01/27] ensure binding / value selection in automation persists --- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index 532e0ff068..7b33cc191b 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -28,7 +28,6 @@ let blockComplete let showLooping = false - $: rowControl = $automationStore.selectedAutomation.automation.rowControl $: showBindingPicker = block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW" @@ -256,7 +255,7 @@ on:change={toggleFieldControl} defaultValue="Use values" autoWidth - value={rowControl ? "Use bindings" : "Use values"} + value={block.rowControl ? "Use bindings" : "Use values"} options={["Use values", "Use bindings"]} placeholder={null} /> From 21456bb3cb0b819ae2ad1d69cdc33469dfd2488e Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 16:02:34 +0100 Subject: [PATCH 02/27] inform user that row selection only works with sql / internal --- packages/client/manifest.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 4190d7f076..16490cace4 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -3007,6 +3007,7 @@ "illegalChildren": ["section"], "hasChildren": true, "showEmptyState": false, + "info": "Row selection is only compatible with internal or SQL tables", "settings": [ { "type": "dataProvider", @@ -3295,6 +3296,7 @@ { "section": true, "name": "Table", + "info": "Row selection is only compatible with internal or SQL tables", "settings": [ { "type": "number", From 1ffa48ced6e3a3ab29372297354dea18af917f44 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 16:38:16 +0100 Subject: [PATCH 03/27] parse max iterations value correctly --- packages/server/src/threads/automation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js index 4ca490affd..7c5c96fc39 100644 --- a/packages/server/src/threads/automation.js +++ b/packages/server/src/threads/automation.js @@ -219,7 +219,7 @@ class Orchestrator { } if ( index === parseInt(env.AUTOMATION_MAX_ITERATIONS) || - index === loopStep.inputs.iterations + index === parseInt(loopStep.inputs.iterations) ) { this.updateContextAndOutput(loopStepNumber, step, tempOutput, { status: AutomationErrors.MAX_ITERATIONS, From 0455abc400ca8bdddaad01ffb286cb2b300d6050 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 24 May 2022 09:47:28 +0100 Subject: [PATCH 04/27] disable row selection within client table --- packages/client/src/components/app/table/Table.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/table/Table.svelte b/packages/client/src/components/app/table/Table.svelte index e8dcd30929..9346b3ca59 100644 --- a/packages/client/src/components/app/table/Table.svelte +++ b/packages/client/src/components/app/table/Table.svelte @@ -39,6 +39,8 @@ dataProvider?.id, ActionTypes.SetDataProviderSorting ) + $: table = dataProvider?.datasource?.type === "table" + $: { rowSelectionStore.actions.updateSelection( $component.id, @@ -142,7 +144,7 @@ {quiet} {compact} {customRenderers} - allowSelectRows={!!allowSelectRows} + allowSelectRows={allowSelectRows && table} bind:selectedRows allowEditRows={false} allowEditColumns={false} From 40f97a58b140a73e4bb35de3eb2ad515be6ea498 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 09:24:07 +0000 Subject: [PATCH 05/27] Update pro version to 1.0.177 --- 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 6c17d89d25..5b2e6a37a9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.177", "@budibase/client": "^1.0.177", - "@budibase/pro": "^1.0.175", + "@budibase/pro": "1.0.177", "@budibase/string-templates": "^1.0.177", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index d46def69de..c930b99fea 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.177", - "@budibase/pro": "^1.0.175", + "@budibase/pro": "1.0.177", "@budibase/string-templates": "^1.0.177", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 6b93905543b292b2fe08d0a1d00b49fb5486e514 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 24 May 2022 12:18:39 +0100 Subject: [PATCH 06/27] kick off release --- scripts/pro/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh index c505c45c28..e08f27158c 100755 --- a/scripts/pro/release.sh +++ b/scripts/pro/release.sh @@ -51,7 +51,7 @@ cd - lerna publish $VERSION --yes --force-publish --dist-tag $TAG ############################################# -# POST-PUBLISH - PRO # +# POST-PUBLISH - PRO # ############################################# # Revert build changes on packages/pro/package.json From 252735b3a3e4bbe24475101f58c1edb97f86b5d8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 11:30:17 +0000 Subject: [PATCH 07/27] v1.0.178 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 9895ab6cb0..5fc863c014 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.177", + "version": "1.0.178", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d0fe4d1aae..f7746f807e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.177", + "version": "1.0.178", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index dfc05ed652..eddf6a98ad 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.0.177", + "version": "1.0.178", "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.0.177", + "@budibase/string-templates": "^1.0.178", "@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 c06ca2bb3b..43d53b8c54 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.177", + "version": "1.0.178", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.177", - "@budibase/client": "^1.0.177", - "@budibase/frontend-core": "^1.0.177", - "@budibase/string-templates": "^1.0.177", + "@budibase/bbui": "^1.0.178", + "@budibase/client": "^1.0.178", + "@budibase/frontend-core": "^1.0.178", + "@budibase/string-templates": "^1.0.178", "@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 0f491d8c03..7d888b421a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.177", + "version": "1.0.178", "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 b82017b7c5..38f005f547 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.177", + "version": "1.0.178", "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.0.177", - "@budibase/frontend-core": "^1.0.177", - "@budibase/string-templates": "^1.0.177", + "@budibase/bbui": "^1.0.178", + "@budibase/frontend-core": "^1.0.178", + "@budibase/string-templates": "^1.0.178", "@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 d381e250c4..cf3c6c18d8 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.177", + "version": "1.0.178", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.177", + "@budibase/bbui": "^1.0.178", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 5b2e6a37a9..f438523d09 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.177", + "version": "1.0.178", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.177", - "@budibase/client": "^1.0.177", + "@budibase/backend-core": "^1.0.178", + "@budibase/client": "^1.0.178", "@budibase/pro": "1.0.177", - "@budibase/string-templates": "^1.0.177", + "@budibase/string-templates": "^1.0.178", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index dda26e9591..0a624e7710 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.177", + "version": "1.0.178", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index c930b99fea..997ed13b14 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.177", + "version": "1.0.178", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.177", + "@budibase/backend-core": "^1.0.178", "@budibase/pro": "1.0.177", - "@budibase/string-templates": "^1.0.177", + "@budibase/string-templates": "^1.0.178", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 60d5d0f7cb5ae94555c2252a703d3dab0494219a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 11:31:34 +0000 Subject: [PATCH 08/27] Update pro version to 1.0.178 --- 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 f438523d09..98bee869a3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.178", "@budibase/client": "^1.0.178", - "@budibase/pro": "1.0.177", + "@budibase/pro": "1.0.178", "@budibase/string-templates": "^1.0.178", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 997ed13b14..373eac7e66 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.178", - "@budibase/pro": "1.0.177", + "@budibase/pro": "1.0.178", "@budibase/string-templates": "^1.0.178", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 663d18593f57254e1a06185089c001a6134b353d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 16:59:27 +0000 Subject: [PATCH 09/27] v1.0.179 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 5fc863c014..e3f9c785a8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.178", + "version": "1.0.179", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f7746f807e..2a78c0f011 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.178", + "version": "1.0.179", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index eddf6a98ad..a2abccb585 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.0.178", + "version": "1.0.179", "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.0.178", + "@budibase/string-templates": "^1.0.179", "@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 43d53b8c54..744c83eb6b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.178", + "version": "1.0.179", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.178", - "@budibase/client": "^1.0.178", - "@budibase/frontend-core": "^1.0.178", - "@budibase/string-templates": "^1.0.178", + "@budibase/bbui": "^1.0.179", + "@budibase/client": "^1.0.179", + "@budibase/frontend-core": "^1.0.179", + "@budibase/string-templates": "^1.0.179", "@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 7d888b421a..b0dfddc138 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.178", + "version": "1.0.179", "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 38f005f547..363d46b812 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.178", + "version": "1.0.179", "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.0.178", - "@budibase/frontend-core": "^1.0.178", - "@budibase/string-templates": "^1.0.178", + "@budibase/bbui": "^1.0.179", + "@budibase/frontend-core": "^1.0.179", + "@budibase/string-templates": "^1.0.179", "@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 cf3c6c18d8..6d7bc11d3e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.178", + "version": "1.0.179", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.178", + "@budibase/bbui": "^1.0.179", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 98bee869a3..0af658c792 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.178", + "version": "1.0.179", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.178", - "@budibase/client": "^1.0.178", + "@budibase/backend-core": "^1.0.179", + "@budibase/client": "^1.0.179", "@budibase/pro": "1.0.178", - "@budibase/string-templates": "^1.0.178", + "@budibase/string-templates": "^1.0.179", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0a624e7710..3484deaf3c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.178", + "version": "1.0.179", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 373eac7e66..7f2c9f0150 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.178", + "version": "1.0.179", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.178", + "@budibase/backend-core": "^1.0.179", "@budibase/pro": "1.0.178", - "@budibase/string-templates": "^1.0.178", + "@budibase/string-templates": "^1.0.179", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From bf0ca9784b688a2fa4acb0b44b8e71ee87b3fc67 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 17:00:49 +0000 Subject: [PATCH 10/27] Update pro version to 1.0.179 --- 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 0af658c792..6aa6a91318 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.179", "@budibase/client": "^1.0.179", - "@budibase/pro": "1.0.178", + "@budibase/pro": "1.0.179", "@budibase/string-templates": "^1.0.179", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7f2c9f0150..e54689a035 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.179", - "@budibase/pro": "1.0.178", + "@budibase/pro": "1.0.179", "@budibase/string-templates": "^1.0.179", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 6aea03fd4407a59c4e8e845ce1bf7c32066b5db9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 24 May 2022 20:09:22 +0100 Subject: [PATCH 11/27] Fix build --- packages/server/package.json | 2 +- packages/server/yarn.lock | 18 +++++++++--------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 6aa6a91318..b5d7365304 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.179", "@budibase/client": "^1.0.179", - "@budibase/pro": "1.0.179", + "@budibase/pro": "^1.0.178", "@budibase/string-templates": "^1.0.179", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f718f4e88d..92f216d9f1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.175": - version "1.0.175" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.175.tgz#9c8f71c00d3cde510c3b6843302700a9249969db" - integrity sha512-ZzIzNyiW6W8YPVTxsAQnaDEmVUtW22Bna8uJ9BEal/0u8JvYpvWnbPmpbrX7nadJ+5zIGJPxxpe97rhsHJeuaA== +"@budibase/backend-core@1.0.178": + version "1.0.178" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.178.tgz#d90730b077a65de77c81c68822cc6f41fe89e772" + integrity sha512-RxVoqKH61Q9F3fZVDcMjpjTRZniRKhsTxisDwWbn3eDHwn/vwkw15XpnylUe+iXPJnAn5Ztm1hHoolnn1+VXUQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1091,12 +1091,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@^1.0.175": - version "1.0.175" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" - integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== +"@budibase/pro@^1.0.178": + version "1.0.178" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178.tgz#f4677e4e5da45332cf40ce1139acbe42fdcd6035" + integrity sha512-JMu9AslFp78bOjNCvHH8DJsGcAATtrjRYpsL5iwUYz+qo2KAGlFQ/TRw+5qhSufoTLOr6+0g0QnnyYugJA+Fvw== dependencies: - "@budibase/backend-core" "1.0.175" + "@budibase/backend-core" "1.0.178" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/package.json b/packages/worker/package.json index e54689a035..59e8e2ae4a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.179", - "@budibase/pro": "1.0.179", + "@budibase/pro": "^1.0.178", "@budibase/string-templates": "^1.0.179", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c844d1c493..f3b00b7b6a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.175": - version "1.0.175" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.175.tgz#9c8f71c00d3cde510c3b6843302700a9249969db" - integrity sha512-ZzIzNyiW6W8YPVTxsAQnaDEmVUtW22Bna8uJ9BEal/0u8JvYpvWnbPmpbrX7nadJ+5zIGJPxxpe97rhsHJeuaA== +"@budibase/backend-core@1.0.178": + version "1.0.178" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.178.tgz#d90730b077a65de77c81c68822cc6f41fe89e772" + integrity sha512-RxVoqKH61Q9F3fZVDcMjpjTRZniRKhsTxisDwWbn3eDHwn/vwkw15XpnylUe+iXPJnAn5Ztm1hHoolnn1+VXUQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -321,12 +321,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@^1.0.175": - version "1.0.175" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" - integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== +"@budibase/pro@^1.0.178": + version "1.0.178" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178.tgz#f4677e4e5da45332cf40ce1139acbe42fdcd6035" + integrity sha512-JMu9AslFp78bOjNCvHH8DJsGcAATtrjRYpsL5iwUYz+qo2KAGlFQ/TRw+5qhSufoTLOr6+0g0QnnyYugJA+Fvw== dependencies: - "@budibase/backend-core" "1.0.175" + "@budibase/backend-core" "1.0.178" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": From 74ba842b764d17086a6060a7c683947f6f6bdb62 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 19:17:59 +0000 Subject: [PATCH 12/27] v1.0.180 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index e3f9c785a8..1764999140 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.179", + "version": "1.0.180", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2a78c0f011..04a979b216 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.179", + "version": "1.0.180", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a2abccb585..914a17840e 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.0.179", + "version": "1.0.180", "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.0.179", + "@budibase/string-templates": "^1.0.180", "@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 744c83eb6b..ed62be3592 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.179", + "version": "1.0.180", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.179", - "@budibase/client": "^1.0.179", - "@budibase/frontend-core": "^1.0.179", - "@budibase/string-templates": "^1.0.179", + "@budibase/bbui": "^1.0.180", + "@budibase/client": "^1.0.180", + "@budibase/frontend-core": "^1.0.180", + "@budibase/string-templates": "^1.0.180", "@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 b0dfddc138..3e93f97658 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.179", + "version": "1.0.180", "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 363d46b812..abf5bd7ba9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.179", + "version": "1.0.180", "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.0.179", - "@budibase/frontend-core": "^1.0.179", - "@budibase/string-templates": "^1.0.179", + "@budibase/bbui": "^1.0.180", + "@budibase/frontend-core": "^1.0.180", + "@budibase/string-templates": "^1.0.180", "@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 6d7bc11d3e..32cc00880a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.179", + "version": "1.0.180", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.179", + "@budibase/bbui": "^1.0.180", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index b5d7365304..b05d009457 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.179", + "version": "1.0.180", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.179", - "@budibase/client": "^1.0.179", + "@budibase/backend-core": "^1.0.180", + "@budibase/client": "^1.0.180", "@budibase/pro": "^1.0.178", - "@budibase/string-templates": "^1.0.179", + "@budibase/string-templates": "^1.0.180", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3484deaf3c..88ea0598b6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.179", + "version": "1.0.180", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 59e8e2ae4a..72694084a6 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.179", + "version": "1.0.180", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.179", + "@budibase/backend-core": "^1.0.180", "@budibase/pro": "^1.0.178", - "@budibase/string-templates": "^1.0.179", + "@budibase/string-templates": "^1.0.180", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 676569870207fd4c981110ae8378683a597bdacf Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 19:19:28 +0000 Subject: [PATCH 13/27] Update pro version to 1.0.180 --- 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 b05d009457..4153efbca4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.180", "@budibase/client": "^1.0.180", - "@budibase/pro": "^1.0.178", + "@budibase/pro": "1.0.180", "@budibase/string-templates": "^1.0.180", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 72694084a6..acdd9e76a5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.180", - "@budibase/pro": "^1.0.178", + "@budibase/pro": "1.0.180", "@budibase/string-templates": "^1.0.180", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 50c6ad9630273b2e795a1926c9745442606556b0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 24 May 2022 22:57:32 +0100 Subject: [PATCH 14/27] catch block in invalidate sessions --- .../backend-core/src/security/sessions.js | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/backend-core/src/security/sessions.js b/packages/backend-core/src/security/sessions.js index 1720eeb820..40a96d06e7 100644 --- a/packages/backend-core/src/security/sessions.js +++ b/packages/backend-core/src/security/sessions.js @@ -15,29 +15,33 @@ function makeSessionID(userId, sessionId) { } async function invalidateSessions(userId, sessionIds = null) { - let sessions = [] + try { + let sessions = [] - // If no sessionIds, get all the sessions for the user - if (!sessionIds) { - sessions = await getSessionsForUser(userId) - sessions.forEach( - session => - (session.key = makeSessionID(session.userId, session.sessionId)) - ) - } else { - // use the passed array of sessionIds - sessions = Array.isArray(sessionIds) ? sessionIds : [sessionIds] - sessions = sessions.map(sessionId => ({ - key: makeSessionID(userId, sessionId), - })) - } + // If no sessionIds, get all the sessions for the user + if (!sessionIds) { + sessions = await getSessionsForUser(userId) + sessions.forEach( + session => + (session.key = makeSessionID(session.userId, session.sessionId)) + ) + } else { + // use the passed array of sessionIds + sessions = Array.isArray(sessionIds) ? sessionIds : [sessionIds] + sessions = sessions.map(sessionId => ({ + key: makeSessionID(userId, sessionId), + })) + } - const client = await redis.getSessionClient() - const promises = [] - for (let session of sessions) { - promises.push(client.delete(session.key)) + const client = await redis.getSessionClient() + const promises = [] + for (let session of sessions) { + promises.push(client.delete(session.key)) + } + await Promise.all(promises) + } catch (err) { + console.error(`Error invalidating sessions: ${err}`) } - await Promise.all(promises) } exports.createASession = async (userId, session) => { From f286b2acbb61a8e19e8c66d31798e97f89bc7ff7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 22:17:47 +0000 Subject: [PATCH 15/27] v1.0.181 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 1764999140..3ff2e1befa 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.180", + "version": "1.0.181", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 04a979b216..a8c70049ae 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.180", + "version": "1.0.181", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 914a17840e..880252b384 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.0.180", + "version": "1.0.181", "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.0.180", + "@budibase/string-templates": "^1.0.181", "@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 ed62be3592..ba3ba0a490 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.180", + "version": "1.0.181", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.180", - "@budibase/client": "^1.0.180", - "@budibase/frontend-core": "^1.0.180", - "@budibase/string-templates": "^1.0.180", + "@budibase/bbui": "^1.0.181", + "@budibase/client": "^1.0.181", + "@budibase/frontend-core": "^1.0.181", + "@budibase/string-templates": "^1.0.181", "@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 3e93f97658..d495afe900 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.180", + "version": "1.0.181", "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 abf5bd7ba9..698c0d6a3e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.180", + "version": "1.0.181", "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.0.180", - "@budibase/frontend-core": "^1.0.180", - "@budibase/string-templates": "^1.0.180", + "@budibase/bbui": "^1.0.181", + "@budibase/frontend-core": "^1.0.181", + "@budibase/string-templates": "^1.0.181", "@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 32cc00880a..8acb09f43a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.180", + "version": "1.0.181", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.180", + "@budibase/bbui": "^1.0.181", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 4153efbca4..8f6e8ff810 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.180", + "version": "1.0.181", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.180", - "@budibase/client": "^1.0.180", + "@budibase/backend-core": "^1.0.181", + "@budibase/client": "^1.0.181", "@budibase/pro": "1.0.180", - "@budibase/string-templates": "^1.0.180", + "@budibase/string-templates": "^1.0.181", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 88ea0598b6..750c62e48a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.180", + "version": "1.0.181", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index acdd9e76a5..421f4b1178 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.180", + "version": "1.0.181", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.180", + "@budibase/backend-core": "^1.0.181", "@budibase/pro": "1.0.180", - "@budibase/string-templates": "^1.0.180", + "@budibase/string-templates": "^1.0.181", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 8e03264509a3ed3c42a564a29d7622cf8d2f48ec Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 22:19:22 +0000 Subject: [PATCH 16/27] Update pro version to 1.0.181 --- 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 8f6e8ff810..f35919d7bf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.181", "@budibase/client": "^1.0.181", - "@budibase/pro": "1.0.180", + "@budibase/pro": "1.0.181", "@budibase/string-templates": "^1.0.181", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 421f4b1178..09a8711e15 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.181", - "@budibase/pro": "1.0.180", + "@budibase/pro": "1.0.181", "@budibase/string-templates": "^1.0.181", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 3d0827a272a0d6ef75529d1f0da5d0bb1622c5bc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 25 May 2022 11:48:18 +0100 Subject: [PATCH 17/27] Adding scripts for generating heavy use of worker. --- packages/worker/scripts/load/heavyUse.js | 172 ++++++++++++++++++ .../{server => worker}/scripts/load/users.js | 0 2 files changed, 172 insertions(+) create mode 100644 packages/worker/scripts/load/heavyUse.js rename packages/{server => worker}/scripts/load/users.js (100%) diff --git a/packages/worker/scripts/load/heavyUse.js b/packages/worker/scripts/load/heavyUse.js new file mode 100644 index 0000000000..87c1cc687f --- /dev/null +++ b/packages/worker/scripts/load/heavyUse.js @@ -0,0 +1,172 @@ +const fetch = require("node-fetch") + +const MAX_RUNTIME_SEC = 600 +const HOST = "http://localhost:10000" +const TENANT_ID = "default" +const RATE_MS = 500 + +let API_KEY = process.argv[2] +let STATS = { + iterations: 0, + error: 0, + success: 0, +} + +if (!API_KEY) { + console.error("Must specify API key as first run command!") + process.exit(-1) +} + +const USERS = [ + { + email: "loadtest1@test.com", + password: "test", + }, + { + email: "loadtest2@test.com", + password: "test", + }, + { + email: "loadtest3@test.com", + password: "test", + }, + { + email: "loadtest4@test.com", + password: "test", + }, + { + email: "loadtest5@test.com", + password: "test", + }, + { + email: "loadtest6@test.com", + password: "test", + }, + { + email: "loadtest7@test.com", + password: "test", + }, +] + +const REQUESTS = [ + { + endpoint: `/api/global/self`, + method: "GET", + }, +] + +function timeout() { + return new Promise(resolve => { + setTimeout(() => { + resolve() + }, MAX_RUNTIME_SEC * 1000) + }) +} + +async function preTest() { + // check if the user exists or not + const response = await fetch(`${HOST}/api/global/users`, { + method: "GET", + headers: { + "x-budibase-api-key": API_KEY, + }, + }) + if (response.status !== 200) { + throw new Error("Unable to retrieve users") + } + const users = await response.json() + for (let user of USERS) { + if (users.find(u => u.email === user.email)) { + continue + } + const response = await fetch(`${HOST}/api/global/users`, { + method: "POST", + headers: { + "x-budibase-api-key": API_KEY, + "Content-Type": "application/json", + }, + body: JSON.stringify({ + ...user, + roles: {}, + status: "active", + }), + }) + if (response.status !== 200) { + throw new Error( + `Unable to create user ${user.email}, reason: ${await response.text()}` + ) + } + } +} + +async function requests(user) { + let response = await fetch(`${HOST}/api/global/auth/${TENANT_ID}/login`, { + method: "POST", + body: JSON.stringify({ + username: user.email, + password: user.password, + }), + headers: { + "Content-Type": "application/json", + }, + }) + // unable to login + if (response.status !== 200) { + STATS.error++ + return + } else { + STATS.success++ + } + const cookie = response.headers.get("set-cookie") + let promises = [] + for (let request of REQUESTS) { + const headers = { + cookie, + } + if (request.body) { + headers["Content-Type"] = "application/json" + } + promises.push( + fetch(`${HOST}${request.endpoint}`, { + method: request.method, + headers: { + cookie, + }, + }) + ) + } + const responses = await Promise.all(promises) + for (let resp of responses) { + if (resp.status !== 200) { + console.error(await resp.text()) + STATS.error++ + } else { + STATS.success++ + } + } +} + +async function run() { + await preTest() + setInterval(async () => { + let promises = [] + for (let user of USERS) { + promises.push(requests(user)) + } + await Promise.all(promises) + console.log( + `Iteration ${STATS.iterations++} - errors: ${STATS.error}, success: ${ + STATS.success + }` + ) + }, RATE_MS) + await timeout() + console.log( + `Max runtime of ${MAX_RUNTIME_SEC} seconds has been reached - stopping.` + ) + process.exit(0) +} + +run().catch(err => { + console.error("Failed to run - ", err) +}) diff --git a/packages/server/scripts/load/users.js b/packages/worker/scripts/load/users.js similarity index 100% rename from packages/server/scripts/load/users.js rename to packages/worker/scripts/load/users.js From 543cd8deb1240c175f4c6fdfcf2036fca133105b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 25 May 2022 13:02:15 +0100 Subject: [PATCH 18/27] add better logging on session invalidation --- packages/backend-core/src/security/sessions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/security/sessions.js b/packages/backend-core/src/security/sessions.js index 40a96d06e7..4e6899c248 100644 --- a/packages/backend-core/src/security/sessions.js +++ b/packages/backend-core/src/security/sessions.js @@ -80,6 +80,7 @@ exports.getSession = async (userId, sessionId) => { return client.get(makeSessionID(userId, sessionId)) } catch (err) { // if can't get session don't error, just don't return anything + console.error(err) return null } } From 1fb604e6019a0dc345128344f2622de87a3fc64a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 12:13:30 +0000 Subject: [PATCH 19/27] v1.0.182 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 3ff2e1befa..eded810d32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.181", + "version": "1.0.182", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a8c70049ae..22eaca2f84 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 880252b384..a65413a82e 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.0.181", + "version": "1.0.182", "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.0.181", + "@budibase/string-templates": "^1.0.182", "@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 ba3ba0a490..1e88156231 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.181", + "version": "1.0.182", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.181", - "@budibase/client": "^1.0.181", - "@budibase/frontend-core": "^1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/bbui": "^1.0.182", + "@budibase/client": "^1.0.182", + "@budibase/frontend-core": "^1.0.182", + "@budibase/string-templates": "^1.0.182", "@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 d495afe900..44eb3e190c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.181", + "version": "1.0.182", "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 698c0d6a3e..24d35b3204 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.181", + "version": "1.0.182", "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.0.181", - "@budibase/frontend-core": "^1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/bbui": "^1.0.182", + "@budibase/frontend-core": "^1.0.182", + "@budibase/string-templates": "^1.0.182", "@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 8acb09f43a..90899f052b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.181", + "@budibase/bbui": "^1.0.182", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f35919d7bf..0ba1a1f9ed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.181", - "@budibase/client": "^1.0.181", + "@budibase/backend-core": "^1.0.182", + "@budibase/client": "^1.0.182", "@budibase/pro": "1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/string-templates": "^1.0.182", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 750c62e48a..c630f35fcd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.181", + "version": "1.0.182", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09a8711e15..797efbc6c7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.181", + "@budibase/backend-core": "^1.0.182", "@budibase/pro": "1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/string-templates": "^1.0.182", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 422a41e2644a2f763bbfb69560d5250b34b2ceae Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 12:14:44 +0000 Subject: [PATCH 20/27] Update pro version to 1.0.182 --- 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 0ba1a1f9ed..9befcebcb7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.182", "@budibase/client": "^1.0.182", - "@budibase/pro": "1.0.181", + "@budibase/pro": "1.0.182", "@budibase/string-templates": "^1.0.182", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 797efbc6c7..b56848b402 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.182", - "@budibase/pro": "1.0.181", + "@budibase/pro": "1.0.182", "@budibase/string-templates": "^1.0.182", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 9f115b8d1e59f3516258d4455cb9f6a6e4900ccd Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 15:03:59 +0000 Subject: [PATCH 21/27] v1.0.183 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index eded810d32..791c46039a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.182", + "version": "1.0.183", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 22eaca2f84..dddd45d33c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a65413a82e..74cb2c522d 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.0.182", + "version": "1.0.183", "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.0.182", + "@budibase/string-templates": "^1.0.183", "@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 1e88156231..ff96a05455 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.182", + "version": "1.0.183", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.182", - "@budibase/client": "^1.0.182", - "@budibase/frontend-core": "^1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/bbui": "^1.0.183", + "@budibase/client": "^1.0.183", + "@budibase/frontend-core": "^1.0.183", + "@budibase/string-templates": "^1.0.183", "@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 44eb3e190c..2cc49c54d7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.182", + "version": "1.0.183", "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 24d35b3204..bb27b25af7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.182", + "version": "1.0.183", "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.0.182", - "@budibase/frontend-core": "^1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/bbui": "^1.0.183", + "@budibase/frontend-core": "^1.0.183", + "@budibase/string-templates": "^1.0.183", "@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 90899f052b..21b96e4078 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.182", + "@budibase/bbui": "^1.0.183", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 9befcebcb7..56702b82d0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.182", - "@budibase/client": "^1.0.182", + "@budibase/backend-core": "^1.0.183", + "@budibase/client": "^1.0.183", "@budibase/pro": "1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/string-templates": "^1.0.183", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c630f35fcd..ba5d0cd221 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.182", + "version": "1.0.183", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index b56848b402..86607796af 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.182", + "@budibase/backend-core": "^1.0.183", "@budibase/pro": "1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/string-templates": "^1.0.183", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From ed3f6af60d80301cbd284cd44c43cc2433e33070 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 15:06:00 +0000 Subject: [PATCH 22/27] Update pro version to 1.0.183 --- 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 56702b82d0..6242ce2bd1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.183", "@budibase/client": "^1.0.183", - "@budibase/pro": "1.0.182", + "@budibase/pro": "1.0.183", "@budibase/string-templates": "^1.0.183", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 86607796af..4d6a01727a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.183", - "@budibase/pro": "1.0.182", + "@budibase/pro": "1.0.183", "@budibase/string-templates": "^1.0.183", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 157802b70af96383e77a80651cf4f214d19593c3 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 25 May 2022 16:14:45 +0100 Subject: [PATCH 23/27] Swapping bcryptjs for bcrypt. --- packages/backend-core/package.json | 2 +- packages/backend-core/src/hashing.js | 2 +- packages/backend-core/yarn.lock | 178 +++++++++++++++++++++++- packages/server/src/utilities/bcrypt.js | 15 -- packages/server/yarn.lock | 18 +-- packages/worker/yarn.lock | 18 +-- 6 files changed, 192 insertions(+), 41 deletions(-) delete mode 100644 packages/server/src/utilities/bcrypt.js diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a8c70049ae..c4749f8b4e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -12,7 +12,7 @@ "dependencies": { "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.901.0", - "bcryptjs": "^2.4.3", + "bcrypt": "^5.0.1", "emitter-listener": "^1.1.2", "ioredis": "^4.27.1", "jsonwebtoken": "^8.5.1", diff --git a/packages/backend-core/src/hashing.js b/packages/backend-core/src/hashing.js index 7f3af2855f..45abe2f9bd 100644 --- a/packages/backend-core/src/hashing.js +++ b/packages/backend-core/src/hashing.js @@ -1,4 +1,4 @@ -const bcrypt = require("bcryptjs") +const bcrypt = require("bcrypt") const env = require("./environment") const { v4 } = require("uuid") diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock index 95bda45504..10bd3cb85a 100644 --- a/packages/backend-core/yarn.lock +++ b/packages/backend-core/yarn.lock @@ -497,6 +497,21 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@mapbox/node-pre-gyp@^1.0.0": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc" + integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw== + dependencies: + detect-libc "^2.0.0" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.7" + nopt "^5.0.0" + npmlog "^5.0.1" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -623,6 +638,11 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + abort-controller@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" @@ -738,6 +758,19 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -958,10 +991,18 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +bcrypt@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.1.tgz#f1a2c20f208e2ccdceea4433df0c8b2c54ecdf71" + integrity sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw== + dependencies: + "@mapbox/node-pre-gyp" "^1.0.0" + node-addon-api "^3.1.0" + bcryptjs@^2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" - integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= + integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ== bl@^4.0.3: version "4.1.0" @@ -1144,6 +1185,11 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -1225,6 +1271,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" @@ -1254,6 +1305,11 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +console-control-strings@^1.0.0, console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" @@ -1410,11 +1466,21 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + denque@^1.1.0: version "1.5.1" resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== + detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -1807,6 +1873,13 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1827,6 +1900,21 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" + integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -1967,6 +2055,11 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -3175,7 +3268,7 @@ ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= -make-dir@^3.0.0: +make-dir@^3.0.0, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -3300,6 +3393,21 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minipass@^3.0.0: + version "3.1.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" + integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -3313,6 +3421,11 @@ mkdirp-classic@^0.5.2: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -3370,12 +3483,17 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-addon-api@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + node-fetch@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-fetch@2.6.7, node-fetch@^2.6.1: +node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== @@ -3419,6 +3537,13 @@ node-releases@^2.0.1: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -3455,6 +3580,16 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" @@ -3475,6 +3610,11 @@ oauth@0.9.x, oauth@^0.9.15: resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -4061,7 +4201,7 @@ readable-stream@1.1.14, readable-stream@^1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0: +"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -4237,7 +4377,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -4325,6 +4465,13 @@ semver@^7.3.2: dependencies: lru-cache "^6.0.0" +semver@^7.3.5: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + dependencies: + lru-cache "^6.0.0" + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -4579,7 +4726,7 @@ string-template@~1.0.0: resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96" integrity sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y= -string-width@^4.1.0, string-width@^4.2.0: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -4692,6 +4839,18 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -5070,6 +5229,13 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" +wide-align@^1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" diff --git a/packages/server/src/utilities/bcrypt.js b/packages/server/src/utilities/bcrypt.js deleted file mode 100644 index 6c52d2c2c7..0000000000 --- a/packages/server/src/utilities/bcrypt.js +++ /dev/null @@ -1,15 +0,0 @@ -// TODO: REMOVE - -const bcrypt = require("bcryptjs") -const env = require("../environment") - -const SALT_ROUNDS = env.SALT_ROUNDS || 10 - -exports.hash = async data => { - const salt = await bcrypt.genSalt(SALT_ROUNDS) - const result = await bcrypt.hash(data, salt) - return result -} - -exports.compare = async (data, encrypted) => - await bcrypt.compare(data, encrypted) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 92f216d9f1..3928cea21d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.178": - version "1.0.178" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.178.tgz#d90730b077a65de77c81c68822cc6f41fe89e772" - integrity sha512-RxVoqKH61Q9F3fZVDcMjpjTRZniRKhsTxisDwWbn3eDHwn/vwkw15XpnylUe+iXPJnAn5Ztm1hHoolnn1+VXUQ== +"@budibase/backend-core@1.0.181": + version "1.0.181" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.181.tgz#b30226bb47709b371eac604acfba40d8216e01cd" + integrity sha512-nje/mQ4uQ7HqWRzwi7xmlvi3QduszGIDkH35aaTprgMyxPwKG4egwfY7UqmVdyGMOqP594VFIg2vuQvsbFZrsw== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1091,12 +1091,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@^1.0.178": - version "1.0.178" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178.tgz#f4677e4e5da45332cf40ce1139acbe42fdcd6035" - integrity sha512-JMu9AslFp78bOjNCvHH8DJsGcAATtrjRYpsL5iwUYz+qo2KAGlFQ/TRw+5qhSufoTLOr6+0g0QnnyYugJA+Fvw== +"@budibase/pro@1.0.181": + version "1.0.181" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.181.tgz#38a79b835bc8fbdef367a676ec77b11a04b6e4ff" + integrity sha512-6OpV8pozT+To58M3eXPCnUoKDqtpBT4z5ghd25neVEQAS314QGtU1uiTo9MvK8avX65xucPh02MSgTDz5bfnAw== dependencies: - "@budibase/backend-core" "1.0.178" + "@budibase/backend-core" "1.0.181" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f3b00b7b6a..4fde5405c3 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.178": - version "1.0.178" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.178.tgz#d90730b077a65de77c81c68822cc6f41fe89e772" - integrity sha512-RxVoqKH61Q9F3fZVDcMjpjTRZniRKhsTxisDwWbn3eDHwn/vwkw15XpnylUe+iXPJnAn5Ztm1hHoolnn1+VXUQ== +"@budibase/backend-core@1.0.181": + version "1.0.181" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.181.tgz#b30226bb47709b371eac604acfba40d8216e01cd" + integrity sha512-nje/mQ4uQ7HqWRzwi7xmlvi3QduszGIDkH35aaTprgMyxPwKG4egwfY7UqmVdyGMOqP594VFIg2vuQvsbFZrsw== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -321,12 +321,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@^1.0.178": - version "1.0.178" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178.tgz#f4677e4e5da45332cf40ce1139acbe42fdcd6035" - integrity sha512-JMu9AslFp78bOjNCvHH8DJsGcAATtrjRYpsL5iwUYz+qo2KAGlFQ/TRw+5qhSufoTLOr6+0g0QnnyYugJA+Fvw== +"@budibase/pro@1.0.181": + version "1.0.181" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.181.tgz#38a79b835bc8fbdef367a676ec77b11a04b6e4ff" + integrity sha512-6OpV8pozT+To58M3eXPCnUoKDqtpBT4z5ghd25neVEQAS314QGtU1uiTo9MvK8avX65xucPh02MSgTDz5bfnAw== dependencies: - "@budibase/backend-core" "1.0.178" + "@budibase/backend-core" "1.0.181" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": From 0a8800cb795e4b8af802bd0438aaa441591fa016 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 16:11:35 +0000 Subject: [PATCH 24/27] v1.0.184 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 791c46039a..688ecaf98e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.183", + "version": "1.0.184", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cec01edfd2..a0650671d0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.183", + "version": "1.0.184", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 74cb2c522d..467446cabe 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.0.183", + "version": "1.0.184", "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.0.183", + "@budibase/string-templates": "^1.0.184", "@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 ff96a05455..7bf0a9ab3a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.183", + "version": "1.0.184", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.183", - "@budibase/client": "^1.0.183", - "@budibase/frontend-core": "^1.0.183", - "@budibase/string-templates": "^1.0.183", + "@budibase/bbui": "^1.0.184", + "@budibase/client": "^1.0.184", + "@budibase/frontend-core": "^1.0.184", + "@budibase/string-templates": "^1.0.184", "@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 2cc49c54d7..8f83704fd5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.183", + "version": "1.0.184", "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 bb27b25af7..2d2323ad6b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.183", + "version": "1.0.184", "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.0.183", - "@budibase/frontend-core": "^1.0.183", - "@budibase/string-templates": "^1.0.183", + "@budibase/bbui": "^1.0.184", + "@budibase/frontend-core": "^1.0.184", + "@budibase/string-templates": "^1.0.184", "@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 21b96e4078..20c5a0c403 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.183", + "version": "1.0.184", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.183", + "@budibase/bbui": "^1.0.184", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6242ce2bd1..5a9724030f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.183", + "version": "1.0.184", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.183", - "@budibase/client": "^1.0.183", + "@budibase/backend-core": "^1.0.184", + "@budibase/client": "^1.0.184", "@budibase/pro": "1.0.183", - "@budibase/string-templates": "^1.0.183", + "@budibase/string-templates": "^1.0.184", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ba5d0cd221..af788f4f48 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.183", + "version": "1.0.184", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4d6a01727a..3394807704 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.183", + "version": "1.0.184", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.183", + "@budibase/backend-core": "^1.0.184", "@budibase/pro": "1.0.183", - "@budibase/string-templates": "^1.0.183", + "@budibase/string-templates": "^1.0.184", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From d21b8abf5aa35bae03eba70e7846090841cd423a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 16:12:57 +0000 Subject: [PATCH 25/27] Update pro version to 1.0.184 --- 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 5a9724030f..e8323e5e68 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.184", "@budibase/client": "^1.0.184", - "@budibase/pro": "1.0.183", + "@budibase/pro": "1.0.184", "@budibase/string-templates": "^1.0.184", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3394807704..5729856e69 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.184", - "@budibase/pro": "1.0.183", + "@budibase/pro": "1.0.184", "@budibase/string-templates": "^1.0.184", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From ef65c070fb9f06bdd953bb26c08f2715143ff853 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 May 2022 17:34:17 +0000 Subject: [PATCH 26/27] v1.0.185-alpha.0 --- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lerna.json b/lerna.json index 688ecaf98e..da3e27e84f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.184", + "version": "1.0.185-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ebf7517e68..434ee80234 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", @@ -12,8 +12,8 @@ "dependencies": { "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.901.0", - "dotenv": "^16.0.1", "bcrypt": "^5.0.1", + "dotenv": "^16.0.1", "emitter-listener": "^1.1.2", "ioredis": "^4.27.1", "jsonwebtoken": "^8.5.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 467446cabe..f2caac1cbc 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.0.184", + "version": "1.0.185-alpha.0", "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.0.184", + "@budibase/string-templates": "^1.0.185-alpha.0", "@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 fffe987795..63df3d5ebf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.184", - "@budibase/client": "^1.0.184", - "@budibase/frontend-core": "^1.0.184", - "@budibase/string-templates": "^1.0.184", + "@budibase/bbui": "^1.0.185-alpha.0", + "@budibase/client": "^1.0.185-alpha.0", + "@budibase/frontend-core": "^1.0.185-alpha.0", + "@budibase/string-templates": "^1.0.185-alpha.0", "@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 8f83704fd5..dd5c8afa8c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "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 2d2323ad6b..342210b811 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "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.0.184", - "@budibase/frontend-core": "^1.0.184", - "@budibase/string-templates": "^1.0.184", + "@budibase/bbui": "^1.0.185-alpha.0", + "@budibase/frontend-core": "^1.0.185-alpha.0", + "@budibase/string-templates": "^1.0.185-alpha.0", "@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 20c5a0c403..c9e8d0751e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.184", + "@budibase/bbui": "^1.0.185-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e8323e5e68..b7babcd256 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.184", - "@budibase/client": "^1.0.184", + "@budibase/backend-core": "^1.0.185-alpha.0", + "@budibase/client": "^1.0.185-alpha.0", "@budibase/pro": "1.0.184", - "@budibase/string-templates": "^1.0.184", + "@budibase/string-templates": "^1.0.185-alpha.0", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index af788f4f48..6073239e03 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5729856e69..e859a93561 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.184", + "version": "1.0.185-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.184", + "@budibase/backend-core": "^1.0.185-alpha.0", "@budibase/pro": "1.0.184", - "@budibase/string-templates": "^1.0.184", + "@budibase/string-templates": "^1.0.185-alpha.0", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 6fec37d705a6800da8d82b5f73bce1d6e28c2d72 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 May 2022 17:35:50 +0000 Subject: [PATCH 27/27] Update pro version to 1.0.185-alpha.0 --- 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 b7babcd256..3e48f53a41 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.185-alpha.0", "@budibase/client": "^1.0.185-alpha.0", - "@budibase/pro": "1.0.184", + "@budibase/pro": "1.0.185-alpha.0", "@budibase/string-templates": "^1.0.185-alpha.0", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index e859a93561..7d7986e5c2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.185-alpha.0", - "@budibase/pro": "1.0.184", + "@budibase/pro": "1.0.185-alpha.0", "@budibase/string-templates": "^1.0.185-alpha.0", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",