diff --git a/package.json b/package.json
index 5e276685b9..443c8cccc3 100644
--- a/package.json
+++ b/package.json
@@ -30,4 +30,4 @@
"@material/icon-button": "4.0.0",
"date-fns": "^2.10.0"
}
-}
+}
\ No newline at end of file
diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore
index 6e90239f92..94ba827047 100644
--- a/packages/builder/.gitignore
+++ b/packages/builder/.gitignore
@@ -4,4 +4,5 @@ node_modules_win
package-lock.json
yarn.lock
release/
-dist/
\ No newline at end of file
+dist/
+routify
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d92f64ce17..cb91f2ce42 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -4,11 +4,11 @@
"license": "AGPL-3.0",
"private": true,
"scripts": {
- "build": "rollup -c",
- "start": "routify -c rollup",
+ "build": "routify --routify-dir routify -b && rollup -c",
+ "start": "routify --routify-dir routify -c rollup",
"test": "jest",
"test:watch": "jest --watchAll",
- "dev:builder": "routify -c rollup",
+ "dev:builder": "routify --routify-dir routify -c rollup",
"rollup": "rollup -c -w"
},
"jest": {
@@ -60,7 +60,7 @@
"@babel/runtime": "^7.5.5",
"@rollup/plugin-alias": "^3.0.1",
"@rollup/plugin-json": "^4.0.3",
- "@sveltech/routify": "1.5.0-beta.40",
+ "@sveltech/routify": "1.7.11",
"babel-jest": "^24.8.0",
"browser-sync": "^2.26.7",
"http-proxy-middleware": "^0.19.1",
@@ -82,4 +82,4 @@
"svelte": "^3.0.0"
},
"gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
+}
\ No newline at end of file
diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index 86c7580a56..c6b76090f9 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -2,7 +2,7 @@
import Modal from "svelte-simple-modal"
import { onMount } from "svelte"
import { Router, basepath } from "@sveltech/routify"
- import { routes } from "@sveltech/routify/tmp/routes"
+ import { routes } from "../routify/routes"
import { store, initialise } from "builderStore"
import AppNotification, {
showAppNotification,
diff --git a/packages/builder/src/index.html b/packages/builder/src/index.html
index 32ee1b4f56..23c5aaf6c0 100644
--- a/packages/builder/src/index.html
+++ b/packages/builder/src/index.html
@@ -16,7 +16,6 @@
-
diff --git a/packages/builder/src/pages/[application]/_layout.svelte b/packages/builder/src/pages/[application]/_layout.svelte
index df3b05a4c6..02f4e9884d 100644
--- a/packages/builder/src/pages/[application]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/_layout.svelte
@@ -2,7 +2,7 @@
import { store } from "builderStore"
import { fade } from "svelte/transition"
- import { isActive, goto, context } from "@sveltech/routify"
+ import { isActive, goto, layout } from "@sveltech/routify"
import { SettingsIcon, PreviewIcon } from "components/common/Icons/"
import IconButton from "components/common/IconButton.svelte"
@@ -23,8 +23,6 @@
throw new Error(pkg)
}
}
- $: ({ component } = $context)
- $: list = component.parent.children.filter(child => child.isIndexable)
@@ -38,12 +36,12 @@
- {#each list as { path, prettyName, children, meta }}
+ {#each $layout.children as { path, title }}
$goto(path)}>
- {prettyName}
+ {title}
{/each}