From 38fda122882e931c6b6d37be39093b1c28d11bbb Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 12:29:36 +0000 Subject: [PATCH 01/13] Update .npmignore path to include all subdirectories of dist (#9129) The dist/* pattern was including only the first level of files inside the dist folder. Update to no longer wildcard to include all the folder contents --- packages/backend-core/.npmignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore index ad6609ce51..284023d6e0 100644 --- a/packages/backend-core/.npmignore +++ b/packages/backend-core/.npmignore @@ -1,2 +1,2 @@ * -!dist/* \ No newline at end of file +!dist \ No newline at end of file From 5aa7291677557615977cafe1c24748cda2ea786a Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 14:30:31 +0000 Subject: [PATCH 02/13] Only build pro after bootstrapping and after backend-core build (#9130) * Update .npmignore path to include all subdirectories of dist The dist/* pattern was including only the first level of files inside the dist folder. Update to no longer wildcard to include all the folder contents * Only build pro after bootstrapping and after backend-core build This protects against the scenario of a breaking change in backend-core that is relied on by the pro package. Introducing to fix the current build as the published backend-core package is corrupted. This change ensures the local filsystem version of core will be used. * Debug line * Debug lines * Update build script --- packages/backend-core/package.json | 2 ++ scripts/pro/build.sh | 15 +++++++++++++++ scripts/pro/install.sh | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 scripts/pro/build.sh diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c2f4b2a98a..7260272f2e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -15,6 +15,8 @@ "prebuild": "rimraf dist/", "prepack": "cp package.json dist", "build": "tsc -p tsconfig.build.json", + "build:pro": "../../scripts/pro/build.sh", + "postbuild": "yarn run build:pro", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "test": "jest --coverage --maxWorkers=2", "test:watch": "jest --watchAll" diff --git a/scripts/pro/build.sh b/scripts/pro/build.sh new file mode 100755 index 0000000000..b03d85a0d0 --- /dev/null +++ b/scripts/pro/build.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# This script is designed for building the pro repo after the backend-core build has completed. +# This ensures that any changes in core that are required by pro are done in the correct order. + +set -e + +# Go to parent of budibase +cd ../../../ + +if [[ -d "budibase-pro" ]]; then + cd budibase-pro + echo "Building pro" + yarn build +fi \ No newline at end of file diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh index ee80bf9e0d..d6662d6341 100755 --- a/scripts/pro/install.sh +++ b/scripts/pro/install.sh @@ -35,5 +35,5 @@ if [[ -d "budibase-pro" ]]; then git pull echo "Initializing pro repo..." - yarn setup + yarn fi \ No newline at end of file From dc7a31b5d47ac03436c355192b4cfdd824cd2d6d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 14:46:51 +0000 Subject: [PATCH 03/13] v2.2.10-alpha.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 c98095044d..bc0d746a61 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7260272f2e..84dadb8a97 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.3", + "version": "2.2.10-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.3", + "@budibase/types": "2.2.10-alpha.4", "@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 26717c1655..ab0cb2f512 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.3", + "version": "2.2.10-alpha.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.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.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 77d7b2388d..4eb0c8b293 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@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", + "@budibase/bbui": "2.2.10-alpha.4", + "@budibase/client": "2.2.10-alpha.4", + "@budibase/frontend-core": "2.2.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.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 56220ce097..1c5d398d96 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.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.10-alpha.3", - "@budibase/string-templates": "2.2.10-alpha.3", - "@budibase/types": "2.2.10-alpha.3", + "@budibase/backend-core": "2.2.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.4", + "@budibase/types": "2.2.10-alpha.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 7a09fcd7ff..d40040bd82 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.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.10-alpha.3", - "@budibase/frontend-core": "2.2.10-alpha.3", - "@budibase/string-templates": "2.2.10-alpha.3", + "@budibase/bbui": "2.2.10-alpha.4", + "@budibase/frontend-core": "2.2.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.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 078d1a45ed..879c54d0be 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.3", + "version": "2.2.10-alpha.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.10-alpha.3", + "@budibase/bbui": "2.2.10-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1facab349e..afe7b92363 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.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 4898ba186b..9c43ba1e9c 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.3", + "version": "2.2.10-alpha.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.10-alpha.3", - "@budibase/client": "2.2.10-alpha.3", + "@budibase/backend-core": "2.2.10-alpha.4", + "@budibase/client": "2.2.10-alpha.4", "@budibase/pro": "2.2.10-alpha.3", - "@budibase/string-templates": "2.2.10-alpha.3", - "@budibase/types": "2.2.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.4", + "@budibase/types": "2.2.10-alpha.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 43d46b8ed6..17c397b4ce 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.3", + "version": "2.2.10-alpha.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 38b121fd32..48d88e2003 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.3", + "version": "2.2.10-alpha.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 d23b6630a8..03e714be88 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.3", + "version": "2.2.10-alpha.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.10-alpha.3", + "@budibase/backend-core": "2.2.10-alpha.4", "@budibase/pro": "2.2.10-alpha.3", - "@budibase/string-templates": "2.2.10-alpha.3", - "@budibase/types": "2.2.10-alpha.3", + "@budibase/string-templates": "2.2.10-alpha.4", + "@budibase/types": "2.2.10-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 503ae8afd93f627d5552fd237542a4d75d7a9206 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 14:51:06 +0000 Subject: [PATCH 04/13] Update pro version to 2.2.10-alpha.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 9c43ba1e9c..0590fe959d 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.4", "@budibase/client": "2.2.10-alpha.4", - "@budibase/pro": "2.2.10-alpha.3", + "@budibase/pro": "2.2.10-alpha.4", "@budibase/string-templates": "2.2.10-alpha.4", "@budibase/types": "2.2.10-alpha.4", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e8ab94017e..2e96b2f9d7 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.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== +"@budibase/backend-core@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.4.tgz#d435f7eec0fc44a92b65b1d72ac3226fb598ae23" + integrity sha512-KdwVriltWvN6g4N4yPcfFPH2QqIqxc499jj/Sbzq4yz13hqGNA2wuGcGxBJSr+8HoCvoVdR+mmOkhRPg88ZsUQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.3" + "@budibase/types" "2.2.10-alpha.4" "@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.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== +"@budibase/pro@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.4.tgz#86983823967d4b78162dacaafb225404efaaba92" + integrity sha512-Uvan3NoIp3dZ6ToL7JhuAVb1YdywCx+xWY8j36c5viw7Z3Qk/gWFxL1dE7pzgpO+7JtynxWTw7hQX3gHubqmgQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.3" - "@budibase/types" "2.2.10-alpha.3" + "@budibase/backend-core" "2.2.10-alpha.4" + "@budibase/types" "2.2.10-alpha.4" "@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.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== +"@budibase/types@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.4.tgz#49d4897f0b8e91a759ee5db892d7881b670f9699" + integrity sha512-dpxIHuAVEoHAy9zejXC1cxiwp0rELOb0kM+Wk16/wgShux1ZeEL/AwXnFKpZWkZSnFYwkOMzTVygznnOjcDxGA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 03e714be88..66a301dbe2 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.4", - "@budibase/pro": "2.2.10-alpha.3", + "@budibase/pro": "2.2.10-alpha.4", "@budibase/string-templates": "2.2.10-alpha.4", "@budibase/types": "2.2.10-alpha.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 8a39c1859d..dd6fb92467 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.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== +"@budibase/backend-core@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.4.tgz#d435f7eec0fc44a92b65b1d72ac3226fb598ae23" + integrity sha512-KdwVriltWvN6g4N4yPcfFPH2QqIqxc499jj/Sbzq4yz13hqGNA2wuGcGxBJSr+8HoCvoVdR+mmOkhRPg88ZsUQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.3" + "@budibase/types" "2.2.10-alpha.4" "@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.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== +"@budibase/pro@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.4.tgz#86983823967d4b78162dacaafb225404efaaba92" + integrity sha512-Uvan3NoIp3dZ6ToL7JhuAVb1YdywCx+xWY8j36c5viw7Z3Qk/gWFxL1dE7pzgpO+7JtynxWTw7hQX3gHubqmgQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.3" - "@budibase/types" "2.2.10-alpha.3" + "@budibase/backend-core" "2.2.10-alpha.4" + "@budibase/types" "2.2.10-alpha.4" "@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.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== +"@budibase/types@2.2.10-alpha.4": + version "2.2.10-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.4.tgz#49d4897f0b8e91a759ee5db892d7881b670f9699" + integrity sha512-dpxIHuAVEoHAy9zejXC1cxiwp0rELOb0kM+Wk16/wgShux1ZeEL/AwXnFKpZWkZSnFYwkOMzTVygznnOjcDxGA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 71c3632c56a95f2ca1fc48750a6da8ea41cd38c1 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 15:05:48 +0000 Subject: [PATCH 05/13] Remove .npmignore (#9131) --- packages/backend-core/.npmignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 packages/backend-core/.npmignore diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore deleted file mode 100644 index 284023d6e0..0000000000 --- a/packages/backend-core/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!dist \ No newline at end of file From e84d0d03753ad957e1b5140f7132d942c5e3214c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 15:21:10 +0000 Subject: [PATCH 06/13] v2.2.10-alpha.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 bc0d746a61..066580128f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 84dadb8a97..e18742ab2f 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.4", + "version": "2.2.10-alpha.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.4", + "@budibase/types": "2.2.10-alpha.5", "@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 ab0cb2f512..0edf33f7d2 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.4", + "version": "2.2.10-alpha.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.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.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 4eb0c8b293..88b484fa7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.4", - "@budibase/client": "2.2.10-alpha.4", - "@budibase/frontend-core": "2.2.10-alpha.4", - "@budibase/string-templates": "2.2.10-alpha.4", + "@budibase/bbui": "2.2.10-alpha.5", + "@budibase/client": "2.2.10-alpha.5", + "@budibase/frontend-core": "2.2.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.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 1c5d398d96..249f81f38c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.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.10-alpha.4", - "@budibase/string-templates": "2.2.10-alpha.4", - "@budibase/types": "2.2.10-alpha.4", + "@budibase/backend-core": "2.2.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.5", + "@budibase/types": "2.2.10-alpha.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 d40040bd82..f551c99dde 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.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.10-alpha.4", - "@budibase/frontend-core": "2.2.10-alpha.4", - "@budibase/string-templates": "2.2.10-alpha.4", + "@budibase/bbui": "2.2.10-alpha.5", + "@budibase/frontend-core": "2.2.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.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 879c54d0be..b13d239c25 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.4", + "version": "2.2.10-alpha.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.10-alpha.4", + "@budibase/bbui": "2.2.10-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index afe7b92363..0eef505c08 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.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 0590fe959d..ec33a11511 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.4", + "version": "2.2.10-alpha.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.10-alpha.4", - "@budibase/client": "2.2.10-alpha.4", + "@budibase/backend-core": "2.2.10-alpha.5", + "@budibase/client": "2.2.10-alpha.5", "@budibase/pro": "2.2.10-alpha.4", - "@budibase/string-templates": "2.2.10-alpha.4", - "@budibase/types": "2.2.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.5", + "@budibase/types": "2.2.10-alpha.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 17c397b4ce..2acb8ebe5a 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.4", + "version": "2.2.10-alpha.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 48d88e2003..c8ee16aac5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.4", + "version": "2.2.10-alpha.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 66a301dbe2..43815589cf 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.4", + "version": "2.2.10-alpha.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.10-alpha.4", + "@budibase/backend-core": "2.2.10-alpha.5", "@budibase/pro": "2.2.10-alpha.4", - "@budibase/string-templates": "2.2.10-alpha.4", - "@budibase/types": "2.2.10-alpha.4", + "@budibase/string-templates": "2.2.10-alpha.5", + "@budibase/types": "2.2.10-alpha.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 46d632365846f9b45a1065aaeb717648bc0a0a9e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 15:25:03 +0000 Subject: [PATCH 07/13] Update pro version to 2.2.10-alpha.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 ec33a11511..608cb2ff87 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.5", "@budibase/client": "2.2.10-alpha.5", - "@budibase/pro": "2.2.10-alpha.4", + "@budibase/pro": "2.2.10-alpha.5", "@budibase/string-templates": "2.2.10-alpha.5", "@budibase/types": "2.2.10-alpha.5", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2e96b2f9d7..d47e90a8ab 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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.4.tgz#d435f7eec0fc44a92b65b1d72ac3226fb598ae23" - integrity sha512-KdwVriltWvN6g4N4yPcfFPH2QqIqxc499jj/Sbzq4yz13hqGNA2wuGcGxBJSr+8HoCvoVdR+mmOkhRPg88ZsUQ== +"@budibase/backend-core@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.5.tgz#728aab05563011dc28341b1f7ec70240bfb55ca1" + integrity sha512-zXozcS1JEVfmjPC5Wg2sUAhljLQT8EeJUVmOw/2s4QgdaJlvBCjMwQhxA1HwBCx6F6qkF2XiLvJs44xLd/Rwug== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.4" + "@budibase/types" "2.2.10-alpha.5" "@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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.4.tgz#86983823967d4b78162dacaafb225404efaaba92" - integrity sha512-Uvan3NoIp3dZ6ToL7JhuAVb1YdywCx+xWY8j36c5viw7Z3Qk/gWFxL1dE7pzgpO+7JtynxWTw7hQX3gHubqmgQ== +"@budibase/pro@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.5.tgz#077ed53125e2d612db41e35a83c3cfec2db8c6d2" + integrity sha512-ThZp+QKQhRGbC3Av/W4qGgO9hqjvB6Z1nkEAOdQPOaEDPiQZPhvaE5wmTHH60gDZQSfw4NcUlFdR3sLxcuJt2Q== dependencies: - "@budibase/backend-core" "2.2.10-alpha.4" - "@budibase/types" "2.2.10-alpha.4" + "@budibase/backend-core" "2.2.10-alpha.5" + "@budibase/types" "2.2.10-alpha.5" "@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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.4.tgz#49d4897f0b8e91a759ee5db892d7881b670f9699" - integrity sha512-dpxIHuAVEoHAy9zejXC1cxiwp0rELOb0kM+Wk16/wgShux1ZeEL/AwXnFKpZWkZSnFYwkOMzTVygznnOjcDxGA== +"@budibase/types@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.5.tgz#b949c8a2a0d4a0bd81ff60ec7933be8d5d686473" + integrity sha512-3gx//4Y0l/kwWDKGkK0l97E9XE6kzjGBi0r96ZVPuL16qD7JPNDN4ElWADj+uefu2DuaCRj9hc4p0XqOuV5Dxg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 43815589cf..6d5c50fe7c 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.5", - "@budibase/pro": "2.2.10-alpha.4", + "@budibase/pro": "2.2.10-alpha.5", "@budibase/string-templates": "2.2.10-alpha.5", "@budibase/types": "2.2.10-alpha.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index dd6fb92467..6b65d7dfe1 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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.4.tgz#d435f7eec0fc44a92b65b1d72ac3226fb598ae23" - integrity sha512-KdwVriltWvN6g4N4yPcfFPH2QqIqxc499jj/Sbzq4yz13hqGNA2wuGcGxBJSr+8HoCvoVdR+mmOkhRPg88ZsUQ== +"@budibase/backend-core@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.5.tgz#728aab05563011dc28341b1f7ec70240bfb55ca1" + integrity sha512-zXozcS1JEVfmjPC5Wg2sUAhljLQT8EeJUVmOw/2s4QgdaJlvBCjMwQhxA1HwBCx6F6qkF2XiLvJs44xLd/Rwug== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.4" + "@budibase/types" "2.2.10-alpha.5" "@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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.4.tgz#86983823967d4b78162dacaafb225404efaaba92" - integrity sha512-Uvan3NoIp3dZ6ToL7JhuAVb1YdywCx+xWY8j36c5viw7Z3Qk/gWFxL1dE7pzgpO+7JtynxWTw7hQX3gHubqmgQ== +"@budibase/pro@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.5.tgz#077ed53125e2d612db41e35a83c3cfec2db8c6d2" + integrity sha512-ThZp+QKQhRGbC3Av/W4qGgO9hqjvB6Z1nkEAOdQPOaEDPiQZPhvaE5wmTHH60gDZQSfw4NcUlFdR3sLxcuJt2Q== dependencies: - "@budibase/backend-core" "2.2.10-alpha.4" - "@budibase/types" "2.2.10-alpha.4" + "@budibase/backend-core" "2.2.10-alpha.5" + "@budibase/types" "2.2.10-alpha.5" "@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.4": - version "2.2.10-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.4.tgz#49d4897f0b8e91a759ee5db892d7881b670f9699" - integrity sha512-dpxIHuAVEoHAy9zejXC1cxiwp0rELOb0kM+Wk16/wgShux1ZeEL/AwXnFKpZWkZSnFYwkOMzTVygznnOjcDxGA== +"@budibase/types@2.2.10-alpha.5": + version "2.2.10-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.5.tgz#b949c8a2a0d4a0bd81ff60ec7933be8d5d686473" + integrity sha512-3gx//4Y0l/kwWDKGkK0l97E9XE6kzjGBi0r96ZVPuL16qD7JPNDN4ElWADj+uefu2DuaCRj9hc4p0XqOuV5Dxg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 57009c6e734e3c416b733f31e42de28acd469663 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 16:10:02 +0000 Subject: [PATCH 08/13] Fix for release version in qa deploy notification (#9132) * Fix for release version in qa deploy notification * Re-add dependency on chart job --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index bcec79b087..68ca2cb105 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -193,6 +193,7 @@ jobs: needs: [release-helm-chart] runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - name: Get the current budibase release version id: version run: | From 66a84be7ee619b3b239acbd17de078b018d9d234 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 16:23:25 +0000 Subject: [PATCH 09/13] v2.2.10-alpha.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 066580128f..2ac7ece879 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e18742ab2f..50a77d5791 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.5", + "version": "2.2.10-alpha.6", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.5", + "@budibase/types": "2.2.10-alpha.6", "@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 0edf33f7d2..4dd622139c 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.5", + "version": "2.2.10-alpha.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.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.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 88b484fa7c..7043daecdf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.5", - "@budibase/client": "2.2.10-alpha.5", - "@budibase/frontend-core": "2.2.10-alpha.5", - "@budibase/string-templates": "2.2.10-alpha.5", + "@budibase/bbui": "2.2.10-alpha.6", + "@budibase/client": "2.2.10-alpha.6", + "@budibase/frontend-core": "2.2.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.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 249f81f38c..4d38453543 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.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.10-alpha.5", - "@budibase/string-templates": "2.2.10-alpha.5", - "@budibase/types": "2.2.10-alpha.5", + "@budibase/backend-core": "2.2.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.6", + "@budibase/types": "2.2.10-alpha.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 f551c99dde..0434a715e3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.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.10-alpha.5", - "@budibase/frontend-core": "2.2.10-alpha.5", - "@budibase/string-templates": "2.2.10-alpha.5", + "@budibase/bbui": "2.2.10-alpha.6", + "@budibase/frontend-core": "2.2.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.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 b13d239c25..b17bd43a3b 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.5", + "version": "2.2.10-alpha.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.10-alpha.5", + "@budibase/bbui": "2.2.10-alpha.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0eef505c08..9beb4ed134 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.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 608cb2ff87..211f008b25 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.5", + "version": "2.2.10-alpha.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.10-alpha.5", - "@budibase/client": "2.2.10-alpha.5", + "@budibase/backend-core": "2.2.10-alpha.6", + "@budibase/client": "2.2.10-alpha.6", "@budibase/pro": "2.2.10-alpha.5", - "@budibase/string-templates": "2.2.10-alpha.5", - "@budibase/types": "2.2.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.6", + "@budibase/types": "2.2.10-alpha.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 2acb8ebe5a..526ad14a15 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.5", + "version": "2.2.10-alpha.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 c8ee16aac5..61a8b63b62 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.5", + "version": "2.2.10-alpha.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 6d5c50fe7c..873b8feb09 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.5", + "version": "2.2.10-alpha.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.10-alpha.5", + "@budibase/backend-core": "2.2.10-alpha.6", "@budibase/pro": "2.2.10-alpha.5", - "@budibase/string-templates": "2.2.10-alpha.5", - "@budibase/types": "2.2.10-alpha.5", + "@budibase/string-templates": "2.2.10-alpha.6", + "@budibase/types": "2.2.10-alpha.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8e6c1bc86ff9540b916ef063359f7888c6cb8be0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 16:26:58 +0000 Subject: [PATCH 10/13] Update pro version to 2.2.10-alpha.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 211f008b25..5860296a44 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.6", "@budibase/client": "2.2.10-alpha.6", - "@budibase/pro": "2.2.10-alpha.5", + "@budibase/pro": "2.2.10-alpha.6", "@budibase/string-templates": "2.2.10-alpha.6", "@budibase/types": "2.2.10-alpha.6", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d47e90a8ab..15c662f67d 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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.5.tgz#728aab05563011dc28341b1f7ec70240bfb55ca1" - integrity sha512-zXozcS1JEVfmjPC5Wg2sUAhljLQT8EeJUVmOw/2s4QgdaJlvBCjMwQhxA1HwBCx6F6qkF2XiLvJs44xLd/Rwug== +"@budibase/backend-core@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.6.tgz#8e46ce33e50ef5127fd6e8b07da7a146b0e4497b" + integrity sha512-WOHZH8T0QAuTtAI6GxWOdfqsgot7ArfADZ71mYwg+DIwU+EsjRp+zMcdlqpQUtOsBA7MyFVfkfJLNlbRBLQGLw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.5" + "@budibase/types" "2.2.10-alpha.6" "@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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.5.tgz#077ed53125e2d612db41e35a83c3cfec2db8c6d2" - integrity sha512-ThZp+QKQhRGbC3Av/W4qGgO9hqjvB6Z1nkEAOdQPOaEDPiQZPhvaE5wmTHH60gDZQSfw4NcUlFdR3sLxcuJt2Q== +"@budibase/pro@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.6.tgz#06573e50f6d0a250c3a61b238e22d9ab55bc6c8a" + integrity sha512-HdZxq6lMqP5aOKbiVSHF0SCqlASElkYg/fN8Vh6AcwW+AJv5VC4g/jII5bG63U76oQ71m/f7nJTKQuCwZLX90g== dependencies: - "@budibase/backend-core" "2.2.10-alpha.5" - "@budibase/types" "2.2.10-alpha.5" + "@budibase/backend-core" "2.2.10-alpha.6" + "@budibase/types" "2.2.10-alpha.6" "@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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.5.tgz#b949c8a2a0d4a0bd81ff60ec7933be8d5d686473" - integrity sha512-3gx//4Y0l/kwWDKGkK0l97E9XE6kzjGBi0r96ZVPuL16qD7JPNDN4ElWADj+uefu2DuaCRj9hc4p0XqOuV5Dxg== +"@budibase/types@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.6.tgz#b0979c9d6eb1e4b209d13c77f4fe8f899844ba91" + integrity sha512-uKYEtpc4uCtH3/tH6hXu9vGtWzsHzcB/8S7YjK6c6xNL+09UbAaPIyGA5Kv4eoT0ZK6E2NRz0jMf5Ri1cFiP1w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 873b8feb09..fac4953d37 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.6", - "@budibase/pro": "2.2.10-alpha.5", + "@budibase/pro": "2.2.10-alpha.6", "@budibase/string-templates": "2.2.10-alpha.6", "@budibase/types": "2.2.10-alpha.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 6b65d7dfe1..fb77b05279 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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.5.tgz#728aab05563011dc28341b1f7ec70240bfb55ca1" - integrity sha512-zXozcS1JEVfmjPC5Wg2sUAhljLQT8EeJUVmOw/2s4QgdaJlvBCjMwQhxA1HwBCx6F6qkF2XiLvJs44xLd/Rwug== +"@budibase/backend-core@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.6.tgz#8e46ce33e50ef5127fd6e8b07da7a146b0e4497b" + integrity sha512-WOHZH8T0QAuTtAI6GxWOdfqsgot7ArfADZ71mYwg+DIwU+EsjRp+zMcdlqpQUtOsBA7MyFVfkfJLNlbRBLQGLw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.5" + "@budibase/types" "2.2.10-alpha.6" "@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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.5.tgz#077ed53125e2d612db41e35a83c3cfec2db8c6d2" - integrity sha512-ThZp+QKQhRGbC3Av/W4qGgO9hqjvB6Z1nkEAOdQPOaEDPiQZPhvaE5wmTHH60gDZQSfw4NcUlFdR3sLxcuJt2Q== +"@budibase/pro@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.6.tgz#06573e50f6d0a250c3a61b238e22d9ab55bc6c8a" + integrity sha512-HdZxq6lMqP5aOKbiVSHF0SCqlASElkYg/fN8Vh6AcwW+AJv5VC4g/jII5bG63U76oQ71m/f7nJTKQuCwZLX90g== dependencies: - "@budibase/backend-core" "2.2.10-alpha.5" - "@budibase/types" "2.2.10-alpha.5" + "@budibase/backend-core" "2.2.10-alpha.6" + "@budibase/types" "2.2.10-alpha.6" "@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.5": - version "2.2.10-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.5.tgz#b949c8a2a0d4a0bd81ff60ec7933be8d5d686473" - integrity sha512-3gx//4Y0l/kwWDKGkK0l97E9XE6kzjGBi0r96ZVPuL16qD7JPNDN4ElWADj+uefu2DuaCRj9hc4p0XqOuV5Dxg== +"@budibase/types@2.2.10-alpha.6": + version "2.2.10-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.6.tgz#b0979c9d6eb1e4b209d13c77f4fe8f899844ba91" + integrity sha512-uKYEtpc4uCtH3/tH6hXu9vGtWzsHzcB/8S7YjK6c6xNL+09UbAaPIyGA5Kv4eoT0ZK6E2NRz0jMf5Ri1cFiP1w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b635614f771931fdf296c4fac07149da2489ab63 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 20 Dec 2022 16:28:13 +0000 Subject: [PATCH 11/13] Allow proxy upstream URLs to be configured at runtime (#7413) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * allow proxy upstream urls to be configured at runtime * make dynamic upstream urls in proxy the default behaviour * reorder env directives * Use appVersion for proxy image * Update couch upstream for proxy * proxy ci updates - WIP * allowing custom resolvers in proxy service deployment * remove generateProxyConf script for prod and remove from builds * remove generateProxyConfig script * removing nginx dev conf * delete generated nginx conf Co-authored-by: Thomas Weiß Co-authored-by: Martin McKeaveney --- .github/workflows/deploy-cloud.yaml | 11 -- .github/workflows/deploy-preprod.yml | 11 -- .github/workflows/deploy-release.yml | 11 -- .github/workflows/release-develop.yml | 11 -- .github/workflows/release.yml | 11 -- .gitignore | 6 +- .../templates/proxy-service-deployment.yaml | 17 ++- charts/budibase/values.yaml | 5 + hosting/docker-compose.dev.yaml | 4 +- hosting/docker-compose.yaml | 6 + .../{nginx.dev.conf.hbs => nginx.dev.conf} | 6 +- hosting/proxy/Dockerfile | 11 +- .../nginx.prod.conf} | 44 +++---- package.json | 10 +- packages/server/scripts/dev/manage.js | 12 +- scripts/proxy/generateProxyConfig.js | 111 ------------------ 16 files changed, 68 insertions(+), 219 deletions(-) rename hosting/{nginx.dev.conf.hbs => nginx.dev.conf} (98%) rename hosting/{nginx.prod.conf.hbs => proxy/nginx.prod.conf} (91%) delete mode 100644 scripts/proxy/generateProxyConfig.js diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 869a88a5b3..644eb5f1be 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -38,17 +38,6 @@ jobs: fi echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - - name: Tag and release Proxy service docker image - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:proxy:prod - docker tag proxy-service budibase/proxy:$PROD_TAG - docker push budibase/proxy:$PROD_TAG - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - PROD_TAG: k8s - - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index c3f690f568..cef47636ee 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -28,17 +28,6 @@ jobs: release_version=$(cat lerna.json | jq -r '.version') echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - - name: Tag and release Proxy service docker image - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:proxy:preprod - docker tag proxy-service budibase/proxy:$PREPROD_TAG - docker push budibase/proxy:$PREPROD_TAG - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - PREPROD_TAG: k8s-preprod - - name: Pull values.yaml from budibase-infra run: | curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index b37ff9cee8..cff26fd7c8 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -29,17 +29,6 @@ jobs: release_version=$(cat lerna.json | jq -r '.version') echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - - name: Tag and release Proxy service docker image - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:proxy:release - docker tag proxy-service budibase/proxy:$RELEASE_TAG - docker push budibase/proxy:$RELEASE_TAG - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - RELEASE_TAG: k8s-release - - name: Pull values.yaml from budibase-infra run: | curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 68ca2cb105..675707453e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -69,17 +69,6 @@ jobs: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - - name: Tag and release Proxy service docker image - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:proxy:release - docker tag proxy-service budibase/proxy:$RELEASE_TAG - docker push budibase/proxy:$RELEASE_TAG - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - RELEASE_TAG: k8s-release - deploy-to-release-env: needs: [release-images] runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de288dd7db..2a28150891 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,17 +98,6 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: eu-west-1 - - name: Tag and release Proxy service docker image - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:proxy:preprod - docker tag proxy-service budibase/proxy:$PREPROD_TAG - docker push budibase/proxy:$PREPROD_TAG - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - PREPROD_TAG: k8s-preprod - - name: Pull values.yaml from budibase-infra run: | curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ diff --git a/.gitignore b/.gitignore index 45bfe8b4c4..b3dc8af0d4 100644 --- a/.gitignore +++ b/.gitignore @@ -66,8 +66,6 @@ typings/ .env !qa-core/.env !hosting/.env -hosting/.generated-nginx.dev.conf -hosting/proxy/.generated-nginx.prod.conf # parcel-bundler cache (https://parceljs.org/) .cache @@ -105,7 +103,9 @@ stats.html # TypeScript cache *.tsbuildinfo + +# plugins budibase-component budibase-datasource -*.iml \ No newline at end of file +*.iml diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml index 3cde7a2388..00c12271db 100644 --- a/charts/budibase/templates/proxy-service-deployment.yaml +++ b/charts/budibase/templates/proxy-service-deployment.yaml @@ -28,11 +28,26 @@ spec: app.kubernetes.io/name: budibase-proxy spec: containers: - - image: budibase/proxy:{{ .Values.services.proxy.tag | default "k8s" }} + - image: budibase/proxy:{{ .Values.globals.appVersion }} imagePullPolicy: Always name: proxy-service ports: - containerPort: {{ .Values.services.proxy.port }} + env: + - name: APPS_UPSTREAM_URL + value: {{ tpl .Values.services.proxy.upstreams.apps . | quote }} + - name: WORKER_UPSTREAM_URL + value: {{ tpl .Values.services.proxy.upstreams.worker . | quote }} + - name: MINIO_UPSTREAM_URL + value: {{ tpl .Values.services.proxy.upstreams.minio . | quote }} + - name: COUCHDB_UPSTREAM_URL + value: {{ .Values.services.couchdb.url | default (tpl .Values.services.proxy.upstreams.couchdb .) | quote }} + - name: RESOLVER + {{ if .Values.services.proxy.resolver }} + value: {{ .Values.services.proxy.resolver }} + {{ else }} + value: kube-dns.kube-system.svc.{{ .Values.services.dns }} + {{ end }} {{ with .Values.services.proxy.resources }} resources: {{- toYaml . | nindent 10 }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 1b2b1c3dcb..1d49a46d59 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -124,6 +124,11 @@ services: proxy: port: 10000 replicaCount: 1 + upstreams: + apps: 'http://app-service.{{ .Release.Namespace }}.svc.{{ .Values.services.dns }}:{{ .Values.services.apps.port }}' + worker: 'http://worker-service.{{ .Release.Namespace }}.svc.{{ .Values.services.dns }}:{{ .Values.services.worker.port }}' + minio: 'http://minio-service.{{ .Release.Namespace }}.svc.{{ .Values.services.dns }}:{{ .Values.services.objectStore.port }}' + couchdb: 'http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}' resources: {} apps: diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index 7322b0e8a9..4dd656066d 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -27,7 +27,7 @@ services: restart: on-failure image: nginx:latest volumes: - - ./.generated-nginx.dev.conf:/etc/nginx/nginx.conf + - ./nginx.dev.conf:/etc/nginx/nginx.conf - ./proxy/error.html:/usr/share/nginx/html/error.html ports: - "${MAIN_PORT}:10000" @@ -36,6 +36,8 @@ services: - couchdb-service extra_hosts: - "host.docker.internal:host-gateway" + environment: + - PROXY_ADDRESS=${PROXY_ADDRESS} couchdb-service: # platform: linux/amd64 diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 5b2adc2665..d36937910f 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -82,6 +82,12 @@ services: environment: - PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10 - PROXY_RATE_LIMIT_API_PER_SECOND=20 + - APPS_UPSTREAM_URL=http://app-service:4002 + - WORKER_UPSTREAM_URL=http://worker-service:4003 + - MINIO_UPSTREAM_URL=http://minio-service:9000 + - COUCHDB_UPSTREAM_URL=http://couchdb-service:5984 + - WATCHTOWER_UPSTREAM_URL=http://watchtower-service:8080 + - RESOLVER=127.0.0.11 depends_on: - minio-service - worker-service diff --git a/hosting/nginx.dev.conf.hbs b/hosting/nginx.dev.conf similarity index 98% rename from hosting/nginx.dev.conf.hbs rename to hosting/nginx.dev.conf index 1dfaeed7ee..1ecee422cd 100644 --- a/hosting/nginx.dev.conf.hbs +++ b/hosting/nginx.dev.conf @@ -25,17 +25,17 @@ http { } upstream app-service { - server {{address}}:4001; + server ${PROXY_ADDRESS}:4001; keepalive 32; } upstream worker-service { - server {{address}}:4002; + server ${PROXY_ADDRESS}:4002; keepalive 32; } upstream builder { - server {{address}}:3000; + server ${PROXY_ADDRESS}:3000; keepalive 32; } diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile index 68e8134750..42327be087 100644 --- a/hosting/proxy/Dockerfile +++ b/hosting/proxy/Dockerfile @@ -4,7 +4,7 @@ FROM nginx:latest # use the default nginx behaviour for *.template files which are processed with envsubst # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx -COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template +COPY nginx.prod.conf /etc/nginx/templates/nginx.conf.template # IPv6 removal needs to happen after envsubst RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh @@ -16,4 +16,11 @@ COPY error.html /usr/share/nginx/html/error.html # Default environment ENV PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10 -ENV PROXY_RATE_LIMIT_API_PER_SECOND=20 \ No newline at end of file +ENV PROXY_RATE_LIMIT_API_PER_SECOND=20 +# Use docker-compose values as defaults for backwards compatibility +ENV APPS_UPSTREAM_URL=http://app-service:4002 +ENV WORKER_UPSTREAM_URL=http://worker-service:4003 +ENV MINIO_UPSTREAM_URL=http://minio-service:9000 +ENV COUCHDB_UPSTREAM_URL=http://couchdb-service:5984 +ENV WATCHTOWER_UPSTREAM_URL=http://watchtower-service:8080 +ENV RESOLVER=127.0.0.11 diff --git a/hosting/nginx.prod.conf.hbs b/hosting/proxy/nginx.prod.conf similarity index 91% rename from hosting/nginx.prod.conf.hbs rename to hosting/proxy/nginx.prod.conf index cd70ce1ae2..fc2f51370b 100644 --- a/hosting/nginx.prod.conf.hbs +++ b/hosting/proxy/nginx.prod.conf @@ -23,7 +23,7 @@ http { tcp_nodelay on; server_tokens off; types_hash_max_size 2048; - resolver {{ resolver }} valid=10s ipv6=off; + resolver ${RESOLVER} valid=10s ipv6=off; # buffering client_header_buffer_size 1k; @@ -76,27 +76,23 @@ http { add_header Content-Security-Policy "${csp_default}; ${csp_script}; ${csp_style}; ${csp_object}; ${csp_base_uri}; ${csp_connect}; ${csp_font}; ${csp_frame}; ${csp_img}; ${csp_manifest}; ${csp_media}; ${csp_worker};" always; # upstreams - set $apps {{ apps }}; - set $worker {{ worker }}; - set $minio {{ minio }}; - set $couchdb {{ couchdb }}; - {{#if watchtower}} - set $watchtower {{ watchtower }}; - {{/if}} + set $apps ${APPS_UPSTREAM_URL}; + set $worker ${WORKER_UPSTREAM_URL}; + set $minio ${MINIO_UPSTREAM_URL}; + set $couchdb ${COUCHDB_UPSTREAM_URL}; + set $watchtower ${WATCHTOWER_UPSTREAM_URL}; location /app { - proxy_pass http://$apps:4002; + proxy_pass $apps; } location = / { - proxy_pass http://$apps:4002; + proxy_pass $apps; } - {{#if watchtower}} location = /v1/update { - proxy_pass http://$watchtower:8080; + proxy_pass $watchtower; } - {{/if}} location ~ ^/(builder|app_) { proxy_http_version 1.1; @@ -107,19 +103,17 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; - proxy_pass http://$apps:4002; + proxy_pass $apps; } location ~ ^/api/(system|admin|global)/ { proxy_set_header Host $host; - - proxy_pass http://$worker:4003; + proxy_pass $worker; } location /worker/ { proxy_set_header Host $host; - - proxy_pass http://$worker:4003; + proxy_pass $worker; rewrite ^/worker/(.*)$ /$1 break; } @@ -138,7 +132,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://$apps:4002; + proxy_pass $apps; } location /api/ { @@ -157,7 +151,7 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; - proxy_pass http://$apps:4002; + proxy_pass $apps; } location /api/webhooks/ { @@ -177,11 +171,11 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; - proxy_pass http://$apps:4002; + proxy_pass $apps; } location /db/ { - proxy_pass http://$couchdb:5984; + proxy_pass $couchdb; rewrite ^/db/(.*)$ /$1 break; } @@ -191,7 +185,7 @@ http { proxy_set_header Connection 'upgrade'; proxy_set_header Host $host; proxy_cache_bypass $http_upgrade; - proxy_pass http://$apps:4002; + proxy_pass $apps; } location / { @@ -205,7 +199,7 @@ http { proxy_set_header Connection ""; chunked_transfer_encoding off; - proxy_pass http://$minio:9000; + proxy_pass $minio; } location /files/signed/ { @@ -224,7 +218,7 @@ http { proxy_set_header Connection ""; chunked_transfer_encoding off; - proxy_pass http://$minio:9000; + proxy_pass $minio; rewrite ^/files/signed/(.*)$ /$1 break; } diff --git a/package.json b/package.json index 5034c3b743..ac09edf5ae 100644 --- a/package.json +++ b/package.json @@ -56,15 +56,11 @@ "test:e2e:ci:record": "lerna run cy:ci:record --stream", "test:e2e:ci:notify": "lerna run cy:ci:notify", "build:specs": "lerna run specs", - "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -", + "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -", "build:docker:pre": "lerna run build && lerna run predocker", "build:docker:proxy": "docker build hosting/proxy -t proxy-service", - "build:docker:proxy:compose": "node scripts/proxy/generateProxyConfig compose && npm run build:docker:proxy", - "build:docker:proxy:preprod": "node scripts/proxy/generateProxyConfig preprod && npm run build:docker:proxy", - "build:docker:proxy:release": "node scripts/proxy/generateProxyConfig release && npm run build:docker:proxy", - "build:docker:proxy:prod": "node scripts/proxy/generateProxyConfig prod && npm run build:docker:proxy", "build:docker:selfhost": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -", - "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", + "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild", "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -", "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", @@ -88,4 +84,4 @@ "install:pro": "bash scripts/pro/install.sh", "dep:clean": "yarn clean && yarn bootstrap" } -} +} \ No newline at end of file diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index e06c6308f8..8d1a7b1585 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -3,7 +3,6 @@ const compose = require("docker-compose") const path = require("path") const fs = require("fs") const isWsl = require("is-wsl") -const { processStringSync } = require("@budibase/string-templates") function isLinux() { return !isWsl && process.platform !== "darwin" && process.platform !== "win32" @@ -23,16 +22,6 @@ const Commands = { } async function init() { - // generate nginx file, always do this incase it has changed - const hostingPath = path.join(process.cwd(), "..", "..", "hosting") - const nginxHbsPath = path.join(hostingPath, "nginx.dev.conf.hbs") - const nginxOutputPath = path.join(hostingPath, ".generated-nginx.dev.conf") - const contents = fs.readFileSync(nginxHbsPath, "utf8") - const config = { - address: isLinux() ? "172.17.0.1" : "host.docker.internal", - } - fs.writeFileSync(nginxOutputPath, processStringSync(contents, config)) - const envFilePath = path.join(process.cwd(), ".env") if (!fs.existsSync(envFilePath)) { const envFileJson = { @@ -60,6 +49,7 @@ async function init() { BB_ADMIN_USER_PASSWORD: "", PLUGINS_DIR: "", TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS", + PROXY_ADDRESS: isLinux() ? "172.17.0.1" : "host.docker.internal", } let envFile = "" Object.keys(envFileJson).forEach(key => { diff --git a/scripts/proxy/generateProxyConfig.js b/scripts/proxy/generateProxyConfig.js deleted file mode 100644 index e30daf6156..0000000000 --- a/scripts/proxy/generateProxyConfig.js +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env node -const path = require("path") -const fs = require("fs") - -function processStringSync(string, env) { - let output = "" - - // process if statements - let removal = false - for (let line of string.split("\n")) { - if (new RegExp(`{{\/if}}`, "g").test(line)) { - removal = false - continue - } - - if (!removal) { - const match = line.match(new RegExp(`{{#if (.*)}}`)) - if (match) { - const key = match[1] - // check the if statement is true - if (!env[key]) { - removal = true - } - continue - } - output += line + "\n" - } - } - - for (let key in env) { - // replace variables - const rgx = new RegExp(`{{\\s*${key}\\s*}}`, "g") - output = output.replace(rgx, env[key]) - } - - return output -} - -const Configs = { - prod: { - apps: "app-service.budibase.svc.cluster.local", - worker: "worker-service.budibase.svc.cluster.local", - minio: "minio-service.budibase.svc.cluster.local", - couchdb: "budibase-prod-svc-couchdb", - resolver: "kube-dns.kube-system.svc.cluster.local" - }, - preprod: { - apps: "app-service.budibase.svc.cluster.local", - worker: "worker-service.budibase.svc.cluster.local", - minio: "minio-service.budibase.svc.cluster.local", - couchdb: "budibase-preprod-svc-couchdb", - resolver: "kube-dns.kube-system.svc.cluster.local" - }, - release: { - apps: "app-service.budibase.svc.cluster.local", - worker: "worker-service.budibase.svc.cluster.local", - minio: "minio-service.budibase.svc.cluster.local", - couchdb: "budibase-release-svc-couchdb", - resolver: "kube-dns.kube-system.svc.cluster.local" - }, - compose: { - apps: "app-service", - worker: "worker-service", - minio: "minio-service", - couchdb: "couchdb-service", - watchtower: "watchtower-service", - resolver: "127.0.0.11" - }, -} - -const Commands = { - Prod: "prod", - Preprod: "preprod", - Release: "release", - Compose: "compose", -} - -async function init(managementCommand) { - const config = Configs[managementCommand] - const hostingPath = path.join(process.cwd(), "hosting") - const nginxHbsPath = path.join(hostingPath, "nginx.prod.conf.hbs") - const nginxOutputPath = path.join( - hostingPath, - "proxy", - ".generated-nginx.prod.conf" - ) - const contents = fs.readFileSync(nginxHbsPath, "utf8") - fs.writeFileSync(nginxOutputPath, processStringSync(contents, config)) -} - -const managementCommand = process.argv.slice(2)[0] - -if ( - !managementCommand || - !Object.values(Commands).some(command => managementCommand === command) -) { - throw new Error( - "You must supply either a 'compose', 'preprod' or 'prod' commmand to generate an NGINX config." - ) -} - -init(managementCommand) - .then(() => { - console.log("Done! 🎉") - }) - .catch(err => { - console.error( - "Something went wrong while creating the nginx configuration", - err.message - ) - }) From 19fc8977e064c3838d02fa6e9c3791cd59ae37af Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 16:56:30 +0000 Subject: [PATCH 12/13] v2.2.10-alpha.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 2ac7ece879..151cf82aa2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 50a77d5791..f3a81961a3 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.6", + "version": "2.2.10-alpha.7", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.10-alpha.6", + "@budibase/types": "2.2.10-alpha.7", "@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 4dd622139c..459299b657 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.6", + "version": "2.2.10-alpha.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.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.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 7043daecdf..4a09ede0ac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.10-alpha.6", - "@budibase/client": "2.2.10-alpha.6", - "@budibase/frontend-core": "2.2.10-alpha.6", - "@budibase/string-templates": "2.2.10-alpha.6", + "@budibase/bbui": "2.2.10-alpha.7", + "@budibase/client": "2.2.10-alpha.7", + "@budibase/frontend-core": "2.2.10-alpha.7", + "@budibase/string-templates": "2.2.10-alpha.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 4d38453543..500bce47e9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.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.10-alpha.6", - "@budibase/string-templates": "2.2.10-alpha.6", - "@budibase/types": "2.2.10-alpha.6", + "@budibase/backend-core": "2.2.10-alpha.7", + "@budibase/string-templates": "2.2.10-alpha.7", + "@budibase/types": "2.2.10-alpha.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 0434a715e3..96ca4cc817 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.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.10-alpha.6", - "@budibase/frontend-core": "2.2.10-alpha.6", - "@budibase/string-templates": "2.2.10-alpha.6", + "@budibase/bbui": "2.2.10-alpha.7", + "@budibase/frontend-core": "2.2.10-alpha.7", + "@budibase/string-templates": "2.2.10-alpha.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 b17bd43a3b..e31f3c2e68 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.6", + "version": "2.2.10-alpha.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.10-alpha.6", + "@budibase/bbui": "2.2.10-alpha.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9beb4ed134..a4bb500944 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.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 5860296a44..73839ac84a 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.6", + "version": "2.2.10-alpha.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.10-alpha.6", - "@budibase/client": "2.2.10-alpha.6", + "@budibase/backend-core": "2.2.10-alpha.7", + "@budibase/client": "2.2.10-alpha.7", "@budibase/pro": "2.2.10-alpha.6", - "@budibase/string-templates": "2.2.10-alpha.6", - "@budibase/types": "2.2.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.7", + "@budibase/types": "2.2.10-alpha.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 526ad14a15..25313cd463 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.6", + "version": "2.2.10-alpha.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 61a8b63b62..2b7b3e2a7a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.10-alpha.6", + "version": "2.2.10-alpha.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 fac4953d37..238e457017 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.6", + "version": "2.2.10-alpha.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.10-alpha.6", + "@budibase/backend-core": "2.2.10-alpha.7", "@budibase/pro": "2.2.10-alpha.6", - "@budibase/string-templates": "2.2.10-alpha.6", - "@budibase/types": "2.2.10-alpha.6", + "@budibase/string-templates": "2.2.10-alpha.7", + "@budibase/types": "2.2.10-alpha.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 315d999dff56d6ef3a91d994a994a669bfc4a6fa Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Dec 2022 17:00:56 +0000 Subject: [PATCH 13/13] Update pro version to 2.2.10-alpha.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 73839ac84a..b151938519 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.7", "@budibase/client": "2.2.10-alpha.7", - "@budibase/pro": "2.2.10-alpha.6", + "@budibase/pro": "2.2.10-alpha.7", "@budibase/string-templates": "2.2.10-alpha.7", "@budibase/types": "2.2.10-alpha.7", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 15c662f67d..296a43aae4 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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.6.tgz#8e46ce33e50ef5127fd6e8b07da7a146b0e4497b" - integrity sha512-WOHZH8T0QAuTtAI6GxWOdfqsgot7ArfADZ71mYwg+DIwU+EsjRp+zMcdlqpQUtOsBA7MyFVfkfJLNlbRBLQGLw== +"@budibase/backend-core@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.7.tgz#f8da10067464f1417ccae81e57a537458e8dde1c" + integrity sha512-dpYr0N8vhbHHQA6tkot6ztB9JC0zvQusfRDOLEwFTePahtZJfdAR6EJs2taf3VrTsSNf8U4UmgS5crfHa3v2kA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.6" + "@budibase/types" "2.2.10-alpha.7" "@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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.6.tgz#06573e50f6d0a250c3a61b238e22d9ab55bc6c8a" - integrity sha512-HdZxq6lMqP5aOKbiVSHF0SCqlASElkYg/fN8Vh6AcwW+AJv5VC4g/jII5bG63U76oQ71m/f7nJTKQuCwZLX90g== +"@budibase/pro@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.7.tgz#83ce8ca3c97eae2effab5db4244367420a39117d" + integrity sha512-1xtQgKQC2PSZLBBQxDcxkz9eDRmYfA/ziz/V6M86PN9t6g2ulFsFVhQo2C86CQZ6OtIWAPNGEpNNwc12+sm0uQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.6" - "@budibase/types" "2.2.10-alpha.6" + "@budibase/backend-core" "2.2.10-alpha.7" + "@budibase/types" "2.2.10-alpha.7" "@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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.6.tgz#b0979c9d6eb1e4b209d13c77f4fe8f899844ba91" - integrity sha512-uKYEtpc4uCtH3/tH6hXu9vGtWzsHzcB/8S7YjK6c6xNL+09UbAaPIyGA5Kv4eoT0ZK6E2NRz0jMf5Ri1cFiP1w== +"@budibase/types@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.7.tgz#e39e57367d065111f07d2b1144b2da44c77009c2" + integrity sha512-tl3adxi6oX3piAH/DMlrTuXxvHbFDL201I/a+9a4gOjvYSFRmJJrmlNx34hWzbepcNAg9Vb/ZwUv8k8DfdvOrw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 238e457017..242e8d50b5 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.7", - "@budibase/pro": "2.2.10-alpha.6", + "@budibase/pro": "2.2.10-alpha.7", "@budibase/string-templates": "2.2.10-alpha.7", "@budibase/types": "2.2.10-alpha.7", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fb77b05279..c8c4ffbac2 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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.6.tgz#8e46ce33e50ef5127fd6e8b07da7a146b0e4497b" - integrity sha512-WOHZH8T0QAuTtAI6GxWOdfqsgot7ArfADZ71mYwg+DIwU+EsjRp+zMcdlqpQUtOsBA7MyFVfkfJLNlbRBLQGLw== +"@budibase/backend-core@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.7.tgz#f8da10067464f1417ccae81e57a537458e8dde1c" + integrity sha512-dpYr0N8vhbHHQA6tkot6ztB9JC0zvQusfRDOLEwFTePahtZJfdAR6EJs2taf3VrTsSNf8U4UmgS5crfHa3v2kA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.10-alpha.6" + "@budibase/types" "2.2.10-alpha.7" "@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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.6.tgz#06573e50f6d0a250c3a61b238e22d9ab55bc6c8a" - integrity sha512-HdZxq6lMqP5aOKbiVSHF0SCqlASElkYg/fN8Vh6AcwW+AJv5VC4g/jII5bG63U76oQ71m/f7nJTKQuCwZLX90g== +"@budibase/pro@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.7.tgz#83ce8ca3c97eae2effab5db4244367420a39117d" + integrity sha512-1xtQgKQC2PSZLBBQxDcxkz9eDRmYfA/ziz/V6M86PN9t6g2ulFsFVhQo2C86CQZ6OtIWAPNGEpNNwc12+sm0uQ== dependencies: - "@budibase/backend-core" "2.2.10-alpha.6" - "@budibase/types" "2.2.10-alpha.6" + "@budibase/backend-core" "2.2.10-alpha.7" + "@budibase/types" "2.2.10-alpha.7" "@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.6": - version "2.2.10-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.6.tgz#b0979c9d6eb1e4b209d13c77f4fe8f899844ba91" - integrity sha512-uKYEtpc4uCtH3/tH6hXu9vGtWzsHzcB/8S7YjK6c6xNL+09UbAaPIyGA5Kv4eoT0ZK6E2NRz0jMf5Ri1cFiP1w== +"@budibase/types@2.2.10-alpha.7": + version "2.2.10-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.7.tgz#e39e57367d065111f07d2b1144b2da44c77009c2" + integrity sha512-tl3adxi6oX3piAH/DMlrTuXxvHbFDL201I/a+9a4gOjvYSFRmJJrmlNx34hWzbepcNAg9Vb/ZwUv8k8DfdvOrw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"