From ea597c90fc709e81aa9591815361d492ad83a698 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 13 Feb 2025 10:46:40 +0100
Subject: [PATCH 1/8] Initial ts conversion

---
 .../builder/src/stores/builder/preview.ts     |  2 +-
 packages/client/src/components/Block.svelte   |  2 +-
 .../src/components/app/forms/S3Upload.svelte  |  2 +-
 .../src/stores/{builder.js => builder.ts}     | 24 +++++++++++++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)
 rename packages/client/src/stores/{builder.js => builder.ts} (87%)

diff --git a/packages/builder/src/stores/builder/preview.ts b/packages/builder/src/stores/builder/preview.ts
index 87b2b9355e..a0b72559aa 100644
--- a/packages/builder/src/stores/builder/preview.ts
+++ b/packages/builder/src/stores/builder/preview.ts
@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
 import { BudiStore } from "../BudiStore"
+import { PreviewDevice } from "@budibase/types"
 
-type PreviewDevice = "desktop" | "tablet" | "mobile"
 type PreviewEventHandler = (name: string, payload?: any) => void
 type ComponentContext = Record<string, any>
 
diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index 48c11f152a..24e010f3d9 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext, onDestroy, onMount, setContext } from "svelte"
-  import { builderStore } from "stores/builder.js"
+  import { builderStore } from "@/stores/builder"
   import { blockStore } from "stores/blocks"
 
   const component = getContext("component")
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index 7ac0532dca..ded79b4dd9 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -2,7 +2,7 @@
   import Field from "./Field.svelte"
   import { CoreDropzone, ProgressCircle, Helpers } from "@budibase/bbui"
   import { getContext, onMount, onDestroy } from "svelte"
-  import { builderStore } from "stores/builder.js"
+  import { builderStore } from "@/stores/builder"
   import { processStringSync } from "@budibase/string-templates"
 
   export let datasourceId
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.ts
similarity index 87%
rename from packages/client/src/stores/builder.js
rename to packages/client/src/stores/builder.ts
index 1ae7d3a670..2a5d616f39 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.ts
@@ -2,9 +2,29 @@ import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
 import { eventStore } from "./events.js"
+import { PreviewDevice } from "@budibase/types"
+
+interface BuilderStore {
+  inBuilder: boolean
+  screen: string | null
+  selectedComponentId: string | null
+  editMode: boolean
+  previewId: string | null
+  theme: string | null
+  customTheme: string | null
+  previewDevice: PreviewDevice
+  navigation: string | null
+  hiddenComponentIds: []
+  usedPlugins: string | null
+  eventResolvers: {}
+  metadata: string | null
+  snippets: string | null
+  componentErrors: {}
+  layout: null
+}
 
 const createBuilderStore = () => {
-  const initialState = {
+  const initialState: BuilderStore = {
     inBuilder: false,
     screen: null,
     selectedComponentId: null,
@@ -26,7 +46,7 @@ const createBuilderStore = () => {
   }
   const store = writable(initialState)
   const actions = {
-    selectComponent: id => {
+    selectComponent: (id: string) => {
       if (id === get(store).selectedComponentId) {
         return
       }

From 12d596e7ab9f076e8a697e4d6b49a2667ab9bfb9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 13 Feb 2025 10:52:22 +0100
Subject: [PATCH 2/8] Move DropPosition

---
 .../_components/ComponentList/dndStore.js        |  7 +------
 packages/client/src/stores/builder.ts            | 16 ++++++++++------
 packages/types/src/ui/stores/misc.ts             |  6 ++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
index 2361abce89..a7b3b0d9ea 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
@@ -1,12 +1,7 @@
 import { writable, get } from "svelte/store"
 import { findComponentParent, findComponentPath } from "@/helpers/components"
 import { selectedScreen, componentStore } from "@/stores/builder"
-
-export const DropPosition = {
-  ABOVE: "above",
-  BELOW: "below",
-  INSIDE: "inside",
-}
+import { DropPosition } from "@budibase/types"
 
 const initialState = {
   source: null,
diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index 2a5d616f39..0c2577ebab 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -2,7 +2,7 @@ import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
 import { eventStore } from "./events.js"
-import { PreviewDevice } from "@budibase/types"
+import { DropPosition, PreviewDevice } from "@budibase/types"
 
 interface BuilderStore {
   inBuilder: boolean
@@ -58,19 +58,23 @@ const createBuilderStore = () => {
       devToolsStore.actions.setAllowSelection(false)
       eventStore.actions.dispatchEvent("select-component", { id })
     },
-    updateProp: (prop, value) => {
+    updateProp: (prop: string, value: any) => {
       eventStore.actions.dispatchEvent("update-prop", { prop, value })
     },
-    updateStyles: async (styles, id) => {
+    updateStyles: async (styles: Record<string, any>, id: string) => {
       await eventStore.actions.dispatchEvent("update-styles", {
         styles,
         id,
       })
     },
-    keyDown: (key, ctrlKey) => {
+    keyDown: (key: string, ctrlKey: boolean) => {
       eventStore.actions.dispatchEvent("key-down", { key, ctrlKey })
     },
-    duplicateComponent: (id, mode = "below", selectComponent = true) => {
+    duplicateComponent: (
+      id: string,
+      mode = DropPosition.BELOW,
+      selectComponent = true
+    ) => {
       eventStore.actions.dispatchEvent("duplicate-component", {
         id,
         mode,
@@ -136,7 +140,7 @@ const createBuilderStore = () => {
       // Notify the builder so we can reload component definitions
       eventStore.actions.dispatchEvent("reload-plugin")
     },
-    addParentComponent: (componentId, parentType) => {
+    addParentComponent: (componentId: any, parentType: any) => {
       eventStore.actions.dispatchEvent("add-parent-component", {
         componentId,
         parentType,
diff --git a/packages/types/src/ui/stores/misc.ts b/packages/types/src/ui/stores/misc.ts
index 275b388e9f..055ed85288 100644
--- a/packages/types/src/ui/stores/misc.ts
+++ b/packages/types/src/ui/stores/misc.ts
@@ -1,2 +1,8 @@
 // type purely to capture structures that the type is unknown, but maybe known later
 export type UIObject = Record<string, any>
+
+export const enum DropPosition {
+  ABOVE = "above",
+  BELOW = "below",
+  INSIDE = "inside",
+}

From 0d096132b83401e36f22432967387fc4b0e56fd5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 13 Feb 2025 11:08:00 +0100
Subject: [PATCH 3/8] Fixes

---
 .../_components/ComponentList/dndStore.js     |  1 +
 packages/builder/src/stores/builder/index.js  | 22 +++++++++----------
 packages/client/src/components/Block.svelte   |  2 +-
 .../src/components/BlockComponent.svelte      |  2 +-
 .../src/components/app/forms/S3Upload.svelte  |  2 +-
 packages/client/src/stores/builder.ts         | 18 +++++++++------
 .../src/stores/derived/devToolsEnabled.js     |  2 +-
 .../client/src/stores/derived/snippets.js     |  2 +-
 8 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
index a7b3b0d9ea..bfbcc9ea5b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
@@ -2,6 +2,7 @@ import { writable, get } from "svelte/store"
 import { findComponentParent, findComponentPath } from "@/helpers/components"
 import { selectedScreen, componentStore } from "@/stores/builder"
 import { DropPosition } from "@budibase/types"
+export { DropPosition } from "@budibase/types"
 
 const initialState = {
   source: null,
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
index 76679d8088..56c2d17cc3 100644
--- a/packages/builder/src/stores/builder/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -1,20 +1,20 @@
-import { layoutStore } from "./layouts.js"
-import { appStore } from "./app.js"
+import { layoutStore } from "./layouts"
+import { appStore } from "./app"
 import { componentStore, selectedComponent } from "./components"
-import { navigationStore } from "./navigation.js"
-import { themeStore } from "./theme.js"
+import { navigationStore } from "./navigation"
+import { themeStore } from "./theme"
 import { screenStore, selectedScreen, sortedScreens } from "./screens"
-import { builderStore } from "./builder.js"
-import { hoverStore } from "./hover.js"
-import { previewStore } from "./preview.js"
+import { builderStore } from "./builder"
+import { hoverStore } from "./hover"
+import { previewStore } from "./preview"
 import {
   automationStore,
   selectedAutomation,
   automationHistoryStore,
-} from "./automations.js"
-import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
-import { deploymentStore } from "./deployments.js"
-import { contextMenuStore } from "./contextMenu.js"
+} from "./automations"
+import { userStore, userSelectedResourceMap, isOnlyUser } from "./users"
+import { deploymentStore } from "./deployments"
+import { contextMenuStore } from "./contextMenu"
 import { snippets } from "./snippets"
 import {
   screenComponentsList,
diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index 24e010f3d9..7ea2a978d9 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext, onDestroy, onMount, setContext } from "svelte"
-  import { builderStore } from "@/stores/builder"
+  import { builderStore } from "stores/builder"
   import { blockStore } from "stores/blocks"
 
   const component = getContext("component")
diff --git a/packages/client/src/components/BlockComponent.svelte b/packages/client/src/components/BlockComponent.svelte
index 12555a7fb5..5e57bc89d8 100644
--- a/packages/client/src/components/BlockComponent.svelte
+++ b/packages/client/src/components/BlockComponent.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getContext, onDestroy } from "svelte"
   import { generate } from "shortid"
-  import { builderStore } from "../stores/builder.js"
+  import { builderStore } from "../stores/builder"
   import Component from "components/Component.svelte"
 
   export let type
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index ded79b4dd9..8103ee50e8 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -2,7 +2,7 @@
   import Field from "./Field.svelte"
   import { CoreDropzone, ProgressCircle, Helpers } from "@budibase/bbui"
   import { getContext, onMount, onDestroy } from "svelte"
-  import { builderStore } from "@/stores/builder"
+  import { builderStore } from "stores/builder"
   import { processStringSync } from "@budibase/string-templates"
 
   export let datasourceId
diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index 0c2577ebab..cd406ccafd 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -2,7 +2,7 @@ import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
 import { eventStore } from "./events.js"
-import { DropPosition, PreviewDevice } from "@budibase/types"
+import { DropPosition, PingSource, PreviewDevice } from "@budibase/types"
 
 interface BuilderStore {
   inBuilder: boolean
@@ -81,34 +81,38 @@ const createBuilderStore = () => {
         selectComponent,
       })
     },
-    deleteComponent: id => {
+    deleteComponent: (id: string) => {
       eventStore.actions.dispatchEvent("delete-component", { id })
     },
     notifyLoaded: () => {
       eventStore.actions.dispatchEvent("preview-loaded")
     },
-    analyticsPing: async ({ embedded }) => {
+    analyticsPing: async ({ embedded }: { embedded: boolean }) => {
       try {
-        await API.analyticsPing({ source: "app", embedded })
+        await API.analyticsPing({ source: PingSource.APP, embedded })
       } catch (error) {
         // Do nothing
       }
     },
-    moveComponent: async (componentId, destinationComponentId, mode) => {
+    moveComponent: async (
+      componentId: string,
+      destinationComponentId: string,
+      mode: DropPosition
+    ) => {
       await eventStore.actions.dispatchEvent("move-component", {
         componentId,
         destinationComponentId,
         mode,
       })
     },
-    dropNewComponent: (component, parent, index) => {
+    dropNewComponent: (component: string, parent: string, index: number) => {
       eventStore.actions.dispatchEvent("drop-new-component", {
         component,
         parent,
         index,
       })
     },
-    setEditMode: enabled => {
+    setEditMode: (enabled: boolean) => {
       if (enabled === get(store).editMode) {
         return
       }
diff --git a/packages/client/src/stores/derived/devToolsEnabled.js b/packages/client/src/stores/derived/devToolsEnabled.js
index 525f70e49b..20327c6550 100644
--- a/packages/client/src/stores/derived/devToolsEnabled.js
+++ b/packages/client/src/stores/derived/devToolsEnabled.js
@@ -1,6 +1,6 @@
 import { derived } from "svelte/store"
 import { appStore } from "../app.js"
-import { builderStore } from "../builder.js"
+import { builderStore } from "../builder"
 
 export const devToolsEnabled = derived(
   [appStore, builderStore],
diff --git a/packages/client/src/stores/derived/snippets.js b/packages/client/src/stores/derived/snippets.js
index 74b2797643..8a7b2c3461 100644
--- a/packages/client/src/stores/derived/snippets.js
+++ b/packages/client/src/stores/derived/snippets.js
@@ -1,5 +1,5 @@
 import { appStore } from "../app.js"
-import { builderStore } from "../builder.js"
+import { builderStore } from "../builder"
 import { derivedMemo } from "@budibase/frontend-core"
 
 export const snippets = derivedMemo(

From a3d6048336e364c5ca2285ce5c29a599caddd23b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 13 Feb 2025 11:24:41 +0100
Subject: [PATCH 4/8] More conversions

---
 packages/client/src/stores/builder.ts | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index cd406ccafd..3dfafbb014 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -2,7 +2,12 @@ import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
 import { eventStore } from "./events.js"
-import { DropPosition, PingSource, PreviewDevice } from "@budibase/types"
+import {
+  ComponentDefinition,
+  DropPosition,
+  PingSource,
+  PreviewDevice,
+} from "@budibase/types"
 
 interface BuilderStore {
   inBuilder: boolean
@@ -15,9 +20,9 @@ interface BuilderStore {
   previewDevice: PreviewDevice
   navigation: string | null
   hiddenComponentIds: []
-  usedPlugins: string | null
+  usedPlugins: { name: string; hash: string }[] | null
   eventResolvers: {}
-  metadata: string | null
+  metadata: { componentId: string; step: number } | null
   snippets: string | null
   componentErrors: {}
   layout: null
@@ -121,18 +126,18 @@ const createBuilderStore = () => {
     requestAddComponent: () => {
       eventStore.actions.dispatchEvent("request-add-component")
     },
-    highlightSetting: setting => {
+    highlightSetting: (setting: string) => {
       eventStore.actions.dispatchEvent("highlight-setting", { setting })
     },
-    ejectBlock: (id, definition) => {
+    ejectBlock: (id: string, definition: ComponentDefinition) => {
       eventStore.actions.dispatchEvent("eject-block", { id, definition })
     },
-    updateUsedPlugin: (name, hash) => {
+    updateUsedPlugin: (name: string, hash: string) => {
       // Check if we used this plugin
       const used = get(store)?.usedPlugins?.find(x => x.name === name)
       if (used) {
         store.update(state => {
-          state.usedPlugins = state.usedPlugins.filter(x => x.name !== name)
+          state.usedPlugins = state.usedPlugins!.filter(x => x.name !== name)
           state.usedPlugins.push({
             ...used,
             hash,
@@ -144,13 +149,13 @@ const createBuilderStore = () => {
       // Notify the builder so we can reload component definitions
       eventStore.actions.dispatchEvent("reload-plugin")
     },
-    addParentComponent: (componentId: any, parentType: any) => {
+    addParentComponent: (componentId: string, parentType: string) => {
       eventStore.actions.dispatchEvent("add-parent-component", {
         componentId,
         parentType,
       })
     },
-    setMetadata: metadata => {
+    setMetadata: (metadata: { componentId: string; step: number }) => {
       store.update(state => ({
         ...state,
         metadata,
@@ -159,7 +164,7 @@ const createBuilderStore = () => {
   }
   return {
     ...store,
-    set: state => store.set({ ...initialState, ...state }),
+    set: (state: BuilderStore) => store.set({ ...initialState, ...state }),
     actions,
   }
 }

From 3d1f03cf027b815aca454b877224c6d66ba625d0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 13 Feb 2025 11:26:57 +0100
Subject: [PATCH 5/8] Improve types

---
 packages/client/src/stores/builder.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index 3dfafbb014..3f22d00495 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -7,11 +7,12 @@ import {
   DropPosition,
   PingSource,
   PreviewDevice,
+  Screen,
 } from "@budibase/types"
 
 interface BuilderStore {
   inBuilder: boolean
-  screen: string | null
+  screen: Screen | null
   selectedComponentId: string | null
   editMode: boolean
   previewId: string | null
@@ -25,7 +26,7 @@ interface BuilderStore {
   metadata: { componentId: string; step: number } | null
   snippets: string | null
   componentErrors: {}
-  layout: null
+  layout: any
 }
 
 const createBuilderStore = () => {

From 227679f18990b2cdb7773df4abeef121d4b671fb Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 14 Feb 2025 12:57:27 +0100
Subject: [PATCH 6/8] Use proper types

---
 packages/client/src/stores/builder.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index fccf6caa30..0a7408eb66 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -8,6 +8,12 @@ import {
   PingSource,
   PreviewDevice,
   Screen,
+  Theme,
+  AppCustomTheme,
+  AppNavigation,
+  Plugin,
+  Snippet,
+  UIComponentError,
 } from "@budibase/types"
 
 interface BuilderStore {
@@ -16,16 +22,16 @@ interface BuilderStore {
   selectedComponentId: string | null
   editMode: boolean
   previewId: string | null
-  theme: string | null
-  customTheme: string | null
+  theme: Theme | null
+  customTheme: AppCustomTheme | null
   previewDevice: PreviewDevice
-  navigation: string | null
-  hiddenComponentIds: []
-  usedPlugins: { name: string; hash: string }[] | null
+  navigation: AppNavigation | null
+  hiddenComponentIds: string[]
+  usedPlugins: Plugin[] | null
   eventResolvers: {}
   metadata: { componentId: string; step: number } | null
-  snippets: string | null
-  componentErrors: {}
+  snippets: Snippet[] | null
+  componentErrors: Record<string, UIComponentError[]>
   layout: any
 }
 

From cc6c6039248ca451b7b4f3cf355d71bca8919bf7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 14 Feb 2025 13:04:25 +0100
Subject: [PATCH 7/8] Remove unused props

---
 packages/client/src/index.ts                                | 2 --
 packages/client/src/stores/builder.ts                       | 6 ------
 packages/client/src/stores/screens.js                       | 5 -----
 .../server/src/api/controllers/static/templates/preview.hbs | 1 -
 4 files changed, 14 deletions(-)

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 443648eb08..c5df424361 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -47,7 +47,6 @@ declare global {
     // Data from builder
     "##BUDIBASE_APP_ID##"?: string
     "##BUDIBASE_IN_BUILDER##"?: true
-    "##BUDIBASE_PREVIEW_LAYOUT##"?: Layout
     "##BUDIBASE_PREVIEW_SCREEN##"?: Screen
     "##BUDIBASE_SELECTED_COMPONENT_ID##"?: string
     "##BUDIBASE_PREVIEW_ID##"?: number
@@ -114,7 +113,6 @@ const loadBudibase = async () => {
   builderStore.set({
     ...get(builderStore),
     inBuilder: !!window["##BUDIBASE_IN_BUILDER##"],
-    layout: window["##BUDIBASE_PREVIEW_LAYOUT##"],
     screen: window["##BUDIBASE_PREVIEW_SCREEN##"],
     selectedComponentId: window["##BUDIBASE_SELECTED_COMPONENT_ID##"],
     previewId: window["##BUDIBASE_PREVIEW_ID##"],
diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index 0a7408eb66..9fe84e0c6f 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -28,11 +28,9 @@ interface BuilderStore {
   navigation: AppNavigation | null
   hiddenComponentIds: string[]
   usedPlugins: Plugin[] | null
-  eventResolvers: {}
   metadata: { componentId: string; step: number } | null
   snippets: Snippet[] | null
   componentErrors: Record<string, UIComponentError[]>
-  layout: any
 }
 
 const createBuilderStore = () => {
@@ -48,13 +46,9 @@ const createBuilderStore = () => {
     navigation: null,
     hiddenComponentIds: [],
     usedPlugins: null,
-    eventResolvers: {},
     metadata: null,
     snippets: null,
     componentErrors: {},
-
-    // Legacy - allow the builder to specify a layout
-    layout: null,
   }
   const store = writable(initialState)
   const actions = {
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index 4163f87e1a..1cc205b382 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -36,11 +36,6 @@ const createScreenStore = () => {
         activeScreen = Helpers.cloneDeep($builderStore.screen)
         screens = [activeScreen]
 
-        // Legacy - allow the builder to specify a layout
-        if ($builderStore.layout) {
-          activeLayout = $builderStore.layout
-        }
-
         // Attach meta
         const errors = $builderStore.componentErrors || {}
         const attachComponentMeta = component => {
diff --git a/packages/server/src/api/controllers/static/templates/preview.hbs b/packages/server/src/api/controllers/static/templates/preview.hbs
index 750a780897..5eb8a8bcbb 100644
--- a/packages/server/src/api/controllers/static/templates/preview.hbs
+++ b/packages/server/src/api/controllers/static/templates/preview.hbs
@@ -80,7 +80,6 @@
       // Set some flags so the app knows we're in the builder
       window["##BUDIBASE_IN_BUILDER##"] = true
       window["##BUDIBASE_APP_ID##"] = appId
-      window["##BUDIBASE_PREVIEW_LAYOUT##"] = layout
       window["##BUDIBASE_PREVIEW_SCREEN##"] = screen
       window["##BUDIBASE_SELECTED_COMPONENT_ID##"] = selectedComponentId
       window["##BUDIBASE_PREVIEW_ID##"] = Math.random()

From 299637a0a026cdd3961cb1481426c88645039480 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 14 Feb 2025 13:12:00 +0100
Subject: [PATCH 8/8] Fix types

---
 packages/client/src/index.ts                  |  9 +-------
 packages/client/src/stores/builder.ts         | 22 +++++++++----------
 .../controllers/static/templates/preview.hbs  |  1 -
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index c5df424361..4d2bd0e1e2 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -18,7 +18,6 @@ import type { ActionTypes } from "@/constants"
 import { Readable } from "svelte/store"
 import {
   Screen,
-  Layout,
   Theme,
   AppCustomTheme,
   PreviewDevice,
@@ -57,13 +56,8 @@ declare global {
     "##BUDIBASE_PREVIEW_NAVIGATION##"?: AppNavigation
     "##BUDIBASE_HIDDEN_COMPONENT_IDS##"?: string[]
     "##BUDIBASE_USED_PLUGINS##"?: Plugin[]
-    "##BUDIBASE_LOCATION##"?: {
-      protocol: string
-      hostname: string
-      port: string
-    }
     "##BUDIBASE_SNIPPETS##"?: Snippet[]
-    "##BUDIBASE_COMPONENT_ERRORS##"?: Record<string, UIComponentError>[]
+    "##BUDIBASE_COMPONENT_ERRORS##"?: Record<string, UIComponentError[]>
     "##BUDIBASE_CUSTOM_COMPONENTS##"?: CustomComponent[]
 
     // Other flags
@@ -122,7 +116,6 @@ const loadBudibase = async () => {
     navigation: window["##BUDIBASE_PREVIEW_NAVIGATION##"],
     hiddenComponentIds: window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"],
     usedPlugins: window["##BUDIBASE_USED_PLUGINS##"],
-    location: window["##BUDIBASE_LOCATION##"],
     snippets: window["##BUDIBASE_SNIPPETS##"],
     componentErrors: window["##BUDIBASE_COMPONENT_ERRORS##"],
   })
diff --git a/packages/client/src/stores/builder.ts b/packages/client/src/stores/builder.ts
index 9fe84e0c6f..36ba7fffb8 100644
--- a/packages/client/src/stores/builder.ts
+++ b/packages/client/src/stores/builder.ts
@@ -18,19 +18,19 @@ import {
 
 interface BuilderStore {
   inBuilder: boolean
-  screen: Screen | null
-  selectedComponentId: string | null
+  screen?: Screen | null
+  selectedComponentId?: string | null
   editMode: boolean
-  previewId: string | null
-  theme: Theme | null
-  customTheme: AppCustomTheme | null
-  previewDevice: PreviewDevice
-  navigation: AppNavigation | null
-  hiddenComponentIds: string[]
-  usedPlugins: Plugin[] | null
+  previewId?: number | null
+  theme?: Theme | null
+  customTheme?: AppCustomTheme | null
+  previewDevice?: PreviewDevice
+  navigation?: AppNavigation | null
+  hiddenComponentIds?: string[]
+  usedPlugins?: Plugin[] | null
   metadata: { componentId: string; step: number } | null
-  snippets: Snippet[] | null
-  componentErrors: Record<string, UIComponentError[]>
+  snippets?: Snippet[] | null
+  componentErrors?: Record<string, UIComponentError[]>
 }
 
 const createBuilderStore = () => {
diff --git a/packages/server/src/api/controllers/static/templates/preview.hbs b/packages/server/src/api/controllers/static/templates/preview.hbs
index 5eb8a8bcbb..fc6de9a28c 100644
--- a/packages/server/src/api/controllers/static/templates/preview.hbs
+++ b/packages/server/src/api/controllers/static/templates/preview.hbs
@@ -89,7 +89,6 @@
       window["##BUDIBASE_PREVIEW_NAVIGATION##"] = navigation
       window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"] = hiddenComponentIds
       window["##BUDIBASE_USED_PLUGINS##"] = usedPlugins
-      window["##BUDIBASE_LOCATION##"] = location
       window["##BUDIBASE_SNIPPETS##"] = snippets
       window['##BUDIBASE_COMPONENT_ERRORS##'] = componentErrors