From 10fe43050fd54f891eba9c8f49127af32ad8b7e0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 24 May 2022 09:12:39 +0100 Subject: [PATCH 1/4] adding default license env variable --- packages/backend-core/src/environment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/environment.js b/packages/backend-core/src/environment.js index f628e899ad..40cf764675 100644 --- a/packages/backend-core/src/environment.js +++ b/packages/backend-core/src/environment.js @@ -41,6 +41,7 @@ module.exports = { GLOBAL_CLOUD_BUCKET_NAME: process.env.GLOBAL_CLOUD_BUCKET_NAME || "prod-budi-tenant-uploads", USE_COUCH: process.env.USE_COUCH || true, + DEFAULT_LICENSE: process.env.DEFAULT_LICENSE, isTest, isDev, _set(key, value) { From a44bff00064626547335036e0a0c9ce78f07ea86 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 08:28:23 +0000 Subject: [PATCH 2/4] v1.0.176 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index fd289506fa..f5a19f0a57 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.175", + "version": "1.0.176", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 39a2fc186a..2f88937c04 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.175", + "version": "1.0.176", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e26a5dc113..f11c5e8055 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.175", + "version": "1.0.176", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.175", + "@budibase/string-templates": "^1.0.176", "@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 f39bc03740..af910f734c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.175", + "version": "1.0.176", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.175", - "@budibase/client": "^1.0.175", - "@budibase/frontend-core": "^1.0.175", - "@budibase/string-templates": "^1.0.175", + "@budibase/bbui": "^1.0.176", + "@budibase/client": "^1.0.176", + "@budibase/frontend-core": "^1.0.176", + "@budibase/string-templates": "^1.0.176", "@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 fb2e593c20..f42fb81c25 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.175", + "version": "1.0.176", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 6ea3f166c3..ceaf1abe4d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.175", + "version": "1.0.176", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.175", - "@budibase/frontend-core": "^1.0.175", - "@budibase/string-templates": "^1.0.175", + "@budibase/bbui": "^1.0.176", + "@budibase/frontend-core": "^1.0.176", + "@budibase/string-templates": "^1.0.176", "@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 e87e7f6e77..9778438a25 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.175", + "version": "1.0.176", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.175", + "@budibase/bbui": "^1.0.176", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fd86e08780..87bde33ead 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.175", + "version": "1.0.176", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.175", - "@budibase/client": "^1.0.175", + "@budibase/backend-core": "^1.0.176", + "@budibase/client": "^1.0.176", "@budibase/pro": "1.0.175", - "@budibase/string-templates": "^1.0.175", + "@budibase/string-templates": "^1.0.176", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 77916aca77..c0ff29331d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.175", + "version": "1.0.176", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5e0cd96397..db6729f60c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.175", + "version": "1.0.176", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.175", + "@budibase/backend-core": "^1.0.176", "@budibase/pro": "1.0.175", - "@budibase/string-templates": "^1.0.175", + "@budibase/string-templates": "^1.0.176", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From d762e8e679c53da26a9472d017816a576edaa795 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 24 May 2022 08:29:39 +0000 Subject: [PATCH 3/4] Update pro version to 1.0.176 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 87bde33ead..6ae7506cdf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.176", "@budibase/client": "^1.0.176", - "@budibase/pro": "1.0.175", + "@budibase/pro": "1.0.176", "@budibase/string-templates": "^1.0.176", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index db6729f60c..7321bed0ab 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.176", - "@budibase/pro": "1.0.175", + "@budibase/pro": "1.0.176", "@budibase/string-templates": "^1.0.176", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 105785a75434751b7f292cf2ad6b7086051531dc Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 24 May 2022 10:11:55 +0100 Subject: [PATCH 4/4] Fix pro and core versions --- packages/server/package.json | 4 ++-- packages/server/yarn.lock | 18 +++++++++--------- packages/worker/package.json | 4 ++-- packages/worker/yarn.lock | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 6ae7506cdf..e61c9039fc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.176", + "@budibase/backend-core": "^1.0.175", "@budibase/client": "^1.0.176", - "@budibase/pro": "1.0.176", + "@budibase/pro": "^1.0.175", "@budibase/string-templates": "^1.0.176", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 277fda70ca..f718f4e88d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.172": - version "1.0.172" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.172.tgz#81f825d5e141fbcbad085202509e1f97dfed0dfc" - integrity sha512-JDyR646dhDmQMWqeJxkdD70wyFv26hfNgRl768sgCgN4fG9B8829QsKeNjOquZf+U2diaKbDmKX+f/7gqoA5FQ== +"@budibase/backend-core@1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.175.tgz#9c8f71c00d3cde510c3b6843302700a9249969db" + integrity sha512-ZzIzNyiW6W8YPVTxsAQnaDEmVUtW22Bna8uJ9BEal/0u8JvYpvWnbPmpbrX7nadJ+5zIGJPxxpe97rhsHJeuaA== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1091,12 +1091,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.172": - version "1.0.172" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.172.tgz#c6fe078098c72b8d163cfcf62d5389a9ca937b20" - integrity sha512-hHNobwr+8G99ofi9zp0cGB13iIC0StEV3JdF2a2HXwB4NzMz4b0vJ6VfcB1J+nVJPEe42DWmJViwJkuSX0jGhw== +"@budibase/pro@^1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" + integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== dependencies: - "@budibase/backend-core" "1.0.172" + "@budibase/backend-core" "1.0.175" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/package.json b/packages/worker/package.json index 7321bed0ab..38a6fb304c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,8 +32,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.176", - "@budibase/pro": "1.0.176", + "@budibase/backend-core": "^1.0.175", + "@budibase/pro": "^1.0.175", "@budibase/string-templates": "^1.0.176", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 57cf9f09af..c844d1c493 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.172": - version "1.0.172" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.172.tgz#81f825d5e141fbcbad085202509e1f97dfed0dfc" - integrity sha512-JDyR646dhDmQMWqeJxkdD70wyFv26hfNgRl768sgCgN4fG9B8829QsKeNjOquZf+U2diaKbDmKX+f/7gqoA5FQ== +"@budibase/backend-core@1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.175.tgz#9c8f71c00d3cde510c3b6843302700a9249969db" + integrity sha512-ZzIzNyiW6W8YPVTxsAQnaDEmVUtW22Bna8uJ9BEal/0u8JvYpvWnbPmpbrX7nadJ+5zIGJPxxpe97rhsHJeuaA== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -321,12 +321,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@1.0.172": - version "1.0.172" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.172.tgz#c6fe078098c72b8d163cfcf62d5389a9ca937b20" - integrity sha512-hHNobwr+8G99ofi9zp0cGB13iIC0StEV3JdF2a2HXwB4NzMz4b0vJ6VfcB1J+nVJPEe42DWmJViwJkuSX0jGhw== +"@budibase/pro@^1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" + integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== dependencies: - "@budibase/backend-core" "1.0.172" + "@budibase/backend-core" "1.0.175" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0":