Merge branch 'master' into builder/consolidating-missing-code

packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte

@@ -40,7 +40,8 @@
 
   let panelDefinition = {}
 
-  $: panelDefinition = componentPropDefinition.properties && 
+  $: panelDefinition =
+    componentPropDefinition.properties &&
     componentPropDefinition.properties[selectedCategory.value]
 
   const onStyleChanged = store.setComponentStyle
@@ -105,6 +106,7 @@
         displayNameField={displayName}
         onChange={onPropChanged}
         screenOrPageInstance={$store.currentView !== "component" && $store.currentPreviewItem} />
+
     {:else if selectedCategory.value === 'events'}
       <EventsEditor component={componentInstance} />
     {/if}

packages/builder/src/components/userInterface/SettingsView.svelte

@@ -21,7 +21,6 @@
     data.target ? onChange(key, data.target.value) : onChange(key, data)
   }
 
-
   const screenDefinition = [
     { key: "description", label: "Description", control: Input },
     { key: "route", label: "Route", control: Input },
@@ -34,7 +33,6 @@
 
   $: isPage = screenOrPageInstance && screenOrPageInstance.favicon
   $: screenOrPageDefinition = isPage ? pageDefinition : screenDefinition
-
 </script>
 
 {#if screenOrPageInstance}
@@ -47,7 +45,7 @@
         {onChange}
         props={{ ...excludeProps(def, ['control', 'label']) }} />
   {/each}
-  <hr/>
+  <hr />
 {/if}
 
 {#if displayNameField}

packages/server/Dockerfile

@@ -0,0 +1,11 @@
+FROM node:12-alpine
+
+WORKDIR /app
+
+# copy files and install dependencies
+COPY . ./
+RUN yarn 
+
+EXPOSE 4001
+
+CMD ["yarn", "run:docker"]

packages/server/package.json

@@ -27,6 +27,7 @@
     "test:integration": "jest workflow --runInBand",
     "test:watch": "jest --watch",
     "initialise": "node ../cli/bin/budi init -b local -q",
+    "run:docker": "node src/index",
     "budi": "node ../cli/bin/budi",
     "dev:builder": "nodemon ../cli/bin/budi run",
     "electron": "electron src/electron.js",

packages/server/src/index.js

@@ -0,0 +1,13 @@
+const { resolve } = require("path")
+
+async function runServer() {
+  const budibaseDir = "~/.budibase"
+
+  process.env.BUDIBASE_DIR = resolve(budibaseDir)
+
+  const server = await require("./app")()
+  server.on("close", () => console.log("Server Closed"))
+  console.log(`Budibase running on ${JSON.stringify(server.address())}`)
+}
+
+runServer()