From e9604377d1fa3a722aaeb981cbd53551747a627e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 14 Jul 2022 18:42:37 +0000 Subject: [PATCH 01/22] v1.1.10 --- lerna.json | 2 +- packages/backend-core/package.json | 6 +++--- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index f6d48473fd..6664986dd0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.9", + "version": "1.1.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index bafbc3714c..98535b7f41 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.9", + "version": "1.1.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.1.9", + "@budibase/types": "^1.1.10", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", @@ -62,6 +62,7 @@ "@shopify/jest-koa-mocks": "3.1.5", "@types/jest": "27.5.1", "@types/koa": "2.0.52", + "@types/lodash": "4.14.180", "@types/node": "14.18.20", "@types/node-fetch": "2.6.1", "@types/pouchdb": "6.4.0", @@ -69,7 +70,6 @@ "@types/semver": "7.3.7", "@types/tar-fs": "2.0.1", "@types/uuid": "8.3.4", - "@types/lodash": "4.14.180", "ioredis-mock": "5.8.0", "jest": "27.5.1", "koa": "2.7.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9ec992d930..708bfafd74 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.1.9", + "version": "1.1.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.9", + "@budibase/string-templates": "^1.1.10", "@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 4453f1de8b..5f2889c4a5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.9", + "version": "1.1.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.9", - "@budibase/client": "^1.1.9", - "@budibase/frontend-core": "^1.1.9", - "@budibase/string-templates": "^1.1.9", + "@budibase/bbui": "^1.1.10", + "@budibase/client": "^1.1.10", + "@budibase/frontend-core": "^1.1.10", + "@budibase/string-templates": "^1.1.10", "@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 cbef7b274f..71541a5c88 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.9", + "version": "1.1.10", "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 fd9223e4d2..6eb9ff92d7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.9", + "version": "1.1.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.9", - "@budibase/frontend-core": "^1.1.9", - "@budibase/string-templates": "^1.1.9", + "@budibase/bbui": "^1.1.10", + "@budibase/frontend-core": "^1.1.10", + "@budibase/string-templates": "^1.1.10", "@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 36022b1e09..e9a6f7d293 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.9", + "version": "1.1.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.9", + "@budibase/bbui": "^1.1.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fd5ba859ae..a0661609d2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.9", + "version": "1.1.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.1.9", - "@budibase/client": "^1.1.9", + "@budibase/backend-core": "^1.1.10", + "@budibase/client": "^1.1.10", "@budibase/pro": "1.1.9", - "@budibase/string-templates": "^1.1.9", - "@budibase/types": "^1.1.9", + "@budibase/string-templates": "^1.1.10", + "@budibase/types": "^1.1.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c22d0e9634..a7782cc730 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.9", + "version": "1.1.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 9c62a34d0f..3599ab93b9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.9", + "version": "1.1.10", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 47f0519c05..9c061640f7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.9", + "version": "1.1.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.9", + "@budibase/backend-core": "^1.1.10", "@budibase/pro": "1.1.9", - "@budibase/string-templates": "^1.1.9", - "@budibase/types": "^1.1.9", + "@budibase/string-templates": "^1.1.10", + "@budibase/types": "^1.1.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From da26008e39a6468aaf5ae4c90672f7c56cc6f75a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 14 Jul 2022 18:44:14 +0000 Subject: [PATCH 02/22] Update pro version to 1.1.10 --- 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 a0661609d2..c9d32516a3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.10", "@budibase/client": "^1.1.10", - "@budibase/pro": "1.1.9", + "@budibase/pro": "1.1.10", "@budibase/string-templates": "^1.1.10", "@budibase/types": "^1.1.10", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9c061640f7..389e0b1d2a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.10", - "@budibase/pro": "1.1.9", + "@budibase/pro": "1.1.10", "@budibase/string-templates": "^1.1.10", "@budibase/types": "^1.1.10", "@koa/router": "8.0.8", From 994aade3729e891521f774b6aac69fc00725692f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 15 Jul 2022 09:32:46 +0100 Subject: [PATCH 03/22] only show intercom in cloud --- packages/builder/src/analytics/IntercomClient.js | 12 ++++++------ packages/builder/src/stores/portal/auth.js | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/analytics/IntercomClient.js b/packages/builder/src/analytics/IntercomClient.js index 6d5bf9e93e..e7a8539267 100644 --- a/packages/builder/src/analytics/IntercomClient.js +++ b/packages/builder/src/analytics/IntercomClient.js @@ -53,12 +53,12 @@ export default class IntercomClient { * @returns Intercom global object */ show(user = {}) { - if (!this.initialised || !user?.admin) return - - return window.Intercom("boot", { - app_id: this.token, - ...user, - }) + if (this.initialised && user?.admin && user?.cloud) { + return window.Intercom("boot", { + app_id: this.token, + ...user, + }) + } } /** diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index 5e8b28f6e7..636e80de99 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -54,6 +54,7 @@ export function createAuthStore() { }) if (user) { + const adminStore = get(admin) analytics .activate() .then(() => { @@ -68,6 +69,7 @@ export function createAuthStore() { builder: user?.builder?.global, "Company size": user.account?.size, "Job role": user.account?.profession, + cloud: adminStore.cloud, }) }) .catch(() => { From 704b293bbc86d49486d258cca7b8cc8c9c50cae5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 15 Jul 2022 09:05:39 +0000 Subject: [PATCH 04/22] v1.1.11 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 6664986dd0..534c66b30e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.10", + "version": "1.1.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 98535b7f41..b8f582bd15 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.10", + "version": "1.1.11", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.1.10", + "@budibase/types": "^1.1.11", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 708bfafd74..bd227d4336 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.1.10", + "version": "1.1.11", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.10", + "@budibase/string-templates": "^1.1.11", "@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 5f2889c4a5..badc15e71f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.10", + "version": "1.1.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.10", - "@budibase/client": "^1.1.10", - "@budibase/frontend-core": "^1.1.10", - "@budibase/string-templates": "^1.1.10", + "@budibase/bbui": "^1.1.11", + "@budibase/client": "^1.1.11", + "@budibase/frontend-core": "^1.1.11", + "@budibase/string-templates": "^1.1.11", "@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 71541a5c88..752bf119f7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.10", + "version": "1.1.11", "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 6eb9ff92d7..e2bd179373 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.10", + "version": "1.1.11", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.10", - "@budibase/frontend-core": "^1.1.10", - "@budibase/string-templates": "^1.1.10", + "@budibase/bbui": "^1.1.11", + "@budibase/frontend-core": "^1.1.11", + "@budibase/string-templates": "^1.1.11", "@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 e9a6f7d293..bdc6a8e335 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.10", + "version": "1.1.11", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.10", + "@budibase/bbui": "^1.1.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index c9d32516a3..3ac361cc3f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.10", + "version": "1.1.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.1.10", - "@budibase/client": "^1.1.10", + "@budibase/backend-core": "^1.1.11", + "@budibase/client": "^1.1.11", "@budibase/pro": "1.1.10", - "@budibase/string-templates": "^1.1.10", - "@budibase/types": "^1.1.10", + "@budibase/string-templates": "^1.1.11", + "@budibase/types": "^1.1.11", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a7782cc730..5170ada5fa 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.10", + "version": "1.1.11", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 3599ab93b9..7dfd30d17f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.10", + "version": "1.1.11", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 389e0b1d2a..8262bcd995 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.10", + "version": "1.1.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.10", + "@budibase/backend-core": "^1.1.11", "@budibase/pro": "1.1.10", - "@budibase/string-templates": "^1.1.10", - "@budibase/types": "^1.1.10", + "@budibase/string-templates": "^1.1.11", + "@budibase/types": "^1.1.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 27fffe63bfa84cb78a7a0915f1315192b32f32c9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 15 Jul 2022 09:07:26 +0000 Subject: [PATCH 05/22] Update pro version to 1.1.11 --- 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 3ac361cc3f..e1f4592abb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.11", "@budibase/client": "^1.1.11", - "@budibase/pro": "1.1.10", + "@budibase/pro": "1.1.11", "@budibase/string-templates": "^1.1.11", "@budibase/types": "^1.1.11", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8262bcd995..6251277d26 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.11", - "@budibase/pro": "1.1.10", + "@budibase/pro": "1.1.11", "@budibase/string-templates": "^1.1.11", "@budibase/types": "^1.1.11", "@koa/router": "8.0.8", From 346416d2ee8464afb1b7b23e2935ef9657ca33d0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 15 Jul 2022 10:26:41 +0100 Subject: [PATCH 06/22] only add account portal people to intercom --- .../builder/src/analytics/IntercomClient.js | 14 +++++----- packages/builder/src/stores/portal/auth.js | 27 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/packages/builder/src/analytics/IntercomClient.js b/packages/builder/src/analytics/IntercomClient.js index e7a8539267..1c98b479cc 100644 --- a/packages/builder/src/analytics/IntercomClient.js +++ b/packages/builder/src/analytics/IntercomClient.js @@ -52,13 +52,13 @@ export default class IntercomClient { * @param {Object} user - user to identify * @returns Intercom global object */ - show(user = {}) { - if (this.initialised && user?.admin && user?.cloud) { - return window.Intercom("boot", { - app_id: this.token, - ...user, - }) - } + show(user = {}, enabled) { + if (!this.initialised || !enabled) return + + return window.Intercom("boot", { + app_id: this.token, + ...user, + }) } /** diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index 636e80de99..d6f4fc140f 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -54,23 +54,24 @@ export function createAuthStore() { }) if (user) { - const adminStore = get(admin) analytics .activate() .then(() => { analytics.identify(user._id) - analytics.showChat({ - email: user.email, - created_at: (user.createdAt || Date.now()) / 1000, - name: user.account?.name, - user_id: user._id, - tenant: user.tenantId, - admin: user?.admin?.global, - builder: user?.builder?.global, - "Company size": user.account?.size, - "Job role": user.account?.profession, - cloud: adminStore.cloud, - }) + analytics.showChat( + { + email: user.email, + created_at: (user.createdAt || Date.now()) / 1000, + name: user.account?.name, + user_id: user._id, + tenant: user.tenantId, + admin: user?.admin?.global, + builder: user?.builder?.global, + "Company size": user.account?.size, + "Job role": user.account?.profession, + }, + !!user?.account + ) }) .catch(() => { // This request may fail due to browser extensions blocking requests From 79e623219dc64823173b2697ed5500aa73473b19 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 15 Jul 2022 11:08:03 +0100 Subject: [PATCH 07/22] Removing the volume tags from the old directories, instead focusing on the single data directory that is now used - #6715. --- hosting/single/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 772ae2a8ab..4e3239d960 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -122,8 +122,7 @@ RUN yarn cache clean -f EXPOSE 80 EXPOSE 443 -VOLUME /opt/couchdb/data -VOLUME /minio +VOLUME /data # setup letsencrypt certificate RUN apt-get install -y certbot python3-certbot-nginx From 320e41c393d1421c026b8fc82611efa1699d8e43 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 15 Jul 2022 13:39:47 +0100 Subject: [PATCH 08/22] Fix for #6702 - remove users table as an option for automation triggers. --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 3 +++ .../components/automation/SetupPanel/TableSelector.svelte | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index c149b6a00e..27ea7aab87 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -41,6 +41,7 @@ let fillWidth = true let codeBindingOpen = false + $: console.log(block) $: stepId = block.stepId $: bindings = getAvailableBindings( block || $automationStore.selectedBlock, @@ -54,6 +55,7 @@ $: schema = getSchemaForTable(tableId, { searchableSchema: true }).schema $: schemaFields = Object.values(schema || {}) $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000" + $: isTrigger = block?.type === "TRIGGER" const onChange = Utils.sequential(async (e, key) => { try { @@ -261,6 +263,7 @@ /> {:else if value.customType === "table"} onChange(e, key)} /> diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte index ceb28a37ca..1645ded66b 100644 --- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte @@ -2,10 +2,16 @@ import { tables } from "stores/backend" import { Select } from "@budibase/bbui" import { createEventDispatcher } from "svelte" + import { TableNames } from "constants" const dispatch = createEventDispatcher() export let value + export let isTrigger + + $: filteredTables = $tables.list.filter(table => { + return !isTrigger || table._id !== TableNames.USERS + }) const onChange = e => { value = e.detail @@ -16,7 +22,7 @@ - + (touched = true)} /> + {#if touched && !value} + + {/if}
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index 1f86abc5b9..906923b2e9 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -97,7 +97,7 @@ export async function enableCronTrigger(appId: any, automation: any) { ) } // need to create cron job - if (isCronTrigger(automation)) { + if (isCronTrigger(automation) && trigger?.inputs.cron) { // make a job id rather than letting Bull decide, makes it easier to handle on way out const jobId = `${appId}_cron_${newid()}` const job: any = await queue.add( From a4825f8f6cd6a4979b60d362de7699819f2d071f Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 15 Jul 2022 14:33:34 +0100 Subject: [PATCH 10/22] Removing console log. --- .../components/automation/SetupPanel/AutomationBlockSetup.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 27ea7aab87..8b3f32a33f 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -41,7 +41,6 @@ let fillWidth = true let codeBindingOpen = false - $: console.log(block) $: stepId = block.stepId $: bindings = getAvailableBindings( block || $automationStore.selectedBlock, From 30b7790e65a5fc78de55fbcd6f7746e3202022e1 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 15 Jul 2022 17:13:45 +0100 Subject: [PATCH 11/22] Fix for #6709 - Adding the option to set a role for app action, allowing users to set what level an automation can be accessed from. --- .../FlowChart/FlowChart.svelte | 3 +- .../FlowChart/FlowItem.svelte | 39 ++++++++++++++++++- .../AutomationBuilder/TestDisplay.svelte | 7 ++-- .../AutomationBuilder/TestPanel.svelte | 3 +- .../CreateAutomationModal.svelte | 3 +- .../SetupPanel/AutomationBlockSetup.svelte | 9 +++-- .../CreateWebhookDeploymentModal.svelte | 3 +- .../actions/TriggerAutomation.svelte | 3 +- .../src/constants/backend/automations.js | 28 +++++++++++++ packages/server/src/utilities/security.js | 1 + 10 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 packages/builder/src/constants/backend/automations.js diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte index 9c987c89d8..05cae46cfc 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte @@ -12,6 +12,7 @@ notifications, Modal, } from "@budibase/bbui" + import { ActionStepID } from "constants/backend/automations" export let automation let testDataModal @@ -82,7 +83,7 @@ in:fly|local={{ x: 500, duration: 500 }} out:fly|local={{ x: 500, duration: 500 }} > - {#if block.stepId !== "LOOP"} + {#if block.stepId !== ActionStepID.LOOP} {/if}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index 291575f3f2..412683721f 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -10,11 +10,15 @@ Select, ActionButton, notifications, + Label, } from "@budibase/bbui" import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte" import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte" import ActionModal from "./ActionModal.svelte" import FlowItemHeader from "./FlowItemHeader.svelte" + import RoleSelect from "components/design/settings/controls/RoleSelect.svelte" + import { ActionStepID, TriggerStepID } from "constants/backend/automations" + import { permissions } from "stores/backend" export let block export let testDataModal @@ -23,9 +27,12 @@ let actionModal let blockComplete let showLooping = false + let role + $: automationId = $automationStore.selectedAutomation?.automation._id $: showBindingPicker = - block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW" + block.stepId === ActionStepID.CREATE_ROW || + block.stepId === ActionStepID.UPDATE_ROW $: isTrigger = block.type === "TRIGGER" @@ -45,6 +52,32 @@ x => x.blockToLoop === block.id ) + $: setPermissions(role) + $: getPermissions(automationId) + + async function setPermissions(role) { + if (!role || !automationId) { + return + } + await permissions.save({ + level: "execute", + role, + resource: automationId, + }) + } + + async function getPermissions(automationId) { + if (!automationId) { + return + } + const perms = await permissions.forResource(automationId) + if (!perms["execute"]) { + role = "BASIC" + } else { + role = perms["execute"] + } + } + async function removeLooping() { loopingSelected = false let loopBlock = @@ -205,6 +238,10 @@ {/if} + {#if block.stepId === TriggerStepID.APP} + + + {/if} import { Icon, Divider, Tabs, Tab, TextArea, Label } from "@budibase/bbui" import FlowItemHeader from "./FlowChart/FlowItemHeader.svelte" + import { ActionStepID } from "constants/backend/automations" export let automation export let testResults @@ -10,7 +11,7 @@ let blocks function prepTestResults(results) { - return results?.steps.filter(x => x.stepId !== "LOOP" || []) + return results?.steps.filter(x => x.stepId !== ActionStepID.LOOP || []) } function textArea(results, message) { @@ -30,7 +31,7 @@ } blocks = blocks .concat(automation.definition.steps || []) - .filter(x => x.stepId !== "LOOP") + .filter(x => x.stepId !== ActionStepID.LOOP) } else if (filteredResults) { blocks = filteredResults || [] // make sure there is an ID for each block being displayed @@ -45,7 +46,7 @@
{#each blocks as block, idx}
- {#if block.stepId !== "LOOP"} + {#if block.stepId !== ActionStepID.LOOP} x.stepId !== "LOOP") + .filter(x => x.stepId !== ActionStepID.LOOP) } else if (testResults) { blocks = testResults.steps || [] } diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte index 9543a9c552..eb148534f3 100644 --- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte @@ -11,6 +11,7 @@ Body, Icon, } from "@budibase/bbui" + import { TriggerStepID } from "constants/backend/automations" let name let selectedTrigger @@ -35,7 +36,7 @@ ) automationStore.actions.addBlockToAutomation(newBlock) - if (triggerVal.stepId === "WEBHOOK") { + if (triggerVal.stepId === TriggerStepID.WEBHOOK) { webhookModal.show } diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 8b3f32a33f..8b34cf8cd2 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -30,6 +30,7 @@ import { LuceneUtils } from "@budibase/frontend-core" import { getSchemaForTable } from "builderStore/dataBinding" import { Utils } from "@budibase/frontend-core" + import { TriggerStepID, ActionStepID } from "constants/backend/automations" export let block export let testData @@ -60,7 +61,7 @@ try { if (isTestModal) { // Special case for webhook, as it requires a body, but the schema already brings back the body's contents - if (stepId === "WEBHOOK") { + if (stepId === TriggerStepID.WEBHOOK) { automationStore.actions.addTestDataToAutomation({ body: { [key]: e.detail, @@ -101,9 +102,9 @@ // Extract all outputs from all previous steps as available bindins let bindings = [] for (let idx = 0; idx < blockIdx; idx++) { - let wasLoopBlock = allSteps[idx]?.stepId === "LOOP" + let wasLoopBlock = allSteps[idx]?.stepId === ActionStepID.LOOP let isLoopBlock = - allSteps[idx]?.stepId === "LOOP" && + allSteps[idx]?.stepId === ActionStepID.LOOP && allSteps.find(x => x.blockToLoop === block.id) // If the previous block was a loop block, decerement the index so the following @@ -345,7 +346,7 @@ -{#if stepId === "WEBHOOK"} +{#if stepId === TriggerStepID.WEBHOOK} {/if} diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte index 19cea6db65..ee6b163a3e 100644 --- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte +++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte @@ -3,6 +3,7 @@ import { ModalContent } from "@budibase/bbui" import { onMount } from "svelte" import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte" + import { TriggerStepID } from "constants/backend/automations" let webhookUrls = [] @@ -11,7 +12,7 @@ onMount(() => { webhookUrls = automations.map(automation => { const trigger = automation.definition.trigger - if (trigger?.stepId === "WEBHOOK" && trigger.inputs) { + if (trigger?.stepId === TriggerStepID.WEBHOOK && trigger.inputs) { return { type: "Automation", name: automation.name, diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte index fa32c88d65..4f661096c5 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte @@ -2,6 +2,7 @@ import { Select, Label, Input, Checkbox } from "@budibase/bbui" import { automationStore } from "builderStore" import SaveFields from "./SaveFields.svelte" + import { TriggerStepID } from "constants/backend/automations" export let parameters = {} export let bindings = [] @@ -16,7 +17,7 @@ : AUTOMATION_STATUS.NEW $: automations = $automationStore.automations - .filter(a => a.definition.trigger?.stepId === "APP") + .filter(a => a.definition.trigger?.stepId === TriggerStepID.APP) .map(automation => { const schema = Object.entries( automation.definition.trigger.inputs.fields || {} diff --git a/packages/builder/src/constants/backend/automations.js b/packages/builder/src/constants/backend/automations.js new file mode 100644 index 0000000000..e0cd5b6405 --- /dev/null +++ b/packages/builder/src/constants/backend/automations.js @@ -0,0 +1,28 @@ +export const TriggerStepID = { + ROW_SAVED: "ROW_SAVED", + ROW_UPDATED: "ROW_UPDATED", + ROW_DELETED: "ROW_DELETED", + WEBHOOK: "WEBHOOK", + APP: "APP", + CRON: "CRON", +} + +export const ActionStepID = { + SEND_EMAIL_SMTP: "SEND_EMAIL_SMTP", + CREATE_ROW: "CREATE_ROW", + UPDATE_ROW: "UPDATE_ROW", + DELETE_ROW: "DELETE_ROW", + OUTGOING_WEBHOOK: "OUTGOING_WEBHOOK", + EXECUTE_SCRIPT: "EXECUTE_SCRIPT", + EXECUTE_QUERY: "EXECUTE_QUERY", + SERVER_LOG: "SERVER_LOG", + DELAY: "DELAY", + FILTER: "FILTER", + QUERY_ROWS: "QUERY_ROWS", + LOOP: "LOOP", + // these used to be lowercase step IDs, maintain for backwards compat + discord: "discord", + slack: "slack", + zapier: "zapier", + integromat: "integromat", +} diff --git a/packages/server/src/utilities/security.js b/packages/server/src/utilities/security.js index de5b696553..a0d9c8d57f 100644 --- a/packages/server/src/utilities/security.js +++ b/packages/server/src/utilities/security.js @@ -13,6 +13,7 @@ const { DocumentTypes } = require("../db/utils") const CURRENTLY_SUPPORTED_LEVELS = [ PermissionLevels.WRITE, PermissionLevels.READ, + PermissionLevels.EXECUTE, ] exports.getPermissionType = resourceId => { From 9c885ad2847d46cd41122a8d903fe3cdad7e7c49 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 15 Jul 2022 17:45:35 +0100 Subject: [PATCH 12/22] Fixing test case. --- packages/server/src/api/routes/tests/permissions.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/routes/tests/permissions.spec.js b/packages/server/src/api/routes/tests/permissions.spec.js index 2b231dbe64..b416d1c0bf 100644 --- a/packages/server/src/api/routes/tests/permissions.spec.js +++ b/packages/server/src/api/routes/tests/permissions.spec.js @@ -37,9 +37,10 @@ describe("/permission", () => { .expect("Content-Type", /json/) .expect(200) expect(res.body).toBeDefined() - expect(res.body.length).toEqual(2) + expect(res.body.length).toEqual(3) expect(res.body).toContain("read") expect(res.body).toContain("write") + expect(res.body).toContain("execute") }) }) From fa20a6169e0ee3fdda70c4f3171d8d27b01c51f4 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sun, 17 Jul 2022 16:21:55 +0100 Subject: [PATCH 13/22] fixing broken migration --- .../server/src/migrations/functions/userEmailViewCasing.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/migrations/functions/userEmailViewCasing.ts b/packages/server/src/migrations/functions/userEmailViewCasing.ts index 16f55655ab..fe58692a27 100644 --- a/packages/server/src/migrations/functions/userEmailViewCasing.ts +++ b/packages/server/src/migrations/functions/userEmailViewCasing.ts @@ -1,4 +1,4 @@ -const { createUserEmailView } = require("@budibase/backend-core/db") +const { createNewUserEmailView } = require("@budibase/backend-core/db") /** * Date: @@ -9,5 +9,5 @@ const { createUserEmailView } = require("@budibase/backend-core/db") */ export const run = async (db: any) => { - await createUserEmailView(db) + await createNewUserEmailView(db) } From dbdd88b46dca31a2e4d06f1addf9e32afbd7e643 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 08:55:27 +0000 Subject: [PATCH 14/22] v1.1.12 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 534c66b30e..7e8ebe8aa2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.11", + "version": "1.1.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b8f582bd15..c3fdabc26d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.11", + "version": "1.1.12", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.1.11", + "@budibase/types": "^1.1.12", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index bd227d4336..7703c65739 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.1.11", + "version": "1.1.12", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.11", + "@budibase/string-templates": "^1.1.12", "@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 badc15e71f..003e47dd0f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.11", + "version": "1.1.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.11", - "@budibase/client": "^1.1.11", - "@budibase/frontend-core": "^1.1.11", - "@budibase/string-templates": "^1.1.11", + "@budibase/bbui": "^1.1.12", + "@budibase/client": "^1.1.12", + "@budibase/frontend-core": "^1.1.12", + "@budibase/string-templates": "^1.1.12", "@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 752bf119f7..f57f4a1644 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.11", + "version": "1.1.12", "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 e2bd179373..6bd6400542 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.11", + "version": "1.1.12", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.11", - "@budibase/frontend-core": "^1.1.11", - "@budibase/string-templates": "^1.1.11", + "@budibase/bbui": "^1.1.12", + "@budibase/frontend-core": "^1.1.12", + "@budibase/string-templates": "^1.1.12", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index bdc6a8e335..0810f69295 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.11", + "version": "1.1.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.11", + "@budibase/bbui": "^1.1.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e1f4592abb..ffae19b6bb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.11", + "version": "1.1.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.1.11", - "@budibase/client": "^1.1.11", + "@budibase/backend-core": "^1.1.12", + "@budibase/client": "^1.1.12", "@budibase/pro": "1.1.11", - "@budibase/string-templates": "^1.1.11", - "@budibase/types": "^1.1.11", + "@budibase/string-templates": "^1.1.12", + "@budibase/types": "^1.1.12", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5170ada5fa..5b550e3df9 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.11", + "version": "1.1.12", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 7dfd30d17f..c222eafe29 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.11", + "version": "1.1.12", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6251277d26..85df063e04 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.11", + "version": "1.1.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.11", + "@budibase/backend-core": "^1.1.12", "@budibase/pro": "1.1.11", - "@budibase/string-templates": "^1.1.11", - "@budibase/types": "^1.1.11", + "@budibase/string-templates": "^1.1.12", + "@budibase/types": "^1.1.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fddb5d13eb569f06fd0b3f3da7a084a74ff9cc9a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 08:57:04 +0000 Subject: [PATCH 15/22] Update pro version to 1.1.12 --- 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 ffae19b6bb..eb5d12d8eb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.12", "@budibase/client": "^1.1.12", - "@budibase/pro": "1.1.11", + "@budibase/pro": "1.1.12", "@budibase/string-templates": "^1.1.12", "@budibase/types": "^1.1.12", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 85df063e04..3838df06f2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.12", - "@budibase/pro": "1.1.11", + "@budibase/pro": "1.1.12", "@budibase/string-templates": "^1.1.12", "@budibase/types": "^1.1.12", "@koa/router": "8.0.8", From 91eb2cfe6f0cb0f38ed189ae53b20b145688ee76 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 18 Jul 2022 10:10:37 +0100 Subject: [PATCH 16/22] Fix for email view casing test. --- .../functions/tests/userEmailViewCasing.spec.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js index 9db59caa4a..a58f8d9114 100644 --- a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js +++ b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js @@ -4,15 +4,13 @@ const { getGlobalDB, doInTenant } = require("@budibase/backend-core/tenancy") // mock email view creation const coreDb = require("@budibase/backend-core/db") -const createUserEmailView = jest.fn() -coreDb.createUserEmailView = createUserEmailView +const createNewUserEmailView = jest.fn() +coreDb.createNewUserEmailView = createNewUserEmailView const migration = require("../userEmailViewCasing") describe("run", () => { - doInTenant(TENANT_ID, () => { let config = new TestConfig(false) - const globalDb = getGlobalDB() beforeEach(async () => { await config.init() @@ -21,8 +19,10 @@ describe("run", () => { afterAll(config.end) it("runs successfully", async () => { - await migration.run(globalDb) - expect(createUserEmailView).toHaveBeenCalledTimes(1) + await doInTenant(TENANT_ID, async () => { + const globalDb = getGlobalDB() + await migration.run(globalDb) + expect(createNewUserEmailView).toHaveBeenCalledTimes(1) + }) }) - }) }) From 13cac82db726d88b9a5c4de2e8d2a1d3be638eda Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 09:53:41 +0000 Subject: [PATCH 17/22] v1.1.13 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 7e8ebe8aa2..5397b2a2da 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.12", + "version": "1.1.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c3fdabc26d..fb4dba0e53 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.12", + "version": "1.1.13", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.1.12", + "@budibase/types": "^1.1.13", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7703c65739..b123220c7c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.1.12", + "version": "1.1.13", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.12", + "@budibase/string-templates": "^1.1.13", "@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 003e47dd0f..257edebdee 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.12", + "version": "1.1.13", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.12", - "@budibase/client": "^1.1.12", - "@budibase/frontend-core": "^1.1.12", - "@budibase/string-templates": "^1.1.12", + "@budibase/bbui": "^1.1.13", + "@budibase/client": "^1.1.13", + "@budibase/frontend-core": "^1.1.13", + "@budibase/string-templates": "^1.1.13", "@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 f57f4a1644..a39d298301 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.12", + "version": "1.1.13", "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 6bd6400542..5765a9dae6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.12", + "version": "1.1.13", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.12", - "@budibase/frontend-core": "^1.1.12", - "@budibase/string-templates": "^1.1.12", + "@budibase/bbui": "^1.1.13", + "@budibase/frontend-core": "^1.1.13", + "@budibase/string-templates": "^1.1.13", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 0810f69295..c9eab2385a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.12", + "version": "1.1.13", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.12", + "@budibase/bbui": "^1.1.13", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index eb5d12d8eb..0e1dc68b28 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.12", + "version": "1.1.13", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.1.12", - "@budibase/client": "^1.1.12", + "@budibase/backend-core": "^1.1.13", + "@budibase/client": "^1.1.13", "@budibase/pro": "1.1.12", - "@budibase/string-templates": "^1.1.12", - "@budibase/types": "^1.1.12", + "@budibase/string-templates": "^1.1.13", + "@budibase/types": "^1.1.13", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5b550e3df9..811ae8bbd5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.12", + "version": "1.1.13", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c222eafe29..739a89b523 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.12", + "version": "1.1.13", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3838df06f2..a82e020021 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.12", + "version": "1.1.13", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.12", + "@budibase/backend-core": "^1.1.13", "@budibase/pro": "1.1.12", - "@budibase/string-templates": "^1.1.12", - "@budibase/types": "^1.1.12", + "@budibase/string-templates": "^1.1.13", + "@budibase/types": "^1.1.13", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a019e739d1a95cedfce767f06c4a9edffc11be55 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 09:55:14 +0000 Subject: [PATCH 18/22] Update pro version to 1.1.13 --- 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 0e1dc68b28..2e9b20e272 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.13", "@budibase/client": "^1.1.13", - "@budibase/pro": "1.1.12", + "@budibase/pro": "1.1.13", "@budibase/string-templates": "^1.1.13", "@budibase/types": "^1.1.13", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index a82e020021..060710d94e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.13", - "@budibase/pro": "1.1.12", + "@budibase/pro": "1.1.13", "@budibase/string-templates": "^1.1.13", "@budibase/types": "^1.1.13", "@koa/router": "8.0.8", From 7b0aca653ab3fda0049299198833131f67fd7a81 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Mon, 18 Jul 2022 10:36:42 +0100 Subject: [PATCH 19/22] WIP: add Azure App Service image to docker registry --- .github/workflows/deploy-single-image.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/deploy-single-image.yml b/.github/workflows/deploy-single-image.yml index 0bd5c71a40..8bf8f232c5 100644 --- a/.github/workflows/deploy-single-image.yml +++ b/.github/workflows/deploy-single-image.yml @@ -57,3 +57,12 @@ jobs: platforms: linux/amd64,linux/arm64 tags: budibase/budibase,budibase/budibase:v${{ env.RELEASE_VERSION }} file: ./hosting/single/Dockerfile + - name: Tag and release Budibase Azure App Service docker image + uses: docker/build-push-action@v2 + with: + context: . + push: true + platforms: linux/amd64 + build-args: TARGETBUILD=aas + tags: budibase/budibase-aas,budibase/budibase-aas:v${{ env.RELEASE_VERSION }} + file: ./hosting/single/Dockerfile From 7be65031dd97ee6cf64fd4fe4a8fafaafc4cd2c1 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Mon, 18 Jul 2022 11:16:33 +0100 Subject: [PATCH 20/22] WAzure App Service image to docker registry --- hosting/scripts/build-target-paths.sh | 14 +++++++------- hosting/single/runner.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hosting/scripts/build-target-paths.sh b/hosting/scripts/build-target-paths.sh index d1c9b5cd05..4c165d12e7 100644 --- a/hosting/scripts/build-target-paths.sh +++ b/hosting/scripts/build-target-paths.sh @@ -3,15 +3,15 @@ echo ${TARGETBUILD} > /buildtarget.txt if [[ "${TARGETBUILD}" = "aas" ]]; then # Azure AppService uses /home for persisent data & SSH on port 2222 - mkdir -p /home/budibase/{minio,couchdb} - mkdir -p /home/budibase/couchdb/data - chown -R couchdb:couchdb /home/budibase/couchdb/ + mkdir -p /home/{search,minio,couch} + mkdir -p /home/couch/{dbs,views} + chown -R couchdb:couchdb /home/couch/ apt update apt-get install -y openssh-server - sed -i 's#dir=/opt/couchdb/data/search#dir=/home/budibase/couchdb/data/search#' /opt/clouseau/clouseau.ini - sed -i 's#/minio/minio server /minio &#/minio/minio server /home/budibase/minio &#' /runner.sh - sed -i 's#database_dir = ./data#database_dir = /home/budibase/couchdb/data#' /opt/couchdb/etc/default.ini - sed -i 's#view_index_dir = ./data#view_index_dir = /home/budibase/couchdb/data#' /opt/couchdb/etc/default.ini + sed -i 's#dir=/opt/couchdb/data/search#dir=/home/search#' /opt/clouseau/clouseau.ini + sed -i 's#/minio/minio server /minio &#/minio/minio server /home/minio &#' /runner.sh + sed -i 's#database_dir = ./data#database_dir = /home/couch/dbs#' /opt/couchdb/etc/default.ini + sed -i 's#view_index_dir = ./data#view_index_dir = /home/couch/views#' /opt/couchdb/etc/default.ini sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config /etc/init.d/ssh restart fi diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index f8c1fc5e56..9abb2fd093 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -24,8 +24,8 @@ if [ ! -f "/data/.env" ]; then fi # make these directories in runner, incase of mount -mkdir -p /data/couch/dbs /data/couch/views -chown couchdb:couchdb /data/couch /data/couch/dbs /data/couch/views +mkdir -p /data/couch/{dbs,views} /home/couch/{dbs,views} +chown -R couchdb:couchdb /data/couch /home/couch redis-server --requirepass $REDIS_PASSWORD & /opt/clouseau/bin/clouseau & /minio/minio server /data/minio & From f0ac987c986107f22b4228379d8ce97797c62a26 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 12:13:20 +0000 Subject: [PATCH 21/22] v1.1.14 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 5397b2a2da..8b496b2dd5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.13", + "version": "1.1.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fb4dba0e53..40caf74457 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.13", + "version": "1.1.14", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.1.13", + "@budibase/types": "^1.1.14", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b123220c7c..9b8ecc8693 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.1.13", + "version": "1.1.14", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.1.13", + "@budibase/string-templates": "^1.1.14", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 257edebdee..b04aadab8f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.13", + "version": "1.1.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.13", - "@budibase/client": "^1.1.13", - "@budibase/frontend-core": "^1.1.13", - "@budibase/string-templates": "^1.1.13", + "@budibase/bbui": "^1.1.14", + "@budibase/client": "^1.1.14", + "@budibase/frontend-core": "^1.1.14", + "@budibase/string-templates": "^1.1.14", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a39d298301..c0e1e9fe69 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.13", + "version": "1.1.14", "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 5765a9dae6..1eea6d59a3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.13", + "version": "1.1.14", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.1.13", - "@budibase/frontend-core": "^1.1.13", - "@budibase/string-templates": "^1.1.13", + "@budibase/bbui": "^1.1.14", + "@budibase/frontend-core": "^1.1.14", + "@budibase/string-templates": "^1.1.14", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c9eab2385a..6666dff2b2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.13", + "version": "1.1.14", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.13", + "@budibase/bbui": "^1.1.14", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 2e9b20e272..a3216c8149 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.13", + "version": "1.1.14", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.1.13", - "@budibase/client": "^1.1.13", + "@budibase/backend-core": "^1.1.14", + "@budibase/client": "^1.1.14", "@budibase/pro": "1.1.13", - "@budibase/string-templates": "^1.1.13", - "@budibase/types": "^1.1.13", + "@budibase/string-templates": "^1.1.14", + "@budibase/types": "^1.1.14", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 811ae8bbd5..0a0b4cf1d5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.13", + "version": "1.1.14", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 739a89b523..5188f17762 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.13", + "version": "1.1.14", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 060710d94e..5d0941bbc3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.13", + "version": "1.1.14", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.13", + "@budibase/backend-core": "^1.1.14", "@budibase/pro": "1.1.13", - "@budibase/string-templates": "^1.1.13", - "@budibase/types": "^1.1.13", + "@budibase/string-templates": "^1.1.14", + "@budibase/types": "^1.1.14", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b201b8c99b3230d0b3f88c38d73aa9c05f88d250 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 18 Jul 2022 12:15:05 +0000 Subject: [PATCH 22/22] Update pro version to 1.1.14 --- 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 a3216c8149..ae168b0e28 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.14", "@budibase/client": "^1.1.14", - "@budibase/pro": "1.1.13", + "@budibase/pro": "1.1.14", "@budibase/string-templates": "^1.1.14", "@budibase/types": "^1.1.14", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5d0941bbc3..1f6532d5a5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.14", - "@budibase/pro": "1.1.13", + "@budibase/pro": "1.1.14", "@budibase/string-templates": "^1.1.14", "@budibase/types": "^1.1.14", "@koa/router": "8.0.8",