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

Merge pull request #5721 from Budibase/merge-master-develop 

Merge master develop
This commit is contained in:
Rory Powell 2022-05-05 08:37:49 +01:00 committed by GitHub
parent a99891d77e 40597fd297
commit 4fb6dbd009
12 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/budibase/templates/app-service-deployment.yaml
View File

@ -34,6 +34,7 @@ spec:
{{ else }}
value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
{{ end }}
{{ if .Values.services.couchdb.enabled }}
- name: COUCH_DB_USER
valueFrom:
secretKeyRef:
@ -44,6 +45,7 @@ spec:
secretKeyRef:
name: {{ template "couchdb.fullname" . }}
key: adminPassword
{{ end }}
- name: ENABLE_ANALYTICS
value: {{ .Values.globals.enableAnalytics | quote }}
- name: INTERNAL_API_KEY

2
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -29,6 +29,7 @@ spec:
- env:
- name: CLUSTER_PORT
value: {{ .Values.services.worker.port | quote }}
{{ if .Values.services.couchdb.enabled }}
- name: COUCH_DB_USER
valueFrom:
secretKeyRef:
@ -39,6 +40,7 @@ spec:
secretKeyRef:
name: {{ template "couchdb.fullname" . }}
key: adminPassword
{{ end }}
- name: COUCH_DB_URL
{{ if .Values.services.couchdb.url }}
value: {{ .Values.services.couchdb.url }}

2
lerna.json
View File

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

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

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

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.142-alpha.1",
"version": "1.0.142",
"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.142-alpha.1",
"@budibase/string-templates": "^1.0.142",
"@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.142-alpha.1",
"version": "1.0.142",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -67,10 +67,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.0.142-alpha.1",
"@budibase/client": "^1.0.142-alpha.1",
"@budibase/frontend-core": "^1.0.142-alpha.1",
"@budibase/string-templates": "^1.0.142-alpha.1",
"@budibase/bbui": "^1.0.142",
"@budibase/client": "^1.0.142",
"@budibase/frontend-core": "^1.0.142",
"@budibase/string-templates": "^1.0.142",
"@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.142-alpha.1",
"version": "1.0.142",
"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.142-alpha.1",
"version": "1.0.142",
"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.142-alpha.1",
"@budibase/frontend-core": "^1.0.142-alpha.1",
"@budibase/string-templates": "^1.0.142-alpha.1",
"@budibase/bbui": "^1.0.142",
"@budibase/frontend-core": "^1.0.142",
"@budibase/string-templates": "^1.0.142",
"@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.142-alpha.1",
"version": "1.0.142",
"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.142-alpha.1",
"@budibase/bbui": "^1.0.142",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

10
packages/server/package.json
View File

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

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

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

8
packages/worker/package.json
View File

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