From 5728cf9b2a66e42b7a886c3d6915d7c527069478 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 11:55:03 +0100 Subject: [PATCH 1/7] Add clickoutside handlers to options, long form and relationship cells --- .../src/components/grid/cells/LongFormCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 3 ++- .../src/components/grid/cells/RelationshipCell.svelte | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte index 00e12dc6a3..886d4ef8b0 100644 --- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte @@ -1,5 +1,6 @@ - + From 06cdb7c20267fd607a8c132ec1ed3d09102e8ce7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:47:04 +0000 Subject: [PATCH 3/7] v2.5.6-alpha.37 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 6633dc9eee..ad2dcaee32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fedb763e75..aa558ba75c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.37", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ca17df6ce2..fe9787e689 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.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3d2a05e998..5dd65a613c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6a2f7bf373..8858872699 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "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 080d67e780..2a9750fa47 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@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 fabc8b265c..28e78c05a0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 77bee658f9..a270fe9a55 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4390ea3882..201135eae8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/client": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/client": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 0cbf9fe2da..4f7c40b73f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.36" + "@budibase/types": "2.5.6-alpha.37" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0818e222f2..aeed9aca4c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "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 bb44434d1f..1b228362a9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4e27f3e73c..05b0fc1846 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a896a75f8fd36bd4eb3d6d9a87cb5b36b19953bc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:48:47 +0000 Subject: [PATCH 4/7] Update pro version to 2.5.6-alpha.37 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 201135eae8..561104bca1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/client": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/shared-core": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", diff --git a/packages/worker/package.json b/packages/worker/package.json index 05b0fc1846..30e5a15432 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 47933b9a92bfd2a392c49f6c823698717531d763 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 16:08:25 +0100 Subject: [PATCH 5/7] Hide manage or renew button when customer uses invoicing + css updates (#10436) * Hide manage or renew button when customer uses invoicing + css updates * Remove usages of 'pro' and 'pro plan' from ui * Enterprise plan -> Enterprise on enforce single sign on * lint --- .../pages/builder/portal/account/usage.svelte | 50 +++++++++---------- .../overview/[appId]/backups/index.svelte | 2 +- .../builder/portal/settings/auth/index.svelte | 2 +- .../builder/portal/settings/branding.svelte | 2 +- .../builder/portal/users/groups/index.svelte | 2 +- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 80e42d52a8..8dc02c6c80 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -43,12 +43,18 @@ } $: quotaUsage = $licensing.quotaUsage + $: license = $auth.user?.license + $: plan = license?.plan + $: usesInvoicing = plan?.usesInvoicing + $: accountPortalAccess = $auth?.user?.accountPortalAccess $: quotaReset = quotaUsage?.quotaReset $: canManagePlan = ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin) + $: showButton = !usesInvoicing && accountPortalAccess + const setMonthlyUsage = () => { monthlyUsage = [] if (quotaUsage.monthly) { @@ -121,7 +127,7 @@ const setTextRows = () => { textRows = [] - if (cancelAt) { + if (cancelAt && !usesInvoicing) { textRows.push({ message: "Subscription has been cancelled" }) textRows.push({ message: `${getDaysRemaining(cancelAt)} days remaining`, @@ -213,7 +219,7 @@ description="YOUR CURRENT PLAN" title={planTitle()} {primaryActionText} - primaryAction={accountPortalAccess ? goToAccountPortal : undefined} + primaryAction={showButton ? goToAccountPortal : undefined} {textRows} >
@@ -224,33 +230,23 @@
{/each} + + Monthly limits +
+ + + Resets in {daysRemainingInMonth} days + + +
+ + + {#each monthlyUsage as usage} + + {/each} + - - {#if monthlyUsage.length} -
- - - Monthly limits -
- - - Resets in {daysRemainingInMonth} days - - -
- - - {#each monthlyUsage as usage} - - {/each} - - -
- {/if} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte index 4ff9ea386a..77d76c9609 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte @@ -176,7 +176,7 @@ Backups {#if !$licensing.backupsEnabled} - Pro plan + Premium {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 60f84049a3..38f5e0788b 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -378,7 +378,7 @@ {#if !$licensing.enforceableSSO} - Enterprise plan + Enterprise {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte index 2184280e89..ae22d310a1 100644 --- a/packages/builder/src/pages/builder/portal/settings/branding.svelte +++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte @@ -213,7 +213,7 @@ {/if} {#if isCloud && !brandingEnabled} - Pro + Premium {/if} diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte index 1a0bad7b11..6abc63811f 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte @@ -94,7 +94,7 @@ Groups {#if !$licensing.groupsEnabled} - Pro plan + Business {/if} From d223643e93776efa0fd06014ebb576af4996719f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:16:50 +0000 Subject: [PATCH 6/7] v2.5.6-alpha.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index ad2dcaee32..7ce908a52e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index aa558ba75c..291bed47dd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fe9787e689..04f18d2666 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.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5dd65a613c..43a4da9b4a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8858872699..553362761f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "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 2a9750fa47..f84545f649 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@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 28e78c05a0..50d266859a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a270fe9a55..8977131c1a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 561104bca1..741b909326 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/client": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/client": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 4f7c40b73f..6c2725577e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.37" + "@budibase/types": "2.5.6-alpha.38" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aeed9aca4c..6f80c7bdd6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "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 1b228362a9..0173d89b50 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 30e5a15432..086d340417 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bea67941fe3f9d4c859b296568ac09bc9bb0e58e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:18:15 +0000 Subject: [PATCH 7/7] Update pro version to 2.5.6-alpha.38 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 741b909326..c4c35239bf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/client": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/shared-core": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", diff --git a/packages/worker/package.json b/packages/worker/package.json index 086d340417..3acc367066 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index fff37f62e4..37947af3b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.36": - version "2.5.6-alpha.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" - integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== +"@budibase/pro@2.5.6-alpha.37": + version "2.5.6-alpha.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.37.tgz#3f4c7ba36bd01e2f7cbc56461c1249cc4098bc38" + integrity sha512-D0P4ePioE43yZ+CvLE5XdO84x6/UcF8oY3rHIhd8+bS1LW1yrzAf4kG9lyBRsNUPZoTMPmJeD9zqGRw67pdjzA== dependencies: - "@budibase/backend-core" "2.5.6-alpha.36" + "@budibase/backend-core" "2.5.6-alpha.37" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.36" + "@budibase/types" "2.5.6-alpha.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0"