From b99a3a3e9b91aae6d2d801cb42a53075e62f6b55 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 09:02:12 +0000 Subject: [PATCH 01/51] v2.1.46 --- 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 79cb3df288..465ceff0df 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.46-alpha.3", + "version": "2.1.46", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4f3064ff56..2876ffb8ff 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.46-alpha.3", + "@budibase/types": "^2.1.46", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 46e05c99ff..94f195cade 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.1.46-alpha.3", + "@budibase/string-templates": "^2.1.46", "@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 5e84be066f..0dd47c4669 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.46-alpha.3", - "@budibase/client": "2.1.46-alpha.3", - "@budibase/frontend-core": "2.1.46-alpha.3", - "@budibase/string-templates": "2.1.46-alpha.3", + "@budibase/bbui": "^2.1.46", + "@budibase/client": "^2.1.46", + "@budibase/frontend-core": "^2.1.46", + "@budibase/string-templates": "^2.1.46", "@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 01f473ee6b..cfbeca726a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.46-alpha.3", - "@budibase/string-templates": "2.1.46-alpha.3", - "@budibase/types": "2.1.46-alpha.3", + "@budibase/backend-core": "^2.1.46", + "@budibase/string-templates": "^2.1.46", + "@budibase/types": "^2.1.46", "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 b25f54b1b2..aa87cfb3e4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.46-alpha.3", - "@budibase/frontend-core": "2.1.46-alpha.3", - "@budibase/string-templates": "2.1.46-alpha.3", + "@budibase/bbui": "^2.1.46", + "@budibase/frontend-core": "^2.1.46", + "@budibase/string-templates": "^2.1.46", "@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 9a33d7bb85..0a9f0e16eb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.46-alpha.3", + "@budibase/bbui": "^2.1.46", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1aec654a91..10eaea83d9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cafebd8476..82a3fe87dd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.46-alpha.3", - "@budibase/client": "2.1.46-alpha.3", + "@budibase/backend-core": "^2.1.46", + "@budibase/client": "^2.1.46", "@budibase/pro": "2.1.46-alpha.3", - "@budibase/string-templates": "2.1.46-alpha.3", - "@budibase/types": "2.1.46-alpha.3", + "@budibase/string-templates": "^2.1.46", + "@budibase/types": "^2.1.46", "@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 df44116ec8..b946699bf2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "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 acb3fb1552..ae6fe62b28 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "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 181c60d098..cf264d02ca 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.46-alpha.3", + "version": "2.1.46", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.46-alpha.3", + "@budibase/backend-core": "^2.1.46", "@budibase/pro": "2.1.46-alpha.3", - "@budibase/string-templates": "2.1.46-alpha.3", - "@budibase/types": "2.1.46-alpha.3", + "@budibase/string-templates": "^2.1.46", + "@budibase/types": "^2.1.46", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 09a55cb2ae94027252f020ac576c3ee957243d56 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 09:05:49 +0000 Subject: [PATCH 02/51] Update pro version to 2.1.46 --- 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 82a3fe87dd..6a3d88823e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.46", "@budibase/client": "^2.1.46", - "@budibase/pro": "2.1.46-alpha.3", + "@budibase/pro": "2.1.46", "@budibase/string-templates": "^2.1.46", "@budibase/types": "^2.1.46", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b9def35086..f2ff64c29c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46-alpha.3.tgz#f8caf2af9a8d3a16d4c4280f365567581f9b55a2" - integrity sha512-osyuJq9db0DeUkaj4uANzo1mMt7SuKO5vSBITemLua0K8T8Z4r2ypE4muktEsfBdPxAH4cclMg/JaYl4RM8bwQ== +"@budibase/backend-core@2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46.tgz#292c522f1e55a8bc47a06575a4ceee032967094a" + integrity sha512-VPsbZpcxlYc3u1RtcLKhZzKWYg84iqcp5UADxZeTOCUqyYkFGElFZpM09FLVRV6UZsLLXVlE9Uva89I9EmgD8Q== dependencies: - "@budibase/types" "2.1.46-alpha.3" + "@budibase/types" "^2.1.46" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46-alpha.3.tgz#88e13775402561f1bd8d20483493a34082a6d8ab" - integrity sha512-B3z/Jk4g1ig8Wx62KmjAeYeITePxwrLHnSoy/Ugz6APNfNiXe7Y/ilQ5BFHWB0z/z3/8Vs1sOdP5c3/R5LpqDQ== +"@budibase/pro@2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46.tgz#7dada8f00152efff77aa338e6cc294023e72569e" + integrity sha512-ihsXMmGQzz8Dh94X1dQZCbXLxOFzHlmWYHL4g3CR4Gu0Vaoard7CR3WGAWY9HleF/ycWyPBMs6nzKyQ87pr3RQ== dependencies: - "@budibase/backend-core" "2.1.46-alpha.3" - "@budibase/types" "2.1.46-alpha.3" + "@budibase/backend-core" "2.1.46" + "@budibase/types" "2.1.46" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46-alpha.3.tgz#ffd96e1f3b006af5f0c0900e927d0454a2e61c53" - integrity sha512-JIO5qH/UYbIays/3dDovltiUEL3a4npXZIMlGgARzPQ5DW7ZB8hfJ5fXPt+BsbMXeaJAEsRbDkx82MDQs4y5Lg== +"@budibase/types@2.1.46", "@budibase/types@^2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46.tgz#f7358ffae35fc0e14d92e7a9739dbff8403ce870" + integrity sha512-wEb9Zip8wFJ0tBybNaGC0y8USfLuVuIJpwnWsgt+RAHAfggZyVk8TvHRt0BWodJbBCrqR4rYnYwoxRGY+JAe0Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index cf264d02ca..d9780a1db3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.46", - "@budibase/pro": "2.1.46-alpha.3", + "@budibase/pro": "2.1.46", "@budibase/string-templates": "^2.1.46", "@budibase/types": "^2.1.46", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 79a3751218..561e386979 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46-alpha.3.tgz#f8caf2af9a8d3a16d4c4280f365567581f9b55a2" - integrity sha512-osyuJq9db0DeUkaj4uANzo1mMt7SuKO5vSBITemLua0K8T8Z4r2ypE4muktEsfBdPxAH4cclMg/JaYl4RM8bwQ== +"@budibase/backend-core@2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46.tgz#292c522f1e55a8bc47a06575a4ceee032967094a" + integrity sha512-VPsbZpcxlYc3u1RtcLKhZzKWYg84iqcp5UADxZeTOCUqyYkFGElFZpM09FLVRV6UZsLLXVlE9Uva89I9EmgD8Q== dependencies: - "@budibase/types" "2.1.46-alpha.3" + "@budibase/types" "^2.1.46" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46-alpha.3.tgz#88e13775402561f1bd8d20483493a34082a6d8ab" - integrity sha512-B3z/Jk4g1ig8Wx62KmjAeYeITePxwrLHnSoy/Ugz6APNfNiXe7Y/ilQ5BFHWB0z/z3/8Vs1sOdP5c3/R5LpqDQ== +"@budibase/pro@2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46.tgz#7dada8f00152efff77aa338e6cc294023e72569e" + integrity sha512-ihsXMmGQzz8Dh94X1dQZCbXLxOFzHlmWYHL4g3CR4Gu0Vaoard7CR3WGAWY9HleF/ycWyPBMs6nzKyQ87pr3RQ== dependencies: - "@budibase/backend-core" "2.1.46-alpha.3" - "@budibase/types" "2.1.46-alpha.3" + "@budibase/backend-core" "2.1.46" + "@budibase/types" "2.1.46" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.46-alpha.3": - version "2.1.46-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46-alpha.3.tgz#ffd96e1f3b006af5f0c0900e927d0454a2e61c53" - integrity sha512-JIO5qH/UYbIays/3dDovltiUEL3a4npXZIMlGgARzPQ5DW7ZB8hfJ5fXPt+BsbMXeaJAEsRbDkx82MDQs4y5Lg== +"@budibase/types@2.1.46", "@budibase/types@^2.1.46": + version "2.1.46" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46.tgz#f7358ffae35fc0e14d92e7a9739dbff8403ce870" + integrity sha512-wEb9Zip8wFJ0tBybNaGC0y8USfLuVuIJpwnWsgt+RAHAfggZyVk8TvHRt0BWodJbBCrqR4rYnYwoxRGY+JAe0Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 736f36effccca273703924dad15c2ddba53132f8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 10:21:57 +0000 Subject: [PATCH 03/51] v2.2.0 --- 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 465ceff0df..790b6ca572 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.46", + "version": "2.2.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2876ffb8ff..a23a8b28c1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.46", + "@budibase/types": "^2.2.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 94f195cade..f5bbd03c60 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.46", + "version": "2.2.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "^2.1.46", + "@budibase/string-templates": "^2.2.0", "@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 0dd47c4669..98a5969896 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.46", + "version": "2.2.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.46", - "@budibase/client": "^2.1.46", - "@budibase/frontend-core": "^2.1.46", - "@budibase/string-templates": "^2.1.46", + "@budibase/bbui": "^2.2.0", + "@budibase/client": "^2.2.0", + "@budibase/frontend-core": "^2.2.0", + "@budibase/string-templates": "^2.2.0", "@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 cfbeca726a..72e62dd5a1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.46", - "@budibase/string-templates": "^2.1.46", - "@budibase/types": "^2.1.46", + "@budibase/backend-core": "^2.2.0", + "@budibase/string-templates": "^2.2.0", + "@budibase/types": "^2.2.0", "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 aa87cfb3e4..8cd02011ca 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.46", + "version": "2.2.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.46", - "@budibase/frontend-core": "^2.1.46", - "@budibase/string-templates": "^2.1.46", + "@budibase/bbui": "^2.2.0", + "@budibase/frontend-core": "^2.2.0", + "@budibase/string-templates": "^2.2.0", "@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 0a9f0e16eb..48ec714397 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.46", + "@budibase/bbui": "^2.2.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 10eaea83d9..3f9caf6419 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6a3d88823e..6d530a646a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.46", - "@budibase/client": "^2.1.46", + "@budibase/backend-core": "^2.2.0", + "@budibase/client": "^2.2.0", "@budibase/pro": "2.1.46", - "@budibase/string-templates": "^2.1.46", - "@budibase/types": "^2.1.46", + "@budibase/string-templates": "^2.2.0", + "@budibase/types": "^2.2.0", "@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 b946699bf2..ca0ecda7a6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.46", + "version": "2.2.0", "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 ae6fe62b28..50f7496928 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.46", + "version": "2.2.0", "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 d9780a1db3..9c9eb59128 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.46", + "version": "2.2.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.46", + "@budibase/backend-core": "^2.2.0", "@budibase/pro": "2.1.46", - "@budibase/string-templates": "^2.1.46", - "@budibase/types": "^2.1.46", + "@budibase/string-templates": "^2.2.0", + "@budibase/types": "^2.2.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c3cd61a44fe9a6a1ddd38bec06d8b7df24289112 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 10:25:56 +0000 Subject: [PATCH 04/51] Update pro version to 2.2.0 --- 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 6d530a646a..89757924a7 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.0", "@budibase/client": "^2.2.0", - "@budibase/pro": "2.1.46", + "@budibase/pro": "2.2.0", "@budibase/string-templates": "^2.2.0", "@budibase/types": "^2.2.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f2ff64c29c..cd5f98984a 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46.tgz#292c522f1e55a8bc47a06575a4ceee032967094a" - integrity sha512-VPsbZpcxlYc3u1RtcLKhZzKWYg84iqcp5UADxZeTOCUqyYkFGElFZpM09FLVRV6UZsLLXVlE9Uva89I9EmgD8Q== +"@budibase/backend-core@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.0.tgz#84eb3bfcb1039cc7aeec0e1fd9dce4b061ffe897" + integrity sha512-Of24pb8psDueeXiAUBncjzI+YYum0+nPCgw08dYxxNXmSSKbXP65tQaJo9+sOgsKp/2T/gjkY7rvfFTzIHt5/w== dependencies: - "@budibase/types" "^2.1.46" + "@budibase/types" "^2.2.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46.tgz#7dada8f00152efff77aa338e6cc294023e72569e" - integrity sha512-ihsXMmGQzz8Dh94X1dQZCbXLxOFzHlmWYHL4g3CR4Gu0Vaoard7CR3WGAWY9HleF/ycWyPBMs6nzKyQ87pr3RQ== +"@budibase/pro@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.0.tgz#8ceda792ff11b53834d933c391c289391ec6e291" + integrity sha512-RcyP9PQG76iMt6Lz31CkURiuTRUVgfu4CmcFEJZRJIpf3ZHO6lJqx7576HsVcPfp9573nGoqJS18+ha5xQWNnA== dependencies: - "@budibase/backend-core" "2.1.46" - "@budibase/types" "2.1.46" + "@budibase/backend-core" "2.2.0" + "@budibase/types" "2.2.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.46", "@budibase/types@^2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46.tgz#f7358ffae35fc0e14d92e7a9739dbff8403ce870" - integrity sha512-wEb9Zip8wFJ0tBybNaGC0y8USfLuVuIJpwnWsgt+RAHAfggZyVk8TvHRt0BWodJbBCrqR4rYnYwoxRGY+JAe0Q== +"@budibase/types@2.2.0", "@budibase/types@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.0.tgz#061baa04ca5461573b95a43632c820906907d838" + integrity sha512-F9LbRli/O6dYDCpU/bGCoFp1Rh29INV0wrtTGXBTDVYpouCXM+rwj9jUBh+8x+rBZ/S9z8V5auOis6RcD4dkqA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9c9eb59128..5acaef02f1 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.0", - "@budibase/pro": "2.1.46", + "@budibase/pro": "2.2.0", "@budibase/string-templates": "^2.2.0", "@budibase/types": "^2.2.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 561e386979..438042a290 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.46.tgz#292c522f1e55a8bc47a06575a4ceee032967094a" - integrity sha512-VPsbZpcxlYc3u1RtcLKhZzKWYg84iqcp5UADxZeTOCUqyYkFGElFZpM09FLVRV6UZsLLXVlE9Uva89I9EmgD8Q== +"@budibase/backend-core@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.0.tgz#84eb3bfcb1039cc7aeec0e1fd9dce4b061ffe897" + integrity sha512-Of24pb8psDueeXiAUBncjzI+YYum0+nPCgw08dYxxNXmSSKbXP65tQaJo9+sOgsKp/2T/gjkY7rvfFTzIHt5/w== dependencies: - "@budibase/types" "^2.1.46" + "@budibase/types" "^2.2.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.46.tgz#7dada8f00152efff77aa338e6cc294023e72569e" - integrity sha512-ihsXMmGQzz8Dh94X1dQZCbXLxOFzHlmWYHL4g3CR4Gu0Vaoard7CR3WGAWY9HleF/ycWyPBMs6nzKyQ87pr3RQ== +"@budibase/pro@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.0.tgz#8ceda792ff11b53834d933c391c289391ec6e291" + integrity sha512-RcyP9PQG76iMt6Lz31CkURiuTRUVgfu4CmcFEJZRJIpf3ZHO6lJqx7576HsVcPfp9573nGoqJS18+ha5xQWNnA== dependencies: - "@budibase/backend-core" "2.1.46" - "@budibase/types" "2.1.46" + "@budibase/backend-core" "2.2.0" + "@budibase/types" "2.2.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.46", "@budibase/types@^2.1.46": - version "2.1.46" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.46.tgz#f7358ffae35fc0e14d92e7a9739dbff8403ce870" - integrity sha512-wEb9Zip8wFJ0tBybNaGC0y8USfLuVuIJpwnWsgt+RAHAfggZyVk8TvHRt0BWodJbBCrqR4rYnYwoxRGY+JAe0Q== +"@budibase/types@2.2.0", "@budibase/types@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.0.tgz#061baa04ca5461573b95a43632c820906907d838" + integrity sha512-F9LbRli/O6dYDCpU/bGCoFp1Rh29INV0wrtTGXBTDVYpouCXM+rwj9jUBh+8x+rBZ/S9z8V5auOis6RcD4dkqA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From dd60aae236f90a64238a792a380b09bb5d295fee Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 12 Dec 2022 12:13:02 +0000 Subject: [PATCH 05/51] Fix for budibase plugin skeleton, which utilises the old import style. --- packages/backend-core/plugins.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/backend-core/plugins.ts diff --git a/packages/backend-core/plugins.ts b/packages/backend-core/plugins.ts new file mode 100644 index 0000000000..33354eaf64 --- /dev/null +++ b/packages/backend-core/plugins.ts @@ -0,0 +1 @@ +export * from "./src/plugin" From ab568a52c1fd56b04fb7bd4a98e5c894670c5d08 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 12 Dec 2022 12:42:11 +0000 Subject: [PATCH 06/51] Fix side nav styles --- packages/client/src/components/app/Layout.svelte | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 6582384569..1f0bed214a 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -275,7 +275,6 @@ justify-content: center; align-items: stretch; z-index: 1; - border-top: 1px solid var(--spectrum-global-color-gray-300); overflow: hidden; position: relative; } @@ -316,6 +315,12 @@ top: 0; left: 0; } + .layout--top .nav-wrapper { + border-bottom: 1px solid var(--spectrum-global-color-gray-300); + } + .layout--left .nav-wrapper { + border-right: 1px solid var(--spectrum-global-color-gray-300); + } .nav { display: flex; @@ -390,10 +395,6 @@ align-items: stretch; flex: 1 1 auto; z-index: 1; - border-top: 1px solid var(--spectrum-global-color-gray-300); - } - .layout--none .main-wrapper { - border-top: none; } .main { display: flex; @@ -487,7 +488,7 @@ } /* Desktop nav overrides */ - .desktop.layout--left { + .desktop.layout--left .layout-body { flex-direction: row; overflow: hidden; } @@ -523,6 +524,8 @@ top: 0; left: 0; box-shadow: 0 0 8px -1px rgba(0, 0, 0, 0.075); + border-bottom: 1px solid var(--spectrum-global-color-gray-300); + border-right: none; } /* Show close button in drawer */ From 04387191d9e9978189f01548d8b0a73b80771536 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 13:13:05 +0000 Subject: [PATCH 07/51] v2.2.1 --- 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 790b6ca572..1aa312ee0b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.2.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a23a8b28c1..01c8ec2018 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.0", + "version": "2.2.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.2.0", + "@budibase/types": "^2.2.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f5bbd03c60..480f651804 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.0", + "version": "2.2.1", "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.0", + "@budibase/string-templates": "^2.2.1", "@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 98a5969896..8243cf96a3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.0", + "version": "2.2.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.0", - "@budibase/client": "^2.2.0", - "@budibase/frontend-core": "^2.2.0", - "@budibase/string-templates": "^2.2.0", + "@budibase/bbui": "^2.2.1", + "@budibase/client": "^2.2.1", + "@budibase/frontend-core": "^2.2.1", + "@budibase/string-templates": "^2.2.1", "@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 72e62dd5a1..64e0cd5ff0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.0", + "version": "2.2.1", "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.0", - "@budibase/string-templates": "^2.2.0", - "@budibase/types": "^2.2.0", + "@budibase/backend-core": "^2.2.1", + "@budibase/string-templates": "^2.2.1", + "@budibase/types": "^2.2.1", "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 8cd02011ca..027381e89f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.0", + "version": "2.2.1", "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.0", - "@budibase/frontend-core": "^2.2.0", - "@budibase/string-templates": "^2.2.0", + "@budibase/bbui": "^2.2.1", + "@budibase/frontend-core": "^2.2.1", + "@budibase/string-templates": "^2.2.1", "@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 48ec714397..72fd9388ee 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.0", + "version": "2.2.1", "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.0", + "@budibase/bbui": "^2.2.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3f9caf6419..b73db204e9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.0", + "version": "2.2.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 89757924a7..9e43aa731c 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.0", + "version": "2.2.1", "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.0", - "@budibase/client": "^2.2.0", + "@budibase/backend-core": "^2.2.1", + "@budibase/client": "^2.2.1", "@budibase/pro": "2.2.0", - "@budibase/string-templates": "^2.2.0", - "@budibase/types": "^2.2.0", + "@budibase/string-templates": "^2.2.1", + "@budibase/types": "^2.2.1", "@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 ca0ecda7a6..3f6928ed4e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.0", + "version": "2.2.1", "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 50f7496928..9ec4cf42a0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.0", + "version": "2.2.1", "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 5acaef02f1..5e22b2d69c 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.0", + "version": "2.2.1", "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.0", + "@budibase/backend-core": "^2.2.1", "@budibase/pro": "2.2.0", - "@budibase/string-templates": "^2.2.0", - "@budibase/types": "^2.2.0", + "@budibase/string-templates": "^2.2.1", + "@budibase/types": "^2.2.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e795971491315a26f5fb5f33b5e0941387f27f9e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 13:16:47 +0000 Subject: [PATCH 08/51] Update pro version to 2.2.1 --- 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 9e43aa731c..dbfba0b3c3 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.1", "@budibase/client": "^2.2.1", - "@budibase/pro": "2.2.0", + "@budibase/pro": "2.2.1", "@budibase/string-templates": "^2.2.1", "@budibase/types": "^2.2.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index cd5f98984a..d49bfc3c3b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.0.tgz#84eb3bfcb1039cc7aeec0e1fd9dce4b061ffe897" - integrity sha512-Of24pb8psDueeXiAUBncjzI+YYum0+nPCgw08dYxxNXmSSKbXP65tQaJo9+sOgsKp/2T/gjkY7rvfFTzIHt5/w== +"@budibase/backend-core@2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.1.tgz#92c2464a17cae3c26afa40066feda21911cef660" + integrity sha512-EMzgxOTWebSLXq1hZr+WF2pNsjOc81XwwlWQ0mxXjv7YahWPYFsMGRZyOLWMOF4i49fuMvbmF39FdFCIa1odcg== dependencies: - "@budibase/types" "^2.2.0" + "@budibase/types" "^2.2.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.0.tgz#8ceda792ff11b53834d933c391c289391ec6e291" - integrity sha512-RcyP9PQG76iMt6Lz31CkURiuTRUVgfu4CmcFEJZRJIpf3ZHO6lJqx7576HsVcPfp9573nGoqJS18+ha5xQWNnA== +"@budibase/pro@2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.1.tgz#fe74a84c32746309ca4f264e8e2fcc423705f639" + integrity sha512-IF6C5PVw9sVEXjUsjGVD1kTbUvMB0RGafwHBKkjmH3Qjs1hTczKW/kNm7pFzse94SB9QJGig02hWngMQ8cvKrg== dependencies: - "@budibase/backend-core" "2.2.0" - "@budibase/types" "2.2.0" + "@budibase/backend-core" "2.2.1" + "@budibase/types" "2.2.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.0", "@budibase/types@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.0.tgz#061baa04ca5461573b95a43632c820906907d838" - integrity sha512-F9LbRli/O6dYDCpU/bGCoFp1Rh29INV0wrtTGXBTDVYpouCXM+rwj9jUBh+8x+rBZ/S9z8V5auOis6RcD4dkqA== +"@budibase/types@2.2.1", "@budibase/types@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.1.tgz#baeaaeb0fee01e3a3746eb58f3b9ecbe249094f1" + integrity sha512-o5FFz47yDq+Evgj22h+yvvpBk9qPUqrs53EKtVB8PwUiSjvt7vbQTotIgJd9CVslAW5274dfnOG4oB2LuG3fDg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5e22b2d69c..73f7f3e611 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.1", - "@budibase/pro": "2.2.0", + "@budibase/pro": "2.2.1", "@budibase/string-templates": "^2.2.1", "@budibase/types": "^2.2.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 438042a290..b8b8c9448f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.0.tgz#84eb3bfcb1039cc7aeec0e1fd9dce4b061ffe897" - integrity sha512-Of24pb8psDueeXiAUBncjzI+YYum0+nPCgw08dYxxNXmSSKbXP65tQaJo9+sOgsKp/2T/gjkY7rvfFTzIHt5/w== +"@budibase/backend-core@2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.1.tgz#92c2464a17cae3c26afa40066feda21911cef660" + integrity sha512-EMzgxOTWebSLXq1hZr+WF2pNsjOc81XwwlWQ0mxXjv7YahWPYFsMGRZyOLWMOF4i49fuMvbmF39FdFCIa1odcg== dependencies: - "@budibase/types" "^2.2.0" + "@budibase/types" "^2.2.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.0.tgz#8ceda792ff11b53834d933c391c289391ec6e291" - integrity sha512-RcyP9PQG76iMt6Lz31CkURiuTRUVgfu4CmcFEJZRJIpf3ZHO6lJqx7576HsVcPfp9573nGoqJS18+ha5xQWNnA== +"@budibase/pro@2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.1.tgz#fe74a84c32746309ca4f264e8e2fcc423705f639" + integrity sha512-IF6C5PVw9sVEXjUsjGVD1kTbUvMB0RGafwHBKkjmH3Qjs1hTczKW/kNm7pFzse94SB9QJGig02hWngMQ8cvKrg== dependencies: - "@budibase/backend-core" "2.2.0" - "@budibase/types" "2.2.0" + "@budibase/backend-core" "2.2.1" + "@budibase/types" "2.2.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.0", "@budibase/types@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.0.tgz#061baa04ca5461573b95a43632c820906907d838" - integrity sha512-F9LbRli/O6dYDCpU/bGCoFp1Rh29INV0wrtTGXBTDVYpouCXM+rwj9jUBh+8x+rBZ/S9z8V5auOis6RcD4dkqA== +"@budibase/types@2.2.1", "@budibase/types@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.1.tgz#baeaaeb0fee01e3a3746eb58f3b9ecbe249094f1" + integrity sha512-o5FFz47yDq+Evgj22h+yvvpBk9qPUqrs53EKtVB8PwUiSjvt7vbQTotIgJd9CVslAW5274dfnOG4oB2LuG3fDg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 3236be3e296cb5c993d5666df75e99ea93b3272d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 12 Dec 2022 16:33:32 +0000 Subject: [PATCH 09/51] using dist folder to allow importing constants for openAPI specs --- packages/server/specs/resources/query.js | 2 +- packages/server/specs/resources/table.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/specs/resources/query.js b/packages/server/specs/resources/query.js index 1442e46a04..10544ee7eb 100644 --- a/packages/server/specs/resources/query.js +++ b/packages/server/specs/resources/query.js @@ -1,6 +1,6 @@ const Resource = require("./utils/Resource") const { object } = require("./utils") -const { BaseQueryVerbs } = require("../../src/constants") +const { BaseQueryVerbs } = require("../../dist/constants") const query = { _id: "query_datasource_plus_4d8be0c506b9465daf4bf84d890fdab6_454854487c574d45bc4029b1e153219e", diff --git a/packages/server/specs/resources/table.js b/packages/server/specs/resources/table.js index 523a3a9dfd..9bc57daf42 100644 --- a/packages/server/specs/resources/table.js +++ b/packages/server/specs/resources/table.js @@ -2,7 +2,7 @@ const { FieldTypes, RelationshipTypes, FormulaTypes, -} = require("../../src/constants") +} = require("../../dist/constants") const { object } = require("./utils") const Resource = require("./utils/Resource") From dc11fd4d54fbe489e28f9e5be0efb44b9ff5e519 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 16:52:02 +0000 Subject: [PATCH 10/51] v2.2.2 --- 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 1aa312ee0b..25209c68cf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.1", + "version": "2.2.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 01c8ec2018..da9687491d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.1", + "version": "2.2.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.2.1", + "@budibase/types": "^2.2.2", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 480f651804..92b9bc24fe 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.1", + "version": "2.2.2", "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.1", + "@budibase/string-templates": "^2.2.2", "@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 8243cf96a3..5301a4a111 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.1", + "version": "2.2.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.1", - "@budibase/client": "^2.2.1", - "@budibase/frontend-core": "^2.2.1", - "@budibase/string-templates": "^2.2.1", + "@budibase/bbui": "^2.2.2", + "@budibase/client": "^2.2.2", + "@budibase/frontend-core": "^2.2.2", + "@budibase/string-templates": "^2.2.2", "@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 64e0cd5ff0..0e998314ef 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.1", + "version": "2.2.2", "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.1", - "@budibase/string-templates": "^2.2.1", - "@budibase/types": "^2.2.1", + "@budibase/backend-core": "^2.2.2", + "@budibase/string-templates": "^2.2.2", + "@budibase/types": "^2.2.2", "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 027381e89f..bc94329b0f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.1", + "version": "2.2.2", "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.1", - "@budibase/frontend-core": "^2.2.1", - "@budibase/string-templates": "^2.2.1", + "@budibase/bbui": "^2.2.2", + "@budibase/frontend-core": "^2.2.2", + "@budibase/string-templates": "^2.2.2", "@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 72fd9388ee..8819f8ceb9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.1", + "version": "2.2.2", "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.1", + "@budibase/bbui": "^2.2.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b73db204e9..ae5644d9ce 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.1", + "version": "2.2.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index dbfba0b3c3..d2e3c5ef08 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.1", + "version": "2.2.2", "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.1", - "@budibase/client": "^2.2.1", + "@budibase/backend-core": "^2.2.2", + "@budibase/client": "^2.2.2", "@budibase/pro": "2.2.1", - "@budibase/string-templates": "^2.2.1", - "@budibase/types": "^2.2.1", + "@budibase/string-templates": "^2.2.2", + "@budibase/types": "^2.2.2", "@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 3f6928ed4e..e97a3af3ec 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.1", + "version": "2.2.2", "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 9ec4cf42a0..6082c4cef7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.1", + "version": "2.2.2", "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 73f7f3e611..fa67868a2b 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.1", + "version": "2.2.2", "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.1", + "@budibase/backend-core": "^2.2.2", "@budibase/pro": "2.2.1", - "@budibase/string-templates": "^2.2.1", - "@budibase/types": "^2.2.1", + "@budibase/string-templates": "^2.2.2", + "@budibase/types": "^2.2.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3cb13e005a6325770c789afab7b75f6a8948f3a8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 12 Dec 2022 16:56:13 +0000 Subject: [PATCH 11/51] Update pro version to 2.2.2 --- 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 d2e3c5ef08..a52402263e 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.2", "@budibase/client": "^2.2.2", - "@budibase/pro": "2.2.1", + "@budibase/pro": "2.2.2", "@budibase/string-templates": "^2.2.2", "@budibase/types": "^2.2.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d49bfc3c3b..b69addc402 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.1.tgz#92c2464a17cae3c26afa40066feda21911cef660" - integrity sha512-EMzgxOTWebSLXq1hZr+WF2pNsjOc81XwwlWQ0mxXjv7YahWPYFsMGRZyOLWMOF4i49fuMvbmF39FdFCIa1odcg== +"@budibase/backend-core@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.2.tgz#f428d9192e3579bcec2a92bd3f51f7667f8f5986" + integrity sha512-xSjMNGmIIhg/BA+iAmhSAZzhUhERGqD1niRn5I2QguKzv/1AFDOq8RuKHXkkCoc/bkaVbrHoRYsGQp0eohdYvg== dependencies: - "@budibase/types" "^2.2.1" + "@budibase/types" "^2.2.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.1.tgz#fe74a84c32746309ca4f264e8e2fcc423705f639" - integrity sha512-IF6C5PVw9sVEXjUsjGVD1kTbUvMB0RGafwHBKkjmH3Qjs1hTczKW/kNm7pFzse94SB9QJGig02hWngMQ8cvKrg== +"@budibase/pro@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.2.tgz#2b15ad938cc303d672eca09ed77295d72053408c" + integrity sha512-fCrKTWjL5FJBVptJQLc7Cf/xovBrHWALG1Lu6/YwhFEw+SxPcFWCMISoRfYmMKuR70j4OhkfulmakkthLhuKOw== dependencies: - "@budibase/backend-core" "2.2.1" - "@budibase/types" "2.2.1" + "@budibase/backend-core" "2.2.2" + "@budibase/types" "2.2.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.1", "@budibase/types@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.1.tgz#baeaaeb0fee01e3a3746eb58f3b9ecbe249094f1" - integrity sha512-o5FFz47yDq+Evgj22h+yvvpBk9qPUqrs53EKtVB8PwUiSjvt7vbQTotIgJd9CVslAW5274dfnOG4oB2LuG3fDg== +"@budibase/types@2.2.2", "@budibase/types@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.2.tgz#8d425f01d037758003b31bc7b72db2ecde490723" + integrity sha512-FjkymgLKipU5mzzzNf2ZtvbXOMJLyJXrxAQIvNyhdCEXR4Pfn45b8RDpusKn/MgpaljLbsTrASttPBdNfOMT7w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index fa67868a2b..4a38103c2c 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.2", - "@budibase/pro": "2.2.1", + "@budibase/pro": "2.2.2", "@budibase/string-templates": "^2.2.2", "@budibase/types": "^2.2.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b8b8c9448f..8f9e40732d 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.1.tgz#92c2464a17cae3c26afa40066feda21911cef660" - integrity sha512-EMzgxOTWebSLXq1hZr+WF2pNsjOc81XwwlWQ0mxXjv7YahWPYFsMGRZyOLWMOF4i49fuMvbmF39FdFCIa1odcg== +"@budibase/backend-core@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.2.tgz#f428d9192e3579bcec2a92bd3f51f7667f8f5986" + integrity sha512-xSjMNGmIIhg/BA+iAmhSAZzhUhERGqD1niRn5I2QguKzv/1AFDOq8RuKHXkkCoc/bkaVbrHoRYsGQp0eohdYvg== dependencies: - "@budibase/types" "^2.2.1" + "@budibase/types" "^2.2.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.1.tgz#fe74a84c32746309ca4f264e8e2fcc423705f639" - integrity sha512-IF6C5PVw9sVEXjUsjGVD1kTbUvMB0RGafwHBKkjmH3Qjs1hTczKW/kNm7pFzse94SB9QJGig02hWngMQ8cvKrg== +"@budibase/pro@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.2.tgz#2b15ad938cc303d672eca09ed77295d72053408c" + integrity sha512-fCrKTWjL5FJBVptJQLc7Cf/xovBrHWALG1Lu6/YwhFEw+SxPcFWCMISoRfYmMKuR70j4OhkfulmakkthLhuKOw== dependencies: - "@budibase/backend-core" "2.2.1" - "@budibase/types" "2.2.1" + "@budibase/backend-core" "2.2.2" + "@budibase/types" "2.2.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.1", "@budibase/types@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.1.tgz#baeaaeb0fee01e3a3746eb58f3b9ecbe249094f1" - integrity sha512-o5FFz47yDq+Evgj22h+yvvpBk9qPUqrs53EKtVB8PwUiSjvt7vbQTotIgJd9CVslAW5274dfnOG4oB2LuG3fDg== +"@budibase/types@2.2.2", "@budibase/types@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.2.tgz#8d425f01d037758003b31bc7b72db2ecde490723" + integrity sha512-FjkymgLKipU5mzzzNf2ZtvbXOMJLyJXrxAQIvNyhdCEXR4Pfn45b8RDpusKn/MgpaljLbsTrASttPBdNfOMT7w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 01c8efbf35350233c21aef23915c73158c6050b6 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Wed, 14 Dec 2022 00:35:15 +0000 Subject: [PATCH 12/51] Fix for user enrichment call (updating to @budibase/nano fork) (#9038) * Fix for #9029 - this should fix the issue users have been experiencing with user enrichment calls in apps, essentially it utilises a fork of the nano library we use to interact with CouchDB, which has been updated to use a POST request rather than a GET request as it supports a larger set of data being sent as query parameters. * Incrementing Nano version to attempt to fix yarn registry issues. --- packages/backend-core/package.json | 2 +- .../backend-core/src/db/couch/DatabaseImpl.ts | 2 +- packages/backend-core/yarn.lock | 24 ++++++++--------- packages/types/package.json | 4 +-- packages/types/src/sdk/db.ts | 2 +- packages/types/yarn.lock | 26 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index da9687491d..35ea6432fd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -21,6 +21,7 @@ }, "dependencies": { "@budibase/types": "^2.2.2", + "@budibase/nano": "10.1.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", @@ -35,7 +36,6 @@ "koa-passport": "4.1.4", "lodash": "4.17.21", "lodash.isarguments": "3.1.0", - "nano": "^10.1.0", "node-fetch": "2.6.7", "passport-google-oauth": "2.0.0", "passport-jwt": "4.0.0", diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts index de06b4e8ee..9b4761d961 100644 --- a/packages/backend-core/src/db/couch/DatabaseImpl.ts +++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts @@ -1,4 +1,4 @@ -import Nano from "nano" +import Nano from "@budibase/nano" import { AllDocsResponse, AnyDocument, diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock index 0a25d5fb43..16de2cbaf8 100644 --- a/packages/backend-core/yarn.lock +++ b/packages/backend-core/yarn.lock @@ -470,6 +470,18 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/nano@10.1.1": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" + integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" @@ -4022,18 +4034,6 @@ msgpackr@^1.5.2: optionalDependencies: msgpackr-extract "^2.1.2" -nano@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" diff --git a/packages/types/package.json b/packages/types/package.json index 6082c4cef7..4bfa68e676 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -13,11 +13,11 @@ }, "jest": {}, "devDependencies": { - "@types/json5": "^2.2.0", + "@budibase/nano": "10.1.1", + "@types/json5": "2.2.0", "@types/koa": "2.13.4", "@types/node": "14.18.20", "@types/pouchdb": "6.4.0", - "nano": "10.1.0", "rimraf": "3.0.2", "typescript": "4.7.3" } diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts index 84daed0f90..50078ed6cc 100644 --- a/packages/types/src/sdk/db.ts +++ b/packages/types/src/sdk/db.ts @@ -1,5 +1,5 @@ import PouchDB from "pouchdb" -import Nano from "nano" +import Nano from "@budibase/nano" import { AllDocsResponse, AnyDocument, Document } from "../" export type PouchOptions = { diff --git a/packages/types/yarn.lock b/packages/types/yarn.lock index f596c58997..20febd4075 100644 --- a/packages/types/yarn.lock +++ b/packages/types/yarn.lock @@ -2,6 +2,18 @@ # yarn lockfile v1 +"@budibase/nano@10.1.1": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" + integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + "@types/accepts@*": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" @@ -75,7 +87,7 @@ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1" integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w== -"@types/json5@^2.2.0": +"@types/json5@2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-2.2.0.tgz#afff29abf9182a7d4a7e39105ca051f11c603d13" integrity sha512-NrVug5woqbvNZ0WX+Gv4R+L4TGddtmFek2u8RtccAgFZWtS9QXF2xCXY22/M4nzkaKF0q9Fc6M/5rxLDhfwc/A== @@ -483,18 +495,6 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nano@10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - node-abort-controller@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" From 1fee98510b81d27546acc7fa1dbcfb89784c8802 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 14 Dec 2022 00:52:41 +0000 Subject: [PATCH 13/51] v2.2.3 --- 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 25209c68cf..3f4bf5ad60 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.2", + "version": "2.2.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 35ea6432fd..2fcff45586 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.2", + "version": "2.2.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,8 +20,8 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.2.2", "@budibase/nano": "10.1.1", + "@budibase/types": "^2.2.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 92b9bc24fe..dbf07e74f5 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.2", + "version": "2.2.3", "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.2", + "@budibase/string-templates": "^2.2.3", "@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 5301a4a111..f1dafbb2a5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.2", + "version": "2.2.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.2", - "@budibase/client": "^2.2.2", - "@budibase/frontend-core": "^2.2.2", - "@budibase/string-templates": "^2.2.2", + "@budibase/bbui": "^2.2.3", + "@budibase/client": "^2.2.3", + "@budibase/frontend-core": "^2.2.3", + "@budibase/string-templates": "^2.2.3", "@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 0e998314ef..8a5b69f5ce 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.2", + "version": "2.2.3", "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.2", - "@budibase/string-templates": "^2.2.2", - "@budibase/types": "^2.2.2", + "@budibase/backend-core": "^2.2.3", + "@budibase/string-templates": "^2.2.3", + "@budibase/types": "^2.2.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index bc94329b0f..d524e60c64 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.2", + "version": "2.2.3", "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.2", - "@budibase/frontend-core": "^2.2.2", - "@budibase/string-templates": "^2.2.2", + "@budibase/bbui": "^2.2.3", + "@budibase/frontend-core": "^2.2.3", + "@budibase/string-templates": "^2.2.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8819f8ceb9..9f623143aa 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.2", + "version": "2.2.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.2.2", + "@budibase/bbui": "^2.2.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ae5644d9ce..31249b8a7d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.2", + "version": "2.2.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a52402263e..90125e2daf 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.2", + "version": "2.2.3", "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.2", - "@budibase/client": "^2.2.2", + "@budibase/backend-core": "^2.2.3", + "@budibase/client": "^2.2.3", "@budibase/pro": "2.2.2", - "@budibase/string-templates": "^2.2.2", - "@budibase/types": "^2.2.2", + "@budibase/string-templates": "^2.2.3", + "@budibase/types": "^2.2.3", "@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 e97a3af3ec..6d878f4df8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.2", + "version": "2.2.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4bfa68e676..940a57bba5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.2", + "version": "2.2.3", "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 4a38103c2c..e02c728cc5 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.2", + "version": "2.2.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.2.2", + "@budibase/backend-core": "^2.2.3", "@budibase/pro": "2.2.2", - "@budibase/string-templates": "^2.2.2", - "@budibase/types": "^2.2.2", + "@budibase/string-templates": "^2.2.3", + "@budibase/types": "^2.2.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c0cfec1081f95fbb607adecfeff93a08f2cd870e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 14 Dec 2022 00:56:53 +0000 Subject: [PATCH 14/51] Update pro version to 2.2.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 56 ++++++++++++++++++------------------ packages/worker/package.json | 2 +- packages/worker/yarn.lock | 56 ++++++++++++++++++------------------ 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 90125e2daf..f4fc9d32cb 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.3", "@budibase/client": "^2.2.3", - "@budibase/pro": "2.2.2", + "@budibase/pro": "2.2.3", "@budibase/string-templates": "^2.2.3", "@budibase/types": "^2.2.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b69addc402..529b229481 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +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.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.2.tgz#f428d9192e3579bcec2a92bd3f51f7667f8f5986" - integrity sha512-xSjMNGmIIhg/BA+iAmhSAZzhUhERGqD1niRn5I2QguKzv/1AFDOq8RuKHXkkCoc/bkaVbrHoRYsGQp0eohdYvg== +"@budibase/backend-core@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.3.tgz#e2c3214bdbd6fa5cc95038816ecc40a9a0538be9" + integrity sha512-vGOWkQ8Xk6p6Lcvbtj6Z4UMoZoZlllMwmnWkwBbwr0am9bVFBF9k65Ca/vioA1egsvmM9hKCCQV6xeDcUz8qaQ== dependencies: - "@budibase/types" "^2.2.2" + "@budibase/nano" "10.1.1" + "@budibase/types" "^2.2.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1293,7 +1294,6 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" - nano "^10.1.0" node-fetch "2.6.7" passport-google-oauth "2.0.0" passport-jwt "4.0.0" @@ -1360,13 +1360,25 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.2.tgz#2b15ad938cc303d672eca09ed77295d72053408c" - integrity sha512-fCrKTWjL5FJBVptJQLc7Cf/xovBrHWALG1Lu6/YwhFEw+SxPcFWCMISoRfYmMKuR70j4OhkfulmakkthLhuKOw== +"@budibase/nano@10.1.1": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" + integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA== dependencies: - "@budibase/backend-core" "2.2.2" - "@budibase/types" "2.2.2" + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + +"@budibase/pro@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.3.tgz#2e307353597e36df74f80d8affe4ba5686f895fb" + integrity sha512-o93ara4THEzMLyNyym+BzcPfB0S8XL4ayRnwbaUnF1cqwbJbiFUv4QR9PC2mrRW7f2EuyVdG2CiCh8EGi05f/A== + dependencies: + "@budibase/backend-core" "2.2.3" + "@budibase/types" "2.2.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.2", "@budibase/types@^2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.2.tgz#8d425f01d037758003b31bc7b72db2ecde490723" - integrity sha512-FjkymgLKipU5mzzzNf2ZtvbXOMJLyJXrxAQIvNyhdCEXR4Pfn45b8RDpusKn/MgpaljLbsTrASttPBdNfOMT7w== +"@budibase/types@2.2.3", "@budibase/types@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.3.tgz#81ecc4d04cf74698bcd7ea77cee226b0dfd9d949" + integrity sha512-+LnzJvxbsUtFnSvd9uki6N7OPwmqu4R8nLXuLzDJyknHVdrLgkAduv+0AZ6WIqjgl6ADVcvk48Et40s0wotZxw== "@bull-board/api@3.7.0": version "3.7.0" @@ -10720,18 +10732,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== -nano@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" diff --git a/packages/worker/package.json b/packages/worker/package.json index e02c728cc5..c103804399 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.3", - "@budibase/pro": "2.2.2", + "@budibase/pro": "2.2.3", "@budibase/string-templates": "^2.2.3", "@budibase/types": "^2.2.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 8f9e40732d..ad7c6e14ba 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +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.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.2.tgz#f428d9192e3579bcec2a92bd3f51f7667f8f5986" - integrity sha512-xSjMNGmIIhg/BA+iAmhSAZzhUhERGqD1niRn5I2QguKzv/1AFDOq8RuKHXkkCoc/bkaVbrHoRYsGQp0eohdYvg== +"@budibase/backend-core@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.3.tgz#e2c3214bdbd6fa5cc95038816ecc40a9a0538be9" + integrity sha512-vGOWkQ8Xk6p6Lcvbtj6Z4UMoZoZlllMwmnWkwBbwr0am9bVFBF9k65Ca/vioA1egsvmM9hKCCQV6xeDcUz8qaQ== dependencies: - "@budibase/types" "^2.2.2" + "@budibase/nano" "10.1.1" + "@budibase/types" "^2.2.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -490,7 +491,6 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" - nano "^10.1.0" node-fetch "2.6.7" passport-google-oauth "2.0.0" passport-jwt "4.0.0" @@ -507,22 +507,34 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.2.tgz#2b15ad938cc303d672eca09ed77295d72053408c" - integrity sha512-fCrKTWjL5FJBVptJQLc7Cf/xovBrHWALG1Lu6/YwhFEw+SxPcFWCMISoRfYmMKuR70j4OhkfulmakkthLhuKOw== +"@budibase/nano@10.1.1": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" + integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA== dependencies: - "@budibase/backend-core" "2.2.2" - "@budibase/types" "2.2.2" + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + +"@budibase/pro@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.3.tgz#2e307353597e36df74f80d8affe4ba5686f895fb" + integrity sha512-o93ara4THEzMLyNyym+BzcPfB0S8XL4ayRnwbaUnF1cqwbJbiFUv4QR9PC2mrRW7f2EuyVdG2CiCh8EGi05f/A== + dependencies: + "@budibase/backend-core" "2.2.3" + "@budibase/types" "2.2.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.2", "@budibase/types@^2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.2.tgz#8d425f01d037758003b31bc7b72db2ecde490723" - integrity sha512-FjkymgLKipU5mzzzNf2ZtvbXOMJLyJXrxAQIvNyhdCEXR4Pfn45b8RDpusKn/MgpaljLbsTrASttPBdNfOMT7w== +"@budibase/types@2.2.3", "@budibase/types@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.3.tgz#81ecc4d04cf74698bcd7ea77cee226b0dfd9d949" + integrity sha512-+LnzJvxbsUtFnSvd9uki6N7OPwmqu4R8nLXuLzDJyknHVdrLgkAduv+0AZ6WIqjgl6ADVcvk48Et40s0wotZxw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -5493,18 +5505,6 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nano@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" From 4188754bbec8059994cde30618dc32a4b9a3087f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Dec 2022 09:22:28 +0000 Subject: [PATCH 15/51] Fix SQL table `_id` filtering (#9030) * Re-add support for filtering on _id using external SQL tables and fix filter key prefixes not working with _id field * Remove like operator from internal tables and only allow basic operators on SQL table _id column * Update data section filtering to respect new rules * Update automation section filtering to respect new rules * Update dynamic filter component to respect new rules --- .../SetupPanel/AutomationBlockSetup.svelte | 1 + .../backend/DataTable/DataTable.svelte | 1 + .../buttons/TableFilterButton.svelte | 2 ++ .../controls/FilterEditor/FilterDrawer.svelte | 20 ++++++----- .../controls/FilterEditor/FilterEditor.svelte | 6 ++-- packages/builder/src/helpers/searchFields.js | 10 +----- .../app/dynamic-filter/DynamicFilter.svelte | 8 ++--- .../app/dynamic-filter/FilterModal.svelte | 11 +++++-- packages/frontend-core/src/utils/lucene.js | 33 +++++++++++++------ .../api/controllers/row/ExternalRequest.ts | 21 ++++++++---- 10 files changed, 70 insertions(+), 43 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index d09faa34c9..a73db5648b 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -232,6 +232,7 @@ {filters} {bindings} {schemaFields} + datasource={{ type: "table", tableId }} panel={AutomationBindingPanel} fillWidth on:change={e => (tempFilters = e.detail)} diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 4f5c3375bd..bdf2f46b2c 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -190,6 +190,7 @@ {filters} on:change={onFilter} disabled={!hasCols} + tableId={id} /> {/key} diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte index be9c6259c6..5db4eb5288 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte @@ -6,6 +6,7 @@ export let schema export let filters export let disabled = false + export let tableId const dispatch = createEventDispatcher() @@ -37,6 +38,7 @@ allowBindings={false} {filters} {schemaFields} + datasource={{ type: "table", tableId }} on:change={e => (tempValue = e.detail)} /> diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index d495e37216..629e2024e7 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -25,7 +25,7 @@ export let panel = ClientBindingPanel export let allowBindings = true export let fillWidth = false - export let tableId + export let datasource const dispatch = createEventDispatcher() const { OperatorOptions } = Constants @@ -41,11 +41,7 @@ $: parseFilters(filters) $: dispatch("change", enrichFilters(rawFilters, matchAny)) - $: enrichedSchemaFields = getFields( - schemaFields || [], - { allowLinks: true }, - tableId - ) + $: enrichedSchemaFields = getFields(schemaFields || [], { allowLinks: true }) $: fieldOptions = enrichedSchemaFields.map(field => field.name) || [] $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"] @@ -119,7 +115,11 @@ const santizeOperator = filter => { // Ensure a valid operator is selected - const operators = getValidOperatorsForType(filter.type).map(x => x.value) + const operators = getValidOperatorsForType( + filter.type, + filter.field, + datasource + ).map(x => x.value) if (!operators.includes(filter.operator)) { filter.operator = operators[0] ?? OperatorOptions.Equals.value } @@ -201,7 +201,11 @@ /> onOperatorChange(filter, e.detail)} placeholder={null} diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index 774ddbd834..427d8f8b97 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -7,7 +7,7 @@ const HBS_REGEX = /{{([^{].*?)}}/g * Returns the valid operator options for a certain data type * @param type the data type */ -export const getValidOperatorsForType = type => { +export const getValidOperatorsForType = (type, field, datasource) => { const Op = OperatorOptions const stringOps = [ Op.Equals, @@ -27,24 +27,37 @@ export const getValidOperatorsForType = type => { Op.NotEmpty, Op.In, ] + let ops = [] if (type === "string") { - return stringOps + ops = stringOps } else if (type === "number") { - return numOps + ops = numOps } else if (type === "options") { - return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In] + ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In] } else if (type === "array") { - return [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty, Op.ContainsAny] + ops = [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty, Op.ContainsAny] } else if (type === "boolean") { - return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty] + ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty] } else if (type === "longform") { - return stringOps + ops = stringOps } else if (type === "datetime") { - return numOps + ops = numOps } else if (type === "formula") { - return stringOps.concat([Op.MoreThan, Op.LessThan]) + ops = stringOps.concat([Op.MoreThan, Op.LessThan]) } - return [] + + // Filter out "like" for internal tables + const externalTable = datasource?.tableId?.includes("datasource_plus") + if (datasource?.type === "table" && !externalTable) { + ops = ops.filter(x => x !== Op.Like) + } + + // Only allow equal/not equal for _id in SQL tables + if (field === "_id" && externalTable) { + ops = [Op.Equals, Op.NotEquals] + } + + return ops } /** diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index a343553fc8..da3ff7bc53 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -25,6 +25,7 @@ import { processObjectSync } from "@budibase/string-templates" import { cloneDeep } from "lodash/fp" import { processFormulas, processDates } from "../../../utilities/rowProcessor" import { context } from "@budibase/backend-core" +import { removeKeyNumbering } from "./utils" export interface ManyRelationship { tableId?: string @@ -55,15 +56,21 @@ function buildFilters( let idCopy: undefined | string | any[] = cloneDeep(id) if (filters) { // need to map over the filters and make sure the _id field isn't present - for (let filter of Object.values(filters)) { - if (filter._id && primary) { - const parts = breakRowIdField(filter._id) - for (let field of primary) { - filter[field] = parts.shift() + let prefix = 1 + for (let operator of Object.values(filters)) { + for (let field of Object.keys(operator || {})) { + if (removeKeyNumbering(field) === "_id") { + if (primary) { + const parts = breakRowIdField(operator[field]) + for (let field of primary) { + operator[`${prefix}:${field}`] = parts.shift() + } + prefix++ + } + // make sure this field doesn't exist on any filter + delete operator[field] } } - // make sure this field doesn't exist on any filter - delete filter._id } } // there is no id, just use the user provided filters From f1dea09042fb0ca40c29976ceeaab2ca740ee424 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 09:37:40 +0000 Subject: [PATCH 16/51] v2.2.4 --- 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 3f4bf5ad60..e9918a572b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.3", + "version": "2.2.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2fcff45586..f7229afbf8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.3", + "version": "2.2.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.3", + "@budibase/types": "^2.2.4", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index dbf07e74f5..8b591fe1f0 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.3", + "version": "2.2.4", "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.3", + "@budibase/string-templates": "^2.2.4", "@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 f1dafbb2a5..0ff7553f32 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.3", + "version": "2.2.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.3", - "@budibase/client": "^2.2.3", - "@budibase/frontend-core": "^2.2.3", - "@budibase/string-templates": "^2.2.3", + "@budibase/bbui": "^2.2.4", + "@budibase/client": "^2.2.4", + "@budibase/frontend-core": "^2.2.4", + "@budibase/string-templates": "^2.2.4", "@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 8a5b69f5ce..b738c8beec 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.3", + "version": "2.2.4", "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.3", - "@budibase/string-templates": "^2.2.3", - "@budibase/types": "^2.2.3", + "@budibase/backend-core": "^2.2.4", + "@budibase/string-templates": "^2.2.4", + "@budibase/types": "^2.2.4", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index d524e60c64..728fad16f2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.3", + "version": "2.2.4", "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.3", - "@budibase/frontend-core": "^2.2.3", - "@budibase/string-templates": "^2.2.3", + "@budibase/bbui": "^2.2.4", + "@budibase/frontend-core": "^2.2.4", + "@budibase/string-templates": "^2.2.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 9f623143aa..1928dff864 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.3", + "version": "2.2.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.2.3", + "@budibase/bbui": "^2.2.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 31249b8a7d..e37dfaedf4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.3", + "version": "2.2.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index f4fc9d32cb..4142d8f6c4 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.3", + "version": "2.2.4", "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.3", - "@budibase/client": "^2.2.3", + "@budibase/backend-core": "^2.2.4", + "@budibase/client": "^2.2.4", "@budibase/pro": "2.2.3", - "@budibase/string-templates": "^2.2.3", - "@budibase/types": "^2.2.3", + "@budibase/string-templates": "^2.2.4", + "@budibase/types": "^2.2.4", "@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 6d878f4df8..5d340314c5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.3", + "version": "2.2.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 940a57bba5..0d7b1920b0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.3", + "version": "2.2.4", "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 c103804399..2c144609e8 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.3", + "version": "2.2.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.2.3", + "@budibase/backend-core": "^2.2.4", "@budibase/pro": "2.2.3", - "@budibase/string-templates": "^2.2.3", - "@budibase/types": "^2.2.3", + "@budibase/string-templates": "^2.2.4", + "@budibase/types": "^2.2.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a8b0dc464696d1e679b0fed50cfaa75ec4bf7707 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 09:41:31 +0000 Subject: [PATCH 17/51] Update pro version to 2.2.4 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4142d8f6c4..184455d8e7 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.4", "@budibase/client": "^2.2.4", - "@budibase/pro": "2.2.3", + "@budibase/pro": "2.2.4", "@budibase/string-templates": "^2.2.4", "@budibase/types": "^2.2.4", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 529b229481..4786dc3d24 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.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.3.tgz#e2c3214bdbd6fa5cc95038816ecc40a9a0538be9" - integrity sha512-vGOWkQ8Xk6p6Lcvbtj6Z4UMoZoZlllMwmnWkwBbwr0am9bVFBF9k65Ca/vioA1egsvmM9hKCCQV6xeDcUz8qaQ== +"@budibase/backend-core@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4.tgz#4fa83cb4b284573a02657a76c34b3095fe8f8961" + integrity sha512-F/9aXmO8xS6/o5kzyiSs5Jw61QoxqPIi+yXqmLmOOy3FtJdQT3QvvVphZSzWAVKGja4EH9DDfnJxt8zXE1MZWA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.3" + "@budibase/types" "^2.2.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.3.tgz#2e307353597e36df74f80d8affe4ba5686f895fb" - integrity sha512-o93ara4THEzMLyNyym+BzcPfB0S8XL4ayRnwbaUnF1cqwbJbiFUv4QR9PC2mrRW7f2EuyVdG2CiCh8EGi05f/A== +"@budibase/pro@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4.tgz#0a199e3f13b1c60b22f356cb3bac939e33a66232" + integrity sha512-l/IdyaVHlxmYcdY7BHsMGGNhKc14LPSgwat2J0soqqZgG8BYsNjukN+G8YbL4hVwCn/8ZvKVuokGMFp+b6ujzQ== dependencies: - "@budibase/backend-core" "2.2.3" - "@budibase/types" "2.2.3" + "@budibase/backend-core" "2.2.4" + "@budibase/types" "2.2.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.3", "@budibase/types@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.3.tgz#81ecc4d04cf74698bcd7ea77cee226b0dfd9d949" - integrity sha512-+LnzJvxbsUtFnSvd9uki6N7OPwmqu4R8nLXuLzDJyknHVdrLgkAduv+0AZ6WIqjgl6ADVcvk48Et40s0wotZxw== +"@budibase/types@2.2.4", "@budibase/types@^2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4.tgz#4baf9e54cbbdfb0a6d7e2b6f3eac50aab4712f8d" + integrity sha512-RIBkVKcdgyiWkvji3wxruW7N4WVSZGDs8gtSwmJmz74d6eKjE8GMLiIBkH1B6cWNtssSfhEoTANsNpbzK2/uvg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 2c144609e8..98d7c94d86 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.4", - "@budibase/pro": "2.2.3", + "@budibase/pro": "2.2.4", "@budibase/string-templates": "^2.2.4", "@budibase/types": "^2.2.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ad7c6e14ba..395a3ae0d2 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.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.3.tgz#e2c3214bdbd6fa5cc95038816ecc40a9a0538be9" - integrity sha512-vGOWkQ8Xk6p6Lcvbtj6Z4UMoZoZlllMwmnWkwBbwr0am9bVFBF9k65Ca/vioA1egsvmM9hKCCQV6xeDcUz8qaQ== +"@budibase/backend-core@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4.tgz#4fa83cb4b284573a02657a76c34b3095fe8f8961" + integrity sha512-F/9aXmO8xS6/o5kzyiSs5Jw61QoxqPIi+yXqmLmOOy3FtJdQT3QvvVphZSzWAVKGja4EH9DDfnJxt8zXE1MZWA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.3" + "@budibase/types" "^2.2.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.3.tgz#2e307353597e36df74f80d8affe4ba5686f895fb" - integrity sha512-o93ara4THEzMLyNyym+BzcPfB0S8XL4ayRnwbaUnF1cqwbJbiFUv4QR9PC2mrRW7f2EuyVdG2CiCh8EGi05f/A== +"@budibase/pro@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4.tgz#0a199e3f13b1c60b22f356cb3bac939e33a66232" + integrity sha512-l/IdyaVHlxmYcdY7BHsMGGNhKc14LPSgwat2J0soqqZgG8BYsNjukN+G8YbL4hVwCn/8ZvKVuokGMFp+b6ujzQ== dependencies: - "@budibase/backend-core" "2.2.3" - "@budibase/types" "2.2.3" + "@budibase/backend-core" "2.2.4" + "@budibase/types" "2.2.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.3", "@budibase/types@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.3.tgz#81ecc4d04cf74698bcd7ea77cee226b0dfd9d949" - integrity sha512-+LnzJvxbsUtFnSvd9uki6N7OPwmqu4R8nLXuLzDJyknHVdrLgkAduv+0AZ6WIqjgl6ADVcvk48Et40s0wotZxw== +"@budibase/types@2.2.4", "@budibase/types@^2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4.tgz#4baf9e54cbbdfb0a6d7e2b6f3eac50aab4712f8d" + integrity sha512-RIBkVKcdgyiWkvji3wxruW7N4WVSZGDs8gtSwmJmz74d6eKjE8GMLiIBkH1B6cWNtssSfhEoTANsNpbzK2/uvg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 07d5ddf3bb837ced7bb6e0ba9a684b6d9047964f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 15 Dec 2022 12:45:53 +0000 Subject: [PATCH 18/51] lock changes (#9047) --- packages/backend-core/src/redis/redlock.ts | 27 ++++++++++++++----- .../types/src/documents/account/account.ts | 2 ++ packages/types/src/sdk/locks.ts | 3 +++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/packages/backend-core/src/redis/redlock.ts b/packages/backend-core/src/redis/redlock.ts index 586302c9b1..54b2c0a8d1 100644 --- a/packages/backend-core/src/redis/redlock.ts +++ b/packages/backend-core/src/redis/redlock.ts @@ -13,6 +13,18 @@ const getClient = async (type: LockType): Promise => { } return noRetryRedlock } + case LockType.DEFAULT: { + if (!noRetryRedlock) { + noRetryRedlock = await newRedlock(OPTIONS.DEFAULT) + } + return noRetryRedlock + } + case LockType.DELAY_500: { + if (!noRetryRedlock) { + noRetryRedlock = await newRedlock(OPTIONS.DELAY_500) + } + return noRetryRedlock + } default: { throw new Error(`Could not get redlock client: ${type}`) } @@ -41,6 +53,9 @@ export const OPTIONS = { // see https://www.awsarchitectureblog.com/2015/03/backoff.html retryJitter: 100, // time in ms }, + DELAY_500: { + retryDelay: 500, + }, } export const newRedlock = async (opts: Options = {}) => { @@ -55,19 +70,17 @@ export const doWithLock = async (opts: LockOptions, task: any) => { let lock try { // aquire lock - let name: string - if (opts.systemLock) { - name = opts.name - } else { - name = `${tenancy.getTenantId()}_${opts.name}` - } + let name: string = `lock:${tenancy.getTenantId()}_${opts.name}` if (opts.nameSuffix) { name = name + `_${opts.nameSuffix}` } lock = await redlock.lock(name, opts.ttl) // perform locked task - return task() + // need to await to ensure completion before unlocking + const result = await task() + return result } catch (e: any) { + console.log("lock error") // lock limit exceeded if (e.name === "LockError") { if (opts.type === LockType.TRY_ONCE) { diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index 70c3061c3f..cf92002744 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -3,6 +3,7 @@ import { Hosting, MonthlyQuotaName, PlanType, + PriceDuration, Quotas, StaticQuotaName, } from "../../sdk" @@ -46,6 +47,7 @@ export interface Account extends CreateAccount { tier: string // deprecated planType?: PlanType planTier?: number + planDuration?: PriceDuration stripeCustomerId?: string licenseKey?: string licenseKeyActivatedAt?: number diff --git a/packages/types/src/sdk/locks.ts b/packages/types/src/sdk/locks.ts index e2f1902762..e6809319b1 100644 --- a/packages/types/src/sdk/locks.ts +++ b/packages/types/src/sdk/locks.ts @@ -4,11 +4,14 @@ export enum LockType { * No retries will take place and no error will be thrown. */ TRY_ONCE = "try_once", + DEFAULT = "default", + DELAY_500 = "delay_500", } export enum LockName { MIGRATIONS = "migrations", TRIGGER_QUOTA = "trigger_quota", + SYNC_ACCOUNT_LICENSE = "sync_account_license", } export interface LockOptions { From edae61a51b640d503030fbbad37b64c1118f6e05 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 13:04:16 +0000 Subject: [PATCH 19/51] v2.2.5 --- 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 e9918a572b..1e22c0ee03 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.4", + "version": "2.2.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f7229afbf8..d7a2a8a73d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.4", + "version": "2.2.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.4", + "@budibase/types": "^2.2.5", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8b591fe1f0..e1e6c641ff 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.4", + "version": "2.2.5", "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.4", + "@budibase/string-templates": "^2.2.5", "@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 0ff7553f32..1e8e6db189 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.4", + "version": "2.2.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.4", - "@budibase/client": "^2.2.4", - "@budibase/frontend-core": "^2.2.4", - "@budibase/string-templates": "^2.2.4", + "@budibase/bbui": "^2.2.5", + "@budibase/client": "^2.2.5", + "@budibase/frontend-core": "^2.2.5", + "@budibase/string-templates": "^2.2.5", "@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 b738c8beec..889c75dabc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.4", + "version": "2.2.5", "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.4", - "@budibase/string-templates": "^2.2.4", - "@budibase/types": "^2.2.4", + "@budibase/backend-core": "^2.2.5", + "@budibase/string-templates": "^2.2.5", + "@budibase/types": "^2.2.5", "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 728fad16f2..146440f805 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.4", + "version": "2.2.5", "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.4", - "@budibase/frontend-core": "^2.2.4", - "@budibase/string-templates": "^2.2.4", + "@budibase/bbui": "^2.2.5", + "@budibase/frontend-core": "^2.2.5", + "@budibase/string-templates": "^2.2.5", "@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 1928dff864..97a0a17f1b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.4", + "version": "2.2.5", "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.4", + "@budibase/bbui": "^2.2.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e37dfaedf4..29d848f6c3 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.4", + "version": "2.2.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 184455d8e7..16acb83264 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.4", + "version": "2.2.5", "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.4", - "@budibase/client": "^2.2.4", + "@budibase/backend-core": "^2.2.5", + "@budibase/client": "^2.2.5", "@budibase/pro": "2.2.4", - "@budibase/string-templates": "^2.2.4", - "@budibase/types": "^2.2.4", + "@budibase/string-templates": "^2.2.5", + "@budibase/types": "^2.2.5", "@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 5d340314c5..b88ba9d38c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.4", + "version": "2.2.5", "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 0d7b1920b0..49f20b28b2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.4", + "version": "2.2.5", "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 98d7c94d86..7c0e64f761 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.4", + "version": "2.2.5", "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.4", + "@budibase/backend-core": "^2.2.5", "@budibase/pro": "2.2.4", - "@budibase/string-templates": "^2.2.4", - "@budibase/types": "^2.2.4", + "@budibase/string-templates": "^2.2.5", + "@budibase/types": "^2.2.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From db8a6bf27177148d3f78711ea95de1593c085f13 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 13:08:36 +0000 Subject: [PATCH 20/51] Update pro version to 2.2.5 --- 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 16acb83264..bc34f5ee14 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.5", "@budibase/client": "^2.2.5", - "@budibase/pro": "2.2.4", + "@budibase/pro": "2.2.5", "@budibase/string-templates": "^2.2.5", "@budibase/types": "^2.2.5", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 4786dc3d24..0cc1ae22b9 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.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4.tgz#4fa83cb4b284573a02657a76c34b3095fe8f8961" - integrity sha512-F/9aXmO8xS6/o5kzyiSs5Jw61QoxqPIi+yXqmLmOOy3FtJdQT3QvvVphZSzWAVKGja4EH9DDfnJxt8zXE1MZWA== +"@budibase/backend-core@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.5.tgz#3cbf4b4848f63a3b20e81f5c615fcb4e92bef643" + integrity sha512-H4j3puP4yYcFgpkTXBkBnEBMRRXq17UPKNFjTbqnfkJU6lNevcAa/XuYRXRzWLThfXrl0UDspNwV6hE8MRlehg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.4" + "@budibase/types" "^2.2.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4.tgz#0a199e3f13b1c60b22f356cb3bac939e33a66232" - integrity sha512-l/IdyaVHlxmYcdY7BHsMGGNhKc14LPSgwat2J0soqqZgG8BYsNjukN+G8YbL4hVwCn/8ZvKVuokGMFp+b6ujzQ== +"@budibase/pro@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.5.tgz#4d156215c559da74378b01bb92229fc30b81733d" + integrity sha512-Gg3Rih1GdzDhkKfFYeRfokkOWp36k3kuZ56j5VeaIiqULC4oBFkPoXflx9lI0UX3zRGrIhHx9cvw1UoqpXB7Dg== dependencies: - "@budibase/backend-core" "2.2.4" - "@budibase/types" "2.2.4" + "@budibase/backend-core" "2.2.5" + "@budibase/types" "2.2.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.4", "@budibase/types@^2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4.tgz#4baf9e54cbbdfb0a6d7e2b6f3eac50aab4712f8d" - integrity sha512-RIBkVKcdgyiWkvji3wxruW7N4WVSZGDs8gtSwmJmz74d6eKjE8GMLiIBkH1B6cWNtssSfhEoTANsNpbzK2/uvg== +"@budibase/types@2.2.5", "@budibase/types@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.5.tgz#801f2f305880208ad020fa3ac67e010c5672402f" + integrity sha512-20AqQAMWzFN3gJ+AgdI1qDGe+u0avpiUkxEM+MMcxXVUmqNFm6Z1KJ2AfCSOYgV7aMRPiLMOkdVms6Wm2Iv2Zg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7c0e64f761..76602e682e 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.5", - "@budibase/pro": "2.2.4", + "@budibase/pro": "2.2.5", "@budibase/string-templates": "^2.2.5", "@budibase/types": "^2.2.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 395a3ae0d2..3f2c461688 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.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4.tgz#4fa83cb4b284573a02657a76c34b3095fe8f8961" - integrity sha512-F/9aXmO8xS6/o5kzyiSs5Jw61QoxqPIi+yXqmLmOOy3FtJdQT3QvvVphZSzWAVKGja4EH9DDfnJxt8zXE1MZWA== +"@budibase/backend-core@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.5.tgz#3cbf4b4848f63a3b20e81f5c615fcb4e92bef643" + integrity sha512-H4j3puP4yYcFgpkTXBkBnEBMRRXq17UPKNFjTbqnfkJU6lNevcAa/XuYRXRzWLThfXrl0UDspNwV6hE8MRlehg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.4" + "@budibase/types" "^2.2.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4.tgz#0a199e3f13b1c60b22f356cb3bac939e33a66232" - integrity sha512-l/IdyaVHlxmYcdY7BHsMGGNhKc14LPSgwat2J0soqqZgG8BYsNjukN+G8YbL4hVwCn/8ZvKVuokGMFp+b6ujzQ== +"@budibase/pro@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.5.tgz#4d156215c559da74378b01bb92229fc30b81733d" + integrity sha512-Gg3Rih1GdzDhkKfFYeRfokkOWp36k3kuZ56j5VeaIiqULC4oBFkPoXflx9lI0UX3zRGrIhHx9cvw1UoqpXB7Dg== dependencies: - "@budibase/backend-core" "2.2.4" - "@budibase/types" "2.2.4" + "@budibase/backend-core" "2.2.5" + "@budibase/types" "2.2.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.4", "@budibase/types@^2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4.tgz#4baf9e54cbbdfb0a6d7e2b6f3eac50aab4712f8d" - integrity sha512-RIBkVKcdgyiWkvji3wxruW7N4WVSZGDs8gtSwmJmz74d6eKjE8GMLiIBkH1B6cWNtssSfhEoTANsNpbzK2/uvg== +"@budibase/types@2.2.5", "@budibase/types@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.5.tgz#801f2f305880208ad020fa3ac67e010c5672402f" + integrity sha512-20AqQAMWzFN3gJ+AgdI1qDGe+u0avpiUkxEM+MMcxXVUmqNFm6Z1KJ2AfCSOYgV7aMRPiLMOkdVms6Wm2Iv2Zg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 6c89f67b9d9f3e003146b95ffc24f33a60f45b7f Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 15 Dec 2022 15:13:12 +0000 Subject: [PATCH 21/51] Make looping arrow point in right direction (#9053) --- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index 2d0a86d95c..d6e5fcb36d 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -180,7 +180,7 @@ onSelect(block) }} > - + From 302704cbf421120b5efa9451530e55289d0c8189 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 15:27:14 +0000 Subject: [PATCH 22/51] v2.2.6 --- 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 1e22c0ee03..4e50e75925 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.5", + "version": "2.2.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d7a2a8a73d..4c0ae9f1b5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.5", + "version": "2.2.6", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.5", + "@budibase/types": "^2.2.6", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e1e6c641ff..15ac33bc4e 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.5", + "version": "2.2.6", "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.5", + "@budibase/string-templates": "^2.2.6", "@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 1e8e6db189..c039a28c8d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.5", + "version": "2.2.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.5", - "@budibase/client": "^2.2.5", - "@budibase/frontend-core": "^2.2.5", - "@budibase/string-templates": "^2.2.5", + "@budibase/bbui": "^2.2.6", + "@budibase/client": "^2.2.6", + "@budibase/frontend-core": "^2.2.6", + "@budibase/string-templates": "^2.2.6", "@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 889c75dabc..6f2a6f7357 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.5", + "version": "2.2.6", "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.5", - "@budibase/string-templates": "^2.2.5", - "@budibase/types": "^2.2.5", + "@budibase/backend-core": "^2.2.6", + "@budibase/string-templates": "^2.2.6", + "@budibase/types": "^2.2.6", "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 146440f805..87eaedbe6a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.5", + "version": "2.2.6", "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.5", - "@budibase/frontend-core": "^2.2.5", - "@budibase/string-templates": "^2.2.5", + "@budibase/bbui": "^2.2.6", + "@budibase/frontend-core": "^2.2.6", + "@budibase/string-templates": "^2.2.6", "@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 97a0a17f1b..af9e5c1143 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.5", + "version": "2.2.6", "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.5", + "@budibase/bbui": "^2.2.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 29d848f6c3..15e672610e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.5", + "version": "2.2.6", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index bc34f5ee14..6a68eeb8c7 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.5", + "version": "2.2.6", "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.5", - "@budibase/client": "^2.2.5", + "@budibase/backend-core": "^2.2.6", + "@budibase/client": "^2.2.6", "@budibase/pro": "2.2.5", - "@budibase/string-templates": "^2.2.5", - "@budibase/types": "^2.2.5", + "@budibase/string-templates": "^2.2.6", + "@budibase/types": "^2.2.6", "@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 b88ba9d38c..6a0c162bf3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.5", + "version": "2.2.6", "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 49f20b28b2..f9e8098459 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.5", + "version": "2.2.6", "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 76602e682e..dedf93ac55 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.5", + "version": "2.2.6", "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.5", + "@budibase/backend-core": "^2.2.6", "@budibase/pro": "2.2.5", - "@budibase/string-templates": "^2.2.5", - "@budibase/types": "^2.2.5", + "@budibase/string-templates": "^2.2.6", + "@budibase/types": "^2.2.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6ec88f1f07b10a6741fc6d10a1d79f5c93c94e53 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Dec 2022 15:30:56 +0000 Subject: [PATCH 23/51] Update pro version to 2.2.6 --- 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 6a68eeb8c7..a47b52b2b8 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.6", "@budibase/client": "^2.2.6", - "@budibase/pro": "2.2.5", + "@budibase/pro": "2.2.6", "@budibase/string-templates": "^2.2.6", "@budibase/types": "^2.2.6", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0cc1ae22b9..e72decdb65 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.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.5.tgz#3cbf4b4848f63a3b20e81f5c615fcb4e92bef643" - integrity sha512-H4j3puP4yYcFgpkTXBkBnEBMRRXq17UPKNFjTbqnfkJU6lNevcAa/XuYRXRzWLThfXrl0UDspNwV6hE8MRlehg== +"@budibase/backend-core@2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.6.tgz#9ee5a54176f90614b36d8b4fa5887d50674cc5f2" + integrity sha512-HdWcZAvO4tnr0nj6oBLf0EQe1MT1C25vYZwJk4IepzgZhl9thIeTWOiRvgHlLCNEn84pmE6/jzJGVPohPbpjqg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.5" + "@budibase/types" "^2.2.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.5.tgz#4d156215c559da74378b01bb92229fc30b81733d" - integrity sha512-Gg3Rih1GdzDhkKfFYeRfokkOWp36k3kuZ56j5VeaIiqULC4oBFkPoXflx9lI0UX3zRGrIhHx9cvw1UoqpXB7Dg== +"@budibase/pro@2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.6.tgz#9ae77dc2e2cf963f6b1cfaa7dbf6f6062db616d9" + integrity sha512-FsYcEW/334i7uEI4G8338APEF7pSIamdV1Ro3aTjPuuFSetUeeJMtLFUhVExBjEPGbnB4M5RYl2JX5yU3HgrBw== dependencies: - "@budibase/backend-core" "2.2.5" - "@budibase/types" "2.2.5" + "@budibase/backend-core" "2.2.6" + "@budibase/types" "2.2.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.5", "@budibase/types@^2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.5.tgz#801f2f305880208ad020fa3ac67e010c5672402f" - integrity sha512-20AqQAMWzFN3gJ+AgdI1qDGe+u0avpiUkxEM+MMcxXVUmqNFm6Z1KJ2AfCSOYgV7aMRPiLMOkdVms6Wm2Iv2Zg== +"@budibase/types@2.2.6", "@budibase/types@^2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.6.tgz#308a7a5538035425d99611c78e5953b800450d9e" + integrity sha512-BYYKdyt//w3ZA05abYNwIDsFNQ+mFodXoI8d89xMe4YqfSbwF6mwMgKffhyAlLxPqAePBi1ncyl7KP5aPFdgVQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index dedf93ac55..0faa9adf53 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.6", - "@budibase/pro": "2.2.5", + "@budibase/pro": "2.2.6", "@budibase/string-templates": "^2.2.6", "@budibase/types": "^2.2.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3f2c461688..2e85eae1c2 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.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.5.tgz#3cbf4b4848f63a3b20e81f5c615fcb4e92bef643" - integrity sha512-H4j3puP4yYcFgpkTXBkBnEBMRRXq17UPKNFjTbqnfkJU6lNevcAa/XuYRXRzWLThfXrl0UDspNwV6hE8MRlehg== +"@budibase/backend-core@2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.6.tgz#9ee5a54176f90614b36d8b4fa5887d50674cc5f2" + integrity sha512-HdWcZAvO4tnr0nj6oBLf0EQe1MT1C25vYZwJk4IepzgZhl9thIeTWOiRvgHlLCNEn84pmE6/jzJGVPohPbpjqg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.5" + "@budibase/types" "^2.2.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.5.tgz#4d156215c559da74378b01bb92229fc30b81733d" - integrity sha512-Gg3Rih1GdzDhkKfFYeRfokkOWp36k3kuZ56j5VeaIiqULC4oBFkPoXflx9lI0UX3zRGrIhHx9cvw1UoqpXB7Dg== +"@budibase/pro@2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.6.tgz#9ae77dc2e2cf963f6b1cfaa7dbf6f6062db616d9" + integrity sha512-FsYcEW/334i7uEI4G8338APEF7pSIamdV1Ro3aTjPuuFSetUeeJMtLFUhVExBjEPGbnB4M5RYl2JX5yU3HgrBw== dependencies: - "@budibase/backend-core" "2.2.5" - "@budibase/types" "2.2.5" + "@budibase/backend-core" "2.2.6" + "@budibase/types" "2.2.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.5", "@budibase/types@^2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.5.tgz#801f2f305880208ad020fa3ac67e010c5672402f" - integrity sha512-20AqQAMWzFN3gJ+AgdI1qDGe+u0avpiUkxEM+MMcxXVUmqNFm6Z1KJ2AfCSOYgV7aMRPiLMOkdVms6Wm2Iv2Zg== +"@budibase/types@2.2.6", "@budibase/types@^2.2.6": + version "2.2.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.6.tgz#308a7a5538035425d99611c78e5953b800450d9e" + integrity sha512-BYYKdyt//w3ZA05abYNwIDsFNQ+mFodXoI8d89xMe4YqfSbwF6mwMgKffhyAlLxPqAePBi1ncyl7KP5aPFdgVQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From d235dd83ab6965a6804304aadc694729522f452b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 16 Dec 2022 10:22:48 +0000 Subject: [PATCH 24/51] Types/attaching license to account (#9065) * adding license type to account * removing planDuration --- packages/types/src/documents/account/account.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index cf92002744..a8684f8427 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -1,6 +1,7 @@ import { Feature, Hosting, + License, MonthlyQuotaName, PlanType, PriceDuration, @@ -47,7 +48,7 @@ export interface Account extends CreateAccount { tier: string // deprecated planType?: PlanType planTier?: number - planDuration?: PriceDuration + license?: License stripeCustomerId?: string licenseKey?: string licenseKeyActivatedAt?: number From 112caa162a835e7190b784abf75ffe82439d72b4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 16 Dec 2022 10:41:13 +0000 Subject: [PATCH 25/51] v2.2.7 --- 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 4e50e75925..e47dc50106 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.6", + "version": "2.2.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4c0ae9f1b5..1db36e07cd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.6", + "version": "2.2.7", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.6", + "@budibase/types": "^2.2.7", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 15ac33bc4e..8bc8d7edac 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.6", + "version": "2.2.7", "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.6", + "@budibase/string-templates": "^2.2.7", "@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 c039a28c8d..8d7ec2c469 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.6", + "version": "2.2.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.6", - "@budibase/client": "^2.2.6", - "@budibase/frontend-core": "^2.2.6", - "@budibase/string-templates": "^2.2.6", + "@budibase/bbui": "^2.2.7", + "@budibase/client": "^2.2.7", + "@budibase/frontend-core": "^2.2.7", + "@budibase/string-templates": "^2.2.7", "@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 6f2a6f7357..974a1ad264 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.6", + "version": "2.2.7", "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.6", - "@budibase/string-templates": "^2.2.6", - "@budibase/types": "^2.2.6", + "@budibase/backend-core": "^2.2.7", + "@budibase/string-templates": "^2.2.7", + "@budibase/types": "^2.2.7", "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 87eaedbe6a..08e8f5e684 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.6", + "version": "2.2.7", "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.6", - "@budibase/frontend-core": "^2.2.6", - "@budibase/string-templates": "^2.2.6", + "@budibase/bbui": "^2.2.7", + "@budibase/frontend-core": "^2.2.7", + "@budibase/string-templates": "^2.2.7", "@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 af9e5c1143..476ed0e445 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.6", + "version": "2.2.7", "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.6", + "@budibase/bbui": "^2.2.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 15e672610e..620efaec08 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.6", + "version": "2.2.7", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a47b52b2b8..77e4a334d8 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.6", + "version": "2.2.7", "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.6", - "@budibase/client": "^2.2.6", + "@budibase/backend-core": "^2.2.7", + "@budibase/client": "^2.2.7", "@budibase/pro": "2.2.6", - "@budibase/string-templates": "^2.2.6", - "@budibase/types": "^2.2.6", + "@budibase/string-templates": "^2.2.7", + "@budibase/types": "^2.2.7", "@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 6a0c162bf3..95d0c5a918 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.6", + "version": "2.2.7", "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 f9e8098459..36d723c796 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.6", + "version": "2.2.7", "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 0faa9adf53..01d5a518d5 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.6", + "version": "2.2.7", "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.6", + "@budibase/backend-core": "^2.2.7", "@budibase/pro": "2.2.6", - "@budibase/string-templates": "^2.2.6", - "@budibase/types": "^2.2.6", + "@budibase/string-templates": "^2.2.7", + "@budibase/types": "^2.2.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0055a08586ac8ce3878b4d88304ec05a4638ba02 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 16 Dec 2022 10:45:37 +0000 Subject: [PATCH 26/51] Update pro version to 2.2.7 --- 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 77e4a334d8..c8cad9d95b 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.7", "@budibase/client": "^2.2.7", - "@budibase/pro": "2.2.6", + "@budibase/pro": "2.2.7", "@budibase/string-templates": "^2.2.7", "@budibase/types": "^2.2.7", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e72decdb65..8365a19d0f 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.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.6.tgz#9ee5a54176f90614b36d8b4fa5887d50674cc5f2" - integrity sha512-HdWcZAvO4tnr0nj6oBLf0EQe1MT1C25vYZwJk4IepzgZhl9thIeTWOiRvgHlLCNEn84pmE6/jzJGVPohPbpjqg== +"@budibase/backend-core@2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.7.tgz#f94e69589a9ce5a708c77cc16ca11fc4865fe04c" + integrity sha512-jiw/20J2J2PrpTHiKYnZp5G3e4Hs+C7yxEEt9HkNf+wN8DLcL1ySY/l17azUJ9ruTLGzIavU9ILdYBgc18F2Mg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.6" + "@budibase/types" "^2.2.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.6.tgz#9ae77dc2e2cf963f6b1cfaa7dbf6f6062db616d9" - integrity sha512-FsYcEW/334i7uEI4G8338APEF7pSIamdV1Ro3aTjPuuFSetUeeJMtLFUhVExBjEPGbnB4M5RYl2JX5yU3HgrBw== +"@budibase/pro@2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.7.tgz#14b243f63b973668a6e92a450de670ee6d1f69d6" + integrity sha512-BCco7dhNj6HQkQCwQ8E4qLLquhbBve+ziaf8MKr3z8m2RraIp+/zwNTvXYo5YBSxfSuy66RhPNj5+nhEOl7TvA== dependencies: - "@budibase/backend-core" "2.2.6" - "@budibase/types" "2.2.6" + "@budibase/backend-core" "2.2.7" + "@budibase/types" "2.2.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.6", "@budibase/types@^2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.6.tgz#308a7a5538035425d99611c78e5953b800450d9e" - integrity sha512-BYYKdyt//w3ZA05abYNwIDsFNQ+mFodXoI8d89xMe4YqfSbwF6mwMgKffhyAlLxPqAePBi1ncyl7KP5aPFdgVQ== +"@budibase/types@2.2.7", "@budibase/types@^2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.7.tgz#a9c0ccf4d32631a995e560283affff2198bd672c" + integrity sha512-rfOXjHAmM0tgwUZCnhElywxfnr6xIpF7/16ojHfXXFrrx0D9+hPBRDiUbVzoKyZjrvXP8rA7AXvfbPz6PsvOaQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 01d5a518d5..397651eacc 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.7", - "@budibase/pro": "2.2.6", + "@budibase/pro": "2.2.7", "@budibase/string-templates": "^2.2.7", "@budibase/types": "^2.2.7", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2e85eae1c2..75a713bdf2 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.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.6.tgz#9ee5a54176f90614b36d8b4fa5887d50674cc5f2" - integrity sha512-HdWcZAvO4tnr0nj6oBLf0EQe1MT1C25vYZwJk4IepzgZhl9thIeTWOiRvgHlLCNEn84pmE6/jzJGVPohPbpjqg== +"@budibase/backend-core@2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.7.tgz#f94e69589a9ce5a708c77cc16ca11fc4865fe04c" + integrity sha512-jiw/20J2J2PrpTHiKYnZp5G3e4Hs+C7yxEEt9HkNf+wN8DLcL1ySY/l17azUJ9ruTLGzIavU9ILdYBgc18F2Mg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.6" + "@budibase/types" "^2.2.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.6.tgz#9ae77dc2e2cf963f6b1cfaa7dbf6f6062db616d9" - integrity sha512-FsYcEW/334i7uEI4G8338APEF7pSIamdV1Ro3aTjPuuFSetUeeJMtLFUhVExBjEPGbnB4M5RYl2JX5yU3HgrBw== +"@budibase/pro@2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.7.tgz#14b243f63b973668a6e92a450de670ee6d1f69d6" + integrity sha512-BCco7dhNj6HQkQCwQ8E4qLLquhbBve+ziaf8MKr3z8m2RraIp+/zwNTvXYo5YBSxfSuy66RhPNj5+nhEOl7TvA== dependencies: - "@budibase/backend-core" "2.2.6" - "@budibase/types" "2.2.6" + "@budibase/backend-core" "2.2.7" + "@budibase/types" "2.2.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.6", "@budibase/types@^2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.6.tgz#308a7a5538035425d99611c78e5953b800450d9e" - integrity sha512-BYYKdyt//w3ZA05abYNwIDsFNQ+mFodXoI8d89xMe4YqfSbwF6mwMgKffhyAlLxPqAePBi1ncyl7KP5aPFdgVQ== +"@budibase/types@2.2.7", "@budibase/types@^2.2.7": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.7.tgz#a9c0ccf4d32631a995e560283affff2198bd672c" + integrity sha512-rfOXjHAmM0tgwUZCnhElywxfnr6xIpF7/16ojHfXXFrrx0D9+hPBRDiUbVzoKyZjrvXP8rA7AXvfbPz6PsvOaQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 8b0129797387bc9e7049db565fc87783834dda64 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 16 Dec 2022 13:16:37 +0000 Subject: [PATCH 27/51] Environment variable type coercion fix (#9074) * Environment variable type coercion fix * Update .gitignore --- .gitignore | 1 + packages/server/src/environment.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1d3e6db0e..915e2ea160 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ builder/* packages/server/runtime_apps/ .idea/ bb-airgapped.tar.gz +*.iml # Logs logs diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index bf5330f9b6..e900753be3 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -108,12 +108,12 @@ const environment = { } // threading can cause memory issues with node-ts in development -if (isDev() && module.exports.DISABLE_THREADING == null) { +if (isDev() && environment.DISABLE_THREADING == null) { environment._set("DISABLE_THREADING", "1") } // clean up any environment variable edge cases -for (let [key, value] of Object.entries(module.exports)) { +for (let [key, value] of Object.entries(environment)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore From ff40a71342755eb260b6ee5a3d397f2c19e404e5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 16 Dec 2022 13:32:25 +0000 Subject: [PATCH 28/51] v2.2.8 --- 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 e47dc50106..2b9efd53b9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.7", + "version": "2.2.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1db36e07cd..6070a2cd50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.7", + "version": "2.2.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.7", + "@budibase/types": "^2.2.8", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8bc8d7edac..aa16117fa7 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.7", + "version": "2.2.8", "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.7", + "@budibase/string-templates": "^2.2.8", "@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 8d7ec2c469..be2befbe44 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.7", + "version": "2.2.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.7", - "@budibase/client": "^2.2.7", - "@budibase/frontend-core": "^2.2.7", - "@budibase/string-templates": "^2.2.7", + "@budibase/bbui": "^2.2.8", + "@budibase/client": "^2.2.8", + "@budibase/frontend-core": "^2.2.8", + "@budibase/string-templates": "^2.2.8", "@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 974a1ad264..f38dc8105d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.7", + "version": "2.2.8", "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.7", - "@budibase/string-templates": "^2.2.7", - "@budibase/types": "^2.2.7", + "@budibase/backend-core": "^2.2.8", + "@budibase/string-templates": "^2.2.8", + "@budibase/types": "^2.2.8", "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 08e8f5e684..cdd8f4941f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.7", + "version": "2.2.8", "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.7", - "@budibase/frontend-core": "^2.2.7", - "@budibase/string-templates": "^2.2.7", + "@budibase/bbui": "^2.2.8", + "@budibase/frontend-core": "^2.2.8", + "@budibase/string-templates": "^2.2.8", "@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 476ed0e445..e92d54c74a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.7", + "version": "2.2.8", "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.7", + "@budibase/bbui": "^2.2.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 620efaec08..d30c707649 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.7", + "version": "2.2.8", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c8cad9d95b..5295deb7f1 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.7", + "version": "2.2.8", "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.7", - "@budibase/client": "^2.2.7", + "@budibase/backend-core": "^2.2.8", + "@budibase/client": "^2.2.8", "@budibase/pro": "2.2.7", - "@budibase/string-templates": "^2.2.7", - "@budibase/types": "^2.2.7", + "@budibase/string-templates": "^2.2.8", + "@budibase/types": "^2.2.8", "@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 95d0c5a918..085e7b07cc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.7", + "version": "2.2.8", "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 36d723c796..5ed20d6b66 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.7", + "version": "2.2.8", "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 397651eacc..ee721db565 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.7", + "version": "2.2.8", "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.7", + "@budibase/backend-core": "^2.2.8", "@budibase/pro": "2.2.7", - "@budibase/string-templates": "^2.2.7", - "@budibase/types": "^2.2.7", + "@budibase/string-templates": "^2.2.8", + "@budibase/types": "^2.2.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 221f9e3813d7347e57080482d50a9e32a9b11809 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 16 Dec 2022 13:36:26 +0000 Subject: [PATCH 29/51] Update pro version to 2.2.8 --- 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 5295deb7f1..97783614a3 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.8", "@budibase/client": "^2.2.8", - "@budibase/pro": "2.2.7", + "@budibase/pro": "2.2.8", "@budibase/string-templates": "^2.2.8", "@budibase/types": "^2.2.8", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8365a19d0f..eb3ccd3b90 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.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.7.tgz#f94e69589a9ce5a708c77cc16ca11fc4865fe04c" - integrity sha512-jiw/20J2J2PrpTHiKYnZp5G3e4Hs+C7yxEEt9HkNf+wN8DLcL1ySY/l17azUJ9ruTLGzIavU9ILdYBgc18F2Mg== +"@budibase/backend-core@2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.8.tgz#9a72bc9bab013f8322ab85cdab5c96b743aa2bcd" + integrity sha512-1wY+xVOCOyiLyhRokOu6VAfsU0WVu7U6Rbcmz1PMSJcYbricucH1XAThKISmKXPP6K3L8o/Ug+r4leI96yw1dQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.7" + "@budibase/types" "^2.2.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.7.tgz#14b243f63b973668a6e92a450de670ee6d1f69d6" - integrity sha512-BCco7dhNj6HQkQCwQ8E4qLLquhbBve+ziaf8MKr3z8m2RraIp+/zwNTvXYo5YBSxfSuy66RhPNj5+nhEOl7TvA== +"@budibase/pro@2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.8.tgz#5b42e85b1843dcc133001e4eb130f371f0c6e973" + integrity sha512-rg4Vq1vWu09DTpqtuiP9yqJ+XyuKoIb9/HTWo1nFfuxOkNBagDEmHJnp8Q+Kwhs+ubWpCGCyC2Ge15JsbLhCCw== dependencies: - "@budibase/backend-core" "2.2.7" - "@budibase/types" "2.2.7" + "@budibase/backend-core" "2.2.8" + "@budibase/types" "2.2.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.7", "@budibase/types@^2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.7.tgz#a9c0ccf4d32631a995e560283affff2198bd672c" - integrity sha512-rfOXjHAmM0tgwUZCnhElywxfnr6xIpF7/16ojHfXXFrrx0D9+hPBRDiUbVzoKyZjrvXP8rA7AXvfbPz6PsvOaQ== +"@budibase/types@2.2.8", "@budibase/types@^2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.8.tgz#fd681947d346c9262bb041f6ffea5a0691ff6ba5" + integrity sha512-mBhEkt+H4uzYuDDYcx7042EBoHUGungURhyi442NF6AWR60u4xbq9MoP+F5DGvSz8zAWQhO6gpkO3hNBeY2aGQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index ee721db565..0f6d6b9b35 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.8", - "@budibase/pro": "2.2.7", + "@budibase/pro": "2.2.8", "@budibase/string-templates": "^2.2.8", "@budibase/types": "^2.2.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 75a713bdf2..d4fdd2ace8 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.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.7.tgz#f94e69589a9ce5a708c77cc16ca11fc4865fe04c" - integrity sha512-jiw/20J2J2PrpTHiKYnZp5G3e4Hs+C7yxEEt9HkNf+wN8DLcL1ySY/l17azUJ9ruTLGzIavU9ILdYBgc18F2Mg== +"@budibase/backend-core@2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.8.tgz#9a72bc9bab013f8322ab85cdab5c96b743aa2bcd" + integrity sha512-1wY+xVOCOyiLyhRokOu6VAfsU0WVu7U6Rbcmz1PMSJcYbricucH1XAThKISmKXPP6K3L8o/Ug+r4leI96yw1dQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.7" + "@budibase/types" "^2.2.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.7.tgz#14b243f63b973668a6e92a450de670ee6d1f69d6" - integrity sha512-BCco7dhNj6HQkQCwQ8E4qLLquhbBve+ziaf8MKr3z8m2RraIp+/zwNTvXYo5YBSxfSuy66RhPNj5+nhEOl7TvA== +"@budibase/pro@2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.8.tgz#5b42e85b1843dcc133001e4eb130f371f0c6e973" + integrity sha512-rg4Vq1vWu09DTpqtuiP9yqJ+XyuKoIb9/HTWo1nFfuxOkNBagDEmHJnp8Q+Kwhs+ubWpCGCyC2Ge15JsbLhCCw== dependencies: - "@budibase/backend-core" "2.2.7" - "@budibase/types" "2.2.7" + "@budibase/backend-core" "2.2.8" + "@budibase/types" "2.2.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.7", "@budibase/types@^2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.7.tgz#a9c0ccf4d32631a995e560283affff2198bd672c" - integrity sha512-rfOXjHAmM0tgwUZCnhElywxfnr6xIpF7/16ojHfXXFrrx0D9+hPBRDiUbVzoKyZjrvXP8rA7AXvfbPz6PsvOaQ== +"@budibase/types@2.2.8", "@budibase/types@^2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.8.tgz#fd681947d346c9262bb041f6ffea5a0691ff6ba5" + integrity sha512-mBhEkt+H4uzYuDDYcx7042EBoHUGungURhyi442NF6AWR60u4xbq9MoP+F5DGvSz8zAWQhO6gpkO3hNBeY2aGQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From eebb638dafd7fbe1dcd65d60d1e6cb9316d1f5a1 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 19 Dec 2022 16:03:07 +0000 Subject: [PATCH 30/51] Re-enable concurrency --- .github/workflows/release-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index cd39148bdc..4d8a43fa36 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -1,5 +1,5 @@ name: Budibase Prerelease -#concurrency: release-prerelease +concurrency: release-prerelease on: push: From 50e750b4b71bb9d4b8d567f861052cc2375e5da0 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 19 Dec 2022 16:04:58 +0000 Subject: [PATCH 31/51] Update job name --- .github/workflows/release-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 4d8a43fa36..bcec79b087 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -189,7 +189,7 @@ jobs: git commit -m "Helm Release: develop" git push - trigger-deploy-to-qa: + trigger-deploy-to-qa-env: needs: [release-helm-chart] runs-on: ubuntu-latest steps: From 3e76f258051d6997ba763c4fcbdd593779a02e69 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 16:33:03 +0000 Subject: [PATCH 32/51] v2.2.4-alpha.8 --- lerna.json | 4 ++-- packages/backend-core/package.json | 6 +++--- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 10 +++++----- packages/client/package.json | 10 +++++----- packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 4 ++-- packages/server/package.json | 12 ++++++------ packages/string-templates/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/worker/package.json | 10 +++++----- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lerna.json b/lerna.json index 17b8ec3cee..7ecf183be1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "npmClient": "yarn", "packages": [ "packages/*" @@ -15,4 +15,4 @@ ] } } -} \ No newline at end of file +} diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 316f6f65db..d45ebf6fab 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.4-alpha.7", + "@budibase/types": "2.2.4-alpha.8", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", @@ -79,4 +79,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6536f65dd5..b17387ec39 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.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", + "@budibase/string-templates": "2.2.4-alpha.8", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", @@ -89,4 +89,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index 1ce40b1e6b..d53b9480ba 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.4-alpha.7", - "@budibase/client": "2.2.4-alpha.7", - "@budibase/frontend-core": "2.2.4-alpha.7", - "@budibase/string-templates": "2.2.4-alpha.7", + "@budibase/bbui": "2.2.4-alpha.8", + "@budibase/client": "2.2.4-alpha.8", + "@budibase/frontend-core": "2.2.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.8", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", @@ -123,4 +123,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} \ No newline at end of file +} diff --git a/packages/cli/package.json b/packages/cli/package.json index f06fc82f1e..b2a6d64e6a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", - "@budibase/string-templates": "2.2.4-alpha.7", - "@budibase/types": "2.2.4-alpha.7", + "@budibase/backend-core": "2.2.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.8", + "@budibase/types": "2.2.4-alpha.8", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", @@ -54,4 +54,4 @@ "eslint": "^7.20.0", "renamer": "^4.0.0" } -} \ No newline at end of file +} diff --git a/packages/client/package.json b/packages/client/package.json index b65b14957c..fabd960261 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", - "@budibase/frontend-core": "2.2.4-alpha.7", - "@budibase/string-templates": "2.2.4-alpha.7", + "@budibase/bbui": "2.2.4-alpha.8", + "@budibase/frontend-core": "2.2.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -63,4 +63,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f34494ef58..9ddbe3113e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", + "@budibase/bbui": "2.2.4-alpha.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/package.json b/packages/sdk/package.json index cca8bbd60e..d127bb3f5f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", @@ -20,4 +20,4 @@ "rollup-plugin-polyfill-node": "^0.8.0", "rollup-plugin-terser": "^7.0.2" } -} \ No newline at end of file +} diff --git a/packages/server/package.json b/packages/server/package.json index c95da1c592..1a9f4601f9 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.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", - "@budibase/client": "2.2.4-alpha.7", + "@budibase/backend-core": "2.2.4-alpha.8", + "@budibase/client": "2.2.4-alpha.8", "@budibase/pro": "2.2.4-alpha.7", - "@budibase/string-templates": "2.2.4-alpha.7", - "@budibase/types": "2.2.4-alpha.7", + "@budibase/string-templates": "2.2.4-alpha.8", + "@budibase/types": "2.2.4-alpha.8", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -168,4 +168,4 @@ "oracledb": "5.3.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5e2d9d6fa2..ed3e542835 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -47,4 +47,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/types/package.json b/packages/types/package.json index e956fc125f..226a51ba72 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.4-alpha.7", + "version": "2.2.4-alpha.8", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -22,4 +22,4 @@ "rimraf": "3.0.2", "typescript": "4.7.3" } -} \ No newline at end of file +} diff --git a/packages/worker/package.json b/packages/worker/package.json index cbad812bb3..90f5ec1456 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.4-alpha.7", + "version": "2.2.4-alpha.8", "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.4-alpha.7", + "@budibase/backend-core": "2.2.4-alpha.8", "@budibase/pro": "2.2.4-alpha.7", - "@budibase/string-templates": "2.2.4-alpha.7", - "@budibase/types": "2.2.4-alpha.7", + "@budibase/string-templates": "2.2.4-alpha.8", + "@budibase/types": "2.2.4-alpha.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", @@ -96,4 +96,4 @@ "update-dotenv": "1.1.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} From deca5bbf81b2532e677d65928a252a9f8d7e7a77 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 16:36:57 +0000 Subject: [PATCH 33/51] Update pro version to 2.2.4-alpha.8 --- 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 1a9f4601f9..6ef50d2f22 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.4-alpha.8", "@budibase/client": "2.2.4-alpha.8", - "@budibase/pro": "2.2.4-alpha.7", + "@budibase/pro": "2.2.4-alpha.8", "@budibase/string-templates": "2.2.4-alpha.8", "@budibase/types": "2.2.4-alpha.8", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6f5a25acbd..10fea5e67a 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.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.7.tgz#24cb6e969918bd3f3f3c8f7bf0371369139a92ef" - integrity sha512-n4ItEFWeDKYKlll0pCjh+A9VfR45Av9U3pjQ6tfrzfl8LeK4pIH/GUAqoT8cMu7S37fN0xMpZ7KD+D1rKbepqQ== +"@budibase/backend-core@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.8.tgz#a26736f283403ef894de6e934ed49795532df676" + integrity sha512-FZ2VMjbV0q1Z8exbYpWDZi6m1npKK39nXU/ZC5piR+jDyXqiqe8ensSw7Pi3+xTb+xtKBLwuSHDgOWRvwJgqCg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.4-alpha.7" + "@budibase/types" "2.2.4-alpha.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.7.tgz#47768c857ee06122411f70b70741d9852a492f71" - integrity sha512-ZKkg68BouP+jAy16rzLiq90OjQmvXOZNe5BAV0d0ni1xw3eYSlIJxbEHAhLf7sQkhLAS/ZqGsLYMP7B//RpvcQ== +"@budibase/pro@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.8.tgz#c244ece36fd66dd3cf2a858bf37096c171f3485a" + integrity sha512-FsXVE1KrLu3i7YijCYcBdenTSFdEFmXZL4gov8hIoXlne9mmjC1SGjtK7oqKPbAVniwFrJH2nltrULFzJ4FY+w== dependencies: - "@budibase/backend-core" "2.2.4-alpha.7" - "@budibase/types" "2.2.4-alpha.7" + "@budibase/backend-core" "2.2.4-alpha.8" + "@budibase/types" "2.2.4-alpha.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.7.tgz#65bf5183d496a0e4088ceea0aadad61c164cc8a2" - integrity sha512-UyMa6rdmWlMbnH6sSA1XHg68ojcOd2K5w09TV0FAF4tBOcSoQgzz04ufYqR4cjg/MNyk0x3ZwlNkox5WekKBQQ== +"@budibase/types@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.8.tgz#5896813006ca5bb136869c86790201950afb6549" + integrity sha512-G8+Twkl47l6pdL7nBwsbQcKFxELfHWry0WkKUgZVkEOz2O5rI535RVShpsq7K8NSaK0RXiOfeZiDSNRmLw6B3w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 90f5ec1456..3e697182df 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.4-alpha.8", - "@budibase/pro": "2.2.4-alpha.7", + "@budibase/pro": "2.2.4-alpha.8", "@budibase/string-templates": "2.2.4-alpha.8", "@budibase/types": "2.2.4-alpha.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 5a1a31207c..56c15af33f 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.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.7.tgz#24cb6e969918bd3f3f3c8f7bf0371369139a92ef" - integrity sha512-n4ItEFWeDKYKlll0pCjh+A9VfR45Av9U3pjQ6tfrzfl8LeK4pIH/GUAqoT8cMu7S37fN0xMpZ7KD+D1rKbepqQ== +"@budibase/backend-core@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.8.tgz#a26736f283403ef894de6e934ed49795532df676" + integrity sha512-FZ2VMjbV0q1Z8exbYpWDZi6m1npKK39nXU/ZC5piR+jDyXqiqe8ensSw7Pi3+xTb+xtKBLwuSHDgOWRvwJgqCg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.4-alpha.7" + "@budibase/types" "2.2.4-alpha.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.7.tgz#47768c857ee06122411f70b70741d9852a492f71" - integrity sha512-ZKkg68BouP+jAy16rzLiq90OjQmvXOZNe5BAV0d0ni1xw3eYSlIJxbEHAhLf7sQkhLAS/ZqGsLYMP7B//RpvcQ== +"@budibase/pro@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.8.tgz#c244ece36fd66dd3cf2a858bf37096c171f3485a" + integrity sha512-FsXVE1KrLu3i7YijCYcBdenTSFdEFmXZL4gov8hIoXlne9mmjC1SGjtK7oqKPbAVniwFrJH2nltrULFzJ4FY+w== dependencies: - "@budibase/backend-core" "2.2.4-alpha.7" - "@budibase/types" "2.2.4-alpha.7" + "@budibase/backend-core" "2.2.4-alpha.8" + "@budibase/types" "2.2.4-alpha.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.4-alpha.7": - version "2.2.4-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.7.tgz#65bf5183d496a0e4088ceea0aadad61c164cc8a2" - integrity sha512-UyMa6rdmWlMbnH6sSA1XHg68ojcOd2K5w09TV0FAF4tBOcSoQgzz04ufYqR4cjg/MNyk0x3ZwlNkox5WekKBQQ== +"@budibase/types@2.2.4-alpha.8": + version "2.2.4-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.8.tgz#5896813006ca5bb136869c86790201950afb6549" + integrity sha512-G8+Twkl47l6pdL7nBwsbQcKFxELfHWry0WkKUgZVkEOz2O5rI535RVShpsq7K8NSaK0RXiOfeZiDSNRmLw6B3w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 05e84e7e41deaed21c8d76d86b6d028c7d83f9b1 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Mon, 19 Dec 2022 17:11:43 +0000 Subject: [PATCH 34/51] Updating createTable command Changing an ID when asserting a table exists - This change will fix the broken tests within the Cypress build --- packages/builder/cypress/support/commands.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 278c6504f8..6789529acb 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -461,10 +461,7 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => { cy.get(".nav-item", { timeout: 2000 }) .contains("Budibase DB") .click({ force: true }) - cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should( - "contain", - tableName - ) + cy.get(".nav-item-content", { timeout: 2000 }).should("contain", tableName) }) Cypress.Commands.add("createTestTableWithData", () => { From d024575edbb09c190da7944833bc98b89be75fe7 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Mon, 19 Dec 2022 17:23:13 +0000 Subject: [PATCH 35/51] Skipping Cypress Tests - No longer needed Skipping Cypress tests associated with the following: - Account Portals - App Overview - Create Automation We now have E2E coverage of these tests via QA Wolf --- .../adminAndManagement/accountPortals.spec.js | 40 +++++++++---------- .../cypress/integration/appOverview.spec.js | 34 ++++++++-------- .../integration/createAutomation.spec.js | 4 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js index 448240f81d..7c69a5462e 100644 --- a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js @@ -3,17 +3,17 @@ const interact = require('../../support/interact') filterTests(["smoke", "all"], () => { context("Account Portals", () => { - + const bbUserEmail = "bbuser@test.com" - + before(() => { cy.login() cy.deleteApp("Cypress Tests") cy.createApp("Cypress Tests", false) - + // Create new user cy.wait(500) - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.createUser(bbUserEmail) cy.contains("bbuser").click() cy.wait(500) @@ -25,18 +25,18 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_MENU).within(() => { cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true }) }) - + cy.get(interact.SPECTRUM_DIALOG_GRID) - .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd') + .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd') cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true }) - + // Login as new user and set password cy.logOut() cy.get('@pwd').then((pwd) => { cy.login(bbUserEmail, pwd) }) - + for (let i = 0; i < 2; i++) { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test") } @@ -58,15 +58,15 @@ filterTests(["smoke", "all"], () => { cy.logoutNoAppGrid() }) - - it("should verify Admin Portal", () => { - cy.login() - // Configure user role - cy.setUserRole("bbuser", "Admin") - bbUserLogin() - // Verify available options for Admin portal - cy.get(interact.SPECTRUM_SIDENAV) + xit("should verify Admin Portal", () => { + cy.login() + // Configure user role + cy.setUserRole("bbuser", "Admin") + bbUserLogin() + + // Verify available options for Admin portal + cy.get(interact.SPECTRUM_SIDENAV) .should('contain', 'Apps') //.and('contain', 'Usage') .and('contain', 'Users') @@ -75,12 +75,12 @@ filterTests(["smoke", "all"], () => { .and('contain', 'Organisation') .and('contain', 'Theming') .and('contain', 'Update') - //.and('contain', 'Upgrade') + //.and('contain', 'Upgrade') - cy.logOut() + cy.logOut() }) - it("should verify Development Portal", () => { + xit("should verify Development Portal", () => { // Only Development access should be enabled cy.login() cy.setUserRole("bbuser", "Developer") @@ -98,7 +98,7 @@ filterTests(["smoke", "all"], () => { .and('not.contain', 'Update') .and('not.contain', 'Upgrade') - cy.logOut() + cy.logOut() }) const bbUserLogin = () => { diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index dafafab67a..2afc0af277 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -9,7 +9,7 @@ filterTests(["all"], () => { cy.createApp("Cypress Tests") }) - it("Should be accessible from the applications list", () => { + xit("Should be accessible from the applications list", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .title") .eq(0) @@ -27,7 +27,7 @@ filterTests(["all"], () => { }) // Find a more suitable place for this. - it("Should allow unlocking in the app list", () => { + xit("Should allow unlocking in the app list", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .lock-status").eq(0).contains("Locked by you").click() @@ -38,7 +38,7 @@ filterTests(["all"], () => { cy.get(".lock-status").should("not.be.visible") }) - it("Should allow unlocking in the app overview screen", () => { + xit("Should allow unlocking in the app overview screen", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") @@ -58,7 +58,7 @@ filterTests(["all"], () => { cy.get(".lock-status").should("not.be.visible") }) - it("Should reflect the deploy state of an app that hasn't been published.", () => { + xit("Should reflect the deploy state of an app that hasn't been published.", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") @@ -81,7 +81,7 @@ filterTests(["all"], () => { }) }) - it("Should reflect the app deployment state", () => { + xit("Should reflect the app deployment state", () => { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(".appTable .app-row-actions button") .contains("Edit") @@ -117,7 +117,7 @@ filterTests(["all"], () => { }) }) - it("Should reflect an application that has been unpublished", () => { + xit("Should reflect an application that has been unpublished", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Edit") @@ -154,7 +154,7 @@ filterTests(["all"], () => { }) }) - it("Should allow the editing of the application icon and colour", () => { + xit("Should allow the editing of the application icon and colour", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Manage") @@ -196,7 +196,7 @@ filterTests(["all"], () => { }) }) - it("Should reflect the last time the application was edited", () => { + xit("Should reflect the last time the application was edited", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Manage") @@ -221,7 +221,7 @@ filterTests(["all"], () => { }) }) - it("Should reflect application version is up-to-date", () => { + xit("Should reflect application version is up-to-date", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Manage") @@ -302,7 +302,7 @@ filterTests(["all"], () => { }) }) - it("Should allow editing of the app details.", () => { + xit("Should allow editing of the app details.", () => { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(".appTable .app-row-actions button") .contains("Manage") @@ -373,13 +373,13 @@ filterTests(["all"], () => { .contains("Copy App ID") .click({ force: true }) }) - + cy.get(".spectrum-Toast-content") - .contains("App ID copied to clipboard.") - .should("be.visible") + .contains("App ID copied to clipboard.") + .should("be.visible") }) - it("Should allow unpublishing of the application via the Unpublish link", () => { + xit("Should allow unpublishing of the application via the Unpublish link", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Manage") @@ -388,7 +388,7 @@ filterTests(["all"], () => { cy.get(`[data-cy="app-status"]`).within(() => { cy.contains("Unpublish").click({ force: true }) - }) + }) cy.get("[data-cy='unpublish-modal']") .should("be.visible") @@ -399,11 +399,11 @@ filterTests(["all"], () => { cy.get(".overview-tab [data-cy='app-status']").within(() => { cy.get(".status-display").contains("Unpublished") cy.get(".status-display .icon svg[aria-label='GlobeStrike']") - .should("exist") + .should("exist") }) }) - it("Should allow deleting of the application", () => { + xit("Should allow deleting of the application", () => { cy.visit(`${Cypress.config().baseUrl}/builder`) cy.get(".appTable .app-row-actions button") .contains("Manage") diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js index 8c16f4bd22..6326691d28 100644 --- a/packages/builder/cypress/integration/createAutomation.spec.js +++ b/packages/builder/cypress/integration/createAutomation.spec.js @@ -2,13 +2,13 @@ import filterTests from "../support/filterTests" const interact = require('../support/interact') filterTests(['smoke', 'all'], () => { - context("Create a automation", () => { + xcontext("Create a automation", () => { before(() => { cy.login() cy.createTestApp() }) - it("should create a automation", () => { + xit("should create a automation", () => { cy.createTestTableWithData() cy.wait(2000) cy.contains("Automate").click() From f923199296c2c55de0e1566daa31dea5d9438237 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 17:56:10 +0000 Subject: [PATCH 36/51] v2.2.4-alpha.9 --- 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 7ecf183be1..40f16ada53 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d45ebf6fab..2a76376171 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.4-alpha.8", + "@budibase/types": "2.2.4-alpha.9", "@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 b17387ec39..d170129eda 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.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.9", "@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 d53b9480ba..8b562345a4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.4-alpha.8", - "@budibase/client": "2.2.4-alpha.8", - "@budibase/frontend-core": "2.2.4-alpha.8", - "@budibase/string-templates": "2.2.4-alpha.8", + "@budibase/bbui": "2.2.4-alpha.9", + "@budibase/client": "2.2.4-alpha.9", + "@budibase/frontend-core": "2.2.4-alpha.9", + "@budibase/string-templates": "2.2.4-alpha.9", "@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 b2a6d64e6a..1c35525bd7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", - "@budibase/string-templates": "2.2.4-alpha.8", - "@budibase/types": "2.2.4-alpha.8", + "@budibase/backend-core": "2.2.4-alpha.9", + "@budibase/string-templates": "2.2.4-alpha.9", + "@budibase/types": "2.2.4-alpha.9", "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 fabd960261..4e12b60638 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", - "@budibase/frontend-core": "2.2.4-alpha.8", - "@budibase/string-templates": "2.2.4-alpha.8", + "@budibase/bbui": "2.2.4-alpha.9", + "@budibase/frontend-core": "2.2.4-alpha.9", + "@budibase/string-templates": "2.2.4-alpha.9", "@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 9ddbe3113e..2fa1d41dc5 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", + "@budibase/bbui": "2.2.4-alpha.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d127bb3f5f..b77685103b 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6ef50d2f22..98d01dd02c 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.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", - "@budibase/client": "2.2.4-alpha.8", + "@budibase/backend-core": "2.2.4-alpha.9", + "@budibase/client": "2.2.4-alpha.9", "@budibase/pro": "2.2.4-alpha.8", - "@budibase/string-templates": "2.2.4-alpha.8", - "@budibase/types": "2.2.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.9", + "@budibase/types": "2.2.4-alpha.9", "@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 ed3e542835..b335eb3620 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "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 226a51ba72..ef35cb227b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.4-alpha.8", + "version": "2.2.4-alpha.9", "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 3e697182df..5e1a64e52c 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.4-alpha.8", + "version": "2.2.4-alpha.9", "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.4-alpha.8", + "@budibase/backend-core": "2.2.4-alpha.9", "@budibase/pro": "2.2.4-alpha.8", - "@budibase/string-templates": "2.2.4-alpha.8", - "@budibase/types": "2.2.4-alpha.8", + "@budibase/string-templates": "2.2.4-alpha.9", + "@budibase/types": "2.2.4-alpha.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From aa188ee299f82afe385b50774d1dee830476838c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 17:59:38 +0000 Subject: [PATCH 37/51] Update pro version to 2.2.4-alpha.9 --- 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 98d01dd02c..b326db6178 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.4-alpha.9", "@budibase/client": "2.2.4-alpha.9", - "@budibase/pro": "2.2.4-alpha.8", + "@budibase/pro": "2.2.4-alpha.9", "@budibase/string-templates": "2.2.4-alpha.9", "@budibase/types": "2.2.4-alpha.9", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 10fea5e67a..f88d637019 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.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.8.tgz#a26736f283403ef894de6e934ed49795532df676" - integrity sha512-FZ2VMjbV0q1Z8exbYpWDZi6m1npKK39nXU/ZC5piR+jDyXqiqe8ensSw7Pi3+xTb+xtKBLwuSHDgOWRvwJgqCg== +"@budibase/backend-core@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.9.tgz#3f3f856803d4a12f640130046dc1c04509f4e23d" + integrity sha512-ra+B5E+CZqY5L8NjKDxSRzvthVvGds6Y0Wmb4Y/jZtFfiw6MWjrR0DbdMQL7wspAiO33mstAtrV4MFgNPOmc/Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.4-alpha.8" + "@budibase/types" "2.2.4-alpha.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.8.tgz#c244ece36fd66dd3cf2a858bf37096c171f3485a" - integrity sha512-FsXVE1KrLu3i7YijCYcBdenTSFdEFmXZL4gov8hIoXlne9mmjC1SGjtK7oqKPbAVniwFrJH2nltrULFzJ4FY+w== +"@budibase/pro@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.9.tgz#59ee6f1a7034f861056fc1ac749a14e5e3eb3979" + integrity sha512-N9YR1AGnO8qWo/cQXPt4laQXyMYdz7Ny8H+huNL9fAw2jEjZxI6rRjyFzjUFLvtDYrrPhGrGa0SJc5/aOFMZGw== dependencies: - "@budibase/backend-core" "2.2.4-alpha.8" - "@budibase/types" "2.2.4-alpha.8" + "@budibase/backend-core" "2.2.4-alpha.9" + "@budibase/types" "2.2.4-alpha.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.8.tgz#5896813006ca5bb136869c86790201950afb6549" - integrity sha512-G8+Twkl47l6pdL7nBwsbQcKFxELfHWry0WkKUgZVkEOz2O5rI535RVShpsq7K8NSaK0RXiOfeZiDSNRmLw6B3w== +"@budibase/types@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.9.tgz#da233bf03c489052fa5c8a94f9071b40d2e3aea5" + integrity sha512-B58dUfIc9sKV8xvUtSQPWkGPRavZgkyjTdk1b6cRimWX+OMONGob100KX8G9JM8Vv+L39U+BOs+4VZRGHQdmyQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5e1a64e52c..fbea518edb 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.4-alpha.9", - "@budibase/pro": "2.2.4-alpha.8", + "@budibase/pro": "2.2.4-alpha.9", "@budibase/string-templates": "2.2.4-alpha.9", "@budibase/types": "2.2.4-alpha.9", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 56c15af33f..f36d3d223f 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.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.8.tgz#a26736f283403ef894de6e934ed49795532df676" - integrity sha512-FZ2VMjbV0q1Z8exbYpWDZi6m1npKK39nXU/ZC5piR+jDyXqiqe8ensSw7Pi3+xTb+xtKBLwuSHDgOWRvwJgqCg== +"@budibase/backend-core@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.4-alpha.9.tgz#3f3f856803d4a12f640130046dc1c04509f4e23d" + integrity sha512-ra+B5E+CZqY5L8NjKDxSRzvthVvGds6Y0Wmb4Y/jZtFfiw6MWjrR0DbdMQL7wspAiO33mstAtrV4MFgNPOmc/Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.4-alpha.8" + "@budibase/types" "2.2.4-alpha.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.8.tgz#c244ece36fd66dd3cf2a858bf37096c171f3485a" - integrity sha512-FsXVE1KrLu3i7YijCYcBdenTSFdEFmXZL4gov8hIoXlne9mmjC1SGjtK7oqKPbAVniwFrJH2nltrULFzJ4FY+w== +"@budibase/pro@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.4-alpha.9.tgz#59ee6f1a7034f861056fc1ac749a14e5e3eb3979" + integrity sha512-N9YR1AGnO8qWo/cQXPt4laQXyMYdz7Ny8H+huNL9fAw2jEjZxI6rRjyFzjUFLvtDYrrPhGrGa0SJc5/aOFMZGw== dependencies: - "@budibase/backend-core" "2.2.4-alpha.8" - "@budibase/types" "2.2.4-alpha.8" + "@budibase/backend-core" "2.2.4-alpha.9" + "@budibase/types" "2.2.4-alpha.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.4-alpha.8": - version "2.2.4-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.8.tgz#5896813006ca5bb136869c86790201950afb6549" - integrity sha512-G8+Twkl47l6pdL7nBwsbQcKFxELfHWry0WkKUgZVkEOz2O5rI535RVShpsq7K8NSaK0RXiOfeZiDSNRmLw6B3w== +"@budibase/types@2.2.4-alpha.9": + version "2.2.4-alpha.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.4-alpha.9.tgz#da233bf03c489052fa5c8a94f9071b40d2e3aea5" + integrity sha512-B58dUfIc9sKV8xvUtSQPWkGPRavZgkyjTdk1b6cRimWX+OMONGob100KX8G9JM8Vv+L39U+BOs+4VZRGHQdmyQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 033094cf30c40c5964adea18c3ab24469fbc9348 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:12:05 +0000 Subject: [PATCH 38/51] SQL server relationship fix for tables in schema (#9103) * Add schema to LEFT JOIN * lint --- packages/server/src/integrations/base/sql.ts | 20 +++- .../server/src/integrations/tests/sql.spec.ts | 92 +++++++++++++++++++ 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 43ebc8b1dd..a2318eff12 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -313,7 +313,8 @@ class InternalBuilder { addRelationships( query: KnexQuery, fromTable: string, - relationships: RelationshipsJson[] | undefined + relationships: RelationshipsJson[] | undefined, + schema: string | undefined ): KnexQuery { if (!relationships) { return query @@ -337,9 +338,13 @@ class InternalBuilder { } for (let [key, relationships] of Object.entries(tableSets)) { const { toTable, throughTable } = JSON.parse(key) + const toTableWithSchema = schema ? `${schema}.${toTable}` : toTable + const throughTableWithSchema = schema + ? `${schema}.${throughTable}` + : throughTable if (!throughTable) { // @ts-ignore - query = query.leftJoin(toTable, function () { + query = query.leftJoin(toTableWithSchema, function () { for (let relationship of relationships) { const from = relationship.from, to = relationship.to @@ -350,7 +355,7 @@ class InternalBuilder { } else { query = query // @ts-ignore - .leftJoin(throughTable, function () { + .leftJoin(throughTableWithSchema, function () { for (let relationship of relationships) { const fromPrimary = relationship.fromPrimary const from = relationship.from @@ -362,7 +367,7 @@ class InternalBuilder { ) } }) - .leftJoin(toTable, function () { + .leftJoin(toTableWithSchema, function () { for (let relationship of relationships) { const toPrimary = relationship.toPrimary const to = relationship.to @@ -456,7 +461,12 @@ class InternalBuilder { preQuery = this.addSorting(preQuery, json) } // handle joins - query = this.addRelationships(preQuery, tableName, relationships) + query = this.addRelationships( + preQuery, + tableName, + relationships, + endpoint.schema + ) return this.addFilters(query, filters, { relationship: true }) } diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts index 421b8535d4..2e45f0754b 100644 --- a/packages/server/src/integrations/tests/sql.spec.ts +++ b/packages/server/src/integrations/tests/sql.spec.ts @@ -51,6 +51,72 @@ function generateDeleteJson(table = TABLE_NAME, filters = {}) { } } +function generateRelationshipJson(config: { schema?: string } = {}) { + return { + endpoint: { + datasourceId: "Postgres", + entityId: "brands", + operation: "READ", + schema: config.schema, + }, + resource: { + fields: [ + "brands.brand_id", + "brands.brand_name", + "products.product_id", + "products.product_name", + "products.brand_id", + ], + }, + filters: {}, + sort: {}, + paginate: {}, + relationships: [ + { + from: "brand_id", + to: "brand_id", + tableName: "products", + column: "products", + }, + ], + extra: { idFilter: {} }, + } +} + +function generateManyRelationshipJson(config: { schema?: string } = {}) { + return { + endpoint: { + datasourceId: "Postgres", + entityId: "stores", + operation: "READ", + schema: config.schema, + }, + resource: { + fields: [ + "stores.store_id", + "stores.store_name", + "products.product_id", + "products.product_name", + ], + }, + filters: {}, + sort: {}, + paginate: {}, + relationships: [ + { + from: "store_id", + to: "product_id", + tableName: "products", + column: "products", + through: "stocks", + fromPrimary: "store_id", + toPrimary: "product_id", + }, + ], + extra: { idFilter: {} }, + } +} + describe("SQL query builder", () => { const limit = 500 const client = SqlClient.POSTGRES @@ -425,4 +491,30 @@ describe("SQL query builder", () => { sql: `select * from (select * from \"${TABLE_NAME}\" where \"${TABLE_NAME}\".\"age\"::jsonb ?| array [20,25] and \"${TABLE_NAME}\".\"name\"::jsonb ?| array ['John','Mary'] limit $1) as \"${TABLE_NAME}\"`, }) }) + + it("should add the schema to the LEFT JOIN", () => { + const query = sql._query(generateRelationshipJson({ schema: "production" })) + expect(query).toEqual({ + bindings: [500, 5000], + sql: `select "brands"."brand_id" as "brands.brand_id", "brands"."brand_name" as "brands.brand_name", "products"."product_id" as "products.product_id", "products"."product_name" as "products.product_name", "products"."brand_id" as "products.brand_id" from (select * from "production"."brands" limit $1) as "brands" left join "production"."products" on "brands"."brand_id" = "products"."brand_id" limit $2`, + }) + }) + + it("should handle if the schema is not present when doing a LEFT JOIN", () => { + const query = sql._query(generateRelationshipJson()) + expect(query).toEqual({ + bindings: [500, 5000], + sql: `select "brands"."brand_id" as "brands.brand_id", "brands"."brand_name" as "brands.brand_name", "products"."product_id" as "products.product_id", "products"."product_name" as "products.product_name", "products"."brand_id" as "products.brand_id" from (select * from "brands" limit $1) as "brands" left join "products" on "brands"."brand_id" = "products"."brand_id" limit $2`, + }) + }) + + it("should add the schema to both the toTable and throughTable in many-to-many join", () => { + const query = sql._query( + generateManyRelationshipJson({ schema: "production" }) + ) + expect(query).toEqual({ + bindings: [500, 5000], + sql: `select "stores"."store_id" as "stores.store_id", "stores"."store_name" as "stores.store_name", "products"."product_id" as "products.product_id", "products"."product_name" as "products.product_name" from (select * from "production"."stores" limit $1) as "stores" left join "production"."stocks" on "stores"."store_id" = "stocks"."store_id" left join "production"."products" on "products"."product_id" = "stocks"."product_id" limit $2`, + }) + }) }) From 8ede6de345512ae60e6ae021f3cddb3d4f0a56ad Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 19 Dec 2022 18:25:02 +0000 Subject: [PATCH 39/51] v2.2.9 --- 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 2b9efd53b9..b04338d8c8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.8", + "version": "2.2.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6070a2cd50..62228af7cd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.8", + "version": "2.2.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.8", + "@budibase/types": "^2.2.9", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index aa16117fa7..1ca692fa8d 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.8", + "version": "2.2.9", "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.8", + "@budibase/string-templates": "^2.2.9", "@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 be2befbe44..da9c912bdf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.8", + "version": "2.2.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.8", - "@budibase/client": "^2.2.8", - "@budibase/frontend-core": "^2.2.8", - "@budibase/string-templates": "^2.2.8", + "@budibase/bbui": "^2.2.9", + "@budibase/client": "^2.2.9", + "@budibase/frontend-core": "^2.2.9", + "@budibase/string-templates": "^2.2.9", "@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 f38dc8105d..d48942b9d1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.8", + "version": "2.2.9", "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.8", - "@budibase/string-templates": "^2.2.8", - "@budibase/types": "^2.2.8", + "@budibase/backend-core": "^2.2.9", + "@budibase/string-templates": "^2.2.9", + "@budibase/types": "^2.2.9", "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 cdd8f4941f..1b797e4bfb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.8", + "version": "2.2.9", "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.8", - "@budibase/frontend-core": "^2.2.8", - "@budibase/string-templates": "^2.2.8", + "@budibase/bbui": "^2.2.9", + "@budibase/frontend-core": "^2.2.9", + "@budibase/string-templates": "^2.2.9", "@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 e92d54c74a..116dc8dfdc 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.8", + "version": "2.2.9", "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.8", + "@budibase/bbui": "^2.2.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d30c707649..04d073908d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.8", + "version": "2.2.9", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 97783614a3..7d1d984e53 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.8", + "version": "2.2.9", "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.8", - "@budibase/client": "^2.2.8", + "@budibase/backend-core": "^2.2.9", + "@budibase/client": "^2.2.9", "@budibase/pro": "2.2.8", - "@budibase/string-templates": "^2.2.8", - "@budibase/types": "^2.2.8", + "@budibase/string-templates": "^2.2.9", + "@budibase/types": "^2.2.9", "@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 085e7b07cc..f7f38ed78f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.8", + "version": "2.2.9", "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 5ed20d6b66..b27ac280ef 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.8", + "version": "2.2.9", "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 0f6d6b9b35..faa9282c87 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.8", + "version": "2.2.9", "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.8", + "@budibase/backend-core": "^2.2.9", "@budibase/pro": "2.2.8", - "@budibase/string-templates": "^2.2.8", - "@budibase/types": "^2.2.8", + "@budibase/string-templates": "^2.2.9", + "@budibase/types": "^2.2.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 23753a1c9f4d215567629631ea0251701f74c640 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 19 Dec 2022 18:28:38 +0000 Subject: [PATCH 40/51] Update pro version to 2.2.9 --- 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 7d1d984e53..2fff32198d 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.9", "@budibase/client": "^2.2.9", - "@budibase/pro": "2.2.8", + "@budibase/pro": "2.2.9", "@budibase/string-templates": "^2.2.9", "@budibase/types": "^2.2.9", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index eb3ccd3b90..7eccc15433 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.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.8.tgz#9a72bc9bab013f8322ab85cdab5c96b743aa2bcd" - integrity sha512-1wY+xVOCOyiLyhRokOu6VAfsU0WVu7U6Rbcmz1PMSJcYbricucH1XAThKISmKXPP6K3L8o/Ug+r4leI96yw1dQ== +"@budibase/backend-core@2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" + integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.8" + "@budibase/types" "^2.2.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1372,13 +1372,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.8.tgz#5b42e85b1843dcc133001e4eb130f371f0c6e973" - integrity sha512-rg4Vq1vWu09DTpqtuiP9yqJ+XyuKoIb9/HTWo1nFfuxOkNBagDEmHJnp8Q+Kwhs+ubWpCGCyC2Ge15JsbLhCCw== +"@budibase/pro@2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" + integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== dependencies: - "@budibase/backend-core" "2.2.8" - "@budibase/types" "2.2.8" + "@budibase/backend-core" "2.2.9" + "@budibase/types" "2.2.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1402,10 +1402,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.8", "@budibase/types@^2.2.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.8.tgz#fd681947d346c9262bb041f6ffea5a0691ff6ba5" - integrity sha512-mBhEkt+H4uzYuDDYcx7042EBoHUGungURhyi442NF6AWR60u4xbq9MoP+F5DGvSz8zAWQhO6gpkO3hNBeY2aGQ== +"@budibase/types@2.2.9", "@budibase/types@^2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" + integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index faa9282c87..a697f45865 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.9", - "@budibase/pro": "2.2.8", + "@budibase/pro": "2.2.9", "@budibase/string-templates": "^2.2.9", "@budibase/types": "^2.2.9", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d4fdd2ace8..cd9c47e53a 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.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.8.tgz#9a72bc9bab013f8322ab85cdab5c96b743aa2bcd" - integrity sha512-1wY+xVOCOyiLyhRokOu6VAfsU0WVu7U6Rbcmz1PMSJcYbricucH1XAThKISmKXPP6K3L8o/Ug+r4leI96yw1dQ== +"@budibase/backend-core@2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" + integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.8" + "@budibase/types" "^2.2.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -519,22 +519,22 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.8.tgz#5b42e85b1843dcc133001e4eb130f371f0c6e973" - integrity sha512-rg4Vq1vWu09DTpqtuiP9yqJ+XyuKoIb9/HTWo1nFfuxOkNBagDEmHJnp8Q+Kwhs+ubWpCGCyC2Ge15JsbLhCCw== +"@budibase/pro@2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" + integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== dependencies: - "@budibase/backend-core" "2.2.8" - "@budibase/types" "2.2.8" + "@budibase/backend-core" "2.2.9" + "@budibase/types" "2.2.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.2.8", "@budibase/types@^2.2.8": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.8.tgz#fd681947d346c9262bb041f6ffea5a0691ff6ba5" - integrity sha512-mBhEkt+H4uzYuDDYcx7042EBoHUGungURhyi442NF6AWR60u4xbq9MoP+F5DGvSz8zAWQhO6gpkO3hNBeY2aGQ== +"@budibase/types@2.2.9", "@budibase/types@^2.2.9": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" + integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 0b59e8e10ea5b64efa10eb7b15db9ba1d0c504ff Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 19 Dec 2022 20:55:05 +0000 Subject: [PATCH 41/51] Fix build (#9115) --- packages/types/package.json | 1 + packages/types/yarn.lock | 111 +++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/packages/types/package.json b/packages/types/package.json index 1ffe87b3fe..c767acc94d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -18,6 +18,7 @@ "@types/koa": "2.13.4", "@types/node": "14.18.20", "@types/pouchdb": "6.4.0", + "koa-body": "4.2.0", "rimraf": "3.0.2", "typescript": "4.7.3" } diff --git a/packages/types/yarn.lock b/packages/types/yarn.lock index bc22fdf93c..4acf3737a0 100644 --- a/packages/types/yarn.lock +++ b/packages/types/yarn.lock @@ -364,6 +364,11 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + call-bind@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -372,6 +377,16 @@ call-bind@^1.0.0: function-bind "^1.1.1" get-intrinsic "^1.0.2" +co-body@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/co-body/-/co-body-5.2.0.tgz#5a0a658c46029131e0e3a306f67647302f71c124" + integrity sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ== + dependencies: + inflation "^2.0.0" + qs "^6.4.0" + raw-body "^2.2.0" + type-is "^1.6.14" + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -396,6 +411,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" @@ -410,6 +430,11 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +formidable@^1.1.1: + version "1.2.6" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168" + integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ== + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -460,6 +485,29 @@ http-cookie-agent@^4.0.2: dependencies: agent-base "^6.0.2" +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +inflation@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/inflation/-/inflation-2.0.0.tgz#8b417e47c28f925a45133d914ca1fd389107f30f" + integrity sha512-m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -468,7 +516,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2: +inherits@2, inherits@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -478,12 +526,26 @@ json5@*: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +koa-body@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f" + integrity sha512-wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA== + dependencies: + "@types/formidable" "^1.0.31" + co-body "^5.1.1" + formidable "^1.1.1" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== + mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12: +mime-types@^2.1.12, mime-types@~2.1.24: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -539,7 +601,7 @@ punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -qs@^6.11.0: +qs@^6.11.0, qs@^6.4.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== @@ -551,6 +613,16 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +raw-body@^2.2.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -563,6 +635,16 @@ rimraf@3.0.2: dependencies: glob "^7.1.3" +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -572,6 +654,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + tough-cookie@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" @@ -582,6 +674,14 @@ tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" +type-is@^1.6.14: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" @@ -592,6 +692,11 @@ universalify@^0.2.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== +unpipe@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + url-parse@^1.5.3: version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" From c66524253459a149aefa42831d63a7806696f036 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 21:08:30 +0000 Subject: [PATCH 42/51] v2.2.10-alpha.0 --- lerna.json | 4 ++-- packages/backend-core/package.json | 6 +++--- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 10 +++++----- packages/client/package.json | 10 +++++----- packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 4 ++-- packages/server/package.json | 12 ++++++------ packages/string-templates/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/worker/package.json | 10 +++++----- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lerna.json b/lerna.json index 3ab31babdd..6f65a22fe1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.9", + "version": "2.2.10-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" @@ -15,4 +15,4 @@ ] } } -} \ No newline at end of file +} diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5090eef467..1305d8ab17 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.2.9", + "@budibase/types": "2.2.10-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", @@ -79,4 +79,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2d8ca3c9eb..371947e65a 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.9", + "version": "2.2.10-alpha.0", "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.9", + "@budibase/string-templates": "2.2.10-alpha.0", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", @@ -89,4 +89,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index 3d1dd15f7d..a5ecad0bc2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.2.9", - "@budibase/client": "^2.2.9", - "@budibase/frontend-core": "^2.2.9", - "@budibase/string-templates": "^2.2.9", + "@budibase/bbui": "2.2.10-alpha.0", + "@budibase/client": "2.2.10-alpha.0", + "@budibase/frontend-core": "2.2.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", @@ -123,4 +123,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} \ No newline at end of file +} diff --git a/packages/cli/package.json b/packages/cli/package.json index 8d9f41f636..f9d16e8f29 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "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.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/backend-core": "2.2.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.0", + "@budibase/types": "2.2.10-alpha.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", @@ -54,4 +54,4 @@ "eslint": "^7.20.0", "renamer": "^4.0.0" } -} \ No newline at end of file +} diff --git a/packages/client/package.json b/packages/client/package.json index 966bf80842..bbafdf099d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "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.9", - "@budibase/frontend-core": "^2.2.9", - "@budibase/string-templates": "^2.2.9", + "@budibase/bbui": "2.2.10-alpha.0", + "@budibase/frontend-core": "2.2.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -63,4 +63,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b55c3453cb..032038ef81 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "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.9", + "@budibase/bbui": "2.2.10-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5442755c25..58cafdeb4f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", @@ -20,4 +20,4 @@ "rollup-plugin-polyfill-node": "^0.8.0", "rollup-plugin-terser": "^7.0.2" } -} \ No newline at end of file +} diff --git a/packages/server/package.json b/packages/server/package.json index 547a9081e2..72f1124e01 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.9", + "version": "2.2.10-alpha.0", "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.9", - "@budibase/client": "^2.2.9", + "@budibase/backend-core": "2.2.10-alpha.0", + "@budibase/client": "2.2.10-alpha.0", "@budibase/pro": "2.2.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/string-templates": "2.2.10-alpha.0", + "@budibase/types": "2.2.10-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -168,4 +168,4 @@ "oracledb": "5.3.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9c359c7c43..6d403f1840 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -47,4 +47,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/types/package.json b/packages/types/package.json index c767acc94d..95bcaa89b5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.9", + "version": "2.2.10-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -22,4 +22,4 @@ "rimraf": "3.0.2", "typescript": "4.7.3" } -} \ No newline at end of file +} diff --git a/packages/worker/package.json b/packages/worker/package.json index 2473daf586..669c254776 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.9", + "version": "2.2.10-alpha.0", "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.9", + "@budibase/backend-core": "2.2.10-alpha.0", "@budibase/pro": "2.2.9", - "@budibase/string-templates": "^2.2.9", - "@budibase/types": "^2.2.9", + "@budibase/string-templates": "2.2.10-alpha.0", + "@budibase/types": "2.2.10-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", @@ -96,4 +96,4 @@ "update-dotenv": "1.1.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} From 48949e706970d16e09a0afb012826339d5b50f7c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 21:12:09 +0000 Subject: [PATCH 43/51] Update pro version to 2.2.10-alpha.0 --- 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 72f1124e01..a5667fd6bf 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.10-alpha.0", "@budibase/client": "2.2.10-alpha.0", - "@budibase/pro": "2.2.9", + "@budibase/pro": "2.2.10-alpha.0", "@budibase/string-templates": "2.2.10-alpha.0", "@budibase/types": "2.2.10-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8c8dd0c96a..ec03b9de4c 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.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" - integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== +"@budibase/backend-core@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.0.tgz#d3fc9d4e156c3195cc61237c2f2d8f00dfe4b880" + integrity sha512-F8BLiwKALkP0LkNZYWgQoa2EsHiPQhZm/elUGmwCORHudWJS/X5rOcrLBp8FnQm+jLZ3WHQOWd6cFzMty1rFFg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.9" + "@budibase/types" "2.2.10-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" - integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== +"@budibase/pro@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.0.tgz#e5bbbd0c31bcc65249806c67abddcf2b1a6edee3" + integrity sha512-ETR0TqZ0AwmGArgAp4l7HxanwQD0LQfUH/6Ln/kAwR+xE6IRilT9X1tCrE9n8gdVQKAS2djGLvKBk3GB7UQSMA== dependencies: - "@budibase/backend-core" "2.2.9" - "@budibase/types" "2.2.9" + "@budibase/backend-core" "2.2.10-alpha.0" + "@budibase/types" "2.2.10-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.9", "@budibase/types@^2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" - integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== +"@budibase/types@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.0.tgz#62f4ad05295eee7950c1ad660ba7777bc0331752" + integrity sha512-Y6LzFyRG5XLvIpEVkzOxFCgJHvsJexvXAo2jjSgUbzbIfdjSE2v121T32/HBOWhXc0SR1y2XRVrNG+MEZ7offg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 669c254776..097be7dbbd 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.10-alpha.0", - "@budibase/pro": "2.2.9", + "@budibase/pro": "2.2.10-alpha.0", "@budibase/string-templates": "2.2.10-alpha.0", "@budibase/types": "2.2.10-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c26a23903a..61922bd40e 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.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.9.tgz#0b7f7c2cef2c51e4304287b988e3af531d05b7b1" - integrity sha512-zZOdK67XBtybnWa5E5D5ioCpBhbTJelkWVNcH2E8vsKqLNu+6g0SZGKgUqKy8O7uiX6JZ/nLdNi80TiRKFpAxg== +"@budibase/backend-core@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.0.tgz#d3fc9d4e156c3195cc61237c2f2d8f00dfe4b880" + integrity sha512-F8BLiwKALkP0LkNZYWgQoa2EsHiPQhZm/elUGmwCORHudWJS/X5rOcrLBp8FnQm+jLZ3WHQOWd6cFzMty1rFFg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.2.9" + "@budibase/types" "2.2.10-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.9.tgz#46f563d5c6ca6ce6621ee79ef77830a81feb2421" - integrity sha512-QCl/kZ8hAd9+GumxLYL6LpDW0/QWm57fda7zKrONDETA9e9+bZwoK94vYYWr9xs3VFq3CwvomKSYre8HfNrFDg== +"@budibase/pro@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.0.tgz#e5bbbd0c31bcc65249806c67abddcf2b1a6edee3" + integrity sha512-ETR0TqZ0AwmGArgAp4l7HxanwQD0LQfUH/6Ln/kAwR+xE6IRilT9X1tCrE9n8gdVQKAS2djGLvKBk3GB7UQSMA== dependencies: - "@budibase/backend-core" "2.2.9" - "@budibase/types" "2.2.9" + "@budibase/backend-core" "2.2.10-alpha.0" + "@budibase/types" "2.2.10-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.9", "@budibase/types@^2.2.9": - version "2.2.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.9.tgz#6fe26748b3506150657612eb4ef5e895e96b72cc" - integrity sha512-jVW2vgx6TrjJuY0XmhnhKLZyZnlQI9xGzzGXr4jORcrdP5VCEp3BBHDh/3hxrLhlmnJ6+9o0Ey0Ru2dy/j9YPA== +"@budibase/types@2.2.10-alpha.0": + version "2.2.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.0.tgz#62f4ad05295eee7950c1ad660ba7777bc0331752" + integrity sha512-Y6LzFyRG5XLvIpEVkzOxFCgJHvsJexvXAo2jjSgUbzbIfdjSE2v121T32/HBOWhXc0SR1y2XRVrNG+MEZ7offg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From a13cfd98f9057f31dd85881556ed24d9b70b2a92 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 19 Dec 2022 22:05:47 +0000 Subject: [PATCH 44/51] Fix docker build (#9116) --- packages/backend-core/package.json | 3 +++ packages/server/src/api/controllers/application.ts | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1305d8ab17..9215826202 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,5 +1,8 @@ { "name": "@budibase/backend-core", + "files": [ + "dist" + ], "version": "2.2.10-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index e227df1a58..06e7dc8a57 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -50,7 +50,6 @@ import { } from "@budibase/types" import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts" import sdk from "../../sdk" -import { getDB } from "@budibase/backend-core/src/db" // utility function, need to do away with this async function getLayouts() { From e0a3bce42537233700098deadcf134fb0fe5552a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 22:21:52 +0000 Subject: [PATCH 45/51] v2.2.10-alpha.1 --- 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 6f65a22fe1..e0c87863d3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9215826202..60f0331be6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -3,7 +3,7 @@ "files": [ "dist" ], - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.0", + "@budibase/types": "2.2.10-alpha.1", "@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 371947e65a..a1c589e563 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.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.1", "@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 a5ecad0bc2..186a4783a1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.0", - "@budibase/client": "2.2.10-alpha.0", - "@budibase/frontend-core": "2.2.10-alpha.0", - "@budibase/string-templates": "2.2.10-alpha.0", + "@budibase/bbui": "2.2.10-alpha.1", + "@budibase/client": "2.2.10-alpha.1", + "@budibase/frontend-core": "2.2.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.1", "@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 f9d16e8f29..c1aca4bd66 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", - "@budibase/string-templates": "2.2.10-alpha.0", - "@budibase/types": "2.2.10-alpha.0", + "@budibase/backend-core": "2.2.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.1", + "@budibase/types": "2.2.10-alpha.1", "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 bbafdf099d..3e1f294eae 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", - "@budibase/frontend-core": "2.2.10-alpha.0", - "@budibase/string-templates": "2.2.10-alpha.0", + "@budibase/bbui": "2.2.10-alpha.1", + "@budibase/frontend-core": "2.2.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.1", "@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 032038ef81..d0533e42ab 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", + "@budibase/bbui": "2.2.10-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 58cafdeb4f..9e2912fa83 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a5667fd6bf..09d2cc9d20 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.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", - "@budibase/client": "2.2.10-alpha.0", + "@budibase/backend-core": "2.2.10-alpha.1", + "@budibase/client": "2.2.10-alpha.1", "@budibase/pro": "2.2.10-alpha.0", - "@budibase/string-templates": "2.2.10-alpha.0", - "@budibase/types": "2.2.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.1", + "@budibase/types": "2.2.10-alpha.1", "@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 6d403f1840..2d74919d9d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "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 95bcaa89b5..4e0a27874b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.0", + "version": "2.2.10-alpha.1", "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 097be7dbbd..023c137a53 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.10-alpha.0", + "version": "2.2.10-alpha.1", "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.10-alpha.0", + "@budibase/backend-core": "2.2.10-alpha.1", "@budibase/pro": "2.2.10-alpha.0", - "@budibase/string-templates": "2.2.10-alpha.0", - "@budibase/types": "2.2.10-alpha.0", + "@budibase/string-templates": "2.2.10-alpha.1", + "@budibase/types": "2.2.10-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5cee1362ac81a9c747b2bf1aec7429e0563ec43e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Dec 2022 22:25:55 +0000 Subject: [PATCH 46/51] Update pro version to 2.2.10-alpha.1 --- 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 09d2cc9d20..4fd1ab20f4 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.10-alpha.1", "@budibase/client": "2.2.10-alpha.1", - "@budibase/pro": "2.2.10-alpha.0", + "@budibase/pro": "2.2.10-alpha.1", "@budibase/string-templates": "2.2.10-alpha.1", "@budibase/types": "2.2.10-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ec03b9de4c..6509b22c0e 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.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.0.tgz#d3fc9d4e156c3195cc61237c2f2d8f00dfe4b880" - integrity sha512-F8BLiwKALkP0LkNZYWgQoa2EsHiPQhZm/elUGmwCORHudWJS/X5rOcrLBp8FnQm+jLZ3WHQOWd6cFzMty1rFFg== +"@budibase/backend-core@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.1.tgz#d09d3ce554463301e0440e41d1ee2c9de82e76b1" + integrity sha512-mcrh8XBHGMWElAbgL5njz6yZugfHeiI8PMrXdP/szeBFCkVE4wD1wNvnRMDToRYDV0rxhWmfbezxbbW/nXZyYQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.0" + "@budibase/types" "2.2.10-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.0.tgz#e5bbbd0c31bcc65249806c67abddcf2b1a6edee3" - integrity sha512-ETR0TqZ0AwmGArgAp4l7HxanwQD0LQfUH/6Ln/kAwR+xE6IRilT9X1tCrE9n8gdVQKAS2djGLvKBk3GB7UQSMA== +"@budibase/pro@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.1.tgz#4fcf96b1fd7a983b67b6c64b94a6bb800cc12328" + integrity sha512-qcOzoW2kKdnIfXMEq4WPwOnkXPkfUVQY6Rp7z4HmVr1v2e8YVwLs6Ae2Tdl8dlW5D6x3WcvCbTOB7pFzwYPGNA== dependencies: - "@budibase/backend-core" "2.2.10-alpha.0" - "@budibase/types" "2.2.10-alpha.0" + "@budibase/backend-core" "2.2.10-alpha.1" + "@budibase/types" "2.2.10-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.0.tgz#62f4ad05295eee7950c1ad660ba7777bc0331752" - integrity sha512-Y6LzFyRG5XLvIpEVkzOxFCgJHvsJexvXAo2jjSgUbzbIfdjSE2v121T32/HBOWhXc0SR1y2XRVrNG+MEZ7offg== +"@budibase/types@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.1.tgz#9ac02f7f06a65ed06e0118ef30a33a38b2fc6ba6" + integrity sha512-TkzMVsUnZUUj3b5oR5ZhJWv6mqzsBRx4gzkFo7kbQ8QoBp99TFuq0si6hNU2D6g+cM9Bb4D+KSCA/cT8ED1c3Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 023c137a53..595a157033 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.10-alpha.1", - "@budibase/pro": "2.2.10-alpha.0", + "@budibase/pro": "2.2.10-alpha.1", "@budibase/string-templates": "2.2.10-alpha.1", "@budibase/types": "2.2.10-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 61922bd40e..0e6bc83be9 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.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.0.tgz#d3fc9d4e156c3195cc61237c2f2d8f00dfe4b880" - integrity sha512-F8BLiwKALkP0LkNZYWgQoa2EsHiPQhZm/elUGmwCORHudWJS/X5rOcrLBp8FnQm+jLZ3WHQOWd6cFzMty1rFFg== +"@budibase/backend-core@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.1.tgz#d09d3ce554463301e0440e41d1ee2c9de82e76b1" + integrity sha512-mcrh8XBHGMWElAbgL5njz6yZugfHeiI8PMrXdP/szeBFCkVE4wD1wNvnRMDToRYDV0rxhWmfbezxbbW/nXZyYQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.0" + "@budibase/types" "2.2.10-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.0.tgz#e5bbbd0c31bcc65249806c67abddcf2b1a6edee3" - integrity sha512-ETR0TqZ0AwmGArgAp4l7HxanwQD0LQfUH/6Ln/kAwR+xE6IRilT9X1tCrE9n8gdVQKAS2djGLvKBk3GB7UQSMA== +"@budibase/pro@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.1.tgz#4fcf96b1fd7a983b67b6c64b94a6bb800cc12328" + integrity sha512-qcOzoW2kKdnIfXMEq4WPwOnkXPkfUVQY6Rp7z4HmVr1v2e8YVwLs6Ae2Tdl8dlW5D6x3WcvCbTOB7pFzwYPGNA== dependencies: - "@budibase/backend-core" "2.2.10-alpha.0" - "@budibase/types" "2.2.10-alpha.0" + "@budibase/backend-core" "2.2.10-alpha.1" + "@budibase/types" "2.2.10-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.10-alpha.0": - version "2.2.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.0.tgz#62f4ad05295eee7950c1ad660ba7777bc0331752" - integrity sha512-Y6LzFyRG5XLvIpEVkzOxFCgJHvsJexvXAo2jjSgUbzbIfdjSE2v121T32/HBOWhXc0SR1y2XRVrNG+MEZ7offg== +"@budibase/types@2.2.10-alpha.1": + version "2.2.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.1.tgz#9ac02f7f06a65ed06e0118ef30a33a38b2fc6ba6" + integrity sha512-TkzMVsUnZUUj3b5oR5ZhJWv6mqzsBRx4gzkFo7kbQ8QoBp99TFuq0si6hNU2D6g+cM9Bb4D+KSCA/cT8ED1c3Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b0d1e37734eae3588ac6036af64fa1523cb9f9a5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 08:40:00 +0000 Subject: [PATCH 47/51] v2.2.10-alpha.2 --- 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 e0c87863d3..c333a22fb4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 60f0331be6..6a8bd0499f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -3,7 +3,7 @@ "files": [ "dist" ], - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.1", + "@budibase/types": "2.2.10-alpha.2", "@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 a1c589e563..c62c37f05a 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.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.2", "@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 186a4783a1..e56778bde6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.1", - "@budibase/client": "2.2.10-alpha.1", - "@budibase/frontend-core": "2.2.10-alpha.1", - "@budibase/string-templates": "2.2.10-alpha.1", + "@budibase/bbui": "2.2.10-alpha.2", + "@budibase/client": "2.2.10-alpha.2", + "@budibase/frontend-core": "2.2.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.2", "@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 c1aca4bd66..a9a8b21b92 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", - "@budibase/string-templates": "2.2.10-alpha.1", - "@budibase/types": "2.2.10-alpha.1", + "@budibase/backend-core": "2.2.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.2", + "@budibase/types": "2.2.10-alpha.2", "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 3e1f294eae..06b731fd58 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", - "@budibase/frontend-core": "2.2.10-alpha.1", - "@budibase/string-templates": "2.2.10-alpha.1", + "@budibase/bbui": "2.2.10-alpha.2", + "@budibase/frontend-core": "2.2.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.2", "@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 d0533e42ab..dedba2421c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", + "@budibase/bbui": "2.2.10-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9e2912fa83..8cdbebb28f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4fd1ab20f4..7330f3baa0 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.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", - "@budibase/client": "2.2.10-alpha.1", + "@budibase/backend-core": "2.2.10-alpha.2", + "@budibase/client": "2.2.10-alpha.2", "@budibase/pro": "2.2.10-alpha.1", - "@budibase/string-templates": "2.2.10-alpha.1", - "@budibase/types": "2.2.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.2", + "@budibase/types": "2.2.10-alpha.2", "@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 2d74919d9d..51f9302f77 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "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 4e0a27874b..a2492732ab 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.1", + "version": "2.2.10-alpha.2", "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 595a157033..8d540a1752 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.10-alpha.1", + "version": "2.2.10-alpha.2", "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.10-alpha.1", + "@budibase/backend-core": "2.2.10-alpha.2", "@budibase/pro": "2.2.10-alpha.1", - "@budibase/string-templates": "2.2.10-alpha.1", - "@budibase/types": "2.2.10-alpha.1", + "@budibase/string-templates": "2.2.10-alpha.2", + "@budibase/types": "2.2.10-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0fe35b59fded67932c88af1b20adfe0b86ed6cd2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 08:43:35 +0000 Subject: [PATCH 48/51] Update pro version to 2.2.10-alpha.2 --- 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 7330f3baa0..a0627e5d3c 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.10-alpha.2", "@budibase/client": "2.2.10-alpha.2", - "@budibase/pro": "2.2.10-alpha.1", + "@budibase/pro": "2.2.10-alpha.2", "@budibase/string-templates": "2.2.10-alpha.2", "@budibase/types": "2.2.10-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6509b22c0e..150854bb59 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.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.1.tgz#d09d3ce554463301e0440e41d1ee2c9de82e76b1" - integrity sha512-mcrh8XBHGMWElAbgL5njz6yZugfHeiI8PMrXdP/szeBFCkVE4wD1wNvnRMDToRYDV0rxhWmfbezxbbW/nXZyYQ== +"@budibase/backend-core@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.2.tgz#77ebfd648a5cbea2bc7418d51c04a413a65925d5" + integrity sha512-9lgi+g5tu470JcKhvdsFREQ8MmGlGiDg4SoL8YClemyjVEcdR6XorDpoaDvVb2gvSqdmrNvBYbaecAdtXQXNnA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.1" + "@budibase/types" "2.2.10-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.1.tgz#4fcf96b1fd7a983b67b6c64b94a6bb800cc12328" - integrity sha512-qcOzoW2kKdnIfXMEq4WPwOnkXPkfUVQY6Rp7z4HmVr1v2e8YVwLs6Ae2Tdl8dlW5D6x3WcvCbTOB7pFzwYPGNA== +"@budibase/pro@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.2.tgz#61597eae90ffdfb6d83209c9f3a0d95b824c68f5" + integrity sha512-aSZJzEnq9v8WUxu0ygj7rctslp+5oD+iz/Q8VkyxrdBXY6HzwsmKdugMnOv99kvY7zrBXbwHxqX1t5qtNzVdKQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.1" - "@budibase/types" "2.2.10-alpha.1" + "@budibase/backend-core" "2.2.10-alpha.2" + "@budibase/types" "2.2.10-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.1.tgz#9ac02f7f06a65ed06e0118ef30a33a38b2fc6ba6" - integrity sha512-TkzMVsUnZUUj3b5oR5ZhJWv6mqzsBRx4gzkFo7kbQ8QoBp99TFuq0si6hNU2D6g+cM9Bb4D+KSCA/cT8ED1c3Q== +"@budibase/types@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.2.tgz#e32adc6c7f9023223bec962f123421d6f5e2bb7a" + integrity sha512-MlLERFfik2PuzVzuo3RUohYC+ZfjAoD+vyFrpnAK/ZzODTBzg2I8DUw+aatJ1vida8BPK1em6LaC5EUG6vlpeA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8d540a1752..fc593bce28 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.10-alpha.2", - "@budibase/pro": "2.2.10-alpha.1", + "@budibase/pro": "2.2.10-alpha.2", "@budibase/string-templates": "2.2.10-alpha.2", "@budibase/types": "2.2.10-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0e6bc83be9..fe0a1424eb 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.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.1.tgz#d09d3ce554463301e0440e41d1ee2c9de82e76b1" - integrity sha512-mcrh8XBHGMWElAbgL5njz6yZugfHeiI8PMrXdP/szeBFCkVE4wD1wNvnRMDToRYDV0rxhWmfbezxbbW/nXZyYQ== +"@budibase/backend-core@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.2.tgz#77ebfd648a5cbea2bc7418d51c04a413a65925d5" + integrity sha512-9lgi+g5tu470JcKhvdsFREQ8MmGlGiDg4SoL8YClemyjVEcdR6XorDpoaDvVb2gvSqdmrNvBYbaecAdtXQXNnA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.1" + "@budibase/types" "2.2.10-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.1.tgz#4fcf96b1fd7a983b67b6c64b94a6bb800cc12328" - integrity sha512-qcOzoW2kKdnIfXMEq4WPwOnkXPkfUVQY6Rp7z4HmVr1v2e8YVwLs6Ae2Tdl8dlW5D6x3WcvCbTOB7pFzwYPGNA== +"@budibase/pro@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.2.tgz#61597eae90ffdfb6d83209c9f3a0d95b824c68f5" + integrity sha512-aSZJzEnq9v8WUxu0ygj7rctslp+5oD+iz/Q8VkyxrdBXY6HzwsmKdugMnOv99kvY7zrBXbwHxqX1t5qtNzVdKQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.1" - "@budibase/types" "2.2.10-alpha.1" + "@budibase/backend-core" "2.2.10-alpha.2" + "@budibase/types" "2.2.10-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.10-alpha.1": - version "2.2.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.1.tgz#9ac02f7f06a65ed06e0118ef30a33a38b2fc6ba6" - integrity sha512-TkzMVsUnZUUj3b5oR5ZhJWv6mqzsBRx4gzkFo7kbQ8QoBp99TFuq0si6hNU2D6g+cM9Bb4D+KSCA/cT8ED1c3Q== +"@budibase/types@2.2.10-alpha.2": + version "2.2.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.2.tgz#e32adc6c7f9023223bec962f123421d6f5e2bb7a" + integrity sha512-MlLERFfik2PuzVzuo3RUohYC+ZfjAoD+vyFrpnAK/ZzODTBzg2I8DUw+aatJ1vida8BPK1em6LaC5EUG6vlpeA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From da6c2a9080f6f2f07c281213c1223de99f66e6a8 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 10:56:33 +0000 Subject: [PATCH 49/51] Fix empty dist folder in npm pacakge (#9125) Use a .npmignore file instead of the files property of package.json A bug in lerna seems to use the generated dist/package.json instead of the root file when determining files to add, resulting in an empty directory. Related: https://stackoverflow.com/questions/54912262/lerna-publish-and-npm-pack-failing-to-package-all-the-files-in-dist-folder --- packages/backend-core/.npmignore | 2 ++ packages/backend-core/package.json | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 packages/backend-core/.npmignore diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore new file mode 100644 index 0000000000..ad6609ce51 --- /dev/null +++ b/packages/backend-core/.npmignore @@ -0,0 +1,2 @@ +* +!dist/* \ No newline at end of file diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6a8bd0499f..a64a159de3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,8 +1,5 @@ { "name": "@budibase/backend-core", - "files": [ - "dist" - ], "version": "2.2.10-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", From 93484a08c48edec4f696a8080083aafb74731746 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 11:08:52 +0000 Subject: [PATCH 50/51] v2.2.10-alpha.3 --- 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 c333a22fb4..c98095044d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a64a159de3..c2f4b2a98a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -21,7 +21,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.2", + "@budibase/types": "2.2.10-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c62c37f05a..26717c1655 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.10-alpha.2", + "version": "2.2.10-alpha.3", "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.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.3", "@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 e56778bde6..77d7b2388d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.2", - "@budibase/client": "2.2.10-alpha.2", - "@budibase/frontend-core": "2.2.10-alpha.2", - "@budibase/string-templates": "2.2.10-alpha.2", + "@budibase/bbui": "2.2.10-alpha.3", + "@budibase/client": "2.2.10-alpha.3", + "@budibase/frontend-core": "2.2.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.3", "@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 a9a8b21b92..56220ce097 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "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.10-alpha.2", - "@budibase/string-templates": "2.2.10-alpha.2", - "@budibase/types": "2.2.10-alpha.2", + "@budibase/backend-core": "2.2.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.3", + "@budibase/types": "2.2.10-alpha.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 06b731fd58..7a09fcd7ff 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "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.10-alpha.2", - "@budibase/frontend-core": "2.2.10-alpha.2", - "@budibase/string-templates": "2.2.10-alpha.2", + "@budibase/bbui": "2.2.10-alpha.3", + "@budibase/frontend-core": "2.2.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index dedba2421c..078d1a45ed 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.10-alpha.2", + "@budibase/bbui": "2.2.10-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8cdbebb28f..1facab349e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a0627e5d3c..017f3bb6f0 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.10-alpha.2", + "version": "2.2.10-alpha.3", "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.10-alpha.2", - "@budibase/client": "2.2.10-alpha.2", + "@budibase/backend-core": "2.2.10-alpha.3", + "@budibase/client": "2.2.10-alpha.3", "@budibase/pro": "2.2.10-alpha.2", - "@budibase/string-templates": "2.2.10-alpha.2", - "@budibase/types": "2.2.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.3", + "@budibase/types": "2.2.10-alpha.3", "@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 51f9302f77..43d46b8ed6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index a2492732ab..38b121fd32 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.2", + "version": "2.2.10-alpha.3", "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 fc593bce28..5c091ce07e 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.10-alpha.2", + "version": "2.2.10-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.10-alpha.2", + "@budibase/backend-core": "2.2.10-alpha.3", "@budibase/pro": "2.2.10-alpha.2", - "@budibase/string-templates": "2.2.10-alpha.2", - "@budibase/types": "2.2.10-alpha.2", + "@budibase/string-templates": "2.2.10-alpha.3", + "@budibase/types": "2.2.10-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From f7a4834d78d4c653104155d6055f2b7d7b8b4fe4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 11:12:26 +0000 Subject: [PATCH 51/51] Update pro version to 2.2.10-alpha.3 --- 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 017f3bb6f0..4898ba186b 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.10-alpha.3", "@budibase/client": "2.2.10-alpha.3", - "@budibase/pro": "2.2.10-alpha.2", + "@budibase/pro": "2.2.10-alpha.3", "@budibase/string-templates": "2.2.10-alpha.3", "@budibase/types": "2.2.10-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 150854bb59..e8ab94017e 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.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.2.tgz#77ebfd648a5cbea2bc7418d51c04a413a65925d5" - integrity sha512-9lgi+g5tu470JcKhvdsFREQ8MmGlGiDg4SoL8YClemyjVEcdR6XorDpoaDvVb2gvSqdmrNvBYbaecAdtXQXNnA== +"@budibase/backend-core@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.3.tgz#ab716813b47f3b6273374a8ec99a879ca0ba287a" + integrity sha512-r9UBi66yZVIyU0XU0uigdBqmkygZR+ZTn17JGpR5YDjcKRQzV60ONFbJuy3yjCJJV6MPm+6go8tzpKHLsUWqkQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.2" + "@budibase/types" "2.2.10-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1373,13 +1373,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.2.tgz#61597eae90ffdfb6d83209c9f3a0d95b824c68f5" - integrity sha512-aSZJzEnq9v8WUxu0ygj7rctslp+5oD+iz/Q8VkyxrdBXY6HzwsmKdugMnOv99kvY7zrBXbwHxqX1t5qtNzVdKQ== +"@budibase/pro@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.3.tgz#bee4b40cd8dc77ca88108acc0aa585f05494b7f4" + integrity sha512-eXTG9GEuy8wdl6V+NM9ws4aHyDJoiypR62TQirB69V3qQFPa6eKoKL8d6Ck2c+HBYcXowDe7Lj9MEj1lkSochg== dependencies: - "@budibase/backend-core" "2.2.10-alpha.2" - "@budibase/types" "2.2.10-alpha.2" + "@budibase/backend-core" "2.2.10-alpha.3" + "@budibase/types" "2.2.10-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1404,10 +1404,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.2.tgz#e32adc6c7f9023223bec962f123421d6f5e2bb7a" - integrity sha512-MlLERFfik2PuzVzuo3RUohYC+ZfjAoD+vyFrpnAK/ZzODTBzg2I8DUw+aatJ1vida8BPK1em6LaC5EUG6vlpeA== +"@budibase/types@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.3.tgz#7a5312f9f611d65ef8aecb5a56eb742484ab436f" + integrity sha512-uLkQtL2PbURew4nCZ72/T5dl1pGnx/95UzOpK7yeFO3g+3T63IrWcOCAoSigZnOfyY+3CvHfc0tV3+Y3UfTNww== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5c091ce07e..d23b6630a8 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.10-alpha.3", - "@budibase/pro": "2.2.10-alpha.2", + "@budibase/pro": "2.2.10-alpha.3", "@budibase/string-templates": "2.2.10-alpha.3", "@budibase/types": "2.2.10-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fe0a1424eb..8a39c1859d 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.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.2.tgz#77ebfd648a5cbea2bc7418d51c04a413a65925d5" - integrity sha512-9lgi+g5tu470JcKhvdsFREQ8MmGlGiDg4SoL8YClemyjVEcdR6XorDpoaDvVb2gvSqdmrNvBYbaecAdtXQXNnA== +"@budibase/backend-core@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.3.tgz#ab716813b47f3b6273374a8ec99a879ca0ba287a" + integrity sha512-r9UBi66yZVIyU0XU0uigdBqmkygZR+ZTn17JGpR5YDjcKRQzV60ONFbJuy3yjCJJV6MPm+6go8tzpKHLsUWqkQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.2" + "@budibase/types" "2.2.10-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -520,23 +520,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.2.tgz#61597eae90ffdfb6d83209c9f3a0d95b824c68f5" - integrity sha512-aSZJzEnq9v8WUxu0ygj7rctslp+5oD+iz/Q8VkyxrdBXY6HzwsmKdugMnOv99kvY7zrBXbwHxqX1t5qtNzVdKQ== +"@budibase/pro@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.3.tgz#bee4b40cd8dc77ca88108acc0aa585f05494b7f4" + integrity sha512-eXTG9GEuy8wdl6V+NM9ws4aHyDJoiypR62TQirB69V3qQFPa6eKoKL8d6Ck2c+HBYcXowDe7Lj9MEj1lkSochg== dependencies: - "@budibase/backend-core" "2.2.10-alpha.2" - "@budibase/types" "2.2.10-alpha.2" + "@budibase/backend-core" "2.2.10-alpha.3" + "@budibase/types" "2.2.10-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.10-alpha.2": - version "2.2.10-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.2.tgz#e32adc6c7f9023223bec962f123421d6f5e2bb7a" - integrity sha512-MlLERFfik2PuzVzuo3RUohYC+ZfjAoD+vyFrpnAK/ZzODTBzg2I8DUw+aatJ1vida8BPK1em6LaC5EUG6vlpeA== +"@budibase/types@2.2.10-alpha.3": + version "2.2.10-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.3.tgz#7a5312f9f611d65ef8aecb5a56eb742484ab436f" + integrity sha512-uLkQtL2PbURew4nCZ72/T5dl1pGnx/95UzOpK7yeFO3g+3T63IrWcOCAoSigZnOfyY+3CvHfc0tV3+Y3UfTNww== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"