@budibase/server 2.1.32-alpha.7 → 2.1.32

package/dist/utilities/usageQuota/rows.js

@@ -8,21 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniqueRows = void 0;
-const utils_1 = require("../../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
-const ROW_EXCLUSIONS = [utils_1.USER_METDATA_PREFIX];
-function getAppPairs(appIds) {
+const { getRowParams, USER_METDATA_PREFIX } = require("../../db/utils");
+const { isDevAppID, getDevelopmentAppID, getProdAppID, doWithDB, } = require("@budibase/backend-core/db");
+const ROW_EXCLUSIONS = [USER_METDATA_PREFIX];
+const getAppPairs = appIds => {
     // collect the app ids into dev / prod pairs
     // keyed by the dev app id
     const pairs = {};
     for (let appId of appIds) {
-        const devId = backend_core_1.db.getDevelopmentAppID(appId);
+        const devId = getDevelopmentAppID(appId);
         if (!pairs[devId]) {
             pairs[devId] = {};
         }
-        if (backend_core_1.db.isDevAppID(appId)) {
+        if (isDevAppID(appId)) {
             pairs[devId].devId = appId;
         }
         else {
@@ -30,59 +28,54 @@ function getAppPairs(appIds) {
         }
     }
     return pairs;
-}
-function getAppRows(appId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // need to specify the app ID, as this is used for different apps in one call
-        return backend_core_1.db.doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
-            const response = yield db.allDocs((0, utils_1.getRowParams)(null, null, {
-                include_docs: false,
-            }));
-            return response.rows
-                .map(r => r.id)
-                .filter(id => {
-                for (let exclusion of ROW_EXCLUSIONS) {
-                    if (id.startsWith(exclusion)) {
-                        return false;
-                    }
-                }
-                return true;
-            });
+};
+const getAppRows = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    // need to specify the app ID, as this is used for different apps in one call
+    return doWithDB(appId, (db) => __awaiter(void 0, void 0, void 0, function* () {
+        const response = yield db.allDocs(getRowParams(null, null, {
+            include_docs: false,
         }));
-    });
-}
+        return response.rows
+            .map(r => r.id)
+            .filter(id => {
+            for (let exclusion of ROW_EXCLUSIONS) {
+                if (id.startsWith(exclusion)) {
+                    return false;
+                }
+            }
+            return true;
+        });
+    }));
+});
 /**
  * Return a set of all rows in the given app ids.
  * The returned rows will be unique on a per dev/prod app basis.
  * Rows duplicates may exist across apps due to data import so they are not filtered out.
  */
-function getUniqueRows(appIds) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let uniqueRows = [], rowsByApp = {};
-        const pairs = getAppPairs(appIds);
-        for (let pair of Object.values(pairs)) {
-            let appRows = [];
-            for (let appId of [pair.devId, pair.prodId]) {
-                if (!appId) {
-                    continue;
-                }
-                try {
-                    appRows = appRows.concat(yield getAppRows(appId));
-                }
-                catch (e) {
-                    console.error(e);
-                    // don't error out if we can't count the app rows, just continue
-                }
+exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function* () {
+    let uniqueRows = [], rowsByApp = {};
+    const pairs = getAppPairs(appIds);
+    for (let pair of Object.values(pairs)) {
+        let appRows = [];
+        for (let appId of [pair.devId, pair.prodId]) {
+            if (!appId) {
+                continue;
+            }
+            try {
+                appRows = appRows.concat(yield getAppRows(appId));
+            }
+            catch (e) {
+                console.error(e);
+                // don't error out if we can't count the app rows, just continue
             }
-            // ensure uniqueness on a per app pair basis
-            // this can't be done on all rows because app import results in
-            // duplicate row ids across apps
-            // the array pre-concat is important to avoid stack overflow
-            const prodId = backend_core_1.db.getProdAppID((pair.devId || pair.prodId));
-            rowsByApp[prodId] = [...new Set(appRows)];
-            uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
         }
-        return { rows: uniqueRows, appRows: rowsByApp };
-    });
-}
-exports.getUniqueRows = getUniqueRows;
+        // ensure uniqueness on a per app pair basis
+        // this can't be done on all rows because app import results in
+        // duplicate row ids across apps
+        // the array pre-concat is important to avoid stack overflow
+        const prodId = getProdAppID(pair.devId || pair.prodId);
+        rowsByApp[prodId] = [...new Set(appRows)];
+        uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
+    }
+    return { rows: uniqueRows, appRows: rowsByApp };
+});

