Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list

2021-05-21 11:00:26 +01:00 · 2021-05-21 11:00:26 +01:00 · c174602704
parent e1c37752db 7ef5a01f04
commit c174602704
14 changed files with 49 additions and 40 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -4,11 +4,7 @@ on:
 push:
    branches:
      - master
- pull_request:
-    branches:
-      - master
-
-
+      
 jobs:
  release:
    runs-on: ubuntu-latest 
--- a/hosting/envoy.yaml
+++ b/hosting/envoy.yaml
@ -21,15 +21,27 @@ static_resources:
                  cluster: app-service
                  prefix_rewrite: "/"

-              - match: { path: "/" }
+              - match: { prefix: "/builder/" }
+                route:
+                  cluster: app-service
+
+              - match: { prefix: "/builder" }
+                route:
+                  cluster: app-service
+              
+              - match: { prefix: "/app_" }
                route:
                  cluster: app-service

              # special case for worker admin API
-              - match: { path: "/api/admin" }
+              - match: { prefix: "/api/admin/" }
                route:
                  cluster: worker-service
-              
+
+              - match: { path: "/" }
+                route:
+                  cluster: app-service
+
              # special case for when API requests are made, can just forward, not to minio    
              - match: { prefix: "/api/" }
                route:
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.8.18",
+  "version": "0.9.1",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.18.6",
+  "version": "0.9.1",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
@ -24,5 +24,6 @@
  },
  "devDependencies": {
    "ioredis-mock": "^5.5.5"
-  }
+  },
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- 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": "1.58.13",
+  "version": "0.9.1",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
@ -78,5 +78,6 @@
    "dayjs": "^1.10.4",
    "svelte-flatpickr": "^3.1.0",
    "svelte-portal": "^1.0.0"
-  }
+  },
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.8.18",
+  "version": "0.9.1",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.18",
+    "@budibase/bbui": "^0.9.1",
+    "@budibase/client": "^0.9.1",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.18",
+    "@budibase/string-templates": "^0.9.1",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
-  "name": "cli",
-  "version": "0.8.18",
+  "name": "@budibase/cli",
+  "version": "0.9.1",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.8.18",
+  "version": "0.9.1",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -18,15 +18,15 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/string-templates": "^0.8.18",
+    "@budibase/string-templates": "^0.9.1",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
  },
  "devDependencies": {
+    "@budibase/standard-components": "^0.9.1",
    "@rollup/plugin-commonjs": "^18.0.0",
    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@budibase/standard-components": "^0.8.18",
    "fs-extra": "^8.1.0",
    "jsdom": "^16.0.1",
    "postcss": "^8.2.9",
@ -40,5 +40,5 @@
    "rollup-plugin-terser": "^7.0.2",
    "svelte": "^3.38.2"
  },
-  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.8.18",
+  "version": "0.9.1",
  "description": "Budibase Web Server",
  "main": "src/electron.js",
  "repository": {
@ -80,9 +80,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.18.6",
-    "@budibase/client": "^0.8.18",
-    "@budibase/string-templates": "^0.8.18",
+    "@budibase/auth": "^0.9.1",
+    "@budibase/client": "^0.9.1",
+    "@budibase/string-templates": "^0.9.1",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
@ -132,7 +132,7 @@
    "zlib": "1.0.5"
  },
  "devDependencies": {
-    "@budibase/standard-components": "^0.8.18",
+    "@budibase/standard-components": "^0.9.1",
    "@jest/test-sequencer": "^24.8.0",
    "docker-compose": "^0.23.6",
    "eslint": "^6.8.0",
@ -142,5 +142,5 @@
    "pouchdb-adapter-memory": "^7.2.1",
    "supertest": "^4.0.2"
  },
-  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@ -12,7 +12,6 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)

 let POUCH_DB_DEFAULTS = {
  prefix: COUCH_DB_URL,
-  skip_setup: env.isProd(),
 }

 if (env.isTest()) {
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -29,11 +29,11 @@
  "keywords": [
    "svelte"
  ],
-  "version": "0.8.18",
+  "version": "0.9.1",
  "license": "MIT",
-  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
  "dependencies": {
-    "@budibase/bbui": "^1.58.13",
+    "@budibase/bbui": "^0.9.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
    "apexcharts": "^3.22.1",
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.8.18",
+  "version": "0.9.1",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
@ -39,5 +39,5 @@
    "rollup-plugin-terser": "^7.0.2",
    "typescript": "^4.1.3"
  },
-  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.8.18",
+  "version": "0.9.1",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -21,8 +21,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.18.6",
-    "@budibase/string-templates": "^0.8.16",
+    "@budibase/auth": "^0.9.1",
+    "@budibase/string-templates": "^0.9.1",
    "@koa/router": "^8.0.0",
    "aws-sdk": "^2.811.0",
    "bcryptjs": "^2.4.3",
@ -58,5 +58,6 @@
    "setupFiles": [
      "./scripts/jestSetup.js"
    ]
-  }
+  },
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
--- a/packages/worker/src/db/index.js
+++ b/packages/worker/src/db/index.js
@ -7,7 +7,6 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/"

 let POUCH_DB_DEFAULTS = {
  prefix: COUCH_DB_URL,
-  skip_setup: env.isProd(),
 }

 if (env.isTest()) {