@budibase/server 2.2.12-alpha.5 → 2.2.13

package/dist/utilities/fileSystem/clientLibrary.js

@@ -19,7 +19,7 @@ const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
 const centralPath_1 = require("../centralPath");
 const environment_1 = __importDefault(require("../../environment"));
-const filesystem_1 = require("./filesystem");
+const TOP_LEVEL_PATH = (0, path_1.join)(__dirname, "..", "..", "..");
 /**
  * Client library paths in the object store:
  * Previously, the entire client library package was downloaded from NPM
@@ -93,8 +93,8 @@ function updateClientLibrary(appId) {
         }
         else {
             // Load the bundled version in prod
-            manifest = (0, centralPath_1.resolve)(filesystem_1.TOP_LEVEL_PATH, "client", "manifest.json");
-            client = (0, centralPath_1.resolve)(filesystem_1.TOP_LEVEL_PATH, "client", "budibase-client.js");
+            manifest = (0, centralPath_1.resolve)(TOP_LEVEL_PATH, "client", "manifest.json");
+            client = (0, centralPath_1.resolve)(TOP_LEVEL_PATH, "client", "budibase-client.js");
         }
         // Upload latest manifest and client library
         const manifestUpload = backend_core_1.objectStore.streamUpload(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "manifest.json"), fs_1.default.createReadStream(manifest), {

package/dist/utilities/fileSystem/index.js

@@ -1,21 +1,345 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
-__exportStar(require("./app"), exports);
-__exportStar(require("./clientLibrary"), exports);
-__exportStar(require("./filesystem"), exports);
-__exportStar(require("./plugin"), exports);
-__exportStar(require("./template"), exports);
+exports.deleteFolderFileSystem = exports.findFileRec = exports.getDatasourcePlugin = exports.getPluginMetadata = exports.extractTarball = exports.createTempFolder = exports.cleanup = exports.readFileSync = exports.getComponentLibraryManifest = exports.downloadTemplate = exports.deleteApp = exports.createApp = exports.sendTempFile = exports.stringToFileStream = exports.storeTempFile = exports.streamFile = exports.apiFileReturn = exports.loadHandlebarsFile = exports.init = exports.NODE_MODULES_PATH = exports.TOP_LEVEL_PATH = void 0;
+const budibaseDir_1 = require("../budibaseDir");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
+const backend_core_1 = require("@budibase/backend-core");
+const constants_1 = require("../../constants");
+const clientLibrary_1 = require("./clientLibrary");
+const __1 = require("../");
+const environment_1 = __importDefault(require("../../environment"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const uuid = require("uuid/v4");
+const tar = require("tar");
+exports.TOP_LEVEL_PATH = (0, path_1.join)(__dirname, "..", "..", "..");
+exports.NODE_MODULES_PATH = (0, path_1.join)(exports.TOP_LEVEL_PATH, "node_modules");
+const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
+/**
+ * The single stack system (Cloud and Builder) should not make use of the file system where possible,
+ * this file handles all of the file access for the system with the intention of limiting it all to one
+ * place. Keeping all of this logic in one place means that when we need to do file system access (like
+ * downloading a package or opening a temporary file) in can be done in way that we can confirm it shouldn't
+ * be done through an object store instead.
+ */
+/**
+ * Upon first startup of instance there may not be everything we need in tmp directory, set it up.
+ */
+function init() {
+    const tempDir = (0, budibaseDir_1.budibaseTempDir)();
+    if (!fs_1.default.existsSync(tempDir)) {
+        // some test cases fire this quickly enough that
+        // synchronous cases can end up here at the same time
+        try {
+            fs_1.default.mkdirSync(tempDir);
+        }
+        catch (err) {
+            if (!err || err.code !== "EEXIST") {
+                throw err;
+            }
+        }
+    }
+    const clientLibPath = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "budibase-client.js");
+    if (environment_1.default.isTest() && !fs_1.default.existsSync(clientLibPath)) {
+        fs_1.default.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
+    }
+}
+exports.init = init;
+/**
+ * Checks if the system is currently in development mode and if it is makes sure
+ * everything required to function is ready.
+ */
+exports.checkDevelopmentEnvironment = () => {
+    if (!environment_1.default.isDev() || environment_1.default.isTest()) {
+        return;
+    }
+    if (!fs_1.default.existsSync((0, budibaseDir_1.budibaseTempDir)())) {
+        fs_1.default.mkdirSync((0, budibaseDir_1.budibaseTempDir)());
+    }
+    let error;
+    if (!fs_1.default.existsSync((0, path_1.join)(process.cwd(), ".env"))) {
+        error = "Must run via yarn once to generate environment.";
+    }
+    if (error) {
+        console.error(error);
+        process.exit(-1);
+    }
+};
+/**
+ * Used to retrieve a handlebars file from the system which will be used as a template.
+ * This is allowable as the template handlebars files should be static and identical across
+ * the cluster.
+ * @param {string} path The path to the handlebars file which is to be loaded.
+ * @returns {string} The loaded handlebars file as a string - loaded as utf8.
+ */
+function loadHandlebarsFile(path) {
+    return fs_1.default.readFileSync(path, "utf8");
+}
+exports.loadHandlebarsFile = loadHandlebarsFile;
+/**
+ * When return a file from the API need to write the file to the system temporarily so we
+ * can create a read stream to send.
+ * @param {string} contents the contents of the file which is to be returned from the API.
+ * @param {string} encoding the encoding of the file to return (utf8 default)
+ * @return {Object} the read stream which can be put into the koa context body.
+ */
+function apiFileReturn(contents, encoding = "utf8") {
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, contents, { encoding });
+    return fs_1.default.createReadStream(path, { encoding });
+}
+exports.apiFileReturn = apiFileReturn;
+function streamFile(path) {
+    return fs_1.default.createReadStream(path);
+}
+exports.streamFile = streamFile;
+/**
+ * Writes the provided contents to a temporary file, which can be used briefly.
+ * @param {string} fileContents contents which will be written to a temp file.
+ * @return {string} the path to the temp file.
+ */
+function storeTempFile(fileContents) {
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, fileContents);
+    return path;
+}
+exports.storeTempFile = storeTempFile;
+/**
+ * Utility function for getting a file read stream - a simple in memory buffered read
+ * stream doesn't work for pouchdb.
+ */
+function stringToFileStream(contents) {
+    const path = exports.storeTempFile(contents);
+    return fs_1.default.createReadStream(path);
+}
+exports.stringToFileStream = stringToFileStream;
+/**
+ * Creates a temp file and returns it from the API.
+ * @param {string} fileContents the contents to be returned in file.
+ */
+function sendTempFile(fileContents) {
+    const path = exports.storeTempFile(fileContents);
+    return fs_1.default.createReadStream(path);
+}
+exports.sendTempFile = sendTempFile;
+/**
+ * Uploads the latest client library to the object store.
+ * @param {string} appId The ID of the app which is being created.
+ * @return {Promise<void>} once promise completes app resources should be ready in object store.
+ */
+function createApp(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield (0, clientLibrary_1.updateClientLibrary)(appId);
+    });
+}
+exports.createApp = createApp;
+/**
+ * Removes all of the assets created for an app in the object store.
+ * @param {string} appId The ID of the app which is being deleted.
+ * @return {Promise<void>} once promise completes the app resources will be removed from object store.
+ */
+function deleteApp(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.objectStore.deleteFolder(constants_1.ObjectStoreBuckets.APPS, `${appId}/`);
+    });
+}
+exports.deleteApp = deleteApp;
+/**
+ * Retrieves a template and pipes it to minio as well as making it available temporarily.
+ * @param {string} type The type of template which is to be retrieved.
+ * @param name
+ * @return {Promise<*>}
+ */
+function downloadTemplate(type, name) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
+        const templateUrl = `https://${DEFAULT_TEMPLATES_BUCKET}/templates/${type}/${name}.tar.gz`;
+        return backend_core_1.objectStore.downloadTarball(templateUrl, constants_1.ObjectStoreBuckets.TEMPLATES, type);
+    });
+}
+exports.downloadTemplate = downloadTemplate;
+/**
+ * Retrieves component libraries from object store (or tmp symlink if in local)
+ */
+function getComponentLibraryManifest(library) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = backend_core_1.context.getAppId();
+        const filename = "manifest.json";
+        /* istanbul ignore next */
+        // when testing in cypress and so on we need to get the package
+        // as the environment may not be fully fleshed out for dev or prod
+        if (environment_1.default.isTest()) {
+            library = library.replace("standard-components", "client");
+            const lib = library.split("/")[1];
+            const path = require.resolve(library).split(lib)[0];
+            return require((0, path_1.join)(path, lib, filename));
+        }
+        else if (environment_1.default.isDev()) {
+            const path = (0, path_1.join)(exports.NODE_MODULES_PATH, "@budibase", "client", filename);
+            // always load from new so that updates are refreshed
+            delete require.cache[require.resolve(path)];
+            return require(path);
+        }
+        if (!appId) {
+            throw new Error("No app ID found - cannot get component libraries");
+        }
+        let resp;
+        let path;
+        try {
+            // Try to load the manifest from the new file location
+            path = (0, path_1.join)(appId, filename);
+            resp = yield backend_core_1.objectStore.retrieve(constants_1.ObjectStoreBuckets.APPS, path);
+        }
+        catch (error) {
+            console.error(`component-manifest-objectstore=failed appId=${appId} path=${path}`, error);
+            // Fallback to loading it from the old location for old apps
+            path = (0, path_1.join)(appId, "node_modules", library, "package", filename);
+            resp = yield backend_core_1.objectStore.retrieve(constants_1.ObjectStoreBuckets.APPS, path);
+        }
+        if (typeof resp !== "string") {
+            resp = resp.toString("utf8");
+        }
+        return JSON.parse(resp);
+    });
+}
+exports.getComponentLibraryManifest = getComponentLibraryManifest;
+/**
+ * All file reads come through here just to make sure all of them make sense
+ * allows a centralised location to check logic is all good.
+ */
+function readFileSync(filepath, options = "utf8") {
+    return fs_1.default.readFileSync(filepath, { encoding: options });
+}
+exports.readFileSync = readFileSync;
+/**
+ * Given a set of app IDs makes sure file system is cleared of any of their temp info.
+ */
+function cleanup(appIds) {
+    for (let appId of appIds) {
+        const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), appId);
+        if (fs_1.default.existsSync(path)) {
+            fs_1.default.rmdirSync(path, { recursive: true });
+        }
+    }
+}
+exports.cleanup = cleanup;
+function createTempFolder(item) {
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), item);
+    try {
+        // remove old tmp directories automatically - don't combine
+        if (fs_1.default.existsSync(path)) {
+            fs_1.default.rmSync(path, { recursive: true, force: true });
+        }
+        fs_1.default.mkdirSync(path);
+    }
+    catch (err) {
+        throw new Error(`Path cannot be created: ${err.message}`);
+    }
+    return path;
+}
+exports.createTempFolder = createTempFolder;
+function extractTarball(fromFilePath, toPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield tar.extract({
+            file: fromFilePath,
+            C: toPath,
+        });
+    });
+}
+exports.extractTarball = extractTarball;
+function getPluginMetadata(path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let metadata = {};
+        try {
+            const pkg = fs_1.default.readFileSync((0, path_1.join)(path, "package.json"), "utf8");
+            const schema = fs_1.default.readFileSync((0, path_1.join)(path, "schema.json"), "utf8");
+            metadata.schema = JSON.parse(schema);
+            metadata.package = JSON.parse(pkg);
+            if (!metadata.package.name ||
+                !metadata.package.version ||
+                !metadata.package.description) {
+                throw new Error("package.json is missing one of 'name', 'version' or 'description'.");
+            }
+        }
+        catch (err) {
+            throw new Error(`Unable to process schema.json/package.json in plugin. ${err.message}`);
+        }
+        return { metadata, directory: path };
+    });
+}
+exports.getPluginMetadata = getPluginMetadata;
+function getDatasourcePlugin(name, url, hash) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
+            fs_1.default.mkdirSync(DATASOURCE_PATH);
+        }
+        const filename = (0, path_1.join)(DATASOURCE_PATH, name);
+        const metadataName = `${filename}.bbmetadata`;
+        if (fs_1.default.existsSync(filename)) {
+            const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
+            // if hash is the same return the file, otherwise remove it and re-download
+            if (currentHash === hash) {
+                return require(filename);
+            }
+            else {
+                console.log(`Updating plugin: ${name}`);
+                delete require.cache[require.resolve(filename)];
+                fs_1.default.unlinkSync(filename);
+            }
+        }
+        const fullUrl = (0, __1.checkSlashesInUrl)(`${environment_1.default.MINIO_URL}/${constants_1.ObjectStoreBuckets.PLUGINS}/${url}`);
+        const response = yield (0, node_fetch_1.default)(fullUrl);
+        if (response.status === 200) {
+            const content = yield response.text();
+            fs_1.default.writeFileSync(filename, content);
+            fs_1.default.writeFileSync(metadataName, hash);
+            return require(filename);
+        }
+        else {
+            throw new Error(`Unable to retrieve plugin - reason: ${yield response.text()}`);
+        }
+    });
+}
+exports.getDatasourcePlugin = getDatasourcePlugin;
+/**
+ * Find for a file recursively from start path applying filter, return first match
+ */
+function findFileRec(startPath, filter) {
+    if (!fs_1.default.existsSync(startPath)) {
+        return;
+    }
+    const files = fs_1.default.readdirSync(startPath);
+    for (let i = 0, len = files.length; i < len; i++) {
+        const filename = (0, path_1.join)(startPath, files[i]);
+        const stat = fs_1.default.lstatSync(filename);
+        if (stat.isDirectory()) {
+            return exports.findFileRec(filename, filter);
+        }
+        else if (filename.endsWith(filter)) {
+            return filename;
+        }
+    }
+}
+exports.findFileRec = findFileRec;
+/**
+ * Remove a folder which is not empty from the file system
+ */
+function deleteFolderFileSystem(path) {
+    if (!fs_1.default.existsSync(path)) {
+        return;
+    }
+    fs_1.default.rmSync(path, { recursive: true, force: true });
+}
+exports.deleteFolderFileSystem = deleteFolderFileSystem;

