@budibase/server 2.1.14-alpha.0 → 2.1.14-alpha.2

package/dist/utilities/index.js

@@ -14,7 +14,6 @@ const { sanitizeKey } = require("@budibase/backend-core/objectStore");
 const { generateMetadataID } = require("../db/utils");
 const Readable = require("stream").Readable;
 const { getAppDB } = require("@budibase/backend-core/context");
-const BB_CDN = "https://cdn.budi.live";
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
 exports.isDev = env.isDev;
 exports.NUMBER_REGEX = /^[+-]?([0-9]*[.])?[0-9]+$/g;
@@ -44,7 +43,7 @@ exports.objectStoreUrl = () => {
         return OBJ_STORE_DIRECTORY;
     }
     else {
-        return BB_CDN;
+        return env.CDN_URL;
     }
 };
 /**

package/dist/utilities/plugins.js

@@ -12,7 +12,7 @@ exports.enrichPluginURLs = 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 ? "https://cdn.budi.live/" : `/${bucket}/`;
+        let jsUrl = cloud ? `${env.CDN_URL}/` : `/${bucket}/`;
         jsUrl += ProPlugins.getBucketPath(plugin.name);
         jsUrl += jsFileName;
         return Object.assign(Object.assign({}, plugin), { jsUrl });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.14-alpha.0",
+  "version": "2.1.14-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.1.14-alpha.0",
-    "@budibase/client": "2.1.14-alpha.0",
-    "@budibase/pro": "2.1.13",
-    "@budibase/string-templates": "2.1.14-alpha.0",
-    "@budibase/types": "2.1.14-alpha.0",
+    "@budibase/backend-core": "2.1.14-alpha.2",
+    "@budibase/client": "2.1.14-alpha.2",
+    "@budibase/pro": "2.1.14-alpha.1",
+    "@budibase/string-templates": "2.1.14-alpha.2",
+    "@budibase/types": "2.1.14-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "86daf059e2340d644dbc0563f1b929ce073114df"
+  "gitHead": "011b9616b3bf4742b7a6c0e6541933a7e5a4452b"
 }

package/src/environment.js

@@ -46,6 +46,7 @@ module.exports = {
   AWS_REGION: process.env.AWS_REGION,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  CDN_URL: process.env.CDN_URL || "https://cdn.budi.live",
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,

package/src/utilities/index.js

@@ -5,8 +5,6 @@ const { generateMetadataID } = require("../db/utils")
 const Readable = require("stream").Readable
 const { getAppDB } = require("@budibase/backend-core/context")
 
-const BB_CDN = "https://cdn.budi.live"
-
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 exports.isDev = env.isDev
@@ -40,7 +38,7 @@ exports.objectStoreUrl = () => {
     // can use a relative url for this as all goes through the proxy (this is hosted in minio)
     return OBJ_STORE_DIRECTORY
   } else {
-    return BB_CDN
+    return env.CDN_URL
   }
 }
 

package/src/utilities/plugins.js

@@ -13,7 +13,7 @@ exports.enrichPluginURLs = plugins => {
 
     // 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 ? "https://cdn.budi.live/" : `/${bucket}/`
+    let jsUrl = cloud ? `${env.CDN_URL}/` : `/${bucket}/`
     jsUrl += ProPlugins.getBucketPath(plugin.name)
     jsUrl += jsFileName
     return { ...plugin, jsUrl }