MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master

This commit is contained in:
Rory Powell 2022-08-10 15:46:30 +01:00
parent 324083f07f f7378af092
commit 6c67ed1345
14 changed files with 112 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.github/workflows/release-selfhost.yml vendored
View File

@ -2,6 +2,10 @@ name: Budibase Release Selfhost
on:
workflow_dispatch:
inputs:
version:
description: Budibase release version. For example - 1.0.0
required: false
env:
BRANCH: ${{ github.event.pull_request.head.ref }}
@ -12,19 +16,35 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fail if branch is not master
if: github.ref != 'refs/heads/master'
run: |
echo "Ref is not master, you must run this job from master."
exit 1
- uses: actions/checkout@v2
with:
node-version: 14.x
fetch_depth: 0
- name: Get the latest budibase release version
id: version
run: |
if [ -z "${{ github.event.inputs.version }}" ]; then
release_version=$(cat lerna.json | jq -r '.version')
else
release_version=${{ github.event.inputs.version }}
fi
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
- name: Checkout tag
run: git checkout v${{ env.RELEASE_VERSION }}
- name: Tag and release Docker images (Self Host)
run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
# Get latest release version
release_version=$(cat lerna.json | jq -r '.version')
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
release_tag=v$release_version
release_tag=v${{ env.RELEASE_VERSION }}
# Pull apps and worker images
docker pull budibase/apps:$release_tag

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.2.30",
"version": "1.2.32",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "^1.2.30",
"@budibase/types": "^1.2.32",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.2.30",
"version": "1.2.32",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.2.30",
"@budibase/string-templates": "^1.2.32",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.2.30",
"version": "1.2.32",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.2.30",
"@budibase/client": "^1.2.30",
"@budibase/frontend-core": "^1.2.30",
"@budibase/string-templates": "^1.2.30",
"@budibase/bbui": "^1.2.32",
"@budibase/client": "^1.2.32",
"@budibase/frontend-core": "^1.2.32",
"@budibase/string-templates": "^1.2.32",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.2.30",
"version": "1.2.32",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "^1.2.30",
"@budibase/frontend-core": "^1.2.30",
"@budibase/string-templates": "^1.2.30",
"@budibase/bbui": "^1.2.32",
"@budibase/frontend-core": "^1.2.32",
"@budibase/string-templates": "^1.2.32",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.2.30",
"@budibase/bbui": "^1.2.32",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "^1.2.30",
"@budibase/client": "^1.2.30",
"@budibase/pro": "1.2.30",
"@budibase/string-templates": "^1.2.30",
"@budibase/types": "^1.2.30",
"@budibase/backend-core": "^1.2.32",
"@budibase/client": "^1.2.32",
"@budibase/pro": "1.2.32",
"@budibase/string-templates": "^1.2.32",
"@budibase/types": "^1.2.32",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

