From 756f5b3aa6b733f6e758a7cb0b2bb98bf5c1b6bc Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 25 May 2022 15:10:37 +0100 Subject: [PATCH 1/9] Explicitly passing requested appId when calling updateAppPackage --- packages/backend-core/src/context/index.js | 4 ++++ packages/server/src/api/controllers/application.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/src/context/index.js b/packages/backend-core/src/context/index.js index 3abbc84596..0555556157 100644 --- a/packages/backend-core/src/context/index.js +++ b/packages/backend-core/src/context/index.js @@ -297,6 +297,10 @@ function getContextDB(key, opts) { toUseAppId = getDevelopmentAppID(appId) break } + + //If the appId is specified, override context + toUseAppId = opts?.appId ? opts?.appId : toUseAppId + db = dangerousGetDB(toUseAppId, opts) try { cls.setOnContext(key, db) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 2ca3c230c7..9e55964fa9 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -502,7 +502,7 @@ export const sync = async (ctx: any, next: any) => { } const updateAppPackage = async (appPackage: any, appId: any) => { - const db = getAppDB() + const db = getAppDB({ appId }) const application = await db.get(DocumentTypes.APP_METADATA) const newAppPackage = { ...application, ...appPackage } From c17e6259616aae2d2234917ff9325cb87dae1f93 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 26 May 2022 10:03:29 +0100 Subject: [PATCH 2/9] Refactored approach to ensure the request context is set appropriately --- packages/backend-core/src/context/index.js | 3 -- .../server/src/api/controllers/application.ts | 30 +++++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/backend-core/src/context/index.js b/packages/backend-core/src/context/index.js index 0555556157..1c596e74e5 100644 --- a/packages/backend-core/src/context/index.js +++ b/packages/backend-core/src/context/index.js @@ -298,9 +298,6 @@ function getContextDB(key, opts) { break } - //If the appId is specified, override context - toUseAppId = opts?.appId ? opts?.appId : toUseAppId - db = dangerousGetDB(toUseAppId, opts) try { cls.setOnContext(key, db) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 9e55964fa9..b5a3217171 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -49,6 +49,7 @@ const { getAppDB, getProdAppDB, updateAppId, + doInAppContext, } = require("@budibase/backend-core/context") import { getUniqueRows } from "../../utilities/usageQuota/rows" import { quotas } from "@budibase/pro" @@ -340,6 +341,7 @@ export const update = async (ctx: any) => { const data = await updateAppPackage(ctx.request.body, ctx.params.appId) ctx.status = 200 ctx.body = data + console.log(JSON.stringify(data)) } export const updateClient = async (ctx: any) => { @@ -502,22 +504,24 @@ export const sync = async (ctx: any, next: any) => { } const updateAppPackage = async (appPackage: any, appId: any) => { - const db = getAppDB({ appId }) - const application = await db.get(DocumentTypes.APP_METADATA) + return doInAppContext(appId, async () => { + const db = getAppDB() + const application = await db.get(DocumentTypes.APP_METADATA) - const newAppPackage = { ...application, ...appPackage } - if (appPackage._rev !== application._rev) { - newAppPackage._rev = application._rev - } + const newAppPackage = { ...application, ...appPackage } + if (appPackage._rev !== application._rev) { + newAppPackage._rev = application._rev + } - // the locked by property is attached by server but generated from - // Redis, shouldn't ever store it - delete newAppPackage.lockedBy + // the locked by property is attached by server but generated from + // Redis, shouldn't ever store it + delete newAppPackage.lockedBy - const response = await db.put(newAppPackage) - // remove any cached metadata, so that it will be updated - await appCache.invalidateAppMetadata(appId) - return response + const response = await db.put(newAppPackage) + // remove any cached metadata, so that it will be updated + await appCache.invalidateAppMetadata(appId) + return response + }) } const createEmptyAppPackage = async (ctx: any, app: any) => { From 0b64a2bd1e26d6f24a740e1fb9e33a687e9c10a0 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 26 May 2022 10:14:01 +0100 Subject: [PATCH 3/9] Removed debug logging --- packages/server/src/api/controllers/application.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index b5a3217171..a7414a6435 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -341,7 +341,6 @@ export const update = async (ctx: any) => { const data = await updateAppPackage(ctx.request.body, ctx.params.appId) ctx.status = 200 ctx.body = data - console.log(JSON.stringify(data)) } export const updateClient = async (ctx: any) => { From e7869504d0ce383da845bd8b9ad9c472da239040 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 27 Jun 2022 14:44:38 +0100 Subject: [PATCH 4/9] Fix slight issue with column editor layout --- .../PropertyControls/ColumnEditor/ColumnDrawer.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte index 48ebddbcf1..cf85b2506b 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte @@ -178,7 +178,7 @@ .column { gap: var(--spacing-l); display: grid; - grid-template-columns: 20px 1fr 1fr auto auto; + grid-template-columns: 20px 1fr 1fr 16px 16px; align-items: center; border-radius: var(--border-radius-s); transition: background-color ease-in-out 130ms; From 2242aa5eb3d7bc947fcdfc0a94c7d77dec5a88ce Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 27 Jun 2022 14:44:52 +0100 Subject: [PATCH 5/9] Use string renderer for datetime fields with custom templates --- packages/bbui/src/Table/CellRenderer.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte index 4dda31240a..246323244a 100644 --- a/packages/bbui/src/Table/CellRenderer.svelte +++ b/packages/bbui/src/Table/CellRenderer.svelte @@ -26,12 +26,20 @@ array: ArrayRenderer, internal: InternalRenderer, } - $: type = schema?.type ?? "string" + $: type = getType(schema) $: customRenderer = customRenderers?.find(x => x.column === schema?.name) $: renderer = customRenderer?.component ?? typeMap[type] ?? StringRenderer $: width = schema?.width || "150px" $: cellValue = getCellValue(value, schema.template) + const getType = schema => { + // Use a string renderer for dates if we use a custom template + if (schema?.type === "datetime" && schema?.template) { + return "string" + } + return schema?.type || "string" + } + const getCellValue = (value, template) => { if (!template) { return value From 33835b47e535a1be22d1e4e4baa5e24402d53d78 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Jul 2022 08:45:33 +0000 Subject: [PATCH 6/9] v1.0.212-alpha.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 d9d78eb964..303aa5daaa 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 116db847b0..4aac22f54d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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.0.212-alpha.10", + "@budibase/types": "^1.0.212-alpha.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 0c590eccf4..a37d87181b 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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.0.212-alpha.10", + "@budibase/string-templates": "^1.0.212-alpha.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 dd4482602c..4d4c69f9ac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.212-alpha.10", - "@budibase/client": "^1.0.212-alpha.10", - "@budibase/frontend-core": "^1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.11", + "@budibase/client": "^1.0.212-alpha.11", + "@budibase/frontend-core": "^1.0.212-alpha.11", + "@budibase/string-templates": "^1.0.212-alpha.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 8738159bb5..b625bc13ed 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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 6e8ca24cb0..bf94d6179d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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.0.212-alpha.10", - "@budibase/frontend-core": "^1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.11", + "@budibase/frontend-core": "^1.0.212-alpha.11", + "@budibase/string-templates": "^1.0.212-alpha.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 ef0bdc5bd6..d54c56d6cc 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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.0.212-alpha.10", + "@budibase/bbui": "^1.0.212-alpha.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 8a427aa899..11df107f69 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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.0.212-alpha.10", - "@budibase/client": "^1.0.212-alpha.10", + "@budibase/backend-core": "^1.0.212-alpha.11", + "@budibase/client": "^1.0.212-alpha.11", "@budibase/pro": "1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", - "@budibase/types": "^1.0.212-alpha.10", + "@budibase/string-templates": "^1.0.212-alpha.11", + "@budibase/types": "^1.0.212-alpha.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 7649d7eb2c..606bc42336 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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 ed0ae25fe6..fc5a86e630 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.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 c729609e1c..bc76bddf9c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.212-alpha.10", + "version": "1.0.212-alpha.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.212-alpha.10", + "@budibase/backend-core": "^1.0.212-alpha.11", "@budibase/pro": "1.0.212-alpha.10", - "@budibase/string-templates": "^1.0.212-alpha.10", - "@budibase/types": "^1.0.212-alpha.10", + "@budibase/string-templates": "^1.0.212-alpha.11", + "@budibase/types": "^1.0.212-alpha.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ee3fa582a86a401556556a83de367738fb8b44d8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Jul 2022 08:47:00 +0000 Subject: [PATCH 7/9] Update pro version to 1.0.212-alpha.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 11df107f69..1f0faa841f 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.0.212-alpha.11", "@budibase/client": "^1.0.212-alpha.11", - "@budibase/pro": "1.0.212-alpha.10", + "@budibase/pro": "1.0.212-alpha.11", "@budibase/string-templates": "^1.0.212-alpha.11", "@budibase/types": "^1.0.212-alpha.11", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index bc76bddf9c..7c2e09c1cf 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.212-alpha.11", - "@budibase/pro": "1.0.212-alpha.10", + "@budibase/pro": "1.0.212-alpha.11", "@budibase/string-templates": "^1.0.212-alpha.11", "@budibase/types": "^1.0.212-alpha.11", "@koa/router": "8.0.8", From 5eddda2f4cc22c42f3c684ab89d4dc8344b2128b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Jul 2022 11:22:35 +0000 Subject: [PATCH 8/9] v1.0.212-alpha.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 303aa5daaa..ed68735461 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4aac22f54d..1a2ee15375 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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.0.212-alpha.11", + "@budibase/types": "^1.0.212-alpha.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 a37d87181b..f6d29b874c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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.0.212-alpha.11", + "@budibase/string-templates": "^1.0.212-alpha.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 4d4c69f9ac..2c9e0ecb7e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.212-alpha.11", - "@budibase/client": "^1.0.212-alpha.11", - "@budibase/frontend-core": "^1.0.212-alpha.11", - "@budibase/string-templates": "^1.0.212-alpha.11", + "@budibase/bbui": "^1.0.212-alpha.12", + "@budibase/client": "^1.0.212-alpha.12", + "@budibase/frontend-core": "^1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.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 b625bc13ed..80914ff41e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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 bf94d6179d..707ab74a2b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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.0.212-alpha.11", - "@budibase/frontend-core": "^1.0.212-alpha.11", - "@budibase/string-templates": "^1.0.212-alpha.11", + "@budibase/bbui": "^1.0.212-alpha.12", + "@budibase/frontend-core": "^1.0.212-alpha.12", + "@budibase/string-templates": "^1.0.212-alpha.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 d54c56d6cc..8a4bdcf87e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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.0.212-alpha.11", + "@budibase/bbui": "^1.0.212-alpha.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 1f0faa841f..7efdeffeeb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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.0.212-alpha.11", - "@budibase/client": "^1.0.212-alpha.11", + "@budibase/backend-core": "^1.0.212-alpha.12", + "@budibase/client": "^1.0.212-alpha.12", "@budibase/pro": "1.0.212-alpha.11", - "@budibase/string-templates": "^1.0.212-alpha.11", - "@budibase/types": "^1.0.212-alpha.11", + "@budibase/string-templates": "^1.0.212-alpha.12", + "@budibase/types": "^1.0.212-alpha.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 606bc42336..753956b2fa 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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 fc5a86e630..44411fe107 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.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 7c2e09c1cf..76ec1af3a1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.212-alpha.11", + "version": "1.0.212-alpha.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.212-alpha.11", + "@budibase/backend-core": "^1.0.212-alpha.12", "@budibase/pro": "1.0.212-alpha.11", - "@budibase/string-templates": "^1.0.212-alpha.11", - "@budibase/types": "^1.0.212-alpha.11", + "@budibase/string-templates": "^1.0.212-alpha.12", + "@budibase/types": "^1.0.212-alpha.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 59b9d9ee4f7a9bc4524794230c47587592d2fb2b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Jul 2022 11:24:06 +0000 Subject: [PATCH 9/9] Update pro version to 1.0.212-alpha.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 7efdeffeeb..6fa60da9c9 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.0.212-alpha.12", "@budibase/client": "^1.0.212-alpha.12", - "@budibase/pro": "1.0.212-alpha.11", + "@budibase/pro": "1.0.212-alpha.12", "@budibase/string-templates": "^1.0.212-alpha.12", "@budibase/types": "^1.0.212-alpha.12", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 76ec1af3a1..a0927a502a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.212-alpha.12", - "@budibase/pro": "1.0.212-alpha.11", + "@budibase/pro": "1.0.212-alpha.12", "@budibase/string-templates": "^1.0.212-alpha.12", "@budibase/types": "^1.0.212-alpha.12", "@koa/router": "8.0.8",