@budibase/server 2.7.5-alpha.0 → 2.7.7-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.7.5-alpha.0",
+  "version": "2.7.7-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -46,12 +46,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.7.5-alpha.0",
-    "@budibase/client": "2.7.5-alpha.0",
-    "@budibase/pro": "2.7.5-alpha.0",
-    "@budibase/shared-core": "2.7.5-alpha.0",
-    "@budibase/string-templates": "2.7.5-alpha.0",
-    "@budibase/types": "2.7.5-alpha.0",
+    "@budibase/backend-core": "2.7.7-alpha.0",
+    "@budibase/client": "2.7.7-alpha.0",
+    "@budibase/pro": "2.7.7-alpha.0",
+    "@budibase/shared-core": "2.7.7-alpha.0",
+    "@budibase/string-templates": "2.7.7-alpha.0",
+    "@budibase/types": "2.7.7-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
       }
     }
   },
-  "gitHead": "73e0a61690d414ffbd592f4cd5765897597408d7"
+  "gitHead": "eb71a172e7bd9fe46a6527763787441b52d634db"
 }

package/src/api/controllers/static/index.ts

@@ -1,6 +1,6 @@
 require("svelte/register")
 
-import { resolve, join } from "../../../utilities/centralPath"
+import { join } from "../../../utilities/centralPath"
 const uuid = require("uuid")
 import { ObjectStoreBuckets } from "../../../constants"
 import { processString } from "@budibase/string-templates"
@@ -49,7 +49,7 @@ export const toggleBetaUiFeature = async function (ctx: any) {
     return
   }
 
-  let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui")
+  let builderPath = join(TOP_LEVEL_PATH, "new_design_ui")
 
   // // download it from S3
   if (!fs.existsSync(builderPath)) {
@@ -67,7 +67,7 @@ export const toggleBetaUiFeature = async function (ctx: any) {
 }
 
 export const serveBuilder = async function (ctx: any) {
-  const builderPath = resolve(TOP_LEVEL_PATH, "builder")
+  const builderPath = join(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
 }
 

package/src/environment.ts

@@ -98,7 +98,8 @@ const environment = {
   isInThread: () => {
     return process.env.FORKED_PROCESS
   },
-  TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH,
+  TOP_LEVEL_PATH:
+    process.env.TOP_LEVEL_PATH || process.env.SERVER_TOP_LEVEL_PATH,
 }
 
 // threading can cause memory issues with node-ts in development

package/src/utilities/fileSystem/filesystem.ts

@@ -1,14 +1,14 @@
 import { PathLike } from "fs"
 import fs from "fs"
 import { budibaseTempDir } from "../budibaseDir"
-import { join } from "path"
+import { resolve, join } from "path"
 import env from "../../environment"
 import tar from "tar"
 import environment from "../../environment"
 const uuid = require("uuid/v4")
 
 export const TOP_LEVEL_PATH =
-  environment.TOP_LEVEL_PATH || join(__dirname, "..", "..", "..")
+  environment.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
 
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.