Merge branch 'master' of github.com:Budibase/budibase into dropdown-components

packages/server/src/api/index.js

@@ -3,6 +3,7 @@ const authenticated = require("../middleware/authenticated")
 const compress = require("koa-compress")
 const zlib = require("zlib")
 const { budibaseAppsDir } = require("../utilities/budibaseDir")
+const { isDev } = require("../utilities")
 const {
   authRoutes,
   pageRoutes,
@@ -45,10 +46,7 @@ router
       jwtSecret: env.JWT_SECRET,
       useAppRootPath: true,
     }
-    ctx.isDev =
+    ctx.isDev = isDev()
-      process.env.NODE_ENV !== "production" &&
-      process.env.NODE_ENV !== "jest" &&
-      process.env.NODE_ENV !== "cypress"
     await next()
   })
   .use("/health", ctx => (ctx.status = 200))

packages/server/src/environment.js

@@ -1,3 +1,17 @@
+const { resolve, join } = require("./utilities/centralPath")
+const { homedir } = require("os")
+const { app } = require("electron")
+
+let LOADED = false
+
+if (!LOADED) {
+  const homeDir = app ? app.getPath("home") : homedir()
+  const budibaseDir = join(homeDir, ".budibase")
+  process.env.BUDIBASE_DIR = budibaseDir
+  require("dotenv").config({ path: resolve(budibaseDir, ".env") })
+  LOADED = true
+}
+
 module.exports = {
   CLIENT_ID: process.env.CLIENT_ID,
   NODE_ENV: process.env.NODE_ENV,

packages/server/src/index.js

@@ -1,18 +1,18 @@
-const { resolve, join } = require("./utilities/centralPath")
+const { budibaseTempDir } = require("./utilities/budibaseDir")
-const { homedir } = require("os")
+const { isDev } = require("./utilities")
-const { app } = require("electron")
+
 const fixPath = require("fix-path")
+const fs = require("fs")
 
 async function runServer() {
-  const homeDir = app ? app.getPath("home") : homedir()
+  if (isDev() && !fs.existsSync(budibaseTempDir())) {
-
+    console.error(
-  const budibaseDir = join(homeDir, ".budibase")
+      "Please run a build before attempting to run server independently to fill 'tmp' directory."
-  process.env.BUDIBASE_DIR = budibaseDir
+    )
+    process.exit(-1)
+  }
 
   fixPath()
-
-  require("dotenv").config({ path: resolve(budibaseDir, ".env") })
-
   require("./app")
 }
 

packages/server/src/utilities/index.js

@@ -1 +1,9 @@
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+exports.isDev = () => {
+  return (
+    process.env.NODE_ENV !== "production" &&
+    process.env.NODE_ENV !== "jest" &&
+    process.env.NODE_ENV !== "cypress"
+  )
+}