58
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.30.tgz#7683406573d2be9c2cd8a25fc4c1bc9de8cb2523"
integrity sha512-SoF+tKksdalUGB2EFyei86Y9aHGGE1yF8IG6Ex1G0vdajIE7+vEhKgxuACyfzPilptCor6m0pwfK6trtL4rd9w==
"@budibase/backend-core@1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.32.tgz#4ec9350a0afb3dc096123ff891ec0da0b5ebca24"
integrity sha512-g0kKpByyhpQI+T2tmW3f2alWHB1KRO6jOJLvtHXGQndayRFA3dJZtDyW8Rd4KqfOEztmYUb6mbc0un8KzeMGqw==
dependencies:
"@budibase/types" "^1.2.30"
"@budibase/types" "^1.2.32"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1177,13 +1177,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.30.tgz#ee498cf776da17cbbf7af43882e4283fc2c9fd92"
integrity sha512-avBjS97zPoAxHDwcrt0zdxZajgaqeS5242NRqirLi07q91yODZBV8tSeh0nPopR8feMuoCDqKV1txm8/ciStnQ==
"@budibase/pro@1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.32.tgz#7116f54ee26218a179ad6720c444f238d47bea5e"
integrity sha512-TbwtUT50ErL/346fGiZdK+I3ddlVkP3hOeafa608Z/kuAwiEpBB8XNk8bbJjjpQfPsy1nbqyWNR66FtXcjE/TA==
dependencies:
"@budibase/backend-core" "1.2.30"
"@budibase/types" "1.2.30"
"@budibase/backend-core" "1.2.32"
"@budibase/types" "1.2.32"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1206,10 +1206,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.2.30", "@budibase/types@^1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.30.tgz#5b94fceabf6abb2b7f5aed2f3aca9fcce9b17fd2"
integrity sha512-gezzb1WDsePlLWL13Q0I2a+ZwWAmcnAYCnY/dz/bNIrIFli+Svlnx/wbsehAn43MBtMDnLpaquuFJ3VVszTdSw==
"@budibase/types@1.2.32", "@budibase/types@^1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.32.tgz#121ab38c0a956662673f8ca689f6cc4371e652b3"
integrity sha512-cmcNSUppv2tkM/R+SHt611uh7jmfJRtFzxwMEaceJMRxFuk9d++v3gmNJxf4Q+C9ENi1lvBOw87SLakqaMfCgQ==
"@bull-board/api@3.7.0":
version "3.7.0"
@ -1343,16 +1343,33 @@
protobufjs "^6.11.3"
yargs "^16.2.0"
"@hapi/address@^4.1.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d"
integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==
dependencies:
"@hapi/hoek" "^9.0.0"
"@hapi/bourne@^2.0.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.1.0.tgz#66aff77094dc3080bd5df44ec63881f2676eb020"
integrity sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q==
"@hapi/formula@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128"
integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==
"@hapi/hoek@^9.0.0":
version "9.3.0"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
"@hapi/pinpoint@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df"
integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==
"@hapi/topo@^5.0.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
@ -8656,6 +8673,17 @@ jmespath@0.16.0:
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
joi@17.2.1:
version "17.2.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz#e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a"
integrity sha512-YT3/4Ln+5YRpacdmfEfrrKh50/kkgX3LgBltjqnlMPIYiZ4hxXZuVJcxmsvxsdeHg9soZfE3qXxHC2tMpCCBOA==
dependencies:
"@hapi/address" "^4.1.0"
"@hapi/formula" "^2.0.0"
"@hapi/hoek" "^9.0.0"
"@hapi/pinpoint" "^2.0.0"
"@hapi/topo" "^5.0.0"
joi@17.6.0:
version "17.6.0"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.2.30",
"version": "1.2.32",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.2.30",
"version": "1.2.32",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.2.30",
"@budibase/pro": "1.2.30",
"@budibase/string-templates": "^1.2.30",
"@budibase/types": "^1.2.30",
"@budibase/backend-core": "^1.2.32",
"@budibase/pro": "1.2.32",
"@budibase/string-templates": "^1.2.32",
"@budibase/types": "^1.2.32",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.30.tgz#7683406573d2be9c2cd8a25fc4c1bc9de8cb2523"
integrity sha512-SoF+tKksdalUGB2EFyei86Y9aHGGE1yF8IG6Ex1G0vdajIE7+vEhKgxuACyfzPilptCor6m0pwfK6trtL4rd9w==
"@budibase/backend-core@1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.32.tgz#4ec9350a0afb3dc096123ff891ec0da0b5ebca24"
integrity sha512-g0kKpByyhpQI+T2tmW3f2alWHB1KRO6jOJLvtHXGQndayRFA3dJZtDyW8Rd4KqfOEztmYUb6mbc0un8KzeMGqw==
dependencies:
"@budibase/types" "^1.2.30"
"@budibase/types" "^1.2.32"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -324,21 +324,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.30.tgz#ee498cf776da17cbbf7af43882e4283fc2c9fd92"
integrity sha512-avBjS97zPoAxHDwcrt0zdxZajgaqeS5242NRqirLi07q91yODZBV8tSeh0nPopR8feMuoCDqKV1txm8/ciStnQ==
"@budibase/pro@1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.32.tgz#7116f54ee26218a179ad6720c444f238d47bea5e"
integrity sha512-TbwtUT50ErL/346fGiZdK+I3ddlVkP3hOeafa608Z/kuAwiEpBB8XNk8bbJjjpQfPsy1nbqyWNR66FtXcjE/TA==
dependencies:
"@budibase/backend-core" "1.2.30"
"@budibase/types" "1.2.30"
"@budibase/backend-core" "1.2.32"
"@budibase/types" "1.2.32"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.2.30", "@budibase/types@^1.2.30":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.30.tgz#5b94fceabf6abb2b7f5aed2f3aca9fcce9b17fd2"
integrity sha512-gezzb1WDsePlLWL13Q0I2a+ZwWAmcnAYCnY/dz/bNIrIFli+Svlnx/wbsehAn43MBtMDnLpaquuFJ3VVszTdSw==
"@budibase/types@1.2.32", "@budibase/types@^1.2.32":
version "1.2.32"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.32.tgz#121ab38c0a956662673f8ca689f6cc4371e652b3"
integrity sha512-cmcNSUppv2tkM/R+SHt611uh7jmfJRtFzxwMEaceJMRxFuk9d++v3gmNJxf4Q+C9ENi1lvBOw87SLakqaMfCgQ==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"