Merge pull request #515 from Budibase/path-bug

fix path bug

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

@@ -16,15 +16,12 @@
   const joinPath = join("/")
 
   const normalizedName = name =>
-    pipe(
+    pipe(name, [
-      name,
+      trimCharsStart("./"),
-      [
+      trimCharsStart("~/"),
-        trimCharsStart("./"),
+      trimCharsStart("../"),
-        trimCharsStart("~/"),
+      trimChars(" "),
-        trimCharsStart("../"),
+    ])
-        trimChars(" "),
-      ]
-    )
 
   const changeScreen = screen => {
     store.setCurrentScreen(screen.props._instanceName)

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

@@ -19,11 +19,7 @@
   const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
   const get_name = s => (!s ? "" : last(s.split("/")))
 
-  const get_capitalised_name = name =>
+  const get_capitalised_name = name => pipe(name, [get_name, capitalise])
-    pipe(
-      name,
-      [get_name, capitalise]
-    )
   const isScreenslot = name => name === "##builtin/screenslot"
 
   const selectComponent = component => {

packages/server/src/api/controllers/component.js

@@ -27,6 +27,7 @@ exports.fetchAppComponentDefinitions = async function(ctx) {
       const componentJson = require(join(
         appDirectory,
         componentLibrary,
+        ctx.isDev ? "" : "packages",
         "components.json"
       ))