From 2fbc0431556fda9a2d59d4cfc1920b96aece649f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 19 May 2020 14:03:46 +0100 Subject: [PATCH 1/5] electron asar --- packages/builder/src/index.html | 1 - packages/builder/src/pages/_builder.svelte | 48 ---------------------- packages/server/package.json | 1 + 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 packages/builder/src/pages/_builder.svelte 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/_builder.svelte b/packages/builder/src/pages/_builder.svelte deleted file mode 100644 index 7c1fc5920e..0000000000 --- a/packages/builder/src/pages/_builder.svelte +++ /dev/null @@ -1,48 +0,0 @@ - - -
- {#await promise} - - {:then result} - - {:catch err} -

{err}

- {/await} -
- - diff --git a/packages/server/package.json b/packages/server/package.json index 95990ac88f..9e58d8d433 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -8,6 +8,7 @@ "url": "https://github.com/Budibase/budibase.git" }, "build": { + "asar": true, "appId": "com.budibase.builder", "productName": "Budibase Builder", "afterSign": "electron-builder-notarize", From 92a04eb4155dcb6bcb1c35cf277480bf6227a658 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 19 May 2020 15:19:32 +0200 Subject: [PATCH 2/5] upgrades routify to latest version --- package.json | 2 +- packages/builder/package.json | 4 +- .../src/pages/[application]/_layout.svelte | 8 +- packages/server/yarn.lock | 190 +----------------- 4 files changed, 8 insertions(+), 196 deletions(-) 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/package.json b/packages/builder/package.json index d92f64ce17..dfb8173c83 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -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/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}