From 80152f886648fe627e2d951176a89695867d01f1 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sun, 8 May 2022 19:23:41 +0100 Subject: [PATCH 01/16] allow copying of app ID from the edit menu --- packages/builder/src/components/start/AppRow.svelte | 4 ++++ .../builder/src/pages/builder/portal/apps/index.svelte | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index ea2f005216..75f218861b 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -19,6 +19,7 @@ export let unpublishApp export let releaseLock export let editIcon + export let copyAppId
@@ -102,6 +103,9 @@ unpublishApp(app)} icon="GlobeRemove"> Unpublish + copyAppId(app)} icon="Copy"> + Copy App ID + {/if} {#if !app.deployed} updateApp(app)} icon="Edit">Edit diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index a25e7e2c6a..7bfa1da171 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -12,6 +12,7 @@ Body, Search, Divider, + Helpers, } from "@budibase/bbui" import TemplateDisplay from "components/common/TemplateDisplay.svelte" import Spinner from "components/common/Spinner.svelte" @@ -261,6 +262,11 @@ } } + const copyAppId = async app => { + await Helpers.copyToClipboard(app.prodId) + notifications.success("App ID copied to clipboard.") + } + function createAppFromTemplateUrl(templateKey) { // validate the template key just to make sure const templateParts = templateKey.split("/") @@ -394,6 +400,7 @@
{#each filteredApps as app (app.appId)} Date: Mon, 9 May 2022 13:23:32 +0000 Subject: [PATCH 02/16] v1.0.148 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 4791ed5872..9f3db9428b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.147", + "version": "1.0.148", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 66a90b2d96..f7d273c826 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.147", + "version": "1.0.148", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fcbc80d603..f2aa113db3 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.147", + "version": "1.0.148", "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.147", + "@budibase/string-templates": "^1.0.148", "@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 178cfc20cf..502a997fe6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.147", + "version": "1.0.148", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.147", - "@budibase/client": "^1.0.147", - "@budibase/frontend-core": "^1.0.147", - "@budibase/string-templates": "^1.0.147", + "@budibase/bbui": "^1.0.148", + "@budibase/client": "^1.0.148", + "@budibase/frontend-core": "^1.0.148", + "@budibase/string-templates": "^1.0.148", "@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 a9bc3ed722..bde35d72a6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.147", + "version": "1.0.148", "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 dbc20a8c39..281d4eff21 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.147", + "version": "1.0.148", "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.147", - "@budibase/frontend-core": "^1.0.147", - "@budibase/string-templates": "^1.0.147", + "@budibase/bbui": "^1.0.148", + "@budibase/frontend-core": "^1.0.148", + "@budibase/string-templates": "^1.0.148", "@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 e79665a1db..21e0734aac 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.147", + "version": "1.0.148", "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.147", + "@budibase/bbui": "^1.0.148", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 30b99fd55c..583279f6db 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.147", + "version": "1.0.148", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.147", - "@budibase/client": "^1.0.147", + "@budibase/backend-core": "^1.0.148", + "@budibase/client": "^1.0.148", "@budibase/pro": "1.0.147", - "@budibase/string-templates": "^1.0.147", + "@budibase/string-templates": "^1.0.148", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 82a8303b81..fb2c92a7aa 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.147", + "version": "1.0.148", "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 bc1b1fd6fb..bf3dc9deae 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.147", + "version": "1.0.148", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.147", + "@budibase/backend-core": "^1.0.148", "@budibase/pro": "1.0.147", - "@budibase/string-templates": "^1.0.147", + "@budibase/string-templates": "^1.0.148", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 04a021b0b2e084113dc4a302b41b189338c86cf9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 9 May 2022 13:24:57 +0000 Subject: [PATCH 03/16] Update pro version to 1.0.148 --- 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 583279f6db..dcf7b43b7a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.148", "@budibase/client": "^1.0.148", - "@budibase/pro": "1.0.147", + "@budibase/pro": "1.0.148", "@budibase/string-templates": "^1.0.148", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index bf3dc9deae..247ed0a4ab 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.148", - "@budibase/pro": "1.0.147", + "@budibase/pro": "1.0.148", "@budibase/string-templates": "^1.0.148", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 6e34649ca75eb32c1f8492c8e9a67e0affece0a4 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 9 May 2022 15:21:51 +0100 Subject: [PATCH 04/16] Don't wrap dates in single quotes --- packages/server/src/api/controllers/view/exporters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/view/exporters.js b/packages/server/src/api/controllers/view/exporters.js index 1232640d0a..ec366753a5 100644 --- a/packages/server/src/api/controllers/view/exporters.js +++ b/packages/server/src/api/controllers/view/exporters.js @@ -6,7 +6,7 @@ exports.csv = function (headers, rows) { .map(header => { let val = row[header] val = - typeof val === "object" + typeof val === "object" && !(val instanceof Date) ? `"${JSON.stringify(val).replace(/"/g, "'")}"` : `"${val}"` return val.trim() From 178613c0ffbca82002472eb9278d660d1e8ac7f6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 9 May 2022 14:54:10 +0000 Subject: [PATCH 05/16] v1.0.149 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 9f3db9428b..a36c5580b3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.148", + "version": "1.0.149", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f7d273c826..4cccf23342 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.148", + "version": "1.0.149", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f2aa113db3..4f1a925490 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.148", + "version": "1.0.149", "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.148", + "@budibase/string-templates": "^1.0.149", "@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 502a997fe6..91ec5e856a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.148", + "version": "1.0.149", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.148", - "@budibase/client": "^1.0.148", - "@budibase/frontend-core": "^1.0.148", - "@budibase/string-templates": "^1.0.148", + "@budibase/bbui": "^1.0.149", + "@budibase/client": "^1.0.149", + "@budibase/frontend-core": "^1.0.149", + "@budibase/string-templates": "^1.0.149", "@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 bde35d72a6..c34ee70dbd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.148", + "version": "1.0.149", "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 281d4eff21..2474c20455 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.148", + "version": "1.0.149", "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.148", - "@budibase/frontend-core": "^1.0.148", - "@budibase/string-templates": "^1.0.148", + "@budibase/bbui": "^1.0.149", + "@budibase/frontend-core": "^1.0.149", + "@budibase/string-templates": "^1.0.149", "@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 21e0734aac..b520d27a13 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.148", + "version": "1.0.149", "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.148", + "@budibase/bbui": "^1.0.149", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index dcf7b43b7a..ceebdc5fbb 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.148", + "version": "1.0.149", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.148", - "@budibase/client": "^1.0.148", + "@budibase/backend-core": "^1.0.149", + "@budibase/client": "^1.0.149", "@budibase/pro": "1.0.148", - "@budibase/string-templates": "^1.0.148", + "@budibase/string-templates": "^1.0.149", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fb2c92a7aa..e0aa34cd91 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.148", + "version": "1.0.149", "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 247ed0a4ab..9364833bd7 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.148", + "version": "1.0.149", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.148", + "@budibase/backend-core": "^1.0.149", "@budibase/pro": "1.0.148", - "@budibase/string-templates": "^1.0.148", + "@budibase/string-templates": "^1.0.149", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 9b011bf8eb0bcc8130514a3efce014f5f46d54c7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 9 May 2022 14:55:43 +0000 Subject: [PATCH 06/16] Update pro version to 1.0.149 --- 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 ceebdc5fbb..f96568a80e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.149", "@budibase/client": "^1.0.149", - "@budibase/pro": "1.0.148", + "@budibase/pro": "1.0.149", "@budibase/string-templates": "^1.0.149", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9364833bd7..e628b133cb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.149", - "@budibase/pro": "1.0.148", + "@budibase/pro": "1.0.149", "@budibase/string-templates": "^1.0.149", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 8c5efd0a619d15d5de38713bf96894538bad3d97 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 May 2022 11:13:40 +0100 Subject: [PATCH 07/16] more strategic connection closing in pg --- packages/server/src/integrations/postgres.ts | 82 +++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 1da0ab31af..430a3f3461 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -147,7 +147,7 @@ module PostgresModule { return parts.join(" || ") } - async internalQuery(query: SqlQuery) { + async internalQuery(query: SqlQuery, close: boolean = true) { const client = this.client this.index = 1 // need to handle a specific issue with json data types in postgres, @@ -164,10 +164,11 @@ module PostgresModule { try { return await client.query(query.sql, query.bindings || []) } catch (err) { + await this.client.end() // @ts-ignore throw new Error(err) } finally { - await this.client.end() + if (close) await this.client.end() } } @@ -204,48 +205,54 @@ module PostgresModule { } } catch (err) { tableKeys = {} - } finally { - await this.client.close() } - const columnsResponse = await this.client.query(this.COLUMNS_SQL) - const tables: { [key: string]: Table } = {} + try { + const columnsResponse = await this.client.query(this.COLUMNS_SQL) - for (let column of columnsResponse.rows) { - const tableName: string = column.table_name - const columnName: string = column.column_name + const tables: { [key: string]: Table } = {} - // table key doesn't exist yet - if (!tables[tableName] || !tables[tableName].schema) { - tables[tableName] = { - _id: buildExternalTableId(datasourceId, tableName), - primary: tableKeys[tableName] || [], - name: tableName, - schema: {}, + for (let column of columnsResponse.rows) { + const tableName: string = column.table_name + const columnName: string = column.column_name + + // table key doesn't exist yet + if (!tables[tableName] || !tables[tableName].schema) { + tables[tableName] = { + _id: buildExternalTableId(datasourceId, tableName), + primary: tableKeys[tableName] || [], + name: tableName, + schema: {}, + } + } + + const identity = !!( + column.identity_generation || + column.identity_start || + column.identity_increment + ) + const hasDefault = + typeof column.column_default === "string" && + column.column_default.startsWith("nextval") + const isGenerated = + column.is_generated && column.is_generated !== "NEVER" + const isAuto: boolean = hasDefault || identity || isGenerated + tables[tableName].schema[columnName] = { + autocolumn: isAuto, + name: columnName, + ...convertSqlType(column.data_type), } } - const identity = !!( - column.identity_generation || - column.identity_start || - column.identity_increment - ) - const hasDefault = - typeof column.column_default === "string" && - column.column_default.startsWith("nextval") - const isGenerated = - column.is_generated && column.is_generated !== "NEVER" - const isAuto: boolean = hasDefault || identity || isGenerated - tables[tableName].schema[columnName] = { - autocolumn: isAuto, - name: columnName, - ...convertSqlType(column.data_type), - } + const final = finaliseExternalTables(tables, entities) + this.tables = final.tables + this.schemaErrors = final.errors + } catch (err) { + // @ts-ignore + throw new Error(err) + } finally { + await this.client.end() } - - const final = finaliseExternalTables(tables, entities) - this.tables = final.tables - this.schemaErrors = final.errors } async create(query: SqlQuery | string) { @@ -274,8 +281,9 @@ module PostgresModule { if (Array.isArray(input)) { const responses = [] for (let query of input) { - responses.push(await this.internalQuery(query)) + responses.push(await this.internalQuery(query, false)) } + await this.client.end() return responses } else { const response = await this.internalQuery(input) From 97bfd5a84c72564ee55d550e867e12eb96419c9b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 10 May 2022 10:48:32 +0000 Subject: [PATCH 08/16] v1.0.150 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index a36c5580b3..a72ecea0e2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.149", + "version": "1.0.150", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4cccf23342..ade493f39a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.149", + "version": "1.0.150", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4f1a925490..cb3d754435 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.149", + "version": "1.0.150", "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.149", + "@budibase/string-templates": "^1.0.150", "@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 91ec5e856a..03bbb4483f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.149", + "version": "1.0.150", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.149", - "@budibase/client": "^1.0.149", - "@budibase/frontend-core": "^1.0.149", - "@budibase/string-templates": "^1.0.149", + "@budibase/bbui": "^1.0.150", + "@budibase/client": "^1.0.150", + "@budibase/frontend-core": "^1.0.150", + "@budibase/string-templates": "^1.0.150", "@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 c34ee70dbd..2c218728e0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.149", + "version": "1.0.150", "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 2474c20455..5357264d22 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.149", + "version": "1.0.150", "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.149", - "@budibase/frontend-core": "^1.0.149", - "@budibase/string-templates": "^1.0.149", + "@budibase/bbui": "^1.0.150", + "@budibase/frontend-core": "^1.0.150", + "@budibase/string-templates": "^1.0.150", "@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 b520d27a13..6e9308712c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.149", + "version": "1.0.150", "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.149", + "@budibase/bbui": "^1.0.150", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f96568a80e..fa7f123efb 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.149", + "version": "1.0.150", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.149", - "@budibase/client": "^1.0.149", + "@budibase/backend-core": "^1.0.150", + "@budibase/client": "^1.0.150", "@budibase/pro": "1.0.149", - "@budibase/string-templates": "^1.0.149", + "@budibase/string-templates": "^1.0.150", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e0aa34cd91..49737dfc2e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.149", + "version": "1.0.150", "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 e628b133cb..e551f7b6e9 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.149", + "version": "1.0.150", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.149", + "@budibase/backend-core": "^1.0.150", "@budibase/pro": "1.0.149", - "@budibase/string-templates": "^1.0.149", + "@budibase/string-templates": "^1.0.150", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 1c261321f2b243510be492b438b2bbcb906c11c2 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 10 May 2022 10:50:03 +0000 Subject: [PATCH 09/16] Update pro version to 1.0.150 --- 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 fa7f123efb..fff039e6a9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.150", "@budibase/client": "^1.0.150", - "@budibase/pro": "1.0.149", + "@budibase/pro": "1.0.150", "@budibase/string-templates": "^1.0.150", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index e551f7b6e9..58400142bc 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.150", - "@budibase/pro": "1.0.149", + "@budibase/pro": "1.0.150", "@budibase/string-templates": "^1.0.150", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From d761e5cfec5aa5863df698981c530fbbdcb0c012 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 09:24:10 +0000 Subject: [PATCH 10/16] v1.0.151-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index a72ecea0e2..2a4cf518eb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.150", + "version": "1.0.151-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ade493f39a..b218202d77 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cb3d754435..715334b2e4 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.150", + "version": "1.0.151-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.150", + "@budibase/string-templates": "^1.0.151-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 03bbb4483f..3707a47473 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.150", - "@budibase/client": "^1.0.150", - "@budibase/frontend-core": "^1.0.150", - "@budibase/string-templates": "^1.0.150", + "@budibase/bbui": "^1.0.151-alpha.0", + "@budibase/client": "^1.0.151-alpha.0", + "@budibase/frontend-core": "^1.0.151-alpha.0", + "@budibase/string-templates": "^1.0.151-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2c218728e0..06b4aad2fa 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 5357264d22..37c33c4817 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.150", - "@budibase/frontend-core": "^1.0.150", - "@budibase/string-templates": "^1.0.150", + "@budibase/bbui": "^1.0.151-alpha.0", + "@budibase/frontend-core": "^1.0.151-alpha.0", + "@budibase/string-templates": "^1.0.151-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6e9308712c..b486cf8f7f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.150", + "@budibase/bbui": "^1.0.151-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fff039e6a9..45120c1435 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.150", + "version": "1.0.151-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.150", - "@budibase/client": "^1.0.150", + "@budibase/backend-core": "^1.0.151-alpha.0", + "@budibase/client": "^1.0.151-alpha.0", "@budibase/pro": "1.0.150", - "@budibase/string-templates": "^1.0.150", + "@budibase/string-templates": "^1.0.151-alpha.0", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 49737dfc2e..bad7b480e0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.150", + "version": "1.0.151-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 58400142bc..724ac81dc2 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.150", + "version": "1.0.151-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.150", + "@budibase/backend-core": "^1.0.151-alpha.0", "@budibase/pro": "1.0.150", - "@budibase/string-templates": "^1.0.150", + "@budibase/string-templates": "^1.0.151-alpha.0", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From bbf0ca6de392d3e1f965da8bfd9a7e3eecbc9195 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 09:25:33 +0000 Subject: [PATCH 11/16] Update pro version to 1.0.151-alpha.0 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 45120c1435..15858150d4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.151-alpha.0", "@budibase/client": "^1.0.151-alpha.0", - "@budibase/pro": "1.0.150", + "@budibase/pro": "1.0.151-alpha.0", "@budibase/string-templates": "^1.0.151-alpha.0", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 724ac81dc2..9835d68af4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.151-alpha.0", - "@budibase/pro": "1.0.150", + "@budibase/pro": "1.0.151-alpha.0", "@budibase/string-templates": "^1.0.151-alpha.0", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From d6142b777eed14f7b4018d01495604d96012fdb9 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 11 May 2022 11:25:53 +0100 Subject: [PATCH 12/16] Add limit placeholder for Automation queries --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 ++ packages/server/src/automations/steps/queryRows.js | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 1af40694a3..7b189ad109 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -53,6 +53,7 @@ : { schema: {} } $: schema = getSchemaForTable(tableId, { searchableSchema: true }).schema $: schemaFields = Object.values(schema || {}) + $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000" const onChange = Utils.sequential(async (e, key) => { try { @@ -330,6 +331,7 @@ on:change={e => onChange(e, key)} {bindings} updateOnChange={false} + placeholder={value.customType === "queryLimit" ? queryLimit : ""} />
{/if} diff --git a/packages/server/src/automations/steps/queryRows.js b/packages/server/src/automations/steps/queryRows.js index 62f7659589..d4bc5fe076 100644 --- a/packages/server/src/automations/steps/queryRows.js +++ b/packages/server/src/automations/steps/queryRows.js @@ -50,6 +50,7 @@ exports.definition = { limit: { type: "number", title: "Limit", + customType: "queryLimit", }, }, required: ["tableId"], From 5ac8e25cb41383123f89538f7eb87b29dbd64218 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 11:09:54 +0000 Subject: [PATCH 13/16] v1.0.151-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 2a4cf518eb..5c1f648095 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b218202d77..eeb6b89622 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 715334b2e4..9c7617123c 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.151-alpha.0", + "version": "1.0.151-alpha.1", "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.151-alpha.0", + "@budibase/string-templates": "^1.0.151-alpha.1", "@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 3707a47473..6f9e132cf7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.151-alpha.0", - "@budibase/client": "^1.0.151-alpha.0", - "@budibase/frontend-core": "^1.0.151-alpha.0", - "@budibase/string-templates": "^1.0.151-alpha.0", + "@budibase/bbui": "^1.0.151-alpha.1", + "@budibase/client": "^1.0.151-alpha.1", + "@budibase/frontend-core": "^1.0.151-alpha.1", + "@budibase/string-templates": "^1.0.151-alpha.1", "@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 06b4aad2fa..6a7ef63b02 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "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 37c33c4817..9077c175aa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "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.151-alpha.0", - "@budibase/frontend-core": "^1.0.151-alpha.0", - "@budibase/string-templates": "^1.0.151-alpha.0", + "@budibase/bbui": "^1.0.151-alpha.1", + "@budibase/frontend-core": "^1.0.151-alpha.1", + "@budibase/string-templates": "^1.0.151-alpha.1", "@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 b486cf8f7f..c3db7f2248 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "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.151-alpha.0", + "@budibase/bbui": "^1.0.151-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 15858150d4..75e49454dc 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.151-alpha.0", + "version": "1.0.151-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.151-alpha.0", - "@budibase/client": "^1.0.151-alpha.0", + "@budibase/backend-core": "^1.0.151-alpha.1", + "@budibase/client": "^1.0.151-alpha.1", "@budibase/pro": "1.0.151-alpha.0", - "@budibase/string-templates": "^1.0.151-alpha.0", + "@budibase/string-templates": "^1.0.151-alpha.1", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index bad7b480e0..9522ef6b66 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.151-alpha.0", + "version": "1.0.151-alpha.1", "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 9835d68af4..47a8dc3402 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.151-alpha.0", + "version": "1.0.151-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.151-alpha.0", + "@budibase/backend-core": "^1.0.151-alpha.1", "@budibase/pro": "1.0.151-alpha.0", - "@budibase/string-templates": "^1.0.151-alpha.0", + "@budibase/string-templates": "^1.0.151-alpha.1", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 54f750e2257ab952479b6bc1effbfdaee8a1d4f9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 11:11:16 +0000 Subject: [PATCH 14/16] Update pro version to 1.0.151-alpha.1 --- 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 75e49454dc..18b47abdf5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.151-alpha.1", "@budibase/client": "^1.0.151-alpha.1", - "@budibase/pro": "1.0.151-alpha.0", + "@budibase/pro": "1.0.151-alpha.1", "@budibase/string-templates": "^1.0.151-alpha.1", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 47a8dc3402..5b9d35d262 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.151-alpha.1", - "@budibase/pro": "1.0.151-alpha.0", + "@budibase/pro": "1.0.151-alpha.1", "@budibase/string-templates": "^1.0.151-alpha.1", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 08e66862b09a9f22670e8722fffe177b2c58848a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 13:57:39 +0000 Subject: [PATCH 15/16] v1.0.151-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 5c1f648095..dd50fdf909 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index eeb6b89622..858588c0ee 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9c7617123c..9cd9f2cbba 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.151-alpha.1", + "version": "1.0.151-alpha.2", "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.151-alpha.1", + "@budibase/string-templates": "^1.0.151-alpha.2", "@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 6f9e132cf7..5a58f2066e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.151-alpha.1", - "@budibase/client": "^1.0.151-alpha.1", - "@budibase/frontend-core": "^1.0.151-alpha.1", - "@budibase/string-templates": "^1.0.151-alpha.1", + "@budibase/bbui": "^1.0.151-alpha.2", + "@budibase/client": "^1.0.151-alpha.2", + "@budibase/frontend-core": "^1.0.151-alpha.2", + "@budibase/string-templates": "^1.0.151-alpha.2", "@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 6a7ef63b02..f230da671e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "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 9077c175aa..edd58a72ad 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "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.151-alpha.1", - "@budibase/frontend-core": "^1.0.151-alpha.1", - "@budibase/string-templates": "^1.0.151-alpha.1", + "@budibase/bbui": "^1.0.151-alpha.2", + "@budibase/frontend-core": "^1.0.151-alpha.2", + "@budibase/string-templates": "^1.0.151-alpha.2", "@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 c3db7f2248..904597a7d9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "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.151-alpha.1", + "@budibase/bbui": "^1.0.151-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 18b47abdf5..bf99db8663 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.151-alpha.1", + "version": "1.0.151-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.151-alpha.1", - "@budibase/client": "^1.0.151-alpha.1", + "@budibase/backend-core": "^1.0.151-alpha.2", + "@budibase/client": "^1.0.151-alpha.2", "@budibase/pro": "1.0.151-alpha.1", - "@budibase/string-templates": "^1.0.151-alpha.1", + "@budibase/string-templates": "^1.0.151-alpha.2", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9522ef6b66..fccfec87e2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.151-alpha.1", + "version": "1.0.151-alpha.2", "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 5b9d35d262..0be327cfae 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.151-alpha.1", + "version": "1.0.151-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.151-alpha.1", + "@budibase/backend-core": "^1.0.151-alpha.2", "@budibase/pro": "1.0.151-alpha.1", - "@budibase/string-templates": "^1.0.151-alpha.1", + "@budibase/string-templates": "^1.0.151-alpha.2", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From cb9655c3607ec52a2af584e3b0335dde76d9c95e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 13:59:01 +0000 Subject: [PATCH 16/16] Update pro version to 1.0.151-alpha.2 --- 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 bf99db8663..0e7910d31d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.151-alpha.2", "@budibase/client": "^1.0.151-alpha.2", - "@budibase/pro": "1.0.151-alpha.1", + "@budibase/pro": "1.0.151-alpha.2", "@budibase/string-templates": "^1.0.151-alpha.2", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0be327cfae..75a464f1c3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.151-alpha.2", - "@budibase/pro": "1.0.151-alpha.1", + "@budibase/pro": "1.0.151-alpha.2", "@budibase/string-templates": "^1.0.151-alpha.2", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",