package/dist/utilities/index.js

@@ -12,8 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isQsTrue = exports.convertBookmark = exports.formatBytes = exports.stringToReadStream = exports.escapeDangerousCharacters = exports.deleteEntityMetadata = exports.saveEntityMetadata = exports.updateEntityMetadata = exports.checkSlashesInUrl = exports.removeFromArray = exports.NUMBER_REGEX = exports.isDev = exports.wait = void 0;
+exports.isQsTrue = exports.convertBookmark = exports.formatBytes = exports.stringToReadStream = exports.escapeDangerousCharacters = exports.deleteEntityMetadata = exports.saveEntityMetadata = exports.updateEntityMetadata = exports.attachmentsRelativeURL = exports.clientLibraryPath = exports.objectStoreUrl = exports.checkSlashesInUrl = exports.removeFromArray = exports.NUMBER_REGEX = exports.isDev = exports.wait = void 0;
 const environment_1 = __importDefault(require("../environment"));
+const constants_1 = require("../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../db/utils");
 const stream_1 = __importDefault(require("stream"));
@@ -42,6 +43,48 @@ function checkSlashesInUrl(url) {
     return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2");
 }
 exports.checkSlashesInUrl = checkSlashesInUrl;
+/**
+ * Gets the address of the object store, depending on whether self hosted or in cloud.
+ * @return {string} The base URL of the object store (MinIO or S3).
+ */
+function objectStoreUrl() {
+    if (environment_1.default.SELF_HOSTED || environment_1.default.MINIO_URL) {
+        // can use a relative url for this as all goes through the proxy (this is hosted in minio)
+        return constants_1.OBJ_STORE_DIRECTORY;
+    }
+    else {
+        return environment_1.default.CDN_URL;
+    }
+}
+exports.objectStoreUrl = objectStoreUrl;
+/**
+ * In production the client library is stored in the object store, however in development
+ * we use the symlinked version produced by lerna, located in node modules. We link to this
+ * via a specific endpoint (under /api/assets/client).
+ * @param {string} appId In production we need the appId to look up the correct bucket, as the
+ * version of the client lib may differ between apps.
+ * @param {string} version The version to retrieve.
+ * @return {string} The URL to be inserted into appPackage response or server rendered
+ * app index file.
+ */
+function clientLibraryPath(appId, version) {
+    if (environment_1.default.isProd()) {
+        let url = `${objectStoreUrl()}/${backend_core_1.objectStore.sanitizeKey(appId)}/budibase-client.js`;
+        // append app version to bust the cache
+        if (version) {
+            url += `?v=${version}`;
+        }
+        return url;
+    }
+    else {
+        return `/api/assets/client`;
+    }
+}
+exports.clientLibraryPath = clientLibraryPath;
+function attachmentsRelativeURL(attachmentKey) {
+    return checkSlashesInUrl(`${objectStoreUrl()}/${attachmentKey}`);
+}
+exports.attachmentsRelativeURL = attachmentsRelativeURL;
 function updateEntityMetadata(type, entityId, updateFn) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();

package/dist/utilities/plugins.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichPluginURLs = void 0;
+const environment_1 = __importDefault(require("../environment"));
+const pro_1 = require("@budibase/pro");
+const backend_core_1 = require("@budibase/backend-core");
+function enrichPluginURLs(plugins) {
+    if (!plugins || !plugins.length) {
+        return [];
+    }
+    return plugins.map(plugin => {
+        const cloud = !environment_1.default.SELF_HOSTED;
+        const bucket = backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS;
+        const jsFileName = "plugin.min.js";
+        // In self host we need to prefix the path, as the bucket name is not part
+        // of the bucket path. In cloud, it's already part of the bucket path.
+        let jsUrl = cloud ? `${environment_1.default.CDN_URL}/` : `/${bucket}/`;
+        jsUrl += pro_1.plugins.getBucketPath(plugin.name);
+        jsUrl += jsFileName;
+        return Object.assign(Object.assign({}, plugin), { jsUrl });
+    });
+}
+exports.enrichPluginURLs = enrichPluginURLs;

package/dist/utilities/rowProcessor/index.js

@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanupAttachments = exports.outputProcessing = exports.inputProcessing = exports.coerce = exports.processAutoColumn = void 0;
 const linkRows = __importStar(require("../../db/linkedRows"));
 const constants_1 = require("../../constants");
+const index_1 = require("../index");
 const utils_1 = require("./utils");
 const constants_2 = require("../../constants");
 const backend_core_1 = require("@budibase/backend-core");
@@ -171,15 +172,6 @@ function inputProcessing(user, table, row, opts) {
         else {
             clonedRow[key] = coerce(value, field.type);
         }
-        // remove any attachment urls, they are generated on read
-        if (field.type === constants_1.FieldTypes.ATTACHMENT) {
-            const attachments = clonedRow[key];
-            if (attachments === null || attachments === void 0 ? void 0 : attachments.length) {
-                attachments.forEach((attachment) => {
-                    delete attachment.url;
-                });
-            }
-        }
     }
     if (!clonedRow._id || !clonedRow._rev) {
         clonedRow._id = row._id;
@@ -209,7 +201,7 @@ function outputProcessing(table, rows, opts = { squash: true }) {
         let enriched = yield linkRows.attachFullLinkedDocs(table, rows);
         // process formulas
         enriched = (0, utils_1.processFormulas)(table, enriched, { dynamic: true });
-        // set the attachments URLs
+        // update the attachments URL depending on hosting
         for (let [property, column] of Object.entries(table.schema)) {
             if (column.type === constants_1.FieldTypes.ATTACHMENT) {
                 for (let row of enriched) {
@@ -217,7 +209,7 @@ function outputProcessing(table, rows, opts = { squash: true }) {
                         continue;
                     }
                     row[property].forEach((attachment) => {
-                        attachment.url = backend_core_1.objectStore.getAppFileUrl(attachment.key);
+                        attachment.url = (0, index_1.attachmentsRelativeURL)(attachment.key);
                     });
                 }
             }
@@ -277,7 +269,7 @@ function cleanupAttachments(table, { row, rows, oldRow, oldTable, }) {
             }
         }
         if (files.length > 0) {
-            yield backend_core_1.objectStore.deleteFiles(constants_2.ObjectStoreBuckets.APPS, files);
+            return backend_core_1.objectStore.deleteFiles(constants_2.ObjectStoreBuckets.APPS, files);
         }
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.5",
+  "version": "2.2.13",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.2.12-alpha.5",
-    "@budibase/client": "2.2.12-alpha.5",
-    "@budibase/pro": "2.2.12-alpha.4",
-    "@budibase/string-templates": "2.2.12-alpha.5",
-    "@budibase/types": "2.2.12-alpha.5",
+    "@budibase/backend-core": "^2.2.13",
+    "@budibase/client": "^2.2.13",
+    "@budibase/pro": "2.2.12",
+    "@budibase/string-templates": "^2.2.13",
+    "@budibase/types": "^2.2.13",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -130,15 +130,13 @@
     "@types/ioredis": "4.28.10",
     "@types/jest": "27.5.1",
     "@types/koa": "2.13.4",
-    "@types/koa__router": "8.0.8",
+    "@types/koa__router": "8.0.11",
     "@types/lodash": "4.14.180",
     "@types/node": "14.18.20",
     "@types/node-fetch": "2.6.1",
     "@types/oracledb": "5.2.2",
     "@types/pouchdb": "6.4.0",
     "@types/redis": "4.0.11",
-    "@types/server-destroy": "1.0.1",
-    "@types/tar": "6.1.3",
     "@typescript-eslint/parser": "5.45.0",
     "apidoc": "0.50.4",
     "babel-jest": "27.5.1",
@@ -167,5 +165,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "1641ca6eacbaa560598d76801c2d4af1c3301f54"
+  "gitHead": "3d3c0d432f6be08367579f01c5142f9662981eee"
 }

package/scripts/dev/manage.js

@@ -2,6 +2,12 @@
 const compose = require("docker-compose")
 const path = require("path")
 const fs = require("fs")
+const isWsl = require("is-wsl")
+const { processStringSync } = require("@budibase/string-templates")
+
+function isLinux() {
+  return !isWsl && process.platform !== "darwin" && process.platform !== "win32"
+}
 
 // This script wraps docker-compose allowing you to manage your dev infrastructure with simple commands.
 const CONFIG = {
@@ -17,6 +23,16 @@ const Commands = {
 }
 
 async function init() {
+  // generate nginx file, always do this incase it has changed
+  const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
+  const nginxHbsPath = path.join(hostingPath, "nginx.dev.conf.hbs")
+  const nginxOutputPath = path.join(hostingPath, ".generated-nginx.dev.conf")
+  const contents = fs.readFileSync(nginxHbsPath, "utf8")
+  const config = {
+    address: isLinux() ? "172.17.0.1" : "host.docker.internal",
+  }
+  fs.writeFileSync(nginxOutputPath, processStringSync(contents, config))
+
   const envFilePath = path.join(process.cwd(), ".env")
   if (!fs.existsSync(envFilePath)) {
     const envFileJson = {