package/dist/utilities/users.js

@@ -8,34 +8,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.publicApiUserFix = exports.getFullUser = void 0;
-const utils_1 = require("../db/utils");
-const global_1 = require("./global");
-const backend_core_1 = require("@budibase/backend-core");
-function getFullUser(ctx, userId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const global = yield (0, global_1.getGlobalUser)(userId);
-        let metadata = {};
-        // always prefer the user metadata _id and _rev
-        delete global._id;
-        delete global._rev;
-        try {
-            // this will throw an error if the db doesn't exist, or there is no appId
-            const db = backend_core_1.context.getAppDB();
-            metadata = yield db.get(userId);
-        }
-        catch (err) {
-            // it is fine if there is no user metadata yet
-        }
-        delete metadata.csrfToken;
-        return Object.assign(Object.assign(Object.assign({}, metadata), global), { roleId: global.roleId || backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC, tableId: utils_1.InternalTables.USER_METADATA, 
-            // make sure the ID is always a local ID, not a global one
-            _id: userId });
-    });
-}
-exports.getFullUser = getFullUser;
-function publicApiUserFix(ctx) {
+const { InternalTables } = require("../db/utils");
+const { getGlobalUser } = require("../utilities/global");
+const { getAppDB } = require("@budibase/backend-core/context");
+const { getProdAppID } = require("@budibase/backend-core/db");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+exports.getFullUser = (ctx, userId) => __awaiter(void 0, void 0, void 0, function* () {
+    const global = yield getGlobalUser(userId);
+    let metadata = {};
+    // always prefer the user metadata _id and _rev
+    delete global._id;
+    delete global._rev;
+    try {
+        // this will throw an error if the db doesn't exist, or there is no appId
+        const db = getAppDB();
+        metadata = yield db.get(userId);
+    }
+    catch (err) {
+        // it is fine if there is no user metadata yet
+    }
+    delete metadata.csrfToken;
+    return Object.assign(Object.assign(Object.assign({}, metadata), global), { roleId: global.roleId || BUILTIN_ROLE_IDS.PUBLIC, tableId: InternalTables.USER_METADATA, 
+        // make sure the ID is always a local ID, not a global one
+        _id: userId });
+});
+exports.publicApiUserFix = ctx => {
     if (!ctx.request.body) {
         return ctx;
     }
@@ -48,10 +45,10 @@ function publicApiUserFix(ctx) {
     else {
         const newRoles = {};
         for (let [appId, role] of Object.entries(ctx.request.body.roles)) {
-            newRoles[backend_core_1.db.getProdAppID(appId)] = role;
+            // @ts-ignore
+            newRoles[getProdAppID(appId)] = role;
         }
         ctx.request.body.roles = newRoles;
     }
     return ctx;
-}
-exports.publicApiUserFix = publicApiUserFix;
+};

package/dist/utilities/workerRequests.js

@@ -8,24 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateApiKey = exports.getChecklist = exports.createAdminUser = exports.readGlobalUser = exports.deleteGlobalUser = exports.saveGlobalUser = exports.allGlobalUsers = exports.removeAppFromUserRoles = exports.getGlobalSelf = exports.sendSmtpEmail = exports.request = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const environment_1 = __importDefault(require("../environment"));
-const index_1 = require("./index");
-const backend_core_1 = require("@budibase/backend-core");
-const global_1 = require("./global");
+const fetch = require("node-fetch");
+const env = require("../environment");
+const { checkSlashesInUrl } = require("./index");
+const { getProdAppID } = require("@budibase/backend-core/db");
+const { updateAppRole } = require("./global");
+const { Headers } = require("@budibase/backend-core/constants");
+const { getTenantId, isTenantIdSet } = require("@budibase/backend-core/tenancy");
 function request(ctx, request) {
     if (!request.headers) {
         request.headers = {};
     }
     if (!ctx) {
-        request.headers[backend_core_1.constants.Header.API_KEY] = environment_1.default.INTERNAL_API_KEY;
-        if (backend_core_1.tenancy.isTenantIdSet()) {
-            request.headers[backend_core_1.constants.Header.TENANT_ID] = backend_core_1.tenancy.getTenantId();
+        request.headers[Headers.API_KEY] = env.INTERNAL_API_KEY;
+        if (isTenantIdSet()) {
+            request.headers[Headers.TENANT_ID] = getTenantId();
         }
     }
     if (request.body && Object.keys(request.body).length > 0) {
@@ -43,7 +40,6 @@ function request(ctx, request) {
     }
     return request;
 }
-exports.request = request;
 function checkResponse(response, errorMsg, { ctx } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         if (response.status !== 200) {
@@ -65,105 +61,76 @@ function checkResponse(response, errorMsg, { ctx } = {}) {
         return response.json();
     });
 }
+exports.request = request;
 // have to pass in the tenant ID as this could be coming from an automation
-function sendSmtpEmail(to, from, subject, contents, cc, bcc, automation) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // tenant ID will be set in header
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/email/send`), request(undefined, {
-            method: "POST",
-            body: {
-                email: to,
-                from,
-                contents,
-                subject,
-                cc,
-                bcc,
-                purpose: "custom",
-                automation,
-            },
-        }));
-        return checkResponse(response, "send email");
-    });
-}
-exports.sendSmtpEmail = sendSmtpEmail;
-function getGlobalSelf(ctx, appId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const endpoint = `/api/global/self`;
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + endpoint), 
-        // we don't want to use API key when getting self
-        request(ctx, { method: "GET" }));
-        let json = yield checkResponse(response, "get self globally", { ctx });
-        if (appId) {
-            json = (0, global_1.updateAppRole)(json);
-        }
-        return json;
-    });
-}
-exports.getGlobalSelf = getGlobalSelf;
-function removeAppFromUserRoles(ctx, appId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const prodAppId = backend_core_1.db.getProdAppID(appId);
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/roles/${prodAppId}`), request(ctx, {
-            method: "DELETE",
-        }));
-        return checkResponse(response, "remove app role");
-    });
-}
-exports.removeAppFromUserRoles = removeAppFromUserRoles;
-function allGlobalUsers(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users"), 
-        // we don't want to use API key when getting self
-        request(ctx, { method: "GET" }));
-        return checkResponse(response, "get users", { ctx });
-    });
-}
-exports.allGlobalUsers = allGlobalUsers;
-function saveGlobalUser(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users"), 
-        // we don't want to use API key when getting self
-        request(ctx, { method: "POST", body: ctx.request.body }));
-        return checkResponse(response, "save user", { ctx });
-    });
-}
-exports.saveGlobalUser = saveGlobalUser;
-function deleteGlobalUser(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
-        // we don't want to use API key when getting self
-        request(ctx, { method: "DELETE" }));
-        return checkResponse(response, "delete user", { ctx });
-    });
-}
-exports.deleteGlobalUser = deleteGlobalUser;
-function readGlobalUser(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
-        // we don't want to use API key when getting self
-        request(ctx, { method: "GET" }));
-        return checkResponse(response, "get user", { ctx });
-    });
-}
-exports.readGlobalUser = readGlobalUser;
-function createAdminUser(email, password, tenantId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users/init"), request(undefined, { method: "POST", body: { email, password, tenantId } }));
-        return checkResponse(response, "create admin user");
-    });
-}
-exports.createAdminUser = createAdminUser;
-function getChecklist() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/configs/checklist"), request(undefined, { method: "GET" }));
-        return checkResponse(response, "get checklist");
-    });
-}
-exports.getChecklist = getChecklist;
-function generateApiKey(userId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/self/api_key"), request(undefined, { method: "POST", body: { userId } }));
-        return checkResponse(response, "generate API key");
-    });
-}
-exports.generateApiKey = generateApiKey;
+exports.sendSmtpEmail = (to, from, subject, contents, cc, bcc, automation) => __awaiter(void 0, void 0, void 0, function* () {
+    // tenant ID will be set in header
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/email/send`), request(null, {
+        method: "POST",
+        body: {
+            email: to,
+            from,
+            contents,
+            subject,
+            cc,
+            bcc,
+            purpose: "custom",
+            automation,
+        },
+    }));
+    return checkResponse(response, "send email");
+});
+exports.getGlobalSelf = (ctx, appId = null) => __awaiter(void 0, void 0, void 0, function* () {
+    const endpoint = `/api/global/self`;
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + endpoint), 
+    // we don't want to use API key when getting self
+    request(ctx, { method: "GET" }));
+    let json = yield checkResponse(response, "get self globally", { ctx });
+    if (appId) {
+        json = updateAppRole(json);
+    }
+    return json;
+});
+exports.removeAppFromUserRoles = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
+    const prodAppId = getProdAppID(appId);
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/roles/${prodAppId}`), request(ctx, {
+        method: "DELETE",
+    }));
+    return checkResponse(response, "remove app role");
+});
+exports.allGlobalUsers = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users"), 
+    // we don't want to use API key when getting self
+    request(ctx, { method: "GET" }));
+    return checkResponse(response, "get users", { ctx });
+});
+exports.saveGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users"), 
+    // we don't want to use API key when getting self
+    request(ctx, { method: "POST", body: ctx.request.body }));
+    return checkResponse(response, "save user", { ctx });
+});
+exports.deleteGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
+    // we don't want to use API key when getting self
+    request(ctx, { method: "DELETE" }));
+    return checkResponse(response, "delete user", { ctx, body: ctx.request.body });
+});
+exports.readGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
+    // we don't want to use API key when getting self
+    request(ctx, { method: "GET" }));
+    return checkResponse(response, "get user", { ctx });
+});
+exports.createAdminUser = (email, password, tenantId) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users/init"), request(null, { method: "POST", body: { email, password, tenantId } }));
+    return checkResponse(response, "create admin user");
+});
+exports.getChecklist = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"), request(null, { method: "GET" }));
+    return checkResponse(response, "get checklist");
+});
+exports.generateApiKey = (userId) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/self/api_key"), request(null, { method: "POST", body: { userId } }));
+    return checkResponse(response, "generate API key");
+});

