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

Merge branch 'master' of github.com:Budibase/budibase into develop

This commit is contained in:
mike12345567 2022-03-10 18:14:57 +00:00
parent f12ce76171 92bf490066
commit f758102b09
21 changed files with 1414 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy-cloud.yaml vendored
View File

@ -42,7 +42,7 @@ jobs:
run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
yarn build:docker:proxy:prod
docker tag budibase/proxy:$release_tag budibase/proxy:$PROD_TAG
docker tag proxy-service budibase/proxy:$PROD_TAG
docker push budibase/proxy:$PROD_TAG
env:
DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}

2
.github/workflows/deploy-preprod.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
yarn build:docker:proxy:preprod
docker tag budibase/proxy:$release_tag budibase/proxy:$PREPROD_TAG
docker tag proxy-service budibase/proxy:$PREPROD_TAG
docker push budibase/proxy:$PREPROD_TAG
env:
DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}

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

@ -48,7 +48,7 @@ jobs:
yarn build
popd
- name: Build OpenAPI sepc
- name: Build OpenAPI spec
run: |
pushd packages/server
yarn

1
.prettierignore
View File

@ -5,6 +5,7 @@ packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
packages/server/builder
packages/server/coverage
packages/server/client
packages/server/src/definitions/openapi.ts
packages/builder/.routify
packages/builder/cypress/support/queryLevelTransformerFunction.js
packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.0.81-alpha.8",
"version": "1.0.83",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.0.81-alpha.8",
"version": "1.0.83",
"description": "Budibase backend core libraries used in server and worker",
"main": "src/index.js",
"author": "Budibase",

21
packages/backend-core/src/redis/utils.js
View File

@ -22,12 +22,25 @@ exports.Databases = {
exports.SEPARATOR = SEPARATOR
exports.getRedisOptions = (clustered = false) => {
const [host, port, ...rest] = REDIS_URL.split(":")
let password = REDIS_PASSWORD
let url = REDIS_URL.split("//")
// get rid of the protocol
url = url.length > 1 ? url[1] : url[0]
// check for a password etc
url = url.split("@")
if (url.length > 1) {
// get the password
password = url[0].split(":")[1]
url = url[1]
} else {
url = url[0]
}
const [host, port] = url.split(":")
let redisProtocolUrl
// fully qualified redis URL
if (rest.length && /rediss?/.test(host)) {
if (/rediss?/.test(REDIS_URL)) {
redisProtocolUrl = REDIS_URL
}
@ -37,13 +50,13 @@ exports.getRedisOptions = (clustered = false) => {
if (clustered) {
opts.redisOptions = {}
opts.redisOptions.tls = {}
opts.redisOptions.password = REDIS_PASSWORD
opts.redisOptions.password = password
opts.slotsRefreshTimeout = SLOT_REFRESH_MS
opts.dnsLookup = (address, callback) => callback(null, address)
} else {
opts.host = host
opts.port = port
opts.password = REDIS_PASSWORD
opts.password = password
}
return { opts, host, port, redisProtocolUrl }
}

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.0.81-alpha.8",
"version": "1.0.83",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.0.81-alpha.8",
"@budibase/string-templates": "^1.0.83",
"@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.0.81-alpha.8",
"version": "1.0.83",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -65,10 +65,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.0.81-alpha.8",
"@budibase/client": "^1.0.81-alpha.8",
"@budibase/frontend-core": "^1.0.81-alpha.8",
"@budibase/string-templates": "^1.0.81-alpha.8",
"@budibase/bbui": "^1.0.83",
"@budibase/client": "^1.0.83",
"@budibase/frontend-core": "^1.0.83",
"@budibase/string-templates": "^1.0.83",
"@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.0.81-alpha.8",
"version": "1.0.83",
"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.0.81-alpha.8",
"version": "1.0.83",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "^1.0.81-alpha.8",
"@budibase/frontend-core": "^1.0.81-alpha.8",
"@budibase/string-templates": "^1.0.81-alpha.8",
"@budibase/bbui": "^1.0.83",
"@budibase/frontend-core": "^1.0.83",
"@budibase/string-templates": "^1.0.83",
"@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.0.81-alpha.8",
"version": "1.0.83",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.0.81-alpha.8",
"@budibase/bbui": "^1.0.83",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

8
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.0.81-alpha.8",
"version": "1.0.83",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -71,9 +71,9 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "^10.0.3",
"@budibase/backend-core": "^1.0.81-alpha.8",
"@budibase/client": "^1.0.81-alpha.8",
"@budibase/string-templates": "^1.0.81-alpha.8",
"@budibase/backend-core": "^1.0.83",
"@budibase/client": "^1.0.83",
"@budibase/string-templates": "^1.0.83",
"@bull-board/api": "^3.7.0",
"@bull-board/koa": "^3.7.0",
"@elastic/elasticsearch": "7.10.0",

8
packages/server/specs/openapi.json
View File

@ -437,8 +437,7 @@
}
},
"required": [
"name",
"url"
"name"
]
},
"applicationOutput": {
@ -1803,11 +1802,6 @@
"tags": [
"applications"
],
"parameters": [
{
"$ref": "#/components/parameters/appId"
}
],
"requestBody": {
"required": true,
"content": {

3
packages/server/specs/openapi.yaml
View File

@ -309,7 +309,6 @@ components:
type: string
required:
- name
- url
applicationOutput:
type: object
properties:
@ -1346,8 +1345,6 @@ paths:
applications.
tags:
- applications
parameters:
- $ref: "#/components/parameters/appId"
requestBody:
required: true
content:

2
packages/server/specs/resources/application.js
View File

@ -27,7 +27,7 @@ const base = {
},
}
const applicationSchema = object(base, { required: ["name", "url"] })
const applicationSchema = object(base, { required: ["name"] })
const applicationOutputSchema = object(
{

2
packages/server/src/api/routes/public/applications.ts
View File

@ -121,8 +121,6 @@ read.push(new Endpoint("get", "/applications/:appId", controller.read))
* description: Based on application properties (currently only name) search for applications.
* tags:
* - applications
* parameters:
* - $ref: '#/components/parameters/appId'
* requestBody:
* required: true
* content:

950
packages/server/src/definitions/openapi.ts
View File

File diff suppressed because it is too large Load Diff

910
packages/server/yarn.lock
View File

File diff suppressed because it is too large Load Diff

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

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

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.0.81-alpha.8",
"version": "1.0.83",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -34,8 +34,8 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.0.81-alpha.8",
"@budibase/string-templates": "^1.0.81-alpha.8",
"@budibase/backend-core": "^1.0.83",
"@budibase/string-templates": "^1.0.83",
"@koa/router": "^8.0.0",
"@sentry/node": "^6.0.0",
"@techpass/passport-openidconnect": "^0.3.0",