From 68769602cdd36c2c4441e64fcde83692a0ef7d7c Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 13 Apr 2023 21:41:42 +0100 Subject: [PATCH 1/3] Fix release pro script --- scripts/pro/release.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh index e57d8deeb8..1af7eea566 100755 --- a/scripts/pro/release.sh +++ b/scripts/pro/release.sh @@ -88,8 +88,7 @@ yarn clean -y && yarn bootstrap # Commit and push changes git add packages/server/package.json -git add packages/server/yarn.lock git add packages/worker/package.json -git add packages/worker/yarn.lock +git add yarn.lock git commit -m "Update pro version to $VERSION" -n git push From fc971ed3ad2e382010f5effb812fcf04eca3965b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 10:17:37 +0000 Subject: [PATCH 2/3] v2.4.44-alpha.22 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 24adb9ee12..b1838f1d32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6987204be9..46d86fc4a6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.44-alpha.21", + "@budibase/types": "2.4.44-alpha.22", "@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 6916b2ecd8..d6e166dbfc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.44-alpha.21", - "@budibase/string-templates": "2.4.44-alpha.21", + "@budibase/shared-core": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.22", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 534c18a974..77445b4415 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.21", - "@budibase/client": "2.4.44-alpha.21", - "@budibase/frontend-core": "2.4.44-alpha.21", - "@budibase/shared-core": "2.4.44-alpha.21", - "@budibase/string-templates": "2.4.44-alpha.21", + "@budibase/bbui": "2.4.44-alpha.22", + "@budibase/client": "2.4.44-alpha.22", + "@budibase/frontend-core": "2.4.44-alpha.22", + "@budibase/shared-core": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.22", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 5b3cac0429..5bccc0f394 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.21", - "@budibase/string-templates": "2.4.44-alpha.21", - "@budibase/types": "2.4.44-alpha.21", + "@budibase/backend-core": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/types": "2.4.44-alpha.22", "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 9862317c05..7a6503943e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.21", - "@budibase/frontend-core": "2.4.44-alpha.21", - "@budibase/shared-core": "2.4.44-alpha.21", - "@budibase/string-templates": "2.4.44-alpha.21", - "@budibase/types": "2.4.44-alpha.21", + "@budibase/bbui": "2.4.44-alpha.22", + "@budibase/frontend-core": "2.4.44-alpha.22", + "@budibase/shared-core": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/types": "2.4.44-alpha.22", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ddcdce8138..821e6649fd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.44-alpha.21", - "@budibase/shared-core": "2.4.44-alpha.21", + "@budibase/bbui": "2.4.44-alpha.22", + "@budibase/shared-core": "2.4.44-alpha.22", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1f000ce34d..d2baddab5d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index eba7711907..068d803a7d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.21", - "@budibase/client": "2.4.44-alpha.21", + "@budibase/backend-core": "2.4.44-alpha.22", + "@budibase/client": "2.4.44-alpha.22", "@budibase/pro": "2.4.44-alpha.20", - "@budibase/shared-core": "2.4.44-alpha.21", - "@budibase/string-templates": "2.4.44-alpha.21", - "@budibase/types": "2.4.44-alpha.21", + "@budibase/shared-core": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/types": "2.4.44-alpha.22", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 010942172e..e7343bc8a9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.44-alpha.21" + "@budibase/types": "2.4.44-alpha.22" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 385b90c6d0..0e4094369c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index b14822655e..bebab03721 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 148bb9e998..ea61abbb93 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.44-alpha.21", + "version": "2.4.44-alpha.22", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.21", + "@budibase/backend-core": "2.4.44-alpha.22", "@budibase/pro": "2.4.44-alpha.20", - "@budibase/string-templates": "2.4.44-alpha.21", - "@budibase/types": "2.4.44-alpha.21", + "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/types": "2.4.44-alpha.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1116c63ed49486a9ff2db04a0dfab99dcc1c421b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 10:19:12 +0000 Subject: [PATCH 3/3] Update pro version to 2.4.44-alpha.22 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 47 ++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 068d803a7d..d758723281 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.44-alpha.22", "@budibase/client": "2.4.44-alpha.22", - "@budibase/pro": "2.4.44-alpha.20", + "@budibase/pro": "2.4.44-alpha.22", "@budibase/shared-core": "2.4.44-alpha.22", "@budibase/string-templates": "2.4.44-alpha.22", "@budibase/types": "2.4.44-alpha.22", diff --git a/packages/worker/package.json b/packages/worker/package.json index ea61abbb93..1fbd1202ff 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.44-alpha.22", - "@budibase/pro": "2.4.44-alpha.20", + "@budibase/pro": "2.4.44-alpha.22", "@budibase/string-templates": "2.4.44-alpha.22", "@budibase/types": "2.4.44-alpha.22", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 47485e1cb6..68b574473c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,46 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.4.44-alpha.20": + version "2.4.44-alpha.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.20.tgz#038074ff8ea654b06d02b41423dc60fa6742007a" + integrity sha512-F0MjLk9BE+Cstue3gv8bcJ/Tcs7uNbZB5GTJ7Oy6+s0RiSTQ6O785AEQMz0EhoMtIcV31X190C/8k3MCt1b7iQ== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.4.44-alpha.20" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1547,6 +1587,13 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== +"@budibase/types@2.4.44-alpha.20": + version "2.4.44-alpha.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.20.tgz#c1693ce0aa4c714453700ac2c3f24d01b11a2acc" + integrity sha512-BIVAIfMlgIMy2F2Kmz6q4f+ynf+aNxAZAipLK8ywTZOCUtal8C9mu5CZTRWS4sANLzgH7RCOkUZRZaPkWoiakw== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af"