package/dist/watch.js

@@ -41,6 +41,7 @@ const env = __importStar(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
+const constants_1 = require("@budibase/backend-core/constants");
 const plugin_1 = require("./api/controllers/plugin");
 function watch() {
     const watchPath = path_1.default.join(env.PLUGINS_DIR, "./**/*.tar.gz");
@@ -59,7 +60,7 @@ function watch() {
         if (!(path === null || path === void 0 ? void 0 : path.endsWith(".tar.gz")) || !fs_1.default.existsSync(path)) {
             return;
         }
-        yield backend_core_1.tenancy.doInTenant(backend_core_1.constants.DEFAULT_TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.tenancy.doInTenant(constants_1.DEFAULT_TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
             try {
                 const split = path.split("/");
                 const name = split[split.length - 1];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.32-alpha.7",
+  "version": "2.1.32",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -36,6 +36,40 @@
     "env:account:enable": "node scripts/account.js enable",
     "env:account:disable": "node scripts/account.js disable"
   },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
+      "@budibase/backend-core": "<rootDir>/../backend-core/src",
+      "@budibase/types": "<rootDir>/../types/src"
+    },
+    "setupFiles": [
+      "./scripts/jestSetup.js"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.js",
+      "!**/node_modules/**",
+      "!src/db/views/*.js",
+      "!src/api/controllers/deploy/**/*.js",
+      "!src/*.js",
+      "!src/api/controllers/static/**/*",
+      "!src/db/dynamoClient.js",
+      "!src/utilities/usageQuota.js",
+      "!src/api/routes/tests/**/*",
+      "!src/db/tests/**/*",
+      "!src/tests/**/*",
+      "!src/automations/tests/**/*",
+      "!src/utilities/fileProcessor.js",
+      "!src/utilities/fileSystem/**/*",
+      "!src/utilities/redis.js"
+    ],
+    "coverageReporters": [
+      "lcov",
+      "json",
+      "clover"
+    ]
+  },
   "keywords": [
     "budibase"
   ],
@@ -43,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.1.32-alpha.7",
-    "@budibase/client": "2.1.32-alpha.7",
-    "@budibase/pro": "2.1.32-alpha.6",
-    "@budibase/string-templates": "2.1.32-alpha.7",
-    "@budibase/types": "2.1.32-alpha.7",
+    "@budibase/backend-core": "^2.1.32",
+    "@budibase/client": "^2.1.32",
+    "@budibase/pro": "2.1.31",
+    "@budibase/string-templates": "^2.1.32",
+    "@budibase/types": "^2.1.32",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -145,7 +179,7 @@
     "eslint": "6.8.0",
     "ioredis-mock": "7.2.0",
     "is-wsl": "2.2.0",
-    "jest": "28.1.1",
+    "jest": "27.5.1",
     "jest-openapi": "0.14.2",
     "nodemon": "2.0.15",
     "openapi-types": "9.3.1",
@@ -156,14 +190,14 @@
     "supertest": "4.0.2",
     "swagger-jsdoc": "6.1.0",
     "timekeeper": "2.2.0",
-    "ts-jest": "28.0.4",
-    "ts-node": "10.8.1",
+    "ts-jest": "27.1.3",
+    "ts-node": "10.5.0",
     "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3",
+    "typescript": "4.6.2",
     "update-dotenv": "1.1.1"
   },
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "3fc0138e8629e9f53c4f81928d764e9543c0cc76"
+  "gitHead": "e2edbced82903f7225429fe2a9d770de073356f3"
 }

package/scripts/exportAppTemplate.js

@@ -3,7 +3,7 @@ const yargs = require("yargs")
 const fs = require("fs")
 const { join } = require("path")
 require("../src/db").init()
-const { db: dbCore } = require("@budibase/backend-core")
+const { doWithDB } = require("@budibase/backend-core/db")
 // load environment
 const env = require("../src/environment")
 const {
@@ -48,7 +48,7 @@ yargs
       const writeStream = fs.createWriteStream(join(exportPath, "dump.text"))
       // perform couch dump
 
-      await dbCore.doWithDB(appId, async db => {
+      await doWithDB(appId, async db => {
         return db.dump(writeStream, {
           filter: doc =>
             !(

package/{src/tests/jestSetup.ts → scripts/jestSetup.js}

@@ -1,5 +1,5 @@
 const { tmpdir } = require("os")
-import env from "../environment"
+const env = require("../src/environment")
 
 env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
@@ -8,11 +8,8 @@ env._set("CLIENT_ID", "test-client-id")
 env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
 env._set("LOG_LEVEL", "silent")
 env._set("PORT", 0)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")
 
-import { mocks } from "@budibase/backend-core/tests"
+const { mocks } = require("@budibase/backend-core/tests")
 
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
@@ -20,9 +17,3 @@ const tk = require("timekeeper")
 tk.freeze(mocks.date.MOCK_DATE)
 
 global.console.log = jest.fn() // console.log are ignored in tests
-
-if (!process.env.CI) {
-  // set a longer timeout in dev for debugging
-  // 100 seconds
-  jest.setTimeout(100000)
-}

package/scripts/localdomain.js

@@ -2,36 +2,6 @@
 const updateDotEnv = require("update-dotenv")
 
 const arg = process.argv.slice(2)[0]
-const isEnable = arg === "enable"
-
-let domain = process.argv.slice(2)[1]
-if (!domain) {
-  domain = "local.com"
-}
-
-const getAccountPortalUrl = () => {
-  if (isEnable) {
-    return `http://account.${domain}:10001`
-  } else {
-    return `http://localhost:10001`
-  }
-}
-
-const getBudibaseUrl = () => {
-  if (isEnable) {
-    return `http://${domain}:10000`
-  } else {
-    return `http://localhost:10000`
-  }
-}
-
-const getCookieDomain = () => {
-  if (isEnable) {
-    return `.${domain}`
-  } else {
-    return ""
-  }
-}
 
 /**
  * For testing multi tenancy sub domains locally.
@@ -46,7 +16,9 @@ const getCookieDomain = () => {
  * 127.0.0.1   t2.local.com
  */
 updateDotEnv({
-  ACCOUNT_PORTAL_URL: getAccountPortalUrl(),
-  COOKIE_DOMAIN: getCookieDomain(),
-  PLATFORM_URL: getBudibaseUrl(),
-}).then(() => console.log("Updated server!"))
+  ACCOUNT_PORTAL_URL:
+    arg === "enable"
+      ? "http://account.local.com:10001"
+      : "http://localhost:10001",
+  COOKIE_DOMAIN: arg === "enable" ? ".local.com" : "",
+}).then(() => console.log("Updated worker!"))