From 7cf104d8d717e0e62677c8049767d7d34ff5e209 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 29 Apr 2022 11:37:40 +0100 Subject: [PATCH 01/12] fix binding panel in automate --- .../SetupPanel/AutomationBlockSetup.svelte | 1 + .../automation/SetupPanel/RowSelector.svelte | 42 ++++++------------- .../SetupPanel/RowSelectorTypes.svelte | 5 ++- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 4333e4a2e5..68afc04886 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -265,6 +265,7 @@ value={inputData[key]} on:change={e => onChange(e, key)} {bindings} + {isTestModal} /> {:else if value.customType === "webhookUrl"} - {:else} - onChange(e, field, schema.type)} - label={field} - type="string" - {bindings} - fillWidth={true} - allowJS={true} - updateOnChange={false} - /> - {/if} - {:else if !rowControl} - + {#if !rowControl} + {:else} - {:else if schema.type === "string" || schema.type === "number"} - onChange(e, field)} From bb2d46ce95bf81e5328c1e99107d7fe67675bd9e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 29 Apr 2022 13:31:30 +0000 Subject: [PATCH 02/12] v1.0.132 --- 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 5d96b1d3bd..a2af84b074 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.131", + "version": "1.0.132", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 754df07fb7..a5896e0bf2 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.131", + "version": "1.0.132", "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 cba9fdbd6e..ff00a11f44 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.131", + "version": "1.0.132", "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.131", + "@budibase/string-templates": "^1.0.132", "@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 d22668bb0e..4e72a2857c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.131", + "version": "1.0.132", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.131", - "@budibase/client": "^1.0.131", - "@budibase/frontend-core": "^1.0.131", - "@budibase/string-templates": "^1.0.131", + "@budibase/bbui": "^1.0.132", + "@budibase/client": "^1.0.132", + "@budibase/frontend-core": "^1.0.132", + "@budibase/string-templates": "^1.0.132", "@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 06f4a8dffa..1ef25ddf77 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.131", + "version": "1.0.132", "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 67ee8e4b29..59e0b7afa7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.131", + "version": "1.0.132", "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.131", - "@budibase/frontend-core": "^1.0.131", - "@budibase/string-templates": "^1.0.131", + "@budibase/bbui": "^1.0.132", + "@budibase/frontend-core": "^1.0.132", + "@budibase/string-templates": "^1.0.132", "@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 d5844a93b3..4f754d490f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.131", + "version": "1.0.132", "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.131", + "@budibase/bbui": "^1.0.132", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 531a823b42..daff649503 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.131", + "version": "1.0.132", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.131", - "@budibase/client": "^1.0.131", + "@budibase/backend-core": "^1.0.132", + "@budibase/client": "^1.0.132", "@budibase/pro": "1.0.131", - "@budibase/string-templates": "^1.0.131", + "@budibase/string-templates": "^1.0.132", "@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 449d300ecf..257f7f7ed8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.131", + "version": "1.0.132", "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 3bc6441327..a8d03105a3 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.131", + "version": "1.0.132", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.131", + "@budibase/backend-core": "^1.0.132", "@budibase/pro": "1.0.131", - "@budibase/string-templates": "^1.0.131", + "@budibase/string-templates": "^1.0.132", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From e5a447815405b15153286e6f9665ef08b4d825c2 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 29 Apr 2022 13:32:47 +0000 Subject: [PATCH 03/12] Update pro version to 1.0.132 --- 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 daff649503..fffaffea10 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.132", "@budibase/client": "^1.0.132", - "@budibase/pro": "1.0.131", + "@budibase/pro": "1.0.132", "@budibase/string-templates": "^1.0.132", "@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 a8d03105a3..05b0e2cf40 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.132", - "@budibase/pro": "1.0.131", + "@budibase/pro": "1.0.132", "@budibase/string-templates": "^1.0.132", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 3b89ccfafa31902bd74f1b8fd94c0d8a2480de59 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sun, 1 May 2022 12:53:39 +0100 Subject: [PATCH 04/12] update google button to match their branding guidelines --- .../_components/GoogleButton.svelte | 37 +++-- .../_components/GoogleSignIn.svelte | 145 ++++++++++++++++++ 2 files changed, 166 insertions(+), 16 deletions(-) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte index 642aa548f2..4622bd7b19 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte @@ -1,5 +1,4 @@ - { let ds = datasource if (!ds) { @@ -22,26 +21,32 @@ ) }} > -
- google icon -

Sign in with Google

-
-
+ google icon +

Sign in with Google

+ diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte new file mode 100644 index 0000000000..c30e8fc2ee --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte @@ -0,0 +1,145 @@ + + + + + btn_google_dark_normal_ios + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 86306882e5dda2be1a1548ddb4768d5bd91bed83 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 2 May 2022 08:48:23 +0000 Subject: [PATCH 05/12] v1.0.133 --- 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 a2af84b074..7c72b2e228 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.132", + "version": "1.0.133", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a5896e0bf2..e544a10a3e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.132", + "version": "1.0.133", "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 ff00a11f44..72daac2bc3 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.132", + "version": "1.0.133", "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.132", + "@budibase/string-templates": "^1.0.133", "@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 4e72a2857c..83d3c50c2f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.132", + "version": "1.0.133", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.132", - "@budibase/client": "^1.0.132", - "@budibase/frontend-core": "^1.0.132", - "@budibase/string-templates": "^1.0.132", + "@budibase/bbui": "^1.0.133", + "@budibase/client": "^1.0.133", + "@budibase/frontend-core": "^1.0.133", + "@budibase/string-templates": "^1.0.133", "@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 1ef25ddf77..a54e2a5363 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.132", + "version": "1.0.133", "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 59e0b7afa7..5477758e7f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.132", + "version": "1.0.133", "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.132", - "@budibase/frontend-core": "^1.0.132", - "@budibase/string-templates": "^1.0.132", + "@budibase/bbui": "^1.0.133", + "@budibase/frontend-core": "^1.0.133", + "@budibase/string-templates": "^1.0.133", "@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 4f754d490f..3fe7b7da3e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.132", + "version": "1.0.133", "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.132", + "@budibase/bbui": "^1.0.133", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fffaffea10..bd6d85ab93 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.132", + "version": "1.0.133", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.132", - "@budibase/client": "^1.0.132", + "@budibase/backend-core": "^1.0.133", + "@budibase/client": "^1.0.133", "@budibase/pro": "1.0.132", - "@budibase/string-templates": "^1.0.132", + "@budibase/string-templates": "^1.0.133", "@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 257f7f7ed8..e9e0d85a04 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.132", + "version": "1.0.133", "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 05b0e2cf40..4813992b0d 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.132", + "version": "1.0.133", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.132", + "@budibase/backend-core": "^1.0.133", "@budibase/pro": "1.0.132", - "@budibase/string-templates": "^1.0.132", + "@budibase/string-templates": "^1.0.133", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 358a3fc874eb111622400f6f81e42c32f7e8eccf Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 2 May 2022 08:49:41 +0000 Subject: [PATCH 06/12] Update pro version to 1.0.133 --- 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 bd6d85ab93..c69daeaf39 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.133", "@budibase/client": "^1.0.133", - "@budibase/pro": "1.0.132", + "@budibase/pro": "1.0.133", "@budibase/string-templates": "^1.0.133", "@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 4813992b0d..94173e2e9a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.133", - "@budibase/pro": "1.0.132", + "@budibase/pro": "1.0.133", "@budibase/string-templates": "^1.0.133", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 016c16b06afb7bb4f576d1c492ca413f90747740 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 May 2022 10:06:54 +0100 Subject: [PATCH 07/12] record cypress runs in smoke test --- .github/workflows/smoke_test.yaml | 2 ++ packages/builder/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml index b26d0386fc..927d860957 100644 --- a/.github/workflows/smoke_test.yaml +++ b/.github/workflows/smoke_test.yaml @@ -33,6 +33,8 @@ jobs: with: install: false command: yarn test:e2e:ci + env: + CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} # TODO: upload recordings to s3 # - name: Configure AWS Credentials diff --git a/packages/builder/package.json b/packages/builder/package.json index 83d3c50c2f..037c3b9791 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -13,7 +13,7 @@ "cy:setup:ci": "node ./cypress/setup.js", "cy:open": "cypress open", "cy:run": "cypress run", - "cy:run:ci": "xvfb-run cypress run --headed --browser chrome", + "cy:run:ci": "xvfb-run cypress run --headed --browser chrome --record", "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run", "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci", "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open", From 4148ef62b11af8303e0e58d024a063051e7db13f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 3 May 2022 09:32:48 +0000 Subject: [PATCH 08/12] v1.0.134 --- 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 7c72b2e228..82ef5dc786 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.133", + "version": "1.0.134", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e544a10a3e..09fc5cf002 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.133", + "version": "1.0.134", "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 72daac2bc3..bceefa032d 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.133", + "version": "1.0.134", "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.133", + "@budibase/string-templates": "^1.0.134", "@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 037c3b9791..a41f46c8a5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.133", + "version": "1.0.134", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.133", - "@budibase/client": "^1.0.133", - "@budibase/frontend-core": "^1.0.133", - "@budibase/string-templates": "^1.0.133", + "@budibase/bbui": "^1.0.134", + "@budibase/client": "^1.0.134", + "@budibase/frontend-core": "^1.0.134", + "@budibase/string-templates": "^1.0.134", "@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 a54e2a5363..7d14c93ade 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.133", + "version": "1.0.134", "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 5477758e7f..743bd52cec 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.133", + "version": "1.0.134", "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.133", - "@budibase/frontend-core": "^1.0.133", - "@budibase/string-templates": "^1.0.133", + "@budibase/bbui": "^1.0.134", + "@budibase/frontend-core": "^1.0.134", + "@budibase/string-templates": "^1.0.134", "@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 3fe7b7da3e..972443e23c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.133", + "version": "1.0.134", "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.133", + "@budibase/bbui": "^1.0.134", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index c69daeaf39..a099628690 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.133", + "version": "1.0.134", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.133", - "@budibase/client": "^1.0.133", + "@budibase/backend-core": "^1.0.134", + "@budibase/client": "^1.0.134", "@budibase/pro": "1.0.133", - "@budibase/string-templates": "^1.0.133", + "@budibase/string-templates": "^1.0.134", "@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 e9e0d85a04..8523ccbe1a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.133", + "version": "1.0.134", "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 94173e2e9a..270023f05f 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.133", + "version": "1.0.134", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.133", + "@budibase/backend-core": "^1.0.134", "@budibase/pro": "1.0.133", - "@budibase/string-templates": "^1.0.133", + "@budibase/string-templates": "^1.0.134", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 0303d7f68a9fc7fe222ff9770e861962c3981f7e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 3 May 2022 09:34:07 +0000 Subject: [PATCH 09/12] Update pro version to 1.0.134 --- 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 a099628690..a621dc3453 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.134", "@budibase/client": "^1.0.134", - "@budibase/pro": "1.0.133", + "@budibase/pro": "1.0.134", "@budibase/string-templates": "^1.0.134", "@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 270023f05f..fd243cba90 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.134", - "@budibase/pro": "1.0.133", + "@budibase/pro": "1.0.134", "@budibase/string-templates": "^1.0.134", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From ab10af171e210d021464944cfa3821046cd66ffa Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 3 May 2022 14:18:18 +0100 Subject: [PATCH 10/12] Add workflow_dispatch to ci, release-develop and release (master) --- .github/workflows/budibase_ci.yml | 1 + .github/workflows/release-develop.yml | 6 ++++++ .github/workflows/release.yml | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 0881d2528d..8e235532cf 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -11,6 +11,7 @@ on: branches: - master - develop + workflow_dispatch: env: BRANCH: ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 87e4f0988a..7ee02ccdd1 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -14,6 +14,7 @@ on: - 'yarn.lock' - 'package.json' - 'yarn.lock' + workflow_dispatch: env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -26,6 +27,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Fail if branch is not develop + if: github.ref != 'refs/heads/develop' + run: | + echo "Ref is not develop, you must run this job from develop." + exit 1 - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3fe81dbcd1..359ad4467b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ on: - 'yarn.lock' - 'package.json' - 'yarn.lock' + workflow_dispatch: env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} @@ -27,6 +28,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Fail if branch is not master + if: github.ref != 'refs/heads/master' + run: | + echo "Ref is not master, you must run this job from master." + exit 1 - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: From eae6a0110baea43dc1d735dc2d7db36732d52da7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 3 May 2022 13:54:24 +0000 Subject: [PATCH 11/12] v1.0.135 --- 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 82ef5dc786..b9d9cfb8b1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.134", + "version": "1.0.135", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 09fc5cf002..90b8bac22a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.134", + "version": "1.0.135", "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 bceefa032d..b55c6bb6fb 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.134", + "version": "1.0.135", "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.134", + "@budibase/string-templates": "^1.0.135", "@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 a41f46c8a5..61e320e61c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.134", + "version": "1.0.135", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.134", - "@budibase/client": "^1.0.134", - "@budibase/frontend-core": "^1.0.134", - "@budibase/string-templates": "^1.0.134", + "@budibase/bbui": "^1.0.135", + "@budibase/client": "^1.0.135", + "@budibase/frontend-core": "^1.0.135", + "@budibase/string-templates": "^1.0.135", "@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 7d14c93ade..2951389d55 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.134", + "version": "1.0.135", "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 743bd52cec..92d9f36662 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.134", + "version": "1.0.135", "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.134", - "@budibase/frontend-core": "^1.0.134", - "@budibase/string-templates": "^1.0.134", + "@budibase/bbui": "^1.0.135", + "@budibase/frontend-core": "^1.0.135", + "@budibase/string-templates": "^1.0.135", "@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 972443e23c..138073f3b0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.134", + "version": "1.0.135", "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.134", + "@budibase/bbui": "^1.0.135", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index a621dc3453..798b3e16ec 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.134", + "version": "1.0.135", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.134", - "@budibase/client": "^1.0.134", + "@budibase/backend-core": "^1.0.135", + "@budibase/client": "^1.0.135", "@budibase/pro": "1.0.134", - "@budibase/string-templates": "^1.0.134", + "@budibase/string-templates": "^1.0.135", "@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 8523ccbe1a..4e5a7e51ff 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.134", + "version": "1.0.135", "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 fd243cba90..4b2ab7100c 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.134", + "version": "1.0.135", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.134", + "@budibase/backend-core": "^1.0.135", "@budibase/pro": "1.0.134", - "@budibase/string-templates": "^1.0.134", + "@budibase/string-templates": "^1.0.135", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 419595f65429282fbd8cde86d014e3f3a46c7d85 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 3 May 2022 13:55:48 +0000 Subject: [PATCH 12/12] Update pro version to 1.0.135 --- 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 798b3e16ec..f0c42073f4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.135", "@budibase/client": "^1.0.135", - "@budibase/pro": "1.0.134", + "@budibase/pro": "1.0.135", "@budibase/string-templates": "^1.0.135", "@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 4b2ab7100c..96f77fa55a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.135", - "@budibase/pro": "1.0.134", + "@budibase/pro": "1.0.135", "@budibase/string-templates": "^1.0.135", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",