From bf90d9cf4cbeac4d09f6de580adb16d0a2880b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Wed, 17 Mar 2021 12:40:24 +0100
Subject: [PATCH] wip: routify

---
 packages/builder/.gitignore                   |   1 +
 packages/builder/package.json                 |  10 +-
 packages/builder/routify.config.js            |   4 +
 packages/builder/src/App.svelte               |  13 +-
 .../DataTable/ExternalDataSourceTable.svelte  |   2 +-
 .../components/backend/DataTable/Table.svelte |   2 +-
 .../popovers/CreateViewPopover.svelte         |   2 +-
 .../DatasourceNavigator.svelte                |   2 +-
 .../modals/CreateDatasourceModal.svelte       |   2 +-
 .../TableNavigator/TableNavigator.svelte      |   2 +-
 .../modals/CreateTableModal.svelte            |   2 +-
 .../popovers/EditViewPopover.svelte           |   2 +-
 .../AppPreview/ComponentSelectionList.svelte  |   2 +-
 .../ComponentTree.svelte                      |   2 +-
 .../LayoutDropdownMenu.svelte                 |   2 +-
 .../ScreenDropdownMenu.svelte                 |   2 +-
 .../FrontendNavigatePane.svelte               |   2 +-
 .../design/NavigationPanel/Layout.svelte      |   2 +-
 .../NavigationPanel/NewLayoutModal.svelte     |   2 +-
 .../components/integration/QueryViewer.svelte |   2 +-
 .../settings/tabs/DangerZone.svelte           |   2 +-
 .../components/start/CreateAppModal.svelte    |   2 +-
 .../src/pages/[application]/_reset.svelte     |   2 +-
 .../automate/[automation]/_layout.svelte      |   2 +-
 .../pages/[application]/data/_layout.svelte   |   2 +-
 .../[selectedDatasource]/[query]/index.svelte |   2 +-
 .../[selectedDatasource]/_layout.svelte       |   2 +-
 .../[selectedDatasource]/index.svelte         |   2 +-
 .../data/datasource/_layout.svelte            |   2 +-
 .../src/pages/[application]/data/index.svelte |   2 +-
 .../data/table/[selectedTable]/_layout.svelte |   2 +-
 .../[selectedField]/index.svelte              |   2 +-
 .../relationship/[selectedRow]/index.svelte   |   2 +-
 .../[selectedTable]/relationship/index.svelte |   2 +-
 .../[application]/data/table/_layout.svelte   |   2 +-
 .../[application]/data/table/index.svelte     |   2 +-
 .../data/view/[selectedView]/_layout.svelte   |   2 +-
 .../design/[assetType]/_layout.svelte         |   2 +-
 .../design/[assetType]/index.svelte           |   2 +-
 .../pages/[application]/design/index.svelte   |   4 +-
 .../src/pages/[application]/index.svelte      |   4 +-
 packages/builder/yarn.lock                    | 116 ++++++++----------
 42 files changed, 111 insertions(+), 111 deletions(-)
 create mode 100644 packages/builder/routify.config.js

diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore
index 2e8ed59c47..7ff36cba13 100644
--- a/packages/builder/.gitignore
+++ b/packages/builder/.gitignore
@@ -7,3 +7,4 @@ dist/
 routify
 cypress/videos
 cypress/screenshots
+.routify
\ No newline at end of file
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 32389a985b..4a153b370b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -4,11 +4,11 @@
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
-    "build": "routify --routify-dir routify -b && rollup -c",
-    "start": "routify --routify-dir routify -c rollup",
+    "build": "routify -b && rollup -c",
+    "start": "routify -c rollup",
     "test": "jest",
     "test:watch": "jest --watchAll",
-    "dev:builder": "routify --routify-dir routify -c rollup",
+    "dev:builder": "routify -c rollup",
     "rollup": "rollup -c -w",
     "cy:setup": "node ./cypress/setup.js",
     "cy:run": "cypress run",
@@ -93,7 +93,7 @@
     "@rollup/plugin-alias": "^3.0.1",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.0.3",
-    "@sveltech/routify": "1.7.11",
+    "@roxi/routify": "2.15.1",
     "@testing-library/jest-dom": "^5.11.0",
     "@testing-library/svelte": "^3.0.0",
     "babel-jest": "^24.8.0",
@@ -117,7 +117,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-url": "^2.2.2",
     "start-server-and-test": "^1.11.0",
-    "svelte": "^3.30.0",
+    "svelte": "^3.35.0",
     "svelte-jester": "^1.0.6"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
diff --git a/packages/builder/routify.config.js b/packages/builder/routify.config.js
new file mode 100644
index 0000000000..94cb4766b0
--- /dev/null
+++ b/packages/builder/routify.config.js
@@ -0,0 +1,4 @@
+module.exports = { 
+    routifyDir: '.routify', 
+    dynamicImports: false
+}
\ No newline at end of file
diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index a5016db114..ff2995b693 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from "svelte"
-  import { Router, basepath } from "@sveltech/routify"
-  import { routes } from "../routify/routes"
+  import { Router } from "@roxi/routify"
+  import { routes } from '../.routify/routes'
   import { initialise } from "builderStore"
   import NotificationDisplay from "components/common/Notification/NotificationDisplay.svelte"
 
@@ -9,8 +9,13 @@
     await initialise()
   })
 
-  $basepath = "/_builder"
+  const config = {
+     urlTransform: {
+       apply: url => `/_builder${url}`,
+       remove: url => url.replace('/_builder', '')
+     }
+   }
 </script>
 
 <NotificationDisplay />
-<Router {routes} />
+<Router {routes} {config} />
diff --git a/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte b/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
index 9be0481c58..1e60fa151e 100644
--- a/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import * as api from "./api"
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 61fa01c09d..059fe1e123 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -1,6 +1,6 @@
 <script>
   import { fade } from "svelte/transition"
-  import { goto, params } from "@sveltech/routify"
+  import { goto, params } from "@roxi/routify"
   import AgGrid from "@budibase/svelte-ag-grid"
 
   import api from "builderStore/api"
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
index cefe1808f9..484366e3da 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Input } from "@budibase/bbui"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 19fd7060ab..35d173d525 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index 962e30d938..a1fc1bdaf4 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto, params } from "@sveltech/routify"
+  import { goto, params } from "@roxi/routify"
   import { backendUiStore, store } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent, Button, Spacer } from "@budibase/bbui"
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 3719d62c62..76b536501f 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 1bd1a29eb7..a346978a0d 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore, store } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent, Toggle } from "@budibase/bbui"
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
index 331f336d4e..fcdc441e6e 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Input } from "@budibase/bbui"
diff --git a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
index a1798d9ad7..f167ff76a2 100644
--- a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import {
     store,
     currentAssetName,
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
index f99d90d2e7..bd912ca916 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { store, currentAssetId } from "builderStore"
   import { DropEffect, DropPosition } from "./dragDropStore"
   import ComponentDropdownMenu from "../ComponentDropdownMenu.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte
index 79a66e0af4..602e46b35b 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { store } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
index 1e7a64b0c0..54b1e96799 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { store, allScreens } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index e235e3b254..76ebca995d 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { goto, params } from "@sveltech/routify"
+  import { goto, params } from "@roxi/routify"
   import {
     store,
     allScreens,
diff --git a/packages/builder/src/components/design/NavigationPanel/Layout.svelte b/packages/builder/src/components/design/NavigationPanel/Layout.svelte
index bab9cf56b6..b63b14ce39 100644
--- a/packages/builder/src/components/design/NavigationPanel/Layout.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/Layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { FrontendTypes } from "constants"
   import ComponentTree from "./ComponentNavigationTree/ComponentTree.svelte"
   import LayoutDropdownMenu from "./ComponentNavigationTree/LayoutDropdownMenu.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
index 7920f9bbf5..2ef467c755 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { notifier } from "builderStore/store/notifications"
   import { store } from "builderStore"
   import { Input, ModalContent } from "@budibase/bbui"
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 44537afff3..66be2bbd64 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import {
     Select,
     Button,
diff --git a/packages/builder/src/components/settings/tabs/DangerZone.svelte b/packages/builder/src/components/settings/tabs/DangerZone.svelte
index 8c7f71e7fd..5cdfaae7eb 100644
--- a/packages/builder/src/components/settings/tabs/DangerZone.svelte
+++ b/packages/builder/src/components/settings/tabs/DangerZone.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params, goto } from "@sveltech/routify"
+  import { params, goto } from "@roxi/routify"
   import { Input, TextArea, Button, Body } from "@budibase/bbui"
   import { del } from "builderStore/api"
 
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 5102179cde..bc5c8149a2 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -14,7 +14,7 @@
   import { API, Info, User } from "./Steps"
   import Indicator from "./Indicator.svelte"
   import { Button } from "@budibase/bbui"
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { fade } from "svelte/transition"
   import { post } from "builderStore/api"
   import analytics from "analytics"
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index 2411fad0c9..463515e755 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -5,7 +5,7 @@
   import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
   import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte"
   import { get } from "builderStore/api"
-  import { isActive, goto, layout } from "@sveltech/routify"
+  import { isActive, goto, layout } from "@roxi/routify"
 
   // Get Package and set store
   export let application
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
index 28234decc3..3a75233306 100644
--- a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { store } from "builderStore"
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
 
   store.actions.layouts.select($params.layout)
 </script>
diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte
index 6a4033d468..695b0c7945 100644
--- a/packages/builder/src/pages/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { Button, Switcher, Modal } from "@budibase/bbui"
   import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
index 2080480fce..dd888294cb 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
   import QueryInterface from "components/integration/QueryViewer.svelte"
 
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
index 48e3c35daf..27f3346d92 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
 
   if ($params.selectedDatasourceId) {
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
index f859e8d397..670ca8e03f 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto, beforeUrlChange } from "@sveltech/routify"
+  import { goto, beforeUrlChange } from "@roxi/routify"
   import { Button, Heading, Body, Spacer, Icon } from "@budibase/bbui"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
diff --git a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
index e67316ca65..b4b8bfddc3 100644
--- a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { goto, leftover } from "@sveltech/routify"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/[application]/data/index.svelte b/packages/builder/src/pages/[application]/data/index.svelte
index b893d8680f..1d238a72df 100644
--- a/packages/builder/src/pages/[application]/data/index.svelte
+++ b/packages/builder/src/pages/[application]/data/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   $goto("../table")
 </script>
 
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
index 9892da00db..9446b37b3f 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
 
   if ($params.selectedTable) {
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
index f291dcc4fa..5e90236ec7 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import RelationshipDataTable from "components/backend/DataTable/RelationshipDataTable.svelte"
 </script>
 
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
index 0ab07a246b..8e195ddb12 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   $goto("../../")
 </script>
 
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte
index aa3b39f016..7d081b6976 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   $goto("../")
 </script>
 
diff --git a/packages/builder/src/pages/[application]/data/table/_layout.svelte b/packages/builder/src/pages/[application]/data/table/_layout.svelte
index 2eea0be4c2..8806879bc2 100644
--- a/packages/builder/src/pages/[application]/data/table/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/table/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { goto, leftover } from "@sveltech/routify"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte
index 6c661bca59..70d43b1b49 100644
--- a/packages/builder/src/pages/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { store, backendUiStore } from "builderStore"
-  import { goto, leftover } from "@sveltech/routify"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from "svelte"
 
   async function selectTable(table) {
diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
index e890c7e276..853e34149d 100644
--- a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
   import { backendUiStore } from "builderStore"
 
   if ($params.selectedView) {
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
index 4cc50b8647..16f0a8323d 100644
--- a/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
@@ -9,7 +9,7 @@
   import PropertiesPanel from "components/design/PropertiesPanel/PropertiesPanel.svelte"
   import ComponentSelectionList from "components/design/AppPreview/ComponentSelectionList.svelte"
   import FrontendNavigatePane from "components/design/NavigationPanel/FrontendNavigatePane.svelte"
-  import { goto, leftover, params } from "@sveltech/routify"
+  import { goto, leftover, params } from "@roxi/routify"
   import { FrontendTypes } from "constants"
   import { findComponent, findComponentPath } from "builderStore/storeUtils"
   import { get } from "svelte/store"
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/[application]/design/[assetType]/index.svelte
index f1383c9190..a767b56b4f 100644
--- a/packages/builder/src/pages/[application]/design/[assetType]/index.svelte
+++ b/packages/builder/src/pages/[application]/design/[assetType]/index.svelte
@@ -2,7 +2,7 @@
   import { get } from "svelte/store"
   import { store, allScreens, selectedAccessRole } from "builderStore"
   import { FrontendTypes } from "constants"
-  import { params } from "@sveltech/routify"
+  import { params } from "@roxi/routify"
 
   $: selectValidAsset($params.assetType)
 
diff --git a/packages/builder/src/pages/[application]/design/index.svelte b/packages/builder/src/pages/[application]/design/index.svelte
index d2cd9e2ffc..1a454df4db 100644
--- a/packages/builder/src/pages/[application]/design/index.svelte
+++ b/packages/builder/src/pages/[application]/design/index.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { goto } from "@sveltech/routify"
+  import { goto } from "@roxi/routify"
   import { FrontendTypes } from "constants"
 
-  $goto(`../${FrontendTypes.SCREEN}`)
+  $goto(`./${FrontendTypes.SCREEN}`)
 </script>
 
 <!-- routify:options index=1 -->
diff --git a/packages/builder/src/pages/[application]/index.svelte b/packages/builder/src/pages/[application]/index.svelte
index 553908cb2e..d3321037d5 100644
--- a/packages/builder/src/pages/[application]/index.svelte
+++ b/packages/builder/src/pages/[application]/index.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { goto } from "@sveltech/routify"
-  $goto("../data")
+  import { goto } from "@roxi/routify"
+  $goto("./data")
 </script>
 
 <!-- routify:options index=false -->
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index e5ded575b2..a481c2fac4 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -1130,6 +1130,33 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@roxi/routify@2.15.1":
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.15.1.tgz#cbd5eafedfee7f04b154173dccd7474c177acb4f"
+  integrity sha512-IRdoaPSfP09EwWtB+tpbHgH6ejYtowale24rgfpxRQhFNyTUK4jYXclvx3XkUD1NSupSgl1kDAsWSiRSG0WvkQ==
+  dependencies:
+    "@roxi/ssr" "^0.2.1"
+    "@types/node" ">=4.2.0 < 13"
+    chalk "^4.0.0"
+    cheap-watch "^1.0.2"
+    commander "^7.1.0"
+    configent "^2.1.4"
+    esm "^3.2.25"
+    fs-extra "^9.0.1"
+    log-symbols "^3.0.0"
+    picomatch "^2.2.2"
+    rollup-pluginutils "^2.8.2"
+
+"@roxi/ssr@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@roxi/ssr/-/ssr-0.2.1.tgz#45c9a34aeb58fdb2642ce6d11ae750c645d7cf7a"
+  integrity sha512-C86xWJOmtCGZr/U4MURqePM0oDKFkTlLeEyT07R+7jSKvREKZ2manJAeAebYudJLYEGITEPGqObhRan32bUUbg==
+  dependencies:
+    bufferutil "^4.0.1"
+    jsdom "^16.0.1"
+    node-fetch "^2.6.0"
+    utf-8-validate "^5.0.2"
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
@@ -1206,36 +1233,6 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@sveltech/routify@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@sveltech/routify/-/routify-1.7.11.tgz#16b7f936a55a243bcb117fed5a4e8e0bf925702c"
-  integrity sha512-w7zlH5CchuVsdoW4m7rKXcGKw0mSi321ZxBYJ4Zb88UNW1FhjTMzO7VfiKfYHMwfrL9xIeCk6TbHjLhAki9BPA==
-  dependencies:
-    "@sveltech/ssr" "^0.0.9"
-    "@types/node" ">=4.2.0 < 13"
-    cheap-watch "^1.0.2"
-    commander "^5.0.0"
-    dotenv "^8.2.0"
-    fs-extra "^9.0.0"
-    js-yaml "^3.13.1"
-    json5 "^2.1.3"
-    log-symbols "^3.0.0"
-    picomatch "^2.2.1"
-    readdirp "^3.3.0"
-    rollup-pluginutils "^2.8.2"
-    yaml "^1.9.2"
-
-"@sveltech/ssr@^0.0.9":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@sveltech/ssr/-/ssr-0.0.9.tgz#a9149b9be5a76d1d9cac84ff48cf92a004afb880"
-  integrity sha512-9zzi/6ub8NKSvQ6AnJHTjTuWioSq6fIpddTqxtLpHTmlExf0bkrQT1BGVBx0Ynh4LE0fufd+rsTpZTAH8gWfmA==
-  dependencies:
-    bufferutil "^4.0.1"
-    canvas "git+https://github.com/sveltech/dummy-module.git"
-    jsdom "^16.0.1"
-    node-fetch "^2.6.0"
-    utf-8-validate "^5.0.2"
-
 "@svelteschool/svelte-forms@0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@svelteschool/svelte-forms/-/svelte-forms-0.7.0.tgz#4ecba15e9a9ab2b04fad3d892931a561118a4cea"
@@ -1580,13 +1577,6 @@ arch@^2.1.2:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2025,10 +2015,6 @@ caniuse-lite@^1.0.30001181:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001189.tgz#f8547299b9db78d3882b0dea1cae891fed1651e8"
   integrity sha512-BSfxClP/UWCD0RX1h1L+vLDexNSJY7SfOtbJtW10bcnatfj3BcoietUFYNwWreOCk+SNvGUaNapGqUNPiGAiSA==
 
-"canvas@git+https://github.com/sveltech/dummy-module.git":
-  version "1.0.0"
-  resolved "git+https://github.com/sveltech/dummy-module.git#7761ae41c468f41de4e35aed0ebb3cec6afe6ddd"
-
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2257,11 +2243,16 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^5.0.0, commander@^5.1.0:
+commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
+commander@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
+  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -2297,6 +2288,13 @@ concat-stream@^1.4.4, concat-stream@^1.6.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+configent@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994"
+  integrity sha512-yIN6zfOWk2nycNJ2JFNiWEai0oiqAhISIht8+pbEBP8bdcpwoQ74AhCZPbUv9aRVJwo7wh1MbCBDUV44UJa7Kw==
+  dependencies:
+    dotenv "^8.2.0"
+
 console-clear@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/console-clear/-/console-clear-1.1.1.tgz#995e20cbfbf14dd792b672cde387bd128d674bf7"
@@ -2843,7 +2841,12 @@ eslint-plugin-cypress@^2.11.1:
   dependencies:
     globals "^11.12.0"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esm@^3.2.25:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4367,14 +4370,6 @@ joi@^17.3.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -4479,7 +4474,7 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.2, json5@^2.1.3:
+json5@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -5756,7 +5751,7 @@ readable-stream@~1.0.26, readable-stream@~1.0.26-4:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdirp@^3.3.0, readdirp@~3.5.0:
+readdirp@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
   integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
@@ -6467,11 +6462,6 @@ split@0.3:
   dependencies:
     through "2"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -6720,10 +6710,10 @@ svelte-portal@^1.0.0:
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
-svelte@^3.30.0:
-  version "3.32.3"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.32.3.tgz#db0c50c65573ecffe4e2f4924e4862d8f9feda74"
-  integrity sha512-5etu/wDwtewhnYO/631KKTjSmFrKohFLWNm1sWErVHXqGZ8eJLqrW0qivDSyYTcN8GbUqsR4LkIhftNFsjNehg==
+svelte@^3.35.0:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
+  integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
 
 symbol-observable@^1.1.0:
   version "1.2.0"
@@ -7259,7 +7249,7 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
   integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
-yaml@^1.7.2, yaml@^1.9.2:
+yaml@^1.7.2:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==