From a8656c0f10d602aef896b3435269ac5aa95c834c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:55:07 +0000 Subject: [PATCH 01/10] v2.2.12-alpha.51 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0360b2e821..b24e3bc52c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 81898f6d0b..f891756772 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.51", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 18092ae2a5..e3281c05fd 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 27ee30f56d..a099c7324b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", - "@budibase/client": "2.2.12-alpha.50", - "@budibase/frontend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", + "@budibase/client": "2.2.12-alpha.51", + "@budibase/frontend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 19fb9e4df8..627e80225d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 79016b204e..992e107b63 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", - "@budibase/frontend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", + "@budibase/frontend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", "@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 3821337599..cb94e37af0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5b91148966..a0f714cd88 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 94b5f563cf..5eba6f75d4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.50", - "@budibase/client": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", + "@budibase/client": "2.2.12-alpha.51", "@budibase/pro": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "@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 21ca20ad27..e268e5bd2a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "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 d7b648264e..cc30804846 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "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 cb98ce525b..e3a5d43928 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", "@budibase/pro": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4ed237ed836b19458e615616a2ca23e281d490af Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:58:46 +0000 Subject: [PATCH 02/10] Update pro version to 2.2.12-alpha.51 --- 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 5eba6f75d4..98a5c50463 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.51", "@budibase/client": "2.2.12-alpha.51", - "@budibase/pro": "2.2.12-alpha.50", + "@budibase/pro": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", "@budibase/types": "2.2.12-alpha.51", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index bdf6187969..16bddaef18 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" - integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== +"@budibase/backend-core@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" + integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.51" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" - integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== +"@budibase/pro@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" + integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.50" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/backend-core" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.51" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" - integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== +"@budibase/types@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" + integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e3a5d43928..cc39afd0d0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.51", - "@budibase/pro": "2.2.12-alpha.50", + "@budibase/pro": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", "@budibase/types": "2.2.12-alpha.51", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d0a31fc49f..353fe2a698 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" - integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== +"@budibase/backend-core@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" + integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.51" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" - integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== +"@budibase/pro@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" + integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.50" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/backend-core" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.51" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" - integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== +"@budibase/types@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" + integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 09ed767d0b28b3b85bc26e7bff3cfe58ffbbb986 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Tue, 31 Jan 2023 17:18:22 +0000 Subject: [PATCH 03/10] New Help Menu (#9371) * New Help Menu * design PR feedback * Feedback updates * Feedback updates, font awesome enhancement, upgrade button hidden if licensing is disabled --------- Co-authored-by: Dean --- packages/builder/package.json | 3 + packages/builder/src/App.svelte | 2 - .../components/common/FontAwesomeIcon.svelte | 31 + .../src/components/common/HelpIcon.svelte | 42 - .../src/components/common/HelpMenu.svelte | 182 + .../portal/_components/UpgradeButton.svelte | 43 +- .../src/pages/builder/portal/_layout.svelte | 2 + packages/builder/yarn.lock | 4337 +++++++++++------ 8 files changed, 3091 insertions(+), 1551 deletions(-) create mode 100644 packages/builder/src/components/common/FontAwesomeIcon.svelte delete mode 100644 packages/builder/src/components/common/HelpIcon.svelte create mode 100644 packages/builder/src/components/common/HelpMenu.svelte diff --git a/packages/builder/package.json b/packages/builder/package.json index a099c7324b..2fa8c23776 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -75,6 +75,9 @@ "@budibase/client": "2.2.12-alpha.51", "@budibase/frontend-core": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 04846e01bf..f31f45bb84 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -3,7 +3,6 @@ import { routes } from "../.routify/routes" import { NotificationDisplay, BannerDisplay } from "@budibase/bbui" import { parse, stringify } from "qs" - import HelpIcon from "components/common/HelpIcon.svelte" import LicensingOverlays from "components/portal/licensing/LicensingOverlays.svelte" const queryHandler = { parse, stringify } @@ -15,7 +14,6 @@