From c11df5d170da0e45487bf0f5d76910134725f893 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Aug 2022 12:28:39 +0100 Subject: [PATCH 01/18] Disable pageview event --- packages/builder/src/analytics/PosthogClient.js | 10 +--------- packages/builder/src/stores/portal/auth.js | 5 ----- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/builder/src/analytics/PosthogClient.js b/packages/builder/src/analytics/PosthogClient.js index c1e596358f..f541b69b13 100644 --- a/packages/builder/src/analytics/PosthogClient.js +++ b/packages/builder/src/analytics/PosthogClient.js @@ -1,7 +1,5 @@ import posthog from "posthog-js" import { Events } from "./constants" -import { get } from "svelte/store" -import { admin } from "../stores/portal" export default class PosthogClient { constructor(token) { @@ -11,15 +9,9 @@ export default class PosthogClient { init() { if (!this.token) return - // enable page views in cloud only - let capturePageViews = false - if (get(admin).cloud) { - capturePageViews = true - } - posthog.init(this.token, { autocapture: false, - capture_pageview: capturePageViews, + capture_pageview: false, }) posthog.set_config({ persistence: "cookie" }) diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index 9d2d9cf42e..8ac19ab785 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -139,11 +139,6 @@ export function createAuthStore() { await setOrganisation(tenantId) }, getSelf: async () => { - // for analytics, we need to make sure the environment has been loaded - // before setting the user - if (!get(admin).loaded) { - await admin.init() - } // We need to catch this locally as we never want this to fail, even // though normally we never want to swallow API errors at the store level. // We're either logged in or we aren't. From ce8df755d34b0204b097211b2bfdc03fd9aa1ee6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 11:36:29 +0000 Subject: [PATCH 02/18] v1.2.20 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index e079a0faee..6394390f18 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.19", + "version": "1.2.20", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b4ab38387e..0bc098a783 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.19", + "version": "1.2.20", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.19", + "@budibase/types": "^1.2.20", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3ae887a4f8..b18158ebf2 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.19", + "version": "1.2.20", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.19", + "@budibase/string-templates": "^1.2.20", "@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 a0ab10f029..63ec40bc28 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.19", + "version": "1.2.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.19", - "@budibase/client": "^1.2.19", - "@budibase/frontend-core": "^1.2.19", - "@budibase/string-templates": "^1.2.19", + "@budibase/bbui": "^1.2.20", + "@budibase/client": "^1.2.20", + "@budibase/frontend-core": "^1.2.20", + "@budibase/string-templates": "^1.2.20", "@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 6971439315..71fb57d161 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.19", + "version": "1.2.20", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 8aad954c28..ecaa128433 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.19", + "version": "1.2.20", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.19", - "@budibase/frontend-core": "^1.2.19", - "@budibase/string-templates": "^1.2.19", + "@budibase/bbui": "^1.2.20", + "@budibase/frontend-core": "^1.2.20", + "@budibase/string-templates": "^1.2.20", "@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 8b76bfae50..4adaa39b86 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.19", + "version": "1.2.20", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.19", + "@budibase/bbui": "^1.2.20", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 964f6bf285..b0f36b20bd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.19", + "version": "1.2.20", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.19", - "@budibase/client": "^1.2.19", + "@budibase/backend-core": "^1.2.20", + "@budibase/client": "^1.2.20", "@budibase/pro": "1.2.19", - "@budibase/string-templates": "^1.2.19", - "@budibase/types": "^1.2.19", + "@budibase/string-templates": "^1.2.20", + "@budibase/types": "^1.2.20", "@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 674f922f02..6577c570d0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.19", + "version": "1.2.20", "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 145329204c..d98e6a1ebd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.19", + "version": "1.2.20", "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 6305ebcbbd..6bbcbe902d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.19", + "version": "1.2.20", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.19", + "@budibase/backend-core": "^1.2.20", "@budibase/pro": "1.2.19", - "@budibase/string-templates": "^1.2.19", - "@budibase/types": "^1.2.19", + "@budibase/string-templates": "^1.2.20", + "@budibase/types": "^1.2.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 55d6c08ad3ef20b457f36223fe169cdc32c52b00 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 11:39:56 +0000 Subject: [PATCH 03/18] Update pro version to 1.2.20 --- 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 b0f36b20bd..61525cc0fb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.20", "@budibase/client": "^1.2.20", - "@budibase/pro": "1.2.19", + "@budibase/pro": "1.2.20", "@budibase/string-templates": "^1.2.20", "@budibase/types": "^1.2.20", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f933f54373..97bcf32bd0 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.19.tgz#8606f41eb02530ff84cc1cd1e3580dd952879103" - integrity sha512-WN1y7NDWhUWzwl4ek+8XejEncZckmYheWqWod1l0JI93apiRfhMfxxPxW1/9Hi473Ofd5LG5qZbFuu8BfZGSVQ== +"@budibase/backend-core@1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20.tgz#3399ea27eef141bb6c04af00e0e61d7fe558c00a" + integrity sha512-TQD4QHJMjVTJa+Y1uQpU4xTPT4M0EsgQOB/2WFPL2nbdNJHYIpdHwdk2bTttxASa4Qy+7AiHWqgB4Xah8dtkjw== dependencies: - "@budibase/types" "^1.2.19" + "@budibase/types" "^1.2.20" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.19.tgz#bfe9305e7dabe3ed239ad494838ba1fa7b4da37b" - integrity sha512-bdD/Y+zpeFe06bBxg6c2fX0C5xm4vwn3BLUelovLBr9CTyrkGEr40NkoEAligWkHZ5awSTiVhHaFkzFceJkjVQ== +"@budibase/pro@1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20.tgz#c01ff026371dbe90bbbf59ee1e0b4ae6b81b7f12" + integrity sha512-+sybFUdz1MbJBZKHc7YvwuLoE+B5NJxa/8SevPyFg+9gS7y3ijmY5Zr4R/mrH8JrVaN76M5g+/6CFoZb0nZPAg== dependencies: - "@budibase/backend-core" "1.2.19" - "@budibase/types" "1.2.19" + "@budibase/backend-core" "1.2.20" + "@budibase/types" "1.2.20" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.19", "@budibase/types@^1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.19.tgz#f2dade0f25f4fa55c3a7a99b3195f655db6c9cf5" - integrity sha512-+FKv29hJ3FXldmihdfn8omfEVp2WsB7nm7gbZPJs7mD+yP+AYGnuZinCYJ8PcX1CjoIgzcYE27OOQuxy+9cDmQ== +"@budibase/types@1.2.20", "@budibase/types@^1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20.tgz#8a51a1cdfcbd82ef3da4595a15111ad0a2f4eafc" + integrity sha512-5T6HrnIazIzsMywzKKitBcOkS3yUBxpxWn3b2+awhfouRua8LNIk1P6EBIgLNzGQvvtn5eRkiVlpn3yIKaWsgw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6bbcbe902d..37f52bb78f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.20", - "@budibase/pro": "1.2.19", + "@budibase/pro": "1.2.20", "@budibase/string-templates": "^1.2.20", "@budibase/types": "^1.2.20", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 53eed9581e..485a8a9550 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.19.tgz#8606f41eb02530ff84cc1cd1e3580dd952879103" - integrity sha512-WN1y7NDWhUWzwl4ek+8XejEncZckmYheWqWod1l0JI93apiRfhMfxxPxW1/9Hi473Ofd5LG5qZbFuu8BfZGSVQ== +"@budibase/backend-core@1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20.tgz#3399ea27eef141bb6c04af00e0e61d7fe558c00a" + integrity sha512-TQD4QHJMjVTJa+Y1uQpU4xTPT4M0EsgQOB/2WFPL2nbdNJHYIpdHwdk2bTttxASa4Qy+7AiHWqgB4Xah8dtkjw== dependencies: - "@budibase/types" "^1.2.19" + "@budibase/types" "^1.2.20" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.19.tgz#bfe9305e7dabe3ed239ad494838ba1fa7b4da37b" - integrity sha512-bdD/Y+zpeFe06bBxg6c2fX0C5xm4vwn3BLUelovLBr9CTyrkGEr40NkoEAligWkHZ5awSTiVhHaFkzFceJkjVQ== +"@budibase/pro@1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20.tgz#c01ff026371dbe90bbbf59ee1e0b4ae6b81b7f12" + integrity sha512-+sybFUdz1MbJBZKHc7YvwuLoE+B5NJxa/8SevPyFg+9gS7y3ijmY5Zr4R/mrH8JrVaN76M5g+/6CFoZb0nZPAg== dependencies: - "@budibase/backend-core" "1.2.19" - "@budibase/types" "1.2.19" + "@budibase/backend-core" "1.2.20" + "@budibase/types" "1.2.20" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.19", "@budibase/types@^1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.19.tgz#f2dade0f25f4fa55c3a7a99b3195f655db6c9cf5" - integrity sha512-+FKv29hJ3FXldmihdfn8omfEVp2WsB7nm7gbZPJs7mD+yP+AYGnuZinCYJ8PcX1CjoIgzcYE27OOQuxy+9cDmQ== +"@budibase/types@1.2.20", "@budibase/types@^1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20.tgz#8a51a1cdfcbd82ef3da4595a15111ad0a2f4eafc" + integrity sha512-5T6HrnIazIzsMywzKKitBcOkS3yUBxpxWn3b2+awhfouRua8LNIk1P6EBIgLNzGQvvtn5eRkiVlpn3yIKaWsgw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 73db927f8efd92a96f347a82525ba110b331b4b4 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Aug 2022 14:03:04 +0100 Subject: [PATCH 04/18] Update posthog token --- .github/workflows/release.yml | 2 +- charts/budibase/values.yaml | 2 +- hosting/single/Dockerfile | 2 +- packages/server/Dockerfile | 2 +- packages/worker/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 348b600f90..961082e1ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ on: env: # Posthog token used by ui at build time - POSTHOG_TOKEN: phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS + POSTHOG_TOKEN: phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 2734202fff..404e92c70f 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -91,7 +91,7 @@ globals: budibaseEnv: PRODUCTION enableAnalytics: "1" sentryDSN: "" - posthogToken: "phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS" + posthogToken: "phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU" logLevel: info selfHosted: "1" # set to 0 for budibase cloud environment, set to 1 for self-hosted setup multiTenancy: "0" # set to 0 to disable multiple orgs, set to 1 to enable multiple orgs diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index b5bf17adde..b631782ac2 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -37,7 +37,7 @@ ENV \ # CUSTOM_DOMAIN=budi001.custom.com \ DEPLOYMENT_ENVIRONMENT=docker \ MINIO_URL=http://localhost:9000 \ - POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS \ + POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU \ REDIS_URL=localhost:6379 \ SELF_HOSTED=1 \ TARGETBUILD=$TARGETBUILD \ diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 1d15dd501f..bd01b6f9ff 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -11,7 +11,7 @@ ENV PORT=4001 ENV COUCH_DB_URL=https://couchdb.budi.live:5984 ENV BUDIBASE_ENVIRONMENT=PRODUCTION ENV SERVICE=app-service -ENV POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS +ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU # copy files and install dependencies COPY . ./ diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile index 607352ad92..883a6c299b 100644 --- a/packages/worker/Dockerfile +++ b/packages/worker/Dockerfile @@ -22,6 +22,6 @@ EXPOSE 4001 ENV NODE_ENV=production ENV CLUSTER_MODE=${CLUSTER_MODE} ENV SERVICE=worker-service -ENV POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS +ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU CMD ["./docker_run.sh"] From d8ec947fddaeb52f3af17b3c09322ea70f48c373 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 8 Aug 2022 14:14:35 +0100 Subject: [PATCH 05/18] Updating self host release to fix issues with CLI build. --- .github/workflows/release-selfhost.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index fc2b7b0cca..b746c76bc3 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -3,6 +3,10 @@ name: Budibase Release Selfhost on: workflow_dispatch: +env: + BRANCH: ${{ github.event.pull_request.head.ref }} + BASE_BRANCH: ${{ github.event.pull_request.base.ref}} + jobs: release: runs-on: ubuntu-latest @@ -40,13 +44,15 @@ jobs: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} SELFHOST_TAG: latest - - - name: Build CLI executables + + - name: Install Pro + run: yarn install:pro $BRANCH $BASE_BRANCH + + - name: Bootstrap and build (CLI) run: | - pushd packages/cli yarn + yarn bootstrap yarn build - popd - name: Build OpenAPI spec run: | @@ -93,4 +99,4 @@ jobs: with: webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} content: "Self Host Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Self Host." - embed-title: ${{ env.RELEASE_VERSION }} \ No newline at end of file + embed-title: ${{ env.RELEASE_VERSION }} From 63d7c9060f669e5c80a905142ede4204838939f0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 13:19:20 +0000 Subject: [PATCH 06/18] v1.2.21 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 6394390f18..78417877fc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.20", + "version": "1.2.21", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0bc098a783..99acfc4419 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.20", + "version": "1.2.21", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.20", + "@budibase/types": "^1.2.21", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b18158ebf2..f504e2162a 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.20", + "version": "1.2.21", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.20", + "@budibase/string-templates": "^1.2.21", "@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 63ec40bc28..e42ec8ad43 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.20", + "version": "1.2.21", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.20", - "@budibase/client": "^1.2.20", - "@budibase/frontend-core": "^1.2.20", - "@budibase/string-templates": "^1.2.20", + "@budibase/bbui": "^1.2.21", + "@budibase/client": "^1.2.21", + "@budibase/frontend-core": "^1.2.21", + "@budibase/string-templates": "^1.2.21", "@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 71fb57d161..bea730c149 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.20", + "version": "1.2.21", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index ecaa128433..5e12f410e5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.20", + "version": "1.2.21", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.20", - "@budibase/frontend-core": "^1.2.20", - "@budibase/string-templates": "^1.2.20", + "@budibase/bbui": "^1.2.21", + "@budibase/frontend-core": "^1.2.21", + "@budibase/string-templates": "^1.2.21", "@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 4adaa39b86..091306d5b2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.20", + "version": "1.2.21", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.20", + "@budibase/bbui": "^1.2.21", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 61525cc0fb..2a1cac8305 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.20", + "version": "1.2.21", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.20", - "@budibase/client": "^1.2.20", + "@budibase/backend-core": "^1.2.21", + "@budibase/client": "^1.2.21", "@budibase/pro": "1.2.20", - "@budibase/string-templates": "^1.2.20", - "@budibase/types": "^1.2.20", + "@budibase/string-templates": "^1.2.21", + "@budibase/types": "^1.2.21", "@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 6577c570d0..e26f9847ac 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.20", + "version": "1.2.21", "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 d98e6a1ebd..89bf3d62f1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.20", + "version": "1.2.21", "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 37f52bb78f..0eb945d717 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.20", + "version": "1.2.21", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.20", + "@budibase/backend-core": "^1.2.21", "@budibase/pro": "1.2.20", - "@budibase/string-templates": "^1.2.20", - "@budibase/types": "^1.2.20", + "@budibase/string-templates": "^1.2.21", + "@budibase/types": "^1.2.21", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 966e130b032ae479af53d74cf94889d4e9f71008 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 13:23:08 +0000 Subject: [PATCH 07/18] Update pro version to 1.2.21 --- 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 2a1cac8305..3db8974d31 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.21", "@budibase/client": "^1.2.21", - "@budibase/pro": "1.2.20", + "@budibase/pro": "1.2.21", "@budibase/string-templates": "^1.2.21", "@budibase/types": "^1.2.21", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 97bcf32bd0..5b912ec249 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20.tgz#3399ea27eef141bb6c04af00e0e61d7fe558c00a" - integrity sha512-TQD4QHJMjVTJa+Y1uQpU4xTPT4M0EsgQOB/2WFPL2nbdNJHYIpdHwdk2bTttxASa4Qy+7AiHWqgB4Xah8dtkjw== +"@budibase/backend-core@1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.21.tgz#bb20e68d9cfff0d59332ec04f604266bf94bcf05" + integrity sha512-mIlY2rTvK8WujgQFUhetkvsBDPk1csH4ivdxuuJl/RdhZ4jF2OJ57D0inU5MJQzJvGsxsLsJa0EfCl5OZhxL8g== dependencies: - "@budibase/types" "^1.2.20" + "@budibase/types" "^1.2.21" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20.tgz#c01ff026371dbe90bbbf59ee1e0b4ae6b81b7f12" - integrity sha512-+sybFUdz1MbJBZKHc7YvwuLoE+B5NJxa/8SevPyFg+9gS7y3ijmY5Zr4R/mrH8JrVaN76M5g+/6CFoZb0nZPAg== +"@budibase/pro@1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.21.tgz#4065eb2862d0f52b4e71ce0326e94f64492d1065" + integrity sha512-UMOCQCmTshAY80L394/rXh2XKuqhIY7EaF0LmF1GnoZS9xsYkLGymr8ik015jcEIkyT7UAgGSKStzvsxBXFnHg== dependencies: - "@budibase/backend-core" "1.2.20" - "@budibase/types" "1.2.20" + "@budibase/backend-core" "1.2.21" + "@budibase/types" "1.2.21" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.20", "@budibase/types@^1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20.tgz#8a51a1cdfcbd82ef3da4595a15111ad0a2f4eafc" - integrity sha512-5T6HrnIazIzsMywzKKitBcOkS3yUBxpxWn3b2+awhfouRua8LNIk1P6EBIgLNzGQvvtn5eRkiVlpn3yIKaWsgw== +"@budibase/types@1.2.21", "@budibase/types@^1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.21.tgz#982b0802d61d51282b8f5aad2454e79ceb82f06a" + integrity sha512-Ellghdr34xFSdD6903UHn7fsjjSG5OCkwaAgPriRdOz/3VFm5nRjIhtK/WICsb4B+h2+tF/DuEPEzeuw/pcQRg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0eb945d717..c15db5dc0a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.21", - "@budibase/pro": "1.2.20", + "@budibase/pro": "1.2.21", "@budibase/string-templates": "^1.2.21", "@budibase/types": "^1.2.21", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 485a8a9550..1080a38d47 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20.tgz#3399ea27eef141bb6c04af00e0e61d7fe558c00a" - integrity sha512-TQD4QHJMjVTJa+Y1uQpU4xTPT4M0EsgQOB/2WFPL2nbdNJHYIpdHwdk2bTttxASa4Qy+7AiHWqgB4Xah8dtkjw== +"@budibase/backend-core@1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.21.tgz#bb20e68d9cfff0d59332ec04f604266bf94bcf05" + integrity sha512-mIlY2rTvK8WujgQFUhetkvsBDPk1csH4ivdxuuJl/RdhZ4jF2OJ57D0inU5MJQzJvGsxsLsJa0EfCl5OZhxL8g== dependencies: - "@budibase/types" "^1.2.20" + "@budibase/types" "^1.2.21" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20.tgz#c01ff026371dbe90bbbf59ee1e0b4ae6b81b7f12" - integrity sha512-+sybFUdz1MbJBZKHc7YvwuLoE+B5NJxa/8SevPyFg+9gS7y3ijmY5Zr4R/mrH8JrVaN76M5g+/6CFoZb0nZPAg== +"@budibase/pro@1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.21.tgz#4065eb2862d0f52b4e71ce0326e94f64492d1065" + integrity sha512-UMOCQCmTshAY80L394/rXh2XKuqhIY7EaF0LmF1GnoZS9xsYkLGymr8ik015jcEIkyT7UAgGSKStzvsxBXFnHg== dependencies: - "@budibase/backend-core" "1.2.20" - "@budibase/types" "1.2.20" + "@budibase/backend-core" "1.2.21" + "@budibase/types" "1.2.21" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.20", "@budibase/types@^1.2.20": - version "1.2.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20.tgz#8a51a1cdfcbd82ef3da4595a15111ad0a2f4eafc" - integrity sha512-5T6HrnIazIzsMywzKKitBcOkS3yUBxpxWn3b2+awhfouRua8LNIk1P6EBIgLNzGQvvtn5eRkiVlpn3yIKaWsgw== +"@budibase/types@1.2.21", "@budibase/types@^1.2.21": + version "1.2.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.21.tgz#982b0802d61d51282b8f5aad2454e79ceb82f06a" + integrity sha512-Ellghdr34xFSdD6903UHn7fsjjSG5OCkwaAgPriRdOz/3VFm5nRjIhtK/WICsb4B+h2+tF/DuEPEzeuw/pcQRg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 66e48550a58d7c83a658858e9c8bd6c34ddc323a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 14:13:10 +0000 Subject: [PATCH 08/18] v1.2.22 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 78417877fc..06cff7f79f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.21", + "version": "1.2.22", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 99acfc4419..d3861f24f4 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.21", + "version": "1.2.22", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.21", + "@budibase/types": "^1.2.22", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f504e2162a..eea42b3adc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.21", + "version": "1.2.22", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.21", + "@budibase/string-templates": "^1.2.22", "@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 e42ec8ad43..f6e801b65e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.21", + "version": "1.2.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.21", - "@budibase/client": "^1.2.21", - "@budibase/frontend-core": "^1.2.21", - "@budibase/string-templates": "^1.2.21", + "@budibase/bbui": "^1.2.22", + "@budibase/client": "^1.2.22", + "@budibase/frontend-core": "^1.2.22", + "@budibase/string-templates": "^1.2.22", "@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 bea730c149..50cf2fc956 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.21", + "version": "1.2.22", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 5e12f410e5..ffd4e9eb54 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.21", + "version": "1.2.22", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.21", - "@budibase/frontend-core": "^1.2.21", - "@budibase/string-templates": "^1.2.21", + "@budibase/bbui": "^1.2.22", + "@budibase/frontend-core": "^1.2.22", + "@budibase/string-templates": "^1.2.22", "@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 091306d5b2..a14244c663 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.21", + "version": "1.2.22", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.21", + "@budibase/bbui": "^1.2.22", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 3db8974d31..d18bbf3c59 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.21", + "version": "1.2.22", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.21", - "@budibase/client": "^1.2.21", + "@budibase/backend-core": "^1.2.22", + "@budibase/client": "^1.2.22", "@budibase/pro": "1.2.21", - "@budibase/string-templates": "^1.2.21", - "@budibase/types": "^1.2.21", + "@budibase/string-templates": "^1.2.22", + "@budibase/types": "^1.2.22", "@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 e26f9847ac..4a63e03dd6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.21", + "version": "1.2.22", "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 89bf3d62f1..54677a1899 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.21", + "version": "1.2.22", "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 c15db5dc0a..6221398fc9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.21", + "version": "1.2.22", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.21", + "@budibase/backend-core": "^1.2.22", "@budibase/pro": "1.2.21", - "@budibase/string-templates": "^1.2.21", - "@budibase/types": "^1.2.21", + "@budibase/string-templates": "^1.2.22", + "@budibase/types": "^1.2.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ea165ea36d4d703db6e183add835d6d3f1e45847 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 14:16:20 +0000 Subject: [PATCH 09/18] Update pro version to 1.2.22 --- 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 d18bbf3c59..8991a6c5f9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.22", "@budibase/client": "^1.2.22", - "@budibase/pro": "1.2.21", + "@budibase/pro": "1.2.22", "@budibase/string-templates": "^1.2.22", "@budibase/types": "^1.2.22", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5b912ec249..aeb373517e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.21.tgz#bb20e68d9cfff0d59332ec04f604266bf94bcf05" - integrity sha512-mIlY2rTvK8WujgQFUhetkvsBDPk1csH4ivdxuuJl/RdhZ4jF2OJ57D0inU5MJQzJvGsxsLsJa0EfCl5OZhxL8g== +"@budibase/backend-core@1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.22.tgz#afa0088af7819378f4ddd37803a3dec46b376e16" + integrity sha512-vFv7McaWfw6N4yyPwbu5gHgqVJ6/4xWfDG9Z8xDtCXd5CqUMIz3a8nc2CLaSsgOKDa44PqRxvsuQ75YkmEOCNQ== dependencies: - "@budibase/types" "^1.2.21" + "@budibase/types" "^1.2.22" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.21.tgz#4065eb2862d0f52b4e71ce0326e94f64492d1065" - integrity sha512-UMOCQCmTshAY80L394/rXh2XKuqhIY7EaF0LmF1GnoZS9xsYkLGymr8ik015jcEIkyT7UAgGSKStzvsxBXFnHg== +"@budibase/pro@1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.22.tgz#d30fac2f536ff2d0d0ee6c4fae79c1f703174935" + integrity sha512-WLEj0ObpA17hbE/tmFV0kIp28N0Dy3DbqiXIEyK3Zwfvn8rjaPFx2LQZ07O6MrNpLRGpuSpSW5xJrBPd8sBjfA== dependencies: - "@budibase/backend-core" "1.2.21" - "@budibase/types" "1.2.21" + "@budibase/backend-core" "1.2.22" + "@budibase/types" "1.2.22" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.21", "@budibase/types@^1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.21.tgz#982b0802d61d51282b8f5aad2454e79ceb82f06a" - integrity sha512-Ellghdr34xFSdD6903UHn7fsjjSG5OCkwaAgPriRdOz/3VFm5nRjIhtK/WICsb4B+h2+tF/DuEPEzeuw/pcQRg== +"@budibase/types@1.2.22", "@budibase/types@^1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.22.tgz#c4aaff01c4f17d2a6cc929492c3de6ad4b3041f7" + integrity sha512-DLbrgF8nlH+lIj6ENrf5pF8VxqT2yu3V2usnGyF3vOrrle3hpix5vBF+hvhZdFnaGylyrVqIWcaSZIxb2HrkbA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6221398fc9..19bb820260 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.22", - "@budibase/pro": "1.2.21", + "@budibase/pro": "1.2.22", "@budibase/string-templates": "^1.2.22", "@budibase/types": "^1.2.22", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 1080a38d47..859a244a11 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.21.tgz#bb20e68d9cfff0d59332ec04f604266bf94bcf05" - integrity sha512-mIlY2rTvK8WujgQFUhetkvsBDPk1csH4ivdxuuJl/RdhZ4jF2OJ57D0inU5MJQzJvGsxsLsJa0EfCl5OZhxL8g== +"@budibase/backend-core@1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.22.tgz#afa0088af7819378f4ddd37803a3dec46b376e16" + integrity sha512-vFv7McaWfw6N4yyPwbu5gHgqVJ6/4xWfDG9Z8xDtCXd5CqUMIz3a8nc2CLaSsgOKDa44PqRxvsuQ75YkmEOCNQ== dependencies: - "@budibase/types" "^1.2.21" + "@budibase/types" "^1.2.22" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.21.tgz#4065eb2862d0f52b4e71ce0326e94f64492d1065" - integrity sha512-UMOCQCmTshAY80L394/rXh2XKuqhIY7EaF0LmF1GnoZS9xsYkLGymr8ik015jcEIkyT7UAgGSKStzvsxBXFnHg== +"@budibase/pro@1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.22.tgz#d30fac2f536ff2d0d0ee6c4fae79c1f703174935" + integrity sha512-WLEj0ObpA17hbE/tmFV0kIp28N0Dy3DbqiXIEyK3Zwfvn8rjaPFx2LQZ07O6MrNpLRGpuSpSW5xJrBPd8sBjfA== dependencies: - "@budibase/backend-core" "1.2.21" - "@budibase/types" "1.2.21" + "@budibase/backend-core" "1.2.22" + "@budibase/types" "1.2.22" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.21", "@budibase/types@^1.2.21": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.21.tgz#982b0802d61d51282b8f5aad2454e79ceb82f06a" - integrity sha512-Ellghdr34xFSdD6903UHn7fsjjSG5OCkwaAgPriRdOz/3VFm5nRjIhtK/WICsb4B+h2+tF/DuEPEzeuw/pcQRg== +"@budibase/types@1.2.22", "@budibase/types@^1.2.22": + version "1.2.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.22.tgz#c4aaff01c4f17d2a6cc929492c3de6ad4b3041f7" + integrity sha512-DLbrgF8nlH+lIj6ENrf5pF8VxqT2yu3V2usnGyF3vOrrle3hpix5vBF+hvhZdFnaGylyrVqIWcaSZIxb2HrkbA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From ae342910c20ff522bc488e4eae1950299692fa32 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Aug 2022 15:44:29 +0100 Subject: [PATCH 10/18] Rate limit served:X events --- packages/backend-core/src/cache/generic.js | 1 + .../events/processors/AnalyticsProcessor.ts | 2 +- .../{ => posthog}/PosthogProcessor.ts | 13 ++- .../src/events/processors/posthog/index.ts | 2 + .../events/processors/posthog/rateLimiting.ts | 95 ++++++++++++++++++ .../posthog/tests/PosthogProcessor.spec.ts | 96 +++++++++++++++++++ .../processors/tests/PosthogProcessor.spec.ts | 40 -------- 7 files changed, 204 insertions(+), 45 deletions(-) rename packages/backend-core/src/events/processors/{ => posthog}/PosthogProcessor.ts (89%) create mode 100644 packages/backend-core/src/events/processors/posthog/index.ts create mode 100644 packages/backend-core/src/events/processors/posthog/rateLimiting.ts create mode 100644 packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts delete mode 100644 packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts diff --git a/packages/backend-core/src/cache/generic.js b/packages/backend-core/src/cache/generic.js index e2f3915339..26ef0c6bb0 100644 --- a/packages/backend-core/src/cache/generic.js +++ b/packages/backend-core/src/cache/generic.js @@ -9,6 +9,7 @@ exports.CacheKeys = { UNIQUE_TENANT_ID: "uniqueTenantId", EVENTS: "events", BACKFILL_METADATA: "backfillMetadata", + EVENTS_RATE_LIMIT: "eventsRateLimit", } exports.TTL = { diff --git a/packages/backend-core/src/events/processors/AnalyticsProcessor.ts b/packages/backend-core/src/events/processors/AnalyticsProcessor.ts index 2ee7a02afa..602407400e 100644 --- a/packages/backend-core/src/events/processors/AnalyticsProcessor.ts +++ b/packages/backend-core/src/events/processors/AnalyticsProcessor.ts @@ -2,7 +2,7 @@ import { Event, Identity, Group, IdentityType } from "@budibase/types" import { EventProcessor } from "./types" import env from "../../environment" import * as analytics from "../analytics" -import PosthogProcessor from "./PosthogProcessor" +import PosthogProcessor from "./posthog" /** * Events that are always captured. diff --git a/packages/backend-core/src/events/processors/PosthogProcessor.ts b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts similarity index 89% rename from packages/backend-core/src/events/processors/PosthogProcessor.ts rename to packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts index 9d68d3919a..593e5ff082 100644 --- a/packages/backend-core/src/events/processors/PosthogProcessor.ts +++ b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts @@ -1,9 +1,10 @@ import PostHog from "posthog-node" import { Event, Identity, Group, BaseEvent } from "@budibase/types" -import { EventProcessor } from "./types" -import env from "../../environment" -import * as context from "../../context" -const pkg = require("../../../package.json") +import { EventProcessor } from "../types" +import env from "../../../environment" +import * as context from "../../../context" +import * as rateLimiting from "./rateLimiting" +const pkg = require("../../../../package.json") const EXCLUDED_EVENTS: Event[] = [ Event.USER_UPDATED, @@ -42,6 +43,10 @@ export default class PosthogProcessor implements EventProcessor { return } + if (await rateLimiting.limited(event)) { + return + } + properties.version = pkg.version properties.service = env.SERVICE properties.environment = identity.environment diff --git a/packages/backend-core/src/events/processors/posthog/index.ts b/packages/backend-core/src/events/processors/posthog/index.ts new file mode 100644 index 0000000000..dceb10d2cd --- /dev/null +++ b/packages/backend-core/src/events/processors/posthog/index.ts @@ -0,0 +1,2 @@ +import PosthogProcessor from "./PosthogProcessor" +export default PosthogProcessor diff --git a/packages/backend-core/src/events/processors/posthog/rateLimiting.ts b/packages/backend-core/src/events/processors/posthog/rateLimiting.ts new file mode 100644 index 0000000000..f61d34d0a4 --- /dev/null +++ b/packages/backend-core/src/events/processors/posthog/rateLimiting.ts @@ -0,0 +1,95 @@ +import { Event } from "@budibase/types" +import { CacheKeys, TTL } from "../../../cache/generic" +import * as cache from "../../../cache/generic" + +type RateLimitedEvent = + | Event.SERVED_BUILDER + | Event.SERVED_APP_PREVIEW + | Event.SERVED_APP + +const isRateLimited = (event: Event): event is RateLimitedEvent => { + return ( + event === Event.SERVED_BUILDER || + event === Event.SERVED_APP_PREVIEW || + event === Event.SERVED_APP + ) +} + +interface EventProperties { + timestamp: number +} + +enum RateLimit { + CALENDAR_DAY = "calendarDay", +} + +const RATE_LIMITS = { + [Event.SERVED_APP]: RateLimit.CALENDAR_DAY, + [Event.SERVED_APP_PREVIEW]: RateLimit.CALENDAR_DAY, + [Event.SERVED_BUILDER]: RateLimit.CALENDAR_DAY, +} + +/** + * Check if this event should be sent right now + * Return false to signal the event SHOULD be sent + * Return true to signal the event should NOT be sent + */ +export const limited = async (event: Event): Promise => { + // not a rate limited event -- send + if (!isRateLimited(event)) { + return false + } + + const cachedEvent = (await readEvent(event)) as EventProperties + if (cachedEvent) { + const timestamp = new Date(cachedEvent.timestamp) + const limit = RATE_LIMITS[event] + switch (limit) { + case RateLimit.CALENDAR_DAY: { + // get midnight at the start of the next day for the timestamp + timestamp.setDate(timestamp.getDate() + 1) + timestamp.setHours(0, 0, 0, 0) + + // if we have passed the threshold into the next day + if (Date.now() > timestamp.getTime()) { + // update the timestamp in the event -- send + await recordEvent(event, { timestamp: Date.now() }) + return false + } else { + // still within the limited period -- don't send + return true + } + } + } + } else { + // no event present i.e. expired -- send + await recordEvent(event, { timestamp: Date.now() }) + return false + } +} + +const eventKey = (event: RateLimitedEvent) => { + return `${CacheKeys.EVENTS_RATE_LIMIT}:${event}` +} + +const readEvent = async (event: RateLimitedEvent) => { + const key = eventKey(event) + return cache.get(key) +} + +const recordEvent = async ( + event: RateLimitedEvent, + properties: EventProperties +) => { + const key = `${CacheKeys.EVENTS_RATE_LIMIT}:${event}` + + const limit = RATE_LIMITS[event] + let ttl + switch (limit) { + case RateLimit.CALENDAR_DAY: { + ttl = TTL.ONE_DAY + } + } + + await cache.store(key, properties, ttl) +} diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts new file mode 100644 index 0000000000..7ddee7279b --- /dev/null +++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts @@ -0,0 +1,96 @@ +import PosthogProcessor from "../PosthogProcessor" +import { Event, IdentityType, Hosting } from "@budibase/types" +const tk = require("timekeeper") +import * as Cache from "../../../../cache/generic" + +const newIdentity = () => { + return { + id: "test", + type: IdentityType.USER, + hosting: Hosting.SELF, + environment: "test", + } +} + +describe("PosthogProcessor", () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + describe("processEvent", () => { + it("processes event", async () => { + const processor = new PosthogProcessor("test") + + const identity = newIdentity() + const properties = {} + + await processor.processEvent(Event.APP_CREATED, identity, properties) + + expect(processor.posthog.capture).toHaveBeenCalledTimes(1) + }) + + it("honours exclusions", async () => { + const processor = new PosthogProcessor("test") + + const identity = newIdentity() + const properties = {} + + await processor.processEvent(Event.AUTH_SSO_UPDATED, identity, properties) + expect(processor.posthog.capture).toHaveBeenCalledTimes(0) + }) + + describe("rate limiting", () => { + it("sends daily event once in same day", async () => { + const processor = new PosthogProcessor("test") + const identity = newIdentity() + const properties = {} + + tk.freeze(new Date(2022, 0, 1, 14, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + // go forward one hour + tk.freeze(new Date(2022, 0, 1, 15, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + + expect(processor.posthog.capture).toHaveBeenCalledTimes(1) + }) + + it("sends daily event once per unique day", async () => { + const processor = new PosthogProcessor("test") + const identity = newIdentity() + const properties = {} + + tk.freeze(new Date(2022, 0, 1, 14, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + // go forward into next day + tk.freeze(new Date(2022, 0, 2, 9, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + // go forward into next day + tk.freeze(new Date(2022, 0, 3, 5, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + // go forward one hour + tk.freeze(new Date(2022, 0, 3, 6, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + + expect(processor.posthog.capture).toHaveBeenCalledTimes(4) + }) + + it("sends event again after cache expires", async () => { + const processor = new PosthogProcessor("test") + const identity = newIdentity() + const properties = {} + + tk.freeze(new Date(2022, 0, 1, 14, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + + await Cache.bustCache( + `${Cache.CacheKeys.EVENTS_RATE_LIMIT}:${Event.SERVED_BUILDER}` + ) + + tk.freeze(new Date(2022, 0, 1, 14, 0)) + await processor.processEvent(Event.SERVED_BUILDER, identity, properties) + + expect(processor.posthog.capture).toHaveBeenCalledTimes(2) + }) + }) + }) +}) diff --git a/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts deleted file mode 100644 index 4a6d55b272..0000000000 --- a/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import PosthogProcessor from "../PosthogProcessor" -import { Event, IdentityType, Hosting } from "@budibase/types" - -const newIdentity = () => { - return { - id: "test", - type: IdentityType.USER, - hosting: Hosting.SELF, - environment: "test", - } -} - -describe("PosthogProcessor", () => { - beforeEach(() => { - jest.clearAllMocks() - }) - - describe("processEvent", () => { - it("processes event", () => { - const processor = new PosthogProcessor("test") - - const identity = newIdentity() - const properties = {} - - processor.processEvent(Event.APP_CREATED, identity, properties) - - expect(processor.posthog.capture).toHaveBeenCalledTimes(1) - }) - - it("honours exclusions", () => { - const processor = new PosthogProcessor("test") - - const identity = newIdentity() - const properties = {} - - processor.processEvent(Event.AUTH_SSO_UPDATED, identity, properties) - expect(processor.posthog.capture).toHaveBeenCalledTimes(0) - }) - }) -}) From b093b18e6a678bef869d6303058e5dda4c267535 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Aug 2022 16:12:38 +0100 Subject: [PATCH 11/18] Support per app events --- .../events/processors/posthog/rateLimiting.ts | 14 ++++- .../posthog/tests/PosthogProcessor.spec.ts | 59 +++++++++++++++++-- 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/events/processors/posthog/rateLimiting.ts b/packages/backend-core/src/events/processors/posthog/rateLimiting.ts index f61d34d0a4..e2a02eb28e 100644 --- a/packages/backend-core/src/events/processors/posthog/rateLimiting.ts +++ b/packages/backend-core/src/events/processors/posthog/rateLimiting.ts @@ -1,6 +1,7 @@ import { Event } from "@budibase/types" import { CacheKeys, TTL } from "../../../cache/generic" import * as cache from "../../../cache/generic" +import * as context from "../../../context" type RateLimitedEvent = | Event.SERVED_BUILDER @@ -15,6 +16,10 @@ const isRateLimited = (event: Event): event is RateLimitedEvent => { ) } +const isPerApp = (event: RateLimitedEvent) => { + return event === Event.SERVED_APP_PREVIEW || event === Event.SERVED_APP +} + interface EventProperties { timestamp: number } @@ -69,7 +74,11 @@ export const limited = async (event: Event): Promise => { } const eventKey = (event: RateLimitedEvent) => { - return `${CacheKeys.EVENTS_RATE_LIMIT}:${event}` + let key = `${CacheKeys.EVENTS_RATE_LIMIT}:${event}` + if (isPerApp(event)) { + key = key + context.getAppId() + } + return key } const readEvent = async (event: RateLimitedEvent) => { @@ -81,8 +90,7 @@ const recordEvent = async ( event: RateLimitedEvent, properties: EventProperties ) => { - const key = `${CacheKeys.EVENTS_RATE_LIMIT}:${event}` - + const key = eventKey(event) const limit = RATE_LIMITS[event] let ttl switch (limit) { diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts index 7ddee7279b..d14b697966 100644 --- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts +++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts @@ -1,7 +1,10 @@ +import "../../../../../tests/utilities/TestConfiguration" import PosthogProcessor from "../PosthogProcessor" import { Event, IdentityType, Hosting } from "@budibase/types" const tk = require("timekeeper") -import * as Cache from "../../../../cache/generic" +import * as cache from "../../../../cache/generic" +import { CacheKeys } from "../../../../cache/generic" +import * as context from "../../../../context" const newIdentity = () => { return { @@ -13,8 +16,11 @@ const newIdentity = () => { } describe("PosthogProcessor", () => { - beforeEach(() => { + beforeEach(async () => { jest.clearAllMocks() + await cache.bustCache( + `${CacheKeys.EVENTS_RATE_LIMIT}:${Event.SERVED_BUILDER}` + ) }) describe("processEvent", () => { @@ -71,7 +77,7 @@ describe("PosthogProcessor", () => { tk.freeze(new Date(2022, 0, 3, 6, 0)) await processor.processEvent(Event.SERVED_BUILDER, identity, properties) - expect(processor.posthog.capture).toHaveBeenCalledTimes(4) + expect(processor.posthog.capture).toHaveBeenCalledTimes(3) }) it("sends event again after cache expires", async () => { @@ -82,8 +88,8 @@ describe("PosthogProcessor", () => { tk.freeze(new Date(2022, 0, 1, 14, 0)) await processor.processEvent(Event.SERVED_BUILDER, identity, properties) - await Cache.bustCache( - `${Cache.CacheKeys.EVENTS_RATE_LIMIT}:${Event.SERVED_BUILDER}` + await cache.bustCache( + `${CacheKeys.EVENTS_RATE_LIMIT}:${Event.SERVED_BUILDER}` ) tk.freeze(new Date(2022, 0, 1, 14, 0)) @@ -91,6 +97,49 @@ describe("PosthogProcessor", () => { expect(processor.posthog.capture).toHaveBeenCalledTimes(2) }) + + it("sends per app events once per day per app", async () => { + const processor = new PosthogProcessor("test") + const identity = newIdentity() + const properties = {} + + const runAppEvents = async (appId: string) => { + await context.doInAppContext(appId, async () => { + tk.freeze(new Date(2022, 0, 1, 14, 0)) + await processor.processEvent(Event.SERVED_APP, identity, properties) + await processor.processEvent( + Event.SERVED_APP_PREVIEW, + identity, + properties + ) + + // go forward one hour - should be ignored + tk.freeze(new Date(2022, 0, 1, 15, 0)) + await processor.processEvent(Event.SERVED_APP, identity, properties) + await processor.processEvent( + Event.SERVED_APP_PREVIEW, + identity, + properties + ) + + // go forward into next day + tk.freeze(new Date(2022, 0, 2, 9, 0)) + + await processor.processEvent(Event.SERVED_APP, identity, properties) + await processor.processEvent( + Event.SERVED_APP_PREVIEW, + identity, + properties + ) + }) + } + + await runAppEvents("app_1") + expect(processor.posthog.capture).toHaveBeenCalledTimes(4) + + await runAppEvents("app_2") + expect(processor.posthog.capture).toHaveBeenCalledTimes(8) + }) }) }) }) From 54355697a9b81aaaf8e58f97169f9938ce4d84fd Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 15:55:00 +0000 Subject: [PATCH 12/18] v1.2.23 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 06cff7f79f..5cbd682efc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.22", + "version": "1.2.23", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d3861f24f4..23c2325c19 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.22", + "version": "1.2.23", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.22", + "@budibase/types": "^1.2.23", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index eea42b3adc..115f0c3fda 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.22", + "version": "1.2.23", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.22", + "@budibase/string-templates": "^1.2.23", "@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 f6e801b65e..e39ab4795b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.22", + "version": "1.2.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.22", - "@budibase/client": "^1.2.22", - "@budibase/frontend-core": "^1.2.22", - "@budibase/string-templates": "^1.2.22", + "@budibase/bbui": "^1.2.23", + "@budibase/client": "^1.2.23", + "@budibase/frontend-core": "^1.2.23", + "@budibase/string-templates": "^1.2.23", "@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 50cf2fc956..b40e25e059 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.22", + "version": "1.2.23", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index ffd4e9eb54..8864569ffa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.22", + "version": "1.2.23", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.22", - "@budibase/frontend-core": "^1.2.22", - "@budibase/string-templates": "^1.2.22", + "@budibase/bbui": "^1.2.23", + "@budibase/frontend-core": "^1.2.23", + "@budibase/string-templates": "^1.2.23", "@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 a14244c663..dd0e2c3172 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.22", + "version": "1.2.23", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.22", + "@budibase/bbui": "^1.2.23", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 8991a6c5f9..adbf4741f8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.22", + "version": "1.2.23", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.22", - "@budibase/client": "^1.2.22", + "@budibase/backend-core": "^1.2.23", + "@budibase/client": "^1.2.23", "@budibase/pro": "1.2.22", - "@budibase/string-templates": "^1.2.22", - "@budibase/types": "^1.2.22", + "@budibase/string-templates": "^1.2.23", + "@budibase/types": "^1.2.23", "@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 4a63e03dd6..a6413af7cf 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.22", + "version": "1.2.23", "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 54677a1899..bb10735358 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.22", + "version": "1.2.23", "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 19bb820260..a8ead8be7f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.22", + "version": "1.2.23", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.22", + "@budibase/backend-core": "^1.2.23", "@budibase/pro": "1.2.22", - "@budibase/string-templates": "^1.2.22", - "@budibase/types": "^1.2.22", + "@budibase/string-templates": "^1.2.23", + "@budibase/types": "^1.2.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8f4fba0e701257a17bc97a5af5159147dc1d54ba Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 15:57:56 +0000 Subject: [PATCH 13/18] Update pro version to 1.2.23 --- 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 adbf4741f8..3d39dccd65 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.23", "@budibase/client": "^1.2.23", - "@budibase/pro": "1.2.22", + "@budibase/pro": "1.2.23", "@budibase/string-templates": "^1.2.23", "@budibase/types": "^1.2.23", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index aeb373517e..793e45d679 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.22.tgz#afa0088af7819378f4ddd37803a3dec46b376e16" - integrity sha512-vFv7McaWfw6N4yyPwbu5gHgqVJ6/4xWfDG9Z8xDtCXd5CqUMIz3a8nc2CLaSsgOKDa44PqRxvsuQ75YkmEOCNQ== +"@budibase/backend-core@1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.23.tgz#5f5d55aa509c354d124439fbb6d74e07df436677" + integrity sha512-oz2Ki/YKbPw0GUUBwavtH+NQwp4pFlpWwGiU2ELHsmhB22oDzOQGJQajl75jB01ilkMpX5+JIb0Si4gUXLtNuw== dependencies: - "@budibase/types" "^1.2.22" + "@budibase/types" "^1.2.23" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.22.tgz#d30fac2f536ff2d0d0ee6c4fae79c1f703174935" - integrity sha512-WLEj0ObpA17hbE/tmFV0kIp28N0Dy3DbqiXIEyK3Zwfvn8rjaPFx2LQZ07O6MrNpLRGpuSpSW5xJrBPd8sBjfA== +"@budibase/pro@1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.23.tgz#8075742e98a2f3b8d8665f0d180d02e5bff91358" + integrity sha512-Il59rgAM/cfUMEkyvTmQ3lpValXHpJYQHa2k+MwITZK3lTOocczG+qgar4B8Nh9lftQYeD0Sl+si/vMX3adhHw== dependencies: - "@budibase/backend-core" "1.2.22" - "@budibase/types" "1.2.22" + "@budibase/backend-core" "1.2.23" + "@budibase/types" "1.2.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.22", "@budibase/types@^1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.22.tgz#c4aaff01c4f17d2a6cc929492c3de6ad4b3041f7" - integrity sha512-DLbrgF8nlH+lIj6ENrf5pF8VxqT2yu3V2usnGyF3vOrrle3hpix5vBF+hvhZdFnaGylyrVqIWcaSZIxb2HrkbA== +"@budibase/types@1.2.23", "@budibase/types@^1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.23.tgz#655ed76f285889782e911ed2853ae18a71546b51" + integrity sha512-IOPntG4kACQuhoZ2IOaSPMXDt7qwG5JXerp7nWpLzRU9713vCQs4xw5arrXia8Ip6gROZNqpwpirTf6ZHD2Jnw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a8ead8be7f..bb59d09cdd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.23", - "@budibase/pro": "1.2.22", + "@budibase/pro": "1.2.23", "@budibase/string-templates": "^1.2.23", "@budibase/types": "^1.2.23", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 859a244a11..4673da13bb 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.22.tgz#afa0088af7819378f4ddd37803a3dec46b376e16" - integrity sha512-vFv7McaWfw6N4yyPwbu5gHgqVJ6/4xWfDG9Z8xDtCXd5CqUMIz3a8nc2CLaSsgOKDa44PqRxvsuQ75YkmEOCNQ== +"@budibase/backend-core@1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.23.tgz#5f5d55aa509c354d124439fbb6d74e07df436677" + integrity sha512-oz2Ki/YKbPw0GUUBwavtH+NQwp4pFlpWwGiU2ELHsmhB22oDzOQGJQajl75jB01ilkMpX5+JIb0Si4gUXLtNuw== dependencies: - "@budibase/types" "^1.2.22" + "@budibase/types" "^1.2.23" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.22.tgz#d30fac2f536ff2d0d0ee6c4fae79c1f703174935" - integrity sha512-WLEj0ObpA17hbE/tmFV0kIp28N0Dy3DbqiXIEyK3Zwfvn8rjaPFx2LQZ07O6MrNpLRGpuSpSW5xJrBPd8sBjfA== +"@budibase/pro@1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.23.tgz#8075742e98a2f3b8d8665f0d180d02e5bff91358" + integrity sha512-Il59rgAM/cfUMEkyvTmQ3lpValXHpJYQHa2k+MwITZK3lTOocczG+qgar4B8Nh9lftQYeD0Sl+si/vMX3adhHw== dependencies: - "@budibase/backend-core" "1.2.22" - "@budibase/types" "1.2.22" + "@budibase/backend-core" "1.2.23" + "@budibase/types" "1.2.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.22", "@budibase/types@^1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.22.tgz#c4aaff01c4f17d2a6cc929492c3de6ad4b3041f7" - integrity sha512-DLbrgF8nlH+lIj6ENrf5pF8VxqT2yu3V2usnGyF3vOrrle3hpix5vBF+hvhZdFnaGylyrVqIWcaSZIxb2HrkbA== +"@budibase/types@1.2.23", "@budibase/types@^1.2.23": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.23.tgz#655ed76f285889782e911ed2853ae18a71546b51" + integrity sha512-IOPntG4kACQuhoZ2IOaSPMXDt7qwG5JXerp7nWpLzRU9713vCQs4xw5arrXia8Ip6gROZNqpwpirTf6ZHD2Jnw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 62df76b14e476fe5d3fe6546afd77cae548455e5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 16:50:33 +0000 Subject: [PATCH 14/18] v1.2.24 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 5cbd682efc..d88bca1b41 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.23", + "version": "1.2.24", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 23c2325c19..eb64fae8cd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.23", + "version": "1.2.24", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.23", + "@budibase/types": "^1.2.24", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 115f0c3fda..5a4ef0974a 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.23", + "version": "1.2.24", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.23", + "@budibase/string-templates": "^1.2.24", "@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 e39ab4795b..a942b57da1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.23", + "version": "1.2.24", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.23", - "@budibase/client": "^1.2.23", - "@budibase/frontend-core": "^1.2.23", - "@budibase/string-templates": "^1.2.23", + "@budibase/bbui": "^1.2.24", + "@budibase/client": "^1.2.24", + "@budibase/frontend-core": "^1.2.24", + "@budibase/string-templates": "^1.2.24", "@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 b40e25e059..898d9ca46d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.23", + "version": "1.2.24", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 8864569ffa..b7108cc96f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.23", + "version": "1.2.24", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.23", - "@budibase/frontend-core": "^1.2.23", - "@budibase/string-templates": "^1.2.23", + "@budibase/bbui": "^1.2.24", + "@budibase/frontend-core": "^1.2.24", + "@budibase/string-templates": "^1.2.24", "@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 dd0e2c3172..f3ab4745b1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.23", + "version": "1.2.24", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.23", + "@budibase/bbui": "^1.2.24", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 3d39dccd65..b104ef160b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.23", + "version": "1.2.24", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.23", - "@budibase/client": "^1.2.23", + "@budibase/backend-core": "^1.2.24", + "@budibase/client": "^1.2.24", "@budibase/pro": "1.2.23", - "@budibase/string-templates": "^1.2.23", - "@budibase/types": "^1.2.23", + "@budibase/string-templates": "^1.2.24", + "@budibase/types": "^1.2.24", "@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 a6413af7cf..501335430d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.23", + "version": "1.2.24", "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 bb10735358..dc05c2943b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.23", + "version": "1.2.24", "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 bb59d09cdd..73a13dcd92 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.23", + "version": "1.2.24", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.23", + "@budibase/backend-core": "^1.2.24", "@budibase/pro": "1.2.23", - "@budibase/string-templates": "^1.2.23", - "@budibase/types": "^1.2.23", + "@budibase/string-templates": "^1.2.24", + "@budibase/types": "^1.2.24", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 971dcf41295766e6454ca5961ae3d132ed2d8a45 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 Aug 2022 16:53:33 +0000 Subject: [PATCH 15/18] Update pro version to 1.2.24 --- 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 b104ef160b..868d933440 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.24", "@budibase/client": "^1.2.24", - "@budibase/pro": "1.2.23", + "@budibase/pro": "1.2.24", "@budibase/string-templates": "^1.2.24", "@budibase/types": "^1.2.24", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 793e45d679..96efcc899b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.23.tgz#5f5d55aa509c354d124439fbb6d74e07df436677" - integrity sha512-oz2Ki/YKbPw0GUUBwavtH+NQwp4pFlpWwGiU2ELHsmhB22oDzOQGJQajl75jB01ilkMpX5+JIb0Si4gUXLtNuw== +"@budibase/backend-core@1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.24.tgz#37c2f85dcb1a167eeb22a19ba8b5274111da3244" + integrity sha512-P1CY04uK1psyuju+WNo6y1u9YyDa2ozSkxYOAnnJHBNCi67CYuu5EeLWVJ1YcmQ6sFeoGl76/KIhwZ9IEaK8IA== dependencies: - "@budibase/types" "^1.2.23" + "@budibase/types" "^1.2.24" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.23.tgz#8075742e98a2f3b8d8665f0d180d02e5bff91358" - integrity sha512-Il59rgAM/cfUMEkyvTmQ3lpValXHpJYQHa2k+MwITZK3lTOocczG+qgar4B8Nh9lftQYeD0Sl+si/vMX3adhHw== +"@budibase/pro@1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.24.tgz#c37c4755d864d2b019f0b9749631f4ad549043c0" + integrity sha512-oYXnPAwEiYtBQ0UfZ0sOYmiLy3KLGIA7HHuNWifQgL+HMlZIPRqYImcSWreCsW7oQNDGWNS+yGBUaO6bIRb/Ng== dependencies: - "@budibase/backend-core" "1.2.23" - "@budibase/types" "1.2.23" + "@budibase/backend-core" "1.2.24" + "@budibase/types" "1.2.24" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.23", "@budibase/types@^1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.23.tgz#655ed76f285889782e911ed2853ae18a71546b51" - integrity sha512-IOPntG4kACQuhoZ2IOaSPMXDt7qwG5JXerp7nWpLzRU9713vCQs4xw5arrXia8Ip6gROZNqpwpirTf6ZHD2Jnw== +"@budibase/types@1.2.24", "@budibase/types@^1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.24.tgz#37bc85720f70da65b5f510cc51b9bd611f71849f" + integrity sha512-o3dAvVxMpMyKgF54wLH1VVLdSAh3OWspfA4Y8C0iEtZEe8yVvK3yMLRVsVCIXQgHUOr4rnXUasfNaHQP2mdrZg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 73a13dcd92..5b6ad6e4e7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.24", - "@budibase/pro": "1.2.23", + "@budibase/pro": "1.2.24", "@budibase/string-templates": "^1.2.24", "@budibase/types": "^1.2.24", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4673da13bb..25698f19a8 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.23.tgz#5f5d55aa509c354d124439fbb6d74e07df436677" - integrity sha512-oz2Ki/YKbPw0GUUBwavtH+NQwp4pFlpWwGiU2ELHsmhB22oDzOQGJQajl75jB01ilkMpX5+JIb0Si4gUXLtNuw== +"@budibase/backend-core@1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.24.tgz#37c2f85dcb1a167eeb22a19ba8b5274111da3244" + integrity sha512-P1CY04uK1psyuju+WNo6y1u9YyDa2ozSkxYOAnnJHBNCi67CYuu5EeLWVJ1YcmQ6sFeoGl76/KIhwZ9IEaK8IA== dependencies: - "@budibase/types" "^1.2.23" + "@budibase/types" "^1.2.24" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.23.tgz#8075742e98a2f3b8d8665f0d180d02e5bff91358" - integrity sha512-Il59rgAM/cfUMEkyvTmQ3lpValXHpJYQHa2k+MwITZK3lTOocczG+qgar4B8Nh9lftQYeD0Sl+si/vMX3adhHw== +"@budibase/pro@1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.24.tgz#c37c4755d864d2b019f0b9749631f4ad549043c0" + integrity sha512-oYXnPAwEiYtBQ0UfZ0sOYmiLy3KLGIA7HHuNWifQgL+HMlZIPRqYImcSWreCsW7oQNDGWNS+yGBUaO6bIRb/Ng== dependencies: - "@budibase/backend-core" "1.2.23" - "@budibase/types" "1.2.23" + "@budibase/backend-core" "1.2.24" + "@budibase/types" "1.2.24" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.23", "@budibase/types@^1.2.23": - version "1.2.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.23.tgz#655ed76f285889782e911ed2853ae18a71546b51" - integrity sha512-IOPntG4kACQuhoZ2IOaSPMXDt7qwG5JXerp7nWpLzRU9713vCQs4xw5arrXia8Ip6gROZNqpwpirTf6ZHD2Jnw== +"@budibase/types@1.2.24", "@budibase/types@^1.2.24": + version "1.2.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.24.tgz#37bc85720f70da65b5f510cc51b9bd611f71849f" + integrity sha512-o3dAvVxMpMyKgF54wLH1VVLdSAh3OWspfA4Y8C0iEtZEe8yVvK3yMLRVsVCIXQgHUOr4rnXUasfNaHQP2mdrZg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From d313e4858c6f7154efb8fdd1402651d27f67eae8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 9 Aug 2022 10:16:22 +0100 Subject: [PATCH 16/18] Set errors to null rather than deleting when validating user email addresses --- .../builder/portal/manage/users/_components/AddUserModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte index 165d94e0b5..ced45db687 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte @@ -48,7 +48,7 @@ if (email) { const res = emailValidator(email) if (res === true) { - delete userData[index].error + userData[index].error = null } else { userData[index].error = res } From 152937e3d1731fcb170db387f954a0bff069a472 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 9 Aug 2022 10:08:51 +0000 Subject: [PATCH 17/18] v1.2.25 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index d88bca1b41..2123c86b0b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.24", + "version": "1.2.25", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index eb64fae8cd..04b40c73b4 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.24", + "version": "1.2.25", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.24", + "@budibase/types": "^1.2.25", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5a4ef0974a..f5e62b48bf 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.24", + "version": "1.2.25", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.24", + "@budibase/string-templates": "^1.2.25", "@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 a942b57da1..d9eb8afcbf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.24", + "version": "1.2.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.24", - "@budibase/client": "^1.2.24", - "@budibase/frontend-core": "^1.2.24", - "@budibase/string-templates": "^1.2.24", + "@budibase/bbui": "^1.2.25", + "@budibase/client": "^1.2.25", + "@budibase/frontend-core": "^1.2.25", + "@budibase/string-templates": "^1.2.25", "@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 898d9ca46d..1586f1693e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.24", + "version": "1.2.25", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index b7108cc96f..2487a67db4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.24", + "version": "1.2.25", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.24", - "@budibase/frontend-core": "^1.2.24", - "@budibase/string-templates": "^1.2.24", + "@budibase/bbui": "^1.2.25", + "@budibase/frontend-core": "^1.2.25", + "@budibase/string-templates": "^1.2.25", "@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 f3ab4745b1..530058fb8f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.24", + "version": "1.2.25", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.24", + "@budibase/bbui": "^1.2.25", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 868d933440..27896232e6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.24", + "version": "1.2.25", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.24", - "@budibase/client": "^1.2.24", + "@budibase/backend-core": "^1.2.25", + "@budibase/client": "^1.2.25", "@budibase/pro": "1.2.24", - "@budibase/string-templates": "^1.2.24", - "@budibase/types": "^1.2.24", + "@budibase/string-templates": "^1.2.25", + "@budibase/types": "^1.2.25", "@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 501335430d..3219960ed3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.24", + "version": "1.2.25", "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 dc05c2943b..dd121b4eb9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.24", + "version": "1.2.25", "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 5b6ad6e4e7..d5ef47ee22 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.24", + "version": "1.2.25", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.24", + "@budibase/backend-core": "^1.2.25", "@budibase/pro": "1.2.24", - "@budibase/string-templates": "^1.2.24", - "@budibase/types": "^1.2.24", + "@budibase/string-templates": "^1.2.25", + "@budibase/types": "^1.2.25", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 56bcd468862060cdd0e8645fdd54305eee9b223f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 9 Aug 2022 10:12:47 +0000 Subject: [PATCH 18/18] Update pro version to 1.2.25 --- 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 27896232e6..8be2dc175f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.2.25", "@budibase/client": "^1.2.25", - "@budibase/pro": "1.2.24", + "@budibase/pro": "1.2.25", "@budibase/string-templates": "^1.2.25", "@budibase/types": "^1.2.25", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 96efcc899b..2d7cbcf962 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.24.tgz#37c2f85dcb1a167eeb22a19ba8b5274111da3244" - integrity sha512-P1CY04uK1psyuju+WNo6y1u9YyDa2ozSkxYOAnnJHBNCi67CYuu5EeLWVJ1YcmQ6sFeoGl76/KIhwZ9IEaK8IA== +"@budibase/backend-core@1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.25.tgz#7dcb958cfdd8f73d3755bf0d8470248d4f721360" + integrity sha512-UKA8t8trzTe/jHEpAGlYT2fZIR8SRxDnFvY0wQFGPspvJ0EnoVX6U2sV7kuZy8EtTxpJxShG7Nvt94I0EjiN5w== dependencies: - "@budibase/types" "^1.2.24" + "@budibase/types" "^1.2.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.24.tgz#c37c4755d864d2b019f0b9749631f4ad549043c0" - integrity sha512-oYXnPAwEiYtBQ0UfZ0sOYmiLy3KLGIA7HHuNWifQgL+HMlZIPRqYImcSWreCsW7oQNDGWNS+yGBUaO6bIRb/Ng== +"@budibase/pro@1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.25.tgz#9e802bb7b18ba192617b01269f6ebefee0477b05" + integrity sha512-zxL7p61jMNznnAL9EKYg+Ap9ar3K9lbzwyM75uZjgAw2VGCYm7Z1Kftj9EGmEQxzXiZfrWTJcOE8MAhu8nAJRA== dependencies: - "@budibase/backend-core" "1.2.24" - "@budibase/types" "1.2.24" + "@budibase/backend-core" "1.2.25" + "@budibase/types" "1.2.25" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.24", "@budibase/types@^1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.24.tgz#37bc85720f70da65b5f510cc51b9bd611f71849f" - integrity sha512-o3dAvVxMpMyKgF54wLH1VVLdSAh3OWspfA4Y8C0iEtZEe8yVvK3yMLRVsVCIXQgHUOr4rnXUasfNaHQP2mdrZg== +"@budibase/types@1.2.25", "@budibase/types@^1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.25.tgz#9b3738f774592e25f9ac44527e8b2e4aba6b4933" + integrity sha512-ReBvf2aN5/3M1eFcCrqycu68g54CxV2BXiEQTOS2om4u3WRcQMPa69eMjHJ4SltBb5HwfXveDu50Tc+4M8kS6w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d5ef47ee22..64b3fbc66b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.2.25", - "@budibase/pro": "1.2.24", + "@budibase/pro": "1.2.25", "@budibase/string-templates": "^1.2.25", "@budibase/types": "^1.2.25", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 25698f19a8..0d982bc14b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.24.tgz#37c2f85dcb1a167eeb22a19ba8b5274111da3244" - integrity sha512-P1CY04uK1psyuju+WNo6y1u9YyDa2ozSkxYOAnnJHBNCi67CYuu5EeLWVJ1YcmQ6sFeoGl76/KIhwZ9IEaK8IA== +"@budibase/backend-core@1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.25.tgz#7dcb958cfdd8f73d3755bf0d8470248d4f721360" + integrity sha512-UKA8t8trzTe/jHEpAGlYT2fZIR8SRxDnFvY0wQFGPspvJ0EnoVX6U2sV7kuZy8EtTxpJxShG7Nvt94I0EjiN5w== dependencies: - "@budibase/types" "^1.2.24" + "@budibase/types" "^1.2.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.24.tgz#c37c4755d864d2b019f0b9749631f4ad549043c0" - integrity sha512-oYXnPAwEiYtBQ0UfZ0sOYmiLy3KLGIA7HHuNWifQgL+HMlZIPRqYImcSWreCsW7oQNDGWNS+yGBUaO6bIRb/Ng== +"@budibase/pro@1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.25.tgz#9e802bb7b18ba192617b01269f6ebefee0477b05" + integrity sha512-zxL7p61jMNznnAL9EKYg+Ap9ar3K9lbzwyM75uZjgAw2VGCYm7Z1Kftj9EGmEQxzXiZfrWTJcOE8MAhu8nAJRA== dependencies: - "@budibase/backend-core" "1.2.24" - "@budibase/types" "1.2.24" + "@budibase/backend-core" "1.2.25" + "@budibase/types" "1.2.25" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.24", "@budibase/types@^1.2.24": - version "1.2.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.24.tgz#37bc85720f70da65b5f510cc51b9bd611f71849f" - integrity sha512-o3dAvVxMpMyKgF54wLH1VVLdSAh3OWspfA4Y8C0iEtZEe8yVvK3yMLRVsVCIXQgHUOr4rnXUasfNaHQP2mdrZg== +"@budibase/types@1.2.25", "@budibase/types@^1.2.25": + version "1.2.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.25.tgz#9b3738f774592e25f9ac44527e8b2e4aba6b4933" + integrity sha512-ReBvf2aN5/3M1eFcCrqycu68g54CxV2BXiEQTOS2om4u3WRcQMPa69eMjHJ4SltBb5HwfXveDu50Tc+4M8kS6w== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"