From 83462a0eee2ab959cc94980bd0aec1206a24004f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 5 Aug 2021 10:52:34 +0100
Subject: [PATCH] Fixing merge issues.

---
 packages/auth/package.json                | 3 ++-
 packages/server/package.json              | 7 +++++--
 packages/server/src/utilities/index.js    | 2 +-
 packages/standard-components/package.json | 1 +
 packages/worker/package.json              | 7 +++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/auth/package.json b/packages/auth/package.json
index 7802aed8e4..c2bccf283e 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -25,7 +25,8 @@
     "sanitize-s3-objectkey": "^0.0.1",
     "tar-fs": "^2.1.1",
     "uuid": "^8.3.2",
-    "zlib": "^1.0.5"
+    "zlib": "^1.0.5",
+    "cls-hooked": "^4.2.2"
   },
   "jest": {
     "setupFiles": [
diff --git a/packages/server/package.json b/packages/server/package.json
index 4430dbeaf2..4ddebdacba 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -23,7 +23,9 @@
     "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"
+    "initialise": "node scripts/initialise.js",
+    "multi:enable": "node scripts/multiTenancy.js enable",
+    "multi:disable": "node scripts/multiTenancy.js disable"
   },
   "jest": {
     "preset": "ts-jest",
@@ -136,7 +138,8 @@
     "supertest": "^4.0.2",
     "ts-jest": "^27.0.3",
     "ts-node": "^10.0.0",
-    "typescript": "^4.3.4"
+    "typescript": "^4.3.4",
+    "update-dotenv": "^1.1.1"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index 4e2631c590..182ad51828 100644
--- a/packages/server/src/utilities/index.js
+++ b/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://d14h4vmm231itd.cloudfront.net"
+const BB_CDN = "https://cdn.app.budi.live/assets"
 
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 1ee620daf6..b868491f83 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -39,6 +39,7 @@
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/typography": "^3.0.2",
     "@spectrum-css/vars": "^3.0.1",
+    "@spectrum-css/divider": "^1.0.3",
     "apexcharts": "^3.22.1",
     "dayjs": "^1.10.5",
     "svelte-apexcharts": "^1.0.2",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e58cf3b5d6..f786d76dc7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -16,7 +16,9 @@
     "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"
+    "test": "jest --runInBand",
+    "multi:enable": "node scripts/multiTenancy.js enable",
+    "multi:disable": "node scripts/multiTenancy.js disable"
   },
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
@@ -52,7 +54,8 @@
     "jest": "^26.6.3",
     "nodemon": "^2.0.7",
     "pouchdb-adapter-memory": "^7.2.2",
-    "supertest": "^6.1.3"
+    "supertest": "^6.1.3",
+    "update-dotenv": "^1.1.1"
   },
   "jest": {
     "testEnvironment": "node",