From 3cba6109f6b18863ac98cd3a495bcc5f5d82a93f Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 30 Mar 2023 13:08:40 +0100 Subject: [PATCH 1/5] First for meta card title override behaviour --- .../src/api/controllers/static/templates/BudibaseApp.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte index 8a495aec93..5df821f453 100644 --- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte +++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte @@ -23,7 +23,7 @@ - + @@ -32,8 +32,8 @@ - - + + {title} From 38e6d617091bcc02d3bd41d8977b9a3cae75ba74 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 30 Mar 2023 13:40:59 +0100 Subject: [PATCH 2/5] Explictly check for google datasource configured (#10165) * Explictly check for google datasource configured * Unit tests for getGoogleDatasourceConfig * Update /api/global/configs/public test + lint --- packages/backend-core/src/configs/configs.ts | 2 +- .../src/configs/tests/configs.spec.ts | 74 ++++++++++++++++++- .../tests/utilities/structures/sso.ts | 14 +++- .../modals/GoogleDatasourceConfigModal.svelte | 2 +- .../builder/src/stores/portal/organisation.js | 2 + packages/types/src/api/web/global/configs.ts | 1 + .../src/api/controllers/global/configs.ts | 3 + .../api/routes/global/tests/configs.spec.ts | 1 + 8 files changed, 94 insertions(+), 5 deletions(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 305a074152..b461497747 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -162,7 +162,7 @@ export async function getGoogleConfig(): Promise< export async function getGoogleDatasourceConfig(): Promise< GoogleInnerConfig | undefined > { - if (!env.isDev() && !env.SELF_HOSTED) { + if (!env.SELF_HOSTED) { // always use the env vars in cloud return getDefaultGoogleConfig() } diff --git a/packages/backend-core/src/configs/tests/configs.spec.ts b/packages/backend-core/src/configs/tests/configs.spec.ts index 079f2ab681..45e56a2581 100644 --- a/packages/backend-core/src/configs/tests/configs.spec.ts +++ b/packages/backend-core/src/configs/tests/configs.spec.ts @@ -1,4 +1,9 @@ -import { DBTestConfiguration, generator, testEnv } from "../../../tests" +import { + DBTestConfiguration, + generator, + testEnv, + structures, +} from "../../../tests" import { ConfigType } from "@budibase/types" import env from "../../environment" import * as configs from "../configs" @@ -113,4 +118,71 @@ describe("configs", () => { }) }) }) + + describe("getGoogleDatasourceConfig", () => { + function setEnvVars() { + env.GOOGLE_CLIENT_SECRET = "test" + env.GOOGLE_CLIENT_ID = "test" + } + + function unsetEnvVars() { + env.GOOGLE_CLIENT_SECRET = undefined + env.GOOGLE_CLIENT_ID = undefined + } + + describe("cloud", () => { + beforeEach(() => { + testEnv.cloudHosted() + }) + + it("returns from env vars", async () => { + await config.doInTenant(async () => { + setEnvVars() + const config = await configs.getGoogleDatasourceConfig() + unsetEnvVars() + + expect(config).toEqual({ + activated: true, + clientID: "test", + clientSecret: "test", + }) + }) + }) + + it("returns undefined when no env vars are configured", async () => { + await config.doInTenant(async () => { + const config = await configs.getGoogleDatasourceConfig() + expect(config).toBeUndefined() + }) + }) + }) + + describe("self host", () => { + beforeEach(() => { + testEnv.selfHosted() + }) + + it("returns from config", async () => { + await config.doInTenant(async () => { + const googleDoc = structures.sso.googleConfigDoc() + await configs.save(googleDoc) + const config = await configs.getGoogleDatasourceConfig() + expect(config).toEqual(googleDoc.config) + }) + }) + + it("falls back to env vars when config is disabled", async () => { + await config.doInTenant(async () => { + setEnvVars() + const config = await configs.getGoogleDatasourceConfig() + unsetEnvVars() + expect(config).toEqual({ + activated: true, + clientID: "test", + clientSecret: "test", + }) + }) + }) + }) + }) }) diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts index 7413fa3c09..9da9c82223 100644 --- a/packages/backend-core/tests/utilities/structures/sso.ts +++ b/packages/backend-core/tests/utilities/structures/sso.ts @@ -1,4 +1,6 @@ import { + ConfigType, + GoogleConfig, GoogleInnerConfig, JwtClaims, OAuth2, @@ -10,10 +12,10 @@ import { User, } from "@budibase/types" import { generator } from "./generator" -import { uuid, email } from "./common" +import { email, uuid } from "./common" import * as shared from "./shared" -import _ from "lodash" import { user } from "./shared" +import _ from "lodash" export function OAuth(): OAuth2 { return { @@ -107,3 +109,11 @@ export function googleConfig(): GoogleInnerConfig { clientSecret: generator.string(), } } + +export function googleConfigDoc(): GoogleConfig { + return { + _id: "config_google", + type: ConfigType.GOOGLE, + config: googleConfig(), + } +} diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index c12ddab78d..de9ecce778 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -12,7 +12,7 @@ // kill the reference so the input isn't saved let datasource = cloneDeep(integration) - $: isGoogleConfigured = !!$organisation.google + $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured onMount(async () => { await organisation.init() diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js index 486b45642d..ed7dd36636 100644 --- a/packages/builder/src/stores/portal/organisation.js +++ b/packages/builder/src/stores/portal/organisation.js @@ -19,6 +19,7 @@ const DEFAULT_CONFIG = { company: "Budibase", oidc: undefined, google: undefined, + googleDatasourceConfigured: undefined, oidcCallbackUrl: "", googleCallbackUrl: "", isSSOEnforced: false, @@ -39,6 +40,7 @@ export function createOrganisationStore() { const storeConfig = _.cloneDeep(get(store)) delete storeConfig.oidc delete storeConfig.google + delete storeConfig.googleDatasourceConfigured delete storeConfig.oidcCallbackUrl delete storeConfig.googleCallbackUrl await API.saveConfig({ diff --git a/packages/types/src/api/web/global/configs.ts b/packages/types/src/api/web/global/configs.ts index 1476d13cee..b36d974904 100644 --- a/packages/types/src/api/web/global/configs.ts +++ b/packages/types/src/api/web/global/configs.ts @@ -5,6 +5,7 @@ import { SettingsConfig, SettingsInnerConfig } from "../../../documents" */ export interface PublicSettingsInnerConfig extends SettingsInnerConfig { google: boolean + googleDatasourceConfigured: boolean oidc: boolean oidcCallbackUrl: string googleCallbackUrl: string diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index ab63a06ab4..66804c3b9c 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -332,6 +332,8 @@ export async function publicSettings( // google const googleConfig = await configs.getGoogleConfig() + const googleDatasourceConfigured = + !!(await configs.getGoogleDatasourceConfig()) const preActivated = googleConfig && googleConfig.activated == null const google = preActivated || !!googleConfig?.activated const _googleCallbackUrl = await googleCallbackUrl(googleConfig) @@ -352,6 +354,7 @@ export async function publicSettings( ...config, ...branding, google, + googleDatasourceConfigured, oidc, isSSOEnforced, oidcCallbackUrl: _oidcCallbackUrl, diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts index 8c31adff2b..193dbf4a59 100644 --- a/packages/worker/src/api/routes/global/tests/configs.spec.ts +++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts @@ -290,6 +290,7 @@ describe("configs", () => { logoUrl: "", analyticsEnabled: false, google: false, + googleDatasourceConfigured: false, googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`, isSSOEnforced: false, oidc: false, From c60f9795bad371c973f2a83b4080acc7ce75f9ef Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 30 Mar 2023 12:48:33 +0000 Subject: [PATCH 3/5] v2.4.42-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index d89395274c..acde155ec8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9d391c0817..5c2005bee2 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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.4.42-alpha.2", + "@budibase/types": "2.4.42-alpha.3", "@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 13814f41ae..2edabae55b 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.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", + "@budibase/shared-core": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.3", "@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 628d89bced..989e422f2d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.42-alpha.2", - "@budibase/client": "2.4.42-alpha.2", - "@budibase/frontend-core": "2.4.42-alpha.2", - "@budibase/shared-core": "2.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", + "@budibase/bbui": "2.4.42-alpha.3", + "@budibase/client": "2.4.42-alpha.3", + "@budibase/frontend-core": "2.4.42-alpha.3", + "@budibase/shared-core": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.3", "@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 5c28ca8bb9..e0fa57a370 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", - "@budibase/types": "2.4.42-alpha.2", + "@budibase/backend-core": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/types": "2.4.42-alpha.3", "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 a7e9ce45af..76d6784706 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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.4.42-alpha.2", - "@budibase/frontend-core": "2.4.42-alpha.2", - "@budibase/shared-core": "2.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", - "@budibase/types": "2.4.42-alpha.2", + "@budibase/bbui": "2.4.42-alpha.3", + "@budibase/frontend-core": "2.4.42-alpha.3", + "@budibase/shared-core": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/types": "2.4.42-alpha.3", "@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 552d43cdd8..4e4963a836 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.42-alpha.2", - "@budibase/shared-core": "2.4.42-alpha.2", + "@budibase/bbui": "2.4.42-alpha.3", + "@budibase/shared-core": "2.4.42-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 03efbabf87..00caee7f7a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 7357430664..b88cc04cc7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.42-alpha.2", - "@budibase/client": "2.4.42-alpha.2", + "@budibase/backend-core": "2.4.42-alpha.3", + "@budibase/client": "2.4.42-alpha.3", "@budibase/pro": "2.4.42-alpha.2", - "@budibase/shared-core": "2.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", - "@budibase/types": "2.4.42-alpha.2", + "@budibase/shared-core": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/types": "2.4.42-alpha.3", "@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 bbb5fed920..919428489a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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.4.42-alpha.2" + "@budibase/types": "2.4.42-alpha.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ab12f05132..0154df339f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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 1746bff8c8..10c1d41bf1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "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 00c4e9b470..60810313d7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.42-alpha.2", + "version": "2.4.42-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.42-alpha.2", + "@budibase/backend-core": "2.4.42-alpha.3", "@budibase/pro": "2.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.2", - "@budibase/types": "2.4.42-alpha.2", + "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/types": "2.4.42-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 46edc6575a034aa91980a28375106dae0e17b1b4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 30 Mar 2023 12:59:11 +0000 Subject: [PATCH 4/5] v2.4.42-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ 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, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index acde155ec8..a6309f4420 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5c2005bee2..fd7a416125 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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.4.42-alpha.3", + "@budibase/types": "2.4.42-alpha.4", "@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 2edabae55b..e65f6eda98 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.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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.4.42-alpha.3", - "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/shared-core": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.4", "@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 989e422f2d..b0ee045824 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.42-alpha.3", - "@budibase/client": "2.4.42-alpha.3", - "@budibase/frontend-core": "2.4.42-alpha.3", - "@budibase/shared-core": "2.4.42-alpha.3", - "@budibase/string-templates": "2.4.42-alpha.3", + "@budibase/bbui": "2.4.42-alpha.4", + "@budibase/client": "2.4.42-alpha.4", + "@budibase/frontend-core": "2.4.42-alpha.4", + "@budibase/shared-core": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.4", "@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 e0fa57a370..bb0b78b81d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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.4.42-alpha.3", - "@budibase/string-templates": "2.4.42-alpha.3", - "@budibase/types": "2.4.42-alpha.3", + "@budibase/backend-core": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/types": "2.4.42-alpha.4", "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 76d6784706..2c57516046 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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.4.42-alpha.3", - "@budibase/frontend-core": "2.4.42-alpha.3", - "@budibase/shared-core": "2.4.42-alpha.3", - "@budibase/string-templates": "2.4.42-alpha.3", - "@budibase/types": "2.4.42-alpha.3", + "@budibase/bbui": "2.4.42-alpha.4", + "@budibase/frontend-core": "2.4.42-alpha.4", + "@budibase/shared-core": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/types": "2.4.42-alpha.4", "@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 4e4963a836..68f36b4bed 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.42-alpha.3", - "@budibase/shared-core": "2.4.42-alpha.3", + "@budibase/bbui": "2.4.42-alpha.4", + "@budibase/shared-core": "2.4.42-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 00caee7f7a..acbbe90da4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b88cc04cc7..03f48d5f39 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.42-alpha.3", - "@budibase/client": "2.4.42-alpha.3", + "@budibase/backend-core": "2.4.42-alpha.4", + "@budibase/client": "2.4.42-alpha.4", "@budibase/pro": "2.4.42-alpha.2", - "@budibase/shared-core": "2.4.42-alpha.3", - "@budibase/string-templates": "2.4.42-alpha.3", - "@budibase/types": "2.4.42-alpha.3", + "@budibase/shared-core": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/types": "2.4.42-alpha.4", "@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 919428489a..796b6a39b1 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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.4.42-alpha.3" + "@budibase/types": "2.4.42-alpha.4" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0154df339f..1517bd0e70 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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 10c1d41bf1..58fb202a86 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "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 60810313d7..0826f3ad29 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.42-alpha.3", + "version": "2.4.42-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.42-alpha.3", + "@budibase/backend-core": "2.4.42-alpha.4", "@budibase/pro": "2.4.42-alpha.2", - "@budibase/string-templates": "2.4.42-alpha.3", - "@budibase/types": "2.4.42-alpha.3", + "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/types": "2.4.42-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 61de98c959cc8e2d38ee3407b020250f27a7e4e6 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 30 Mar 2023 13:02:05 +0000 Subject: [PATCH 5/5] Update pro version to 2.4.42-alpha.4 --- 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 03f48d5f39..cff1a6c68f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.42-alpha.4", "@budibase/client": "2.4.42-alpha.4", - "@budibase/pro": "2.4.42-alpha.2", + "@budibase/pro": "2.4.42-alpha.4", "@budibase/shared-core": "2.4.42-alpha.4", "@budibase/string-templates": "2.4.42-alpha.4", "@budibase/types": "2.4.42-alpha.4", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 9c4623fc4f..0c2c983c83 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.2.tgz#b51c6fadb97f9f0a6d980a132d073e88c1c53bf8" - integrity sha512-lgEiSHHioKAOn34DT0mfZ31S/SvPxDn671Zjazc33QCwAEEtzPuU6/z3N/xkwDYc32fZkh1up5CuAce55UPU6w== +"@budibase/backend-core@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115" + integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.42-alpha.2" + "@budibase/types" "2.4.42-alpha.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.2.tgz#037bc36e8a64b35f31d5625f9a6c2687b2bc22b2" - integrity sha512-fpdBvSuz2mrNPxI9zDtBi1TFuGHw6xQNHJhNjwtJXFxDbPiIUsxitrQA4neZvYQ0BH/0PPSw5tmrE+2uemZcEw== +"@budibase/pro@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e" + integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg== dependencies: - "@budibase/backend-core" "2.4.42-alpha.2" + "@budibase/backend-core" "2.4.42-alpha.4" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.42-alpha.2" + "@budibase/types" "2.4.42-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.2.tgz#57eb9c224dd13c4a25cf3f6b1c440a1354fd38e0" - integrity sha512-LzmMywUeK82YHOXw9mhrh/PXryOn+JahB/zZWkcSjiIPF+VPEfhGK4ZSKV9jvNrVycAjcwzgEGbjrXfT289Qqg== +"@budibase/types@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6" + integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0826f3ad29..c370365a56 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.42-alpha.4", - "@budibase/pro": "2.4.42-alpha.2", + "@budibase/pro": "2.4.42-alpha.4", "@budibase/string-templates": "2.4.42-alpha.4", "@budibase/types": "2.4.42-alpha.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cab9aded4b..82a492003a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.2.tgz#b51c6fadb97f9f0a6d980a132d073e88c1c53bf8" - integrity sha512-lgEiSHHioKAOn34DT0mfZ31S/SvPxDn671Zjazc33QCwAEEtzPuU6/z3N/xkwDYc32fZkh1up5CuAce55UPU6w== +"@budibase/backend-core@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115" + integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.42-alpha.2" + "@budibase/types" "2.4.42-alpha.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.2.tgz#037bc36e8a64b35f31d5625f9a6c2687b2bc22b2" - integrity sha512-fpdBvSuz2mrNPxI9zDtBi1TFuGHw6xQNHJhNjwtJXFxDbPiIUsxitrQA4neZvYQ0BH/0PPSw5tmrE+2uemZcEw== +"@budibase/pro@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e" + integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg== dependencies: - "@budibase/backend-core" "2.4.42-alpha.2" + "@budibase/backend-core" "2.4.42-alpha.4" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.42-alpha.2" + "@budibase/types" "2.4.42-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.42-alpha.2": - version "2.4.42-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.2.tgz#57eb9c224dd13c4a25cf3f6b1c440a1354fd38e0" - integrity sha512-LzmMywUeK82YHOXw9mhrh/PXryOn+JahB/zZWkcSjiIPF+VPEfhGK4ZSKV9jvNrVycAjcwzgEGbjrXfT289Qqg== +"@budibase/types@2.4.42-alpha.4": + version "2.4.42-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6" + integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"