Merge branch 'master' of github.com:Budibase/budibase into feature/dynamo-describe

.github/CONTRIBUTING.md

@@ -79,6 +79,8 @@ Component libraries are collections of components as well as the definition of t
 ### Getting Started For Contributors
 #### 1.  Prerequisites
 
+NodeJS Version `14.x.x`
+
 *yarn -* `npm install -g yarn`
 
 *jest* - `npm install -g jest`

.github/stale.yml

@@ -1,7 +1,9 @@
-# Number of days of inactivity before an issue becomes stale
+# Configuration for probot-stale - https://github.com/probot/stale
+# Number of days of inactivity before an Issue or Pull Request becomes stale
 daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-daysUntilClose: 7
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: false
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned

.github/workflows/release-develop.yml

@@ -4,6 +4,16 @@ on:
  push:
     branches:
       - develop
+    paths:
+      - '.aws/**'
+      - '.github/**'
+      - 'charts/**'
+      - 'packages/**'
+      - 'scripts/**'
+      - 'package.json'
+      - 'yarn.lock'
+      - 'package.json'
+      - 'yarn.lock'
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}

.github/workflows/release.yml

@@ -4,6 +4,16 @@ on:
  push:
     branches:
       - master
+    paths:
+      - '.aws/**'
+      - '.github/**'
+      - 'charts/**'
+      - 'packages/**'
+      - 'scripts/**'
+      - 'package.json'
+      - 'yarn.lock'
+      - 'package.json'
+      - 'yarn.lock'
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}

charts/budibase/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: couchdb
+  repository: https://apache.github.io/couchdb-helm
+  version: 3.3.4
+- name: ingress-nginx
+  repository: https://kubernetes.github.io/ingress-nginx
+  version: 4.0.13
+digest: sha256:20892705c2d8e64c98257d181063a514ac55013e2b43399a6e54868a97f97845
+generated: "2021-12-30T18:55:30.878411Z"

charts/budibase/Chart.yaml

@@ -19,6 +19,6 @@ dependencies:
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled
   - name: ingress-nginx
-    version: 3.35.0
+    version: 4.0.13
-    repository: https://github.com/kubernetes/ingress-nginx
+    repository: https://kubernetes.github.io/ingress-nginx
     condition: ingress.nginx

charts/budibase/templates/proxy-service-service.yaml

@@ -9,12 +9,11 @@ metadata:
     app.kubernetes.io/name: budibase-proxy
   name: proxy-service
 spec:
-  type: NodePort
   ports:
-  - port: {{ .Values.services.proxy.port }}
+  - name: {{ .Values.services.proxy.port | quote }}
+    port: {{ .Values.services.proxy.port }}
     targetPort: {{ .Values.services.proxy.port }}
-    protocol: TCP
   selector:
     app.kubernetes.io/name: budibase-proxy
 status:
-  loadBalancer: {}
+  loadBalancer: {}

lerna.json

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

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27",
+    "@budibase/bbui": "^1.0.32",
-    "@budibase/client": "^1.0.27",
+    "@budibase/client": "^1.0.32",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.27",
+    "@budibase/string-templates": "^1.0.32",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

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

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.27",
+  "version": "1.0.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.0.27",
+    "@budibase/bbui": "^1.0.32",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.27",
+    "@budibase/string-templates": "^1.0.32",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,9 +69,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.27",
+    "@budibase/auth": "^1.0.32",
-    "@budibase/client": "^1.0.27",
+    "@budibase/client": "^1.0.32",
-    "@budibase/string-templates": "^1.0.27",
+    "@budibase/string-templates": "^1.0.32",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/src/utilities/index.js

@@ -34,7 +34,7 @@ exports.checkSlashesInUrl = url => {
  * @return {string} The base URL of the object store (MinIO or S3).
  */
 exports.objectStoreUrl = () => {
-  if (env.SELF_HOSTED) {
+  if (env.SELF_HOSTED || env.MINIO_URL) {
     // can use a relative url for this as all goes through the proxy (this is hosted in minio)
     return OBJ_STORE_DIRECTORY
   } else {

packages/string-templates/package.json

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

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.27",
+    "@budibase/auth": "^1.0.32",
-    "@budibase/string-templates": "^1.0.27",
+    "@budibase/string-templates": "^1.0.32",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",