From 88c0a635a09ae7b320ea8a8a59a50f9f359990b4 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Sun, 25 Jul 2021 12:07:25 +0100 Subject: [PATCH 01/10] Adding back logout functionality. --- packages/client/src/store/auth.js | 20 +++++++++++++++++++- packages/client/src/utils/buttonActions.js | 7 ++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/packages/client/src/store/auth.js b/packages/client/src/store/auth.js index 604da7f9ad..5feb161b97 100644 --- a/packages/client/src/store/auth.js +++ b/packages/client/src/store/auth.js @@ -1,18 +1,36 @@ import * as API from "../api" import { writable } from "svelte/store" +import { initialise } from "./initialise" const createAuthStore = () => { const store = writable(null) + const goToDefaultRoute = () => { + // Setting the active route forces an update of the active screen ID, + // even if we're on the same URL + routeStore.actions.setActiveRoute("/") + + // Navigating updates the URL to reflect this route + routeStore.actions.navigate("/") + } + + // Fetches the user object if someone is logged in and has reloaded the page const fetchUser = async () => { const user = await API.fetchSelf() store.set(user) } + const logOut = async () => { + store.set(null) + window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;` + await initialise() + goToDefaultRoute() + } + return { subscribe: store.subscribe, - actions: { fetchUser }, + actions: { fetchUser, logOut }, } } diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index af4826a1c4..8c62f266e8 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -1,5 +1,5 @@ import { get } from "svelte/store" -import { routeStore, builderStore, confirmationStore } from "../store" +import { routeStore, builderStore, confirmationStore, authStore } from "../store" import { saveRow, deleteRow, executeQuery, triggerAutomation } from "../api" import { ActionTypes } from "../constants" @@ -77,6 +77,10 @@ const refreshDatasourceHandler = async (action, context) => { ) } +const logoutHandler = async () => { + await authStore.actions.logOut() +} + const handlerMap = { ["Save Row"]: saveRowHandler, ["Delete Row"]: deleteRowHandler, @@ -85,6 +89,7 @@ const handlerMap = { ["Trigger Automation"]: triggerAutomationHandler, ["Validate Form"]: validateFormHandler, ["Refresh Datasource"]: refreshDatasourceHandler, + ["Log Out"]: logoutHandler, } const confirmTextMap = { From f32b4f94e7dd2304a2ea92929f27a3a25091ee90 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Sun, 25 Jul 2021 12:09:50 +0100 Subject: [PATCH 02/10] Linting. --- packages/client/src/store/auth.js | 2 +- packages/client/src/utils/buttonActions.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/client/src/store/auth.js b/packages/client/src/store/auth.js index 5feb161b97..86e4500282 100644 --- a/packages/client/src/store/auth.js +++ b/packages/client/src/store/auth.js @@ -1,6 +1,7 @@ import * as API from "../api" import { writable } from "svelte/store" import { initialise } from "./initialise" +import { routeStore } from "./routes" const createAuthStore = () => { const store = writable(null) @@ -14,7 +15,6 @@ const createAuthStore = () => { routeStore.actions.navigate("/") } - // Fetches the user object if someone is logged in and has reloaded the page const fetchUser = async () => { const user = await API.fetchSelf() diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index 8c62f266e8..98ba9dc214 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -1,5 +1,10 @@ import { get } from "svelte/store" -import { routeStore, builderStore, confirmationStore, authStore } from "../store" +import { + routeStore, + builderStore, + confirmationStore, + authStore, +} from "../store" import { saveRow, deleteRow, executeQuery, triggerAutomation } from "../api" import { ActionTypes } from "../constants" From e74d9a73127f03a8879ea5ebb36929ca36b73163 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sun, 25 Jul 2021 13:29:27 +0100 Subject: [PATCH 03/10] Reload location on client logout for full reset, avoiding error when public pages exist --- packages/client/src/store/auth.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/client/src/store/auth.js b/packages/client/src/store/auth.js index 86e4500282..beaeb6007c 100644 --- a/packages/client/src/store/auth.js +++ b/packages/client/src/store/auth.js @@ -1,20 +1,9 @@ import * as API from "../api" import { writable } from "svelte/store" -import { initialise } from "./initialise" -import { routeStore } from "./routes" const createAuthStore = () => { const store = writable(null) - const goToDefaultRoute = () => { - // Setting the active route forces an update of the active screen ID, - // even if we're on the same URL - routeStore.actions.setActiveRoute("/") - - // Navigating updates the URL to reflect this route - routeStore.actions.navigate("/") - } - // Fetches the user object if someone is logged in and has reloaded the page const fetchUser = async () => { const user = await API.fetchSelf() @@ -22,10 +11,8 @@ const createAuthStore = () => { } const logOut = async () => { - store.set(null) window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;` - await initialise() - goToDefaultRoute() + window.location.reload() } return { From 95d05c8a8e4f02cb2f2fa562176cfc0c46f31696 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sun, 25 Jul 2021 13:43:07 +0100 Subject: [PATCH 04/10] Fix error with refreshing app package so that page reload on logout can be prevented --- packages/client/src/store/app.js | 11 +++++++++-- packages/client/src/store/auth.js | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packages/client/src/store/app.js b/packages/client/src/store/app.js index eb5a259a25..0cabaec4ab 100644 --- a/packages/client/src/store/app.js +++ b/packages/client/src/store/app.js @@ -6,8 +6,15 @@ const createAppStore = () => { // Fetches the app definition including screens, layouts and theme const fetchAppDefinition = async () => { - const appDefinition = await API.fetchAppPackage(get(store).appId) - store.set(appDefinition) + const appId = get(store)?.appId + if (!appId) { + throw "Cannot fetch app definition without app ID set" + } + const appDefinition = await API.fetchAppPackage(appId) + store.set({ + ...appDefinition, + appId: appDefinition?.application?.appId, + }) } // Sets the initial app ID diff --git a/packages/client/src/store/auth.js b/packages/client/src/store/auth.js index beaeb6007c..86e4500282 100644 --- a/packages/client/src/store/auth.js +++ b/packages/client/src/store/auth.js @@ -1,9 +1,20 @@ import * as API from "../api" import { writable } from "svelte/store" +import { initialise } from "./initialise" +import { routeStore } from "./routes" const createAuthStore = () => { const store = writable(null) + const goToDefaultRoute = () => { + // Setting the active route forces an update of the active screen ID, + // even if we're on the same URL + routeStore.actions.setActiveRoute("/") + + // Navigating updates the URL to reflect this route + routeStore.actions.navigate("/") + } + // Fetches the user object if someone is logged in and has reloaded the page const fetchUser = async () => { const user = await API.fetchSelf() @@ -11,8 +22,10 @@ const createAuthStore = () => { } const logOut = async () => { + store.set(null) window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;` - window.location.reload() + await initialise() + goToDefaultRoute() } return { From c9eda114a8df08bd359637bdd7bc19e98e4aa5bc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sun, 25 Jul 2021 13:47:28 +0100 Subject: [PATCH 05/10] Redirect to login screen on client logout to prevent viewing public pages if they exist --- packages/client/src/store/auth.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/client/src/store/auth.js b/packages/client/src/store/auth.js index 86e4500282..1fa4ae17b0 100644 --- a/packages/client/src/store/auth.js +++ b/packages/client/src/store/auth.js @@ -1,20 +1,9 @@ import * as API from "../api" import { writable } from "svelte/store" -import { initialise } from "./initialise" -import { routeStore } from "./routes" const createAuthStore = () => { const store = writable(null) - const goToDefaultRoute = () => { - // Setting the active route forces an update of the active screen ID, - // even if we're on the same URL - routeStore.actions.setActiveRoute("/") - - // Navigating updates the URL to reflect this route - routeStore.actions.navigate("/") - } - // Fetches the user object if someone is logged in and has reloaded the page const fetchUser = async () => { const user = await API.fetchSelf() @@ -22,10 +11,8 @@ const createAuthStore = () => { } const logOut = async () => { - store.set(null) window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;` - await initialise() - goToDefaultRoute() + window.location = "/builder/auth/login" } return { From 8850771a493176265dc765b6d56ddb0f8ecee5c9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Sun, 25 Jul 2021 21:14:49 +0100 Subject: [PATCH 06/10] Add dedicateed renderer for roles tags --- .../src/pages/builder/portal/manage/users/[userId].svelte | 3 ++- .../users/_components/RolesTagsTableRenderer.svelte | 8 ++++++++ .../manage/users/_components/TagsTableRenderer.svelte | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index 72a0cd3f4e..ebb01bd336 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -19,7 +19,8 @@ import { fetchData } from "helpers" import { users, auth } from "stores/portal" - import TagsRenderer from "./_components/TagsTableRenderer.svelte" + import TagsRenderer from "./_components/RolesTagsTableRenderer.svelte" + import UpdateRolesModal from "./_components/UpdateRolesModal.svelte" import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte new file mode 100644 index 0000000000..7e63045edd --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte @@ -0,0 +1,8 @@ + + + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte index 564abca211..d2b56bbf33 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte @@ -4,9 +4,9 @@ const displayLimit = 5 - $: roles = value?.filter(role => role != null).map(role => role.name) ?? [] - $: tags = roles.slice(0, displayLimit) - $: leftover = roles.length - tags.length + $: values = value?.filter(value => value != null) ?? [] + $: tags = values.slice(0, displayLimit) + $: leftover = values.length - tags.length
From d44bafba06c290fd14b5e61d31b87214ac1bf999 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 26 Jul 2021 07:42:30 +0000 Subject: [PATCH 07/10] v0.9.80-alpha.5 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index b6a33ead3d..acbc730ca2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index b629ed218e..4005941b14 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c7e1116405..69a6ef6339 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": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6966ffe43c..ad9f7c8133 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.4", - "@budibase/client": "^0.9.80-alpha.4", + "@budibase/bbui": "^0.9.80-alpha.5", + "@budibase/client": "^0.9.80-alpha.5", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.80-alpha.4", + "@budibase/string-templates": "^0.9.80-alpha.5", "@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 f784b5b615..f2a9c782b3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "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 a38c69c9ec..e60a5f6dea 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.4", - "@budibase/standard-components": "^0.9.80-alpha.4", - "@budibase/string-templates": "^0.9.80-alpha.4", + "@budibase/bbui": "^0.9.80-alpha.5", + "@budibase/standard-components": "^0.9.80-alpha.5", + "@budibase/string-templates": "^0.9.80-alpha.5", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 0a8768216a..6883fb4732 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -60,9 +60,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.4", - "@budibase/client": "^0.9.80-alpha.4", - "@budibase/string-templates": "^0.9.80-alpha.4", + "@budibase/auth": "^0.9.80-alpha.5", + "@budibase/client": "^0.9.80-alpha.5", + "@budibase/string-templates": "^0.9.80-alpha.5", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -115,7 +115,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.80-alpha.4", + "@budibase/standard-components": "^0.9.80-alpha.5", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 47b2252a23..d3a7e797a8 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.4", + "@budibase/bbui": "^0.9.80-alpha.5", "@spectrum-css/card": "^3.0.3", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 42afe14938..4bb83a1e8f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "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 f787559751..7388ff23ff 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.80-alpha.4", + "version": "0.9.80-alpha.5", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.4", - "@budibase/string-templates": "^0.9.80-alpha.4", + "@budibase/auth": "^0.9.80-alpha.5", + "@budibase/string-templates": "^0.9.80-alpha.5", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 98ce904b80ea8b44d67ec14cb34204e06a0ad149 Mon Sep 17 00:00:00 2001 From: Maurits Lourens Date: Mon, 26 Jul 2021 10:01:02 +0200 Subject: [PATCH 08/10] fix overflow in automation setup menu for large tables --- .../src/pages/builder/app/[application]/automate/_layout.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte index feb15d00bb..d1aaeb0240 100644 --- a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte @@ -58,5 +58,6 @@ align-items: stretch; gap: var(--spacing-l); background-color: var(--background); + overflow-y: auto; } From 074ebfde6389baba3999c170c96d218ead4f47a7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 26 Jul 2021 08:23:08 +0000 Subject: [PATCH 09/10] v0.9.80-alpha.6 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index acbc730ca2..dacc5ac331 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 4005941b14..d071c92df7 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 69a6ef6339..5beb94bf4d 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": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index ad9f7c8133..c0595d8f21 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.5", - "@budibase/client": "^0.9.80-alpha.5", + "@budibase/bbui": "^0.9.80-alpha.6", + "@budibase/client": "^0.9.80-alpha.6", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.80-alpha.5", + "@budibase/string-templates": "^0.9.80-alpha.6", "@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 f2a9c782b3..6899e70393 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "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 e60a5f6dea..a5bc17a4df 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.5", - "@budibase/standard-components": "^0.9.80-alpha.5", - "@budibase/string-templates": "^0.9.80-alpha.5", + "@budibase/bbui": "^0.9.80-alpha.6", + "@budibase/standard-components": "^0.9.80-alpha.6", + "@budibase/string-templates": "^0.9.80-alpha.6", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 6883fb4732..aadd5ab84a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -60,9 +60,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.5", - "@budibase/client": "^0.9.80-alpha.5", - "@budibase/string-templates": "^0.9.80-alpha.5", + "@budibase/auth": "^0.9.80-alpha.6", + "@budibase/client": "^0.9.80-alpha.6", + "@budibase/string-templates": "^0.9.80-alpha.6", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -115,7 +115,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.80-alpha.5", + "@budibase/standard-components": "^0.9.80-alpha.6", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index d3a7e797a8..757165f046 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.5", + "@budibase/bbui": "^0.9.80-alpha.6", "@spectrum-css/card": "^3.0.3", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4bb83a1e8f..d7c9168289 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "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 7388ff23ff..86b90469f5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.80-alpha.5", + "version": "0.9.80-alpha.6", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.5", - "@budibase/string-templates": "^0.9.80-alpha.5", + "@budibase/auth": "^0.9.80-alpha.6", + "@budibase/string-templates": "^0.9.80-alpha.6", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 54217685218ba7ea51f39b892dcbde5efe04888a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 26 Jul 2021 09:34:02 +0000 Subject: [PATCH 10/10] v0.9.80-alpha.7 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index dacc5ac331..94018c3177 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index d071c92df7..9af14c6398 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5beb94bf4d..b63c8f734b 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": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index c0595d8f21..3219577fc3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.6", - "@budibase/client": "^0.9.80-alpha.6", + "@budibase/bbui": "^0.9.80-alpha.7", + "@budibase/client": "^0.9.80-alpha.7", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.80-alpha.6", + "@budibase/string-templates": "^0.9.80-alpha.7", "@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 6899e70393..a244db13e3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "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 a5bc17a4df..3f6ed11457 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.6", - "@budibase/standard-components": "^0.9.80-alpha.6", - "@budibase/string-templates": "^0.9.80-alpha.6", + "@budibase/bbui": "^0.9.80-alpha.7", + "@budibase/standard-components": "^0.9.80-alpha.7", + "@budibase/string-templates": "^0.9.80-alpha.7", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index aadd5ab84a..e60ab04078 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -60,9 +60,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.6", - "@budibase/client": "^0.9.80-alpha.6", - "@budibase/string-templates": "^0.9.80-alpha.6", + "@budibase/auth": "^0.9.80-alpha.7", + "@budibase/client": "^0.9.80-alpha.7", + "@budibase/string-templates": "^0.9.80-alpha.7", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -115,7 +115,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.80-alpha.6", + "@budibase/standard-components": "^0.9.80-alpha.7", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 757165f046..a8ee83727f 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.80-alpha.6", + "@budibase/bbui": "^0.9.80-alpha.7", "@spectrum-css/card": "^3.0.3", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d7c9168289..cc76a60cdd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "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 86b90469f5..03b7be9e20 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.80-alpha.6", + "version": "0.9.80-alpha.7", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.80-alpha.6", - "@budibase/string-templates": "^0.9.80-alpha.6", + "@budibase/auth": "^0.9.80-alpha.7", + "@budibase/string-templates": "^0.9.80-alpha.7", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0",