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

lerna.json

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

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
@@ -13,7 +13,6 @@
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.901.0",
     "bcryptjs": "^2.4.3",
-    "cls-hooked": "^4.2.2",
     "ioredis": "^4.27.1",
     "jsonwebtoken": "^8.5.1",
     "koa-passport": "^4.1.4",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.97-alpha.0",
-    "@budibase/client": "^0.9.97-alpha.0",
+    "@budibase/bbui": "^0.9.98",
+    "@budibase/client": "^0.9.98",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.97-alpha.0",
+    "@budibase/string-templates": "^0.9.98",
     "@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": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "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": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.97-alpha.0",
-    "@budibase/standard-components": "^0.9.97-alpha.0",
-    "@budibase/string-templates": "^0.9.97-alpha.0",
+    "@budibase/bbui": "^0.9.98",
+    "@budibase/standard-components": "^0.9.98",
+    "@budibase/string-templates": "^0.9.98",
     "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": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -23,9 +23,7 @@
     "format": "prettier --config ../../.prettierrc.json 'src/**/*.ts' --write",
     "lint": "eslint --fix src/",
     "lint:fix": "yarn run format && yarn run lint",
-    "initialise": "node scripts/initialise.js",
-    "multi:enable": "node scripts/multiTenancy.js enable",
-    "multi:disable": "node scripts/multiTenancy.js disable"
+    "initialise": "node scripts/initialise.js"
   },
   "jest": {
     "preset": "ts-jest",
@@ -62,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.97-alpha.0",
-    "@budibase/client": "^0.9.97-alpha.0",
-    "@budibase/string-templates": "^0.9.97-alpha.0",
+    "@budibase/auth": "^0.9.98",
+    "@budibase/client": "^0.9.98",
+    "@budibase/string-templates": "^0.9.98",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.97-alpha.0",
+    "@budibase/standard-components": "^0.9.98",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
@@ -138,8 +136,7 @@
     "supertest": "^4.0.2",
     "ts-jest": "^27.0.3",
     "ts-node": "^10.0.0",
-    "typescript": "^4.3.4",
-    "update-dotenv": "^1.1.1"
+    "typescript": "^4.3.4"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }

packages/server/src/api/routes/hosting.js

@@ -1,7 +1,6 @@
 const Router = require("@koa/router")
 const controller = require("../controllers/hosting")
 const authorized = require("../../middleware/authorized")
-const selfhost = require("../../middleware/selfhost")
 const { BUILDER } = require("@budibase/auth/permissions")
 
 const router = Router()
@@ -9,6 +8,6 @@ const router = Router()
 router
   .get("/api/hosting/urls", authorized(BUILDER), controller.fetchUrls)
   // this isn't risky, doesn't return anything about apps other than names and URLs
-  .get("/api/hosting/apps", selfhost, controller.getDeployedApps)
+  .get("/api/hosting/apps", controller.getDeployedApps)
 
 module.exports = router

packages/server/src/utilities/index.js

@@ -2,7 +2,7 @@ const env = require("../environment")
 const { OBJ_STORE_DIRECTORY, ObjectStoreBuckets } = require("../constants")
 const { sanitizeKey } = require("@budibase/auth/src/objectStore")
 
-const BB_CDN = "https://cdn.app.budi.live/assets"
+const BB_CDN = "https://d14h4vmm231itd.cloudfront.net"
 
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 

packages/standard-components/package.json

@@ -29,13 +29,12 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.97-alpha.0",
+    "@budibase/bbui": "^0.9.98",
     "@spectrum-css/card": "^3.0.3",
-    "@spectrum-css/divider": "^1.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/typography": "^3.0.2",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "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": "0.9.97-alpha.0",
+  "version": "0.9.98",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -16,15 +16,13 @@
     "build:docker": "docker build . -t worker-service",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon src/index.js",
-    "test": "jest --runInBand",
-    "multi:enable": "node scripts/multiTenancy.js enable",
-    "multi:disable": "node scripts/multiTenancy.js disable"
+    "test": "jest --runInBand"
   },
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.97-alpha.0",
-    "@budibase/string-templates": "^0.9.97-alpha.0",
+    "@budibase/auth": "^0.9.98",
+    "@budibase/string-templates": "^0.9.98",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",
@@ -54,8 +52,7 @@
     "jest": "^26.6.3",
     "nodemon": "^2.0.7",
     "pouchdb-adapter-memory": "^7.2.2",
-    "supertest": "^6.1.3",
-    "update-dotenv": "^1.1.1"
+    "supertest": "^6.1.3"
   },
   "jest": {
     "testEnvironment": "node",