From c41a0f8d78aada2b4c83f611461802041333245b Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 15 Nov 2022 14:29:58 +0000 Subject: [PATCH 01/10] Default datasource behaviour with order of preference: DefaultDB, Internal then External --- .../src/builderStore/store/frontend.js | 43 +++++++++++++++++++ .../builder/app/[application]/_layout.svelte | 4 -- .../builder/src/stores/backend/datasources.js | 1 + 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 1291f81294..9814bcfc74 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -481,6 +481,40 @@ export const getFrontendStore = () => { return null } + const dataSourceField = definition.settings.find( + setting => setting.type == "dataSource" + ) + + let defaultDatasource + if (dataSourceField) { + const _tables = get(tables) + const filteredTables = _tables.list.filter( + table => table._id != "ta_users" + ) + + const internalTable = filteredTables.find( + table => + table.sourceId === "bb_internal" && table.type == "internal" + ) + + const defaultSourceTable = filteredTables.find( + table => + table.sourceId !== "bb_internal" && table.type == "internal" + ) + + const defaultExternalTable = filteredTables.find( + table => table.type == "external" + ) + + if (defaultSourceTable) { + defaultDatasource = defaultSourceTable + } else if (internalTable) { + defaultDatasource = internalTable + } else if (defaultExternalTable) { + defaultDatasource = defaultExternalTable + } + } + // Generate default props const settings = getComponentSettings(componentName) let props = { ...presetProps } @@ -490,6 +524,15 @@ export const getFrontendStore = () => { } }) + // Set a default datasource + if (dataSourceField && defaultDatasource) { + props["dataSource"] = { + label: defaultDatasource.name, + tableId: defaultDatasource._id, + type: "table", + } + } + // Add any extra properties the component needs let extras = {} if (definition.hasChildren) { diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index a854d09304..5296604dc7 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -1,7 +1,6 @@
Bindings - {#if !bindable} - - {/if}
{#if !bindable} From 20c4b00a0cc0411eb8c81cec81e6173fb346aef8 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 25 Nov 2022 12:52:50 +0000 Subject: [PATCH 06/10] Environment variable type coercion fix --- packages/worker/src/environment.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index c9eabdfdb4..cfe284cb0a 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -67,7 +67,8 @@ const env = { ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY, _set(key: any, value: any) { process.env[key] = value - module.exports[key] = value + // @ts-ignore + env[key] = value }, isDev, isTest, @@ -82,7 +83,7 @@ if (!env.APPS_URL) { } // clean up any environment variable edge cases -for (let [key, value] of Object.entries(module.exports)) { +for (let [key, value] of Object.entries(env)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore From 229f7bd35b0003efa58000c70eb4dd06400a9761 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 25 Nov 2022 13:57:11 +0000 Subject: [PATCH 07/10] v2.1.32-alpha.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 1eeecc5051..838ce6d479 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9f2a1a3888..49d4038181 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.32-alpha.9", + "@budibase/types": "2.1.32-alpha.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5e077007b6..388faff0d8 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": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.32-alpha.9", + "@budibase/string-templates": "2.1.32-alpha.10", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 2ab073e4d6..202cf52cb0 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.32-alpha.9", - "@budibase/client": "2.1.32-alpha.9", - "@budibase/frontend-core": "2.1.32-alpha.9", - "@budibase/string-templates": "2.1.32-alpha.9", + "@budibase/bbui": "2.1.32-alpha.10", + "@budibase/client": "2.1.32-alpha.10", + "@budibase/frontend-core": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-alpha.10", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index bbeb869168..8dfb594d36 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.9", - "@budibase/string-templates": "2.1.32-alpha.9", - "@budibase/types": "2.1.32-alpha.9", + "@budibase/backend-core": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-alpha.10", + "@budibase/types": "2.1.32-alpha.10", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 8c31d4ff48..b9b1564eb9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.32-alpha.9", - "@budibase/frontend-core": "2.1.32-alpha.9", - "@budibase/string-templates": "2.1.32-alpha.9", + "@budibase/bbui": "2.1.32-alpha.10", + "@budibase/frontend-core": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-alpha.10", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8fc2dc016e..0a408d2b00 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.32-alpha.9", + "@budibase/bbui": "2.1.32-alpha.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1311a2ecda..3b1bab8552 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cce46742bd..d2a9279f5c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.32-alpha.9", - "@budibase/client": "2.1.32-alpha.9", + "@budibase/backend-core": "2.1.32-alpha.10", + "@budibase/client": "2.1.32-alpha.10", "@budibase/pro": "2.1.32-alpha.9", - "@budibase/string-templates": "2.1.32-alpha.9", - "@budibase/types": "2.1.32-alpha.9", + "@budibase/string-templates": "2.1.32-alpha.10", + "@budibase/types": "2.1.32-alpha.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a4f755ac79..a0fd805602 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 054c282857..83c69ad990 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 599ce579fb..30c0cfc1dc 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.32-alpha.9", + "version": "2.1.32-alpha.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.9", + "@budibase/backend-core": "2.1.32-alpha.10", "@budibase/pro": "2.1.32-alpha.9", - "@budibase/string-templates": "2.1.32-alpha.9", - "@budibase/types": "2.1.32-alpha.9", + "@budibase/string-templates": "2.1.32-alpha.10", + "@budibase/types": "2.1.32-alpha.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 998fd7ccc8a611ca00c30491409e1c96605cd233 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 25 Nov 2022 14:00:38 +0000 Subject: [PATCH 08/10] Update pro version to 2.1.32-alpha.10 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d2a9279f5c..0f6b956c04 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.32-alpha.10", "@budibase/client": "2.1.32-alpha.10", - "@budibase/pro": "2.1.32-alpha.9", + "@budibase/pro": "2.1.32-alpha.10", "@budibase/string-templates": "2.1.32-alpha.10", "@budibase/types": "2.1.32-alpha.10", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 089a92385f..16176aa20b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.9.tgz#847dc57740824f25cfa4ad97657bd590636c567a" - integrity sha512-VTwkHzGjhrdlbX2X/6++mXKNfJyAg7v5fUhoJ+Zpg/o8V9SRosoSFIFYmXRRFdHxgTdFaFSu8lz8hPu93fnIug== +"@budibase/backend-core@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988" + integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw== dependencies: - "@budibase/types" "2.1.32-alpha.9" + "@budibase/types" "2.1.32-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1361,13 +1361,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.9.tgz#689f70e7c7eea1dc2f7e1ea598b042fb3e9731be" - integrity sha512-17ZYWHZgPWJGj/fkGAFkN4VFd/evGok8W8kQQowe5ijIxXu0iP8iSXGs0fqOk8UDsSTORHT2N8HWmHiLMUUmCg== +"@budibase/pro@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972" + integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ== dependencies: - "@budibase/backend-core" "2.1.32-alpha.9" - "@budibase/types" "2.1.32-alpha.9" + "@budibase/backend-core" "2.1.32-alpha.10" + "@budibase/types" "2.1.32-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1391,10 +1391,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.9.tgz#880633164df0d737e16894e4f21f3a227f4b0f35" - integrity sha512-ClaAgoFkS6CnG37E5mhWDT5DCym0GY72taWyIFcuiCBzMYzAr3/EpM8Mt4g3cccFr+DFDpdMI7dTHWDaxqDpmA== +"@budibase/types@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca" + integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 30c0cfc1dc..d7d661a949 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.32-alpha.10", - "@budibase/pro": "2.1.32-alpha.9", + "@budibase/pro": "2.1.32-alpha.10", "@budibase/string-templates": "2.1.32-alpha.10", "@budibase/types": "2.1.32-alpha.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index aeaff750d2..69951bb768 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.9.tgz#847dc57740824f25cfa4ad97657bd590636c567a" - integrity sha512-VTwkHzGjhrdlbX2X/6++mXKNfJyAg7v5fUhoJ+Zpg/o8V9SRosoSFIFYmXRRFdHxgTdFaFSu8lz8hPu93fnIug== +"@budibase/backend-core@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988" + integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw== dependencies: - "@budibase/types" "2.1.32-alpha.9" + "@budibase/types" "2.1.32-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -508,22 +508,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.9.tgz#689f70e7c7eea1dc2f7e1ea598b042fb3e9731be" - integrity sha512-17ZYWHZgPWJGj/fkGAFkN4VFd/evGok8W8kQQowe5ijIxXu0iP8iSXGs0fqOk8UDsSTORHT2N8HWmHiLMUUmCg== +"@budibase/pro@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972" + integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ== dependencies: - "@budibase/backend-core" "2.1.32-alpha.9" - "@budibase/types" "2.1.32-alpha.9" + "@budibase/backend-core" "2.1.32-alpha.10" + "@budibase/types" "2.1.32-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.32-alpha.9": - version "2.1.32-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.9.tgz#880633164df0d737e16894e4f21f3a227f4b0f35" - integrity sha512-ClaAgoFkS6CnG37E5mhWDT5DCym0GY72taWyIFcuiCBzMYzAr3/EpM8Mt4g3cccFr+DFDpdMI7dTHWDaxqDpmA== +"@budibase/types@2.1.32-alpha.10": + version "2.1.32-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca" + integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 91a5cf74f3c4c7e96a38f6544d1b43ff94e564a3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 28 Nov 2022 09:19:56 +0000 Subject: [PATCH 09/10] v2.1.32-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 | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 838ce6d479..e26819bf33 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 49d4038181..9f08efc49f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.32-alpha.10", + "version": "2.1.32-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": "2.1.32-alpha.10", + "@budibase/types": "2.1.32-alpha.11", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 388faff0d8..2e2a9f7f36 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": "2.1.32-alpha.10", + "version": "2.1.32-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": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-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 202cf52cb0..ec531fe7ec 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.32-alpha.10", - "@budibase/client": "2.1.32-alpha.10", - "@budibase/frontend-core": "2.1.32-alpha.10", - "@budibase/string-templates": "2.1.32-alpha.10", + "@budibase/bbui": "2.1.32-alpha.11", + "@budibase/client": "2.1.32-alpha.11", + "@budibase/frontend-core": "2.1.32-alpha.11", + "@budibase/string-templates": "2.1.32-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 8dfb594d36..8544963b47 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.10", - "@budibase/string-templates": "2.1.32-alpha.10", - "@budibase/types": "2.1.32-alpha.10", + "@budibase/backend-core": "2.1.32-alpha.11", + "@budibase/string-templates": "2.1.32-alpha.11", + "@budibase/types": "2.1.32-alpha.11", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index b9b1564eb9..d99a4545b3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.32-alpha.10", + "version": "2.1.32-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": "2.1.32-alpha.10", - "@budibase/frontend-core": "2.1.32-alpha.10", - "@budibase/string-templates": "2.1.32-alpha.10", + "@budibase/bbui": "2.1.32-alpha.11", + "@budibase/frontend-core": "2.1.32-alpha.11", + "@budibase/string-templates": "2.1.32-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 0a408d2b00..8fe3888252 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.32-alpha.10", + "version": "2.1.32-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": "2.1.32-alpha.10", + "@budibase/bbui": "2.1.32-alpha.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3b1bab8552..bb49c76919 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 0f6b956c04..b1faee5e5e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.32-alpha.10", - "@budibase/client": "2.1.32-alpha.10", + "@budibase/backend-core": "2.1.32-alpha.11", + "@budibase/client": "2.1.32-alpha.11", "@budibase/pro": "2.1.32-alpha.10", - "@budibase/string-templates": "2.1.32-alpha.10", - "@budibase/types": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-alpha.11", + "@budibase/types": "2.1.32-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 a0fd805602..7742b61ae3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.32-alpha.10", + "version": "2.1.32-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 83c69ad990..d69ee43a37 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.32-alpha.10", + "version": "2.1.32-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 d7d661a949..b6cca52aea 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.32-alpha.10", + "version": "2.1.32-alpha.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.10", + "@budibase/backend-core": "2.1.32-alpha.11", "@budibase/pro": "2.1.32-alpha.10", - "@budibase/string-templates": "2.1.32-alpha.10", - "@budibase/types": "2.1.32-alpha.10", + "@budibase/string-templates": "2.1.32-alpha.11", + "@budibase/types": "2.1.32-alpha.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 38f0bf8145179ac5d6b33eb08073345a20aa25a1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 28 Nov 2022 09:23:26 +0000 Subject: [PATCH 10/10] Update pro version to 2.1.32-alpha.11 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b1faee5e5e..ba4f186c05 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.32-alpha.11", "@budibase/client": "2.1.32-alpha.11", - "@budibase/pro": "2.1.32-alpha.10", + "@budibase/pro": "2.1.32-alpha.11", "@budibase/string-templates": "2.1.32-alpha.11", "@budibase/types": "2.1.32-alpha.11", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 16176aa20b..4e68957ab2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988" - integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw== +"@budibase/backend-core@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.11.tgz#bbf49464c95d3bc10e58d478d53fb88012c7bc35" + integrity sha512-JPlJIDkN6Id2K++MysV0Wx05KS8qFmdyhE1OTt1e7EVYrYdCHubWPmJynEfd0ceMEkMTqdssN7nUuQfMXBP4dA== dependencies: - "@budibase/types" "2.1.32-alpha.10" + "@budibase/types" "2.1.32-alpha.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1361,13 +1361,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972" - integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ== +"@budibase/pro@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.11.tgz#40e57623403133eeef1e3e1f5b6f9226dabd9b39" + integrity sha512-/XW5BDP7IueDSeAhDw6/Lp1kIQBxCTgjk9GLmpCuvSv4HEN1mu1bobebASaaqiZ7YVx8dPZXQV8bfzSKl6eHOg== dependencies: - "@budibase/backend-core" "2.1.32-alpha.10" - "@budibase/types" "2.1.32-alpha.10" + "@budibase/backend-core" "2.1.32-alpha.11" + "@budibase/types" "2.1.32-alpha.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1391,10 +1391,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca" - integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg== +"@budibase/types@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.11.tgz#a69b002ab80fd7a97b1204b12ef867a16d48122a" + integrity sha512-lyN7EZQAe2I815z9IEQ1kZS1eDrWxsvyyGMM6tLucm/49d+FutqAqTuMvU0OatjEzaxBflEQLhv98EGX4vDVuw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b6cca52aea..8149abfbdf 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.32-alpha.11", - "@budibase/pro": "2.1.32-alpha.10", + "@budibase/pro": "2.1.32-alpha.11", "@budibase/string-templates": "2.1.32-alpha.11", "@budibase/types": "2.1.32-alpha.11", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 69951bb768..f670f90db6 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988" - integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw== +"@budibase/backend-core@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.11.tgz#bbf49464c95d3bc10e58d478d53fb88012c7bc35" + integrity sha512-JPlJIDkN6Id2K++MysV0Wx05KS8qFmdyhE1OTt1e7EVYrYdCHubWPmJynEfd0ceMEkMTqdssN7nUuQfMXBP4dA== dependencies: - "@budibase/types" "2.1.32-alpha.10" + "@budibase/types" "2.1.32-alpha.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -508,22 +508,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972" - integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ== +"@budibase/pro@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.11.tgz#40e57623403133eeef1e3e1f5b6f9226dabd9b39" + integrity sha512-/XW5BDP7IueDSeAhDw6/Lp1kIQBxCTgjk9GLmpCuvSv4HEN1mu1bobebASaaqiZ7YVx8dPZXQV8bfzSKl6eHOg== dependencies: - "@budibase/backend-core" "2.1.32-alpha.10" - "@budibase/types" "2.1.32-alpha.10" + "@budibase/backend-core" "2.1.32-alpha.11" + "@budibase/types" "2.1.32-alpha.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.32-alpha.10": - version "2.1.32-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca" - integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg== +"@budibase/types@2.1.32-alpha.11": + version "2.1.32-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.11.tgz#a69b002ab80fd7a97b1204b12ef867a16d48122a" + integrity sha512-lyN7EZQAe2I815z9IEQ1kZS1eDrWxsvyyGMM6tLucm/49d+FutqAqTuMvU0OatjEzaxBflEQLhv98EGX4vDVuw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"