Remove legacy nested builder directory and move screen templates and utils into better locations

packages/builder/package.json

@@ -23,7 +23,6 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
       "components(.*)$": "<rootDir>/src/components$1",
-      "builder(.*)$": "<rootDir>/src/builder$1",
       "stores(.*)$": "<rootDir>/src/stores$1",
       "analytics(.*)$": "<rootDir>/src/analytics$1",
       "constants/backend": "<rootDir>/src/constants/backend/index.js"

packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte

@@ -13,7 +13,7 @@
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
-  import { checkForCollectStep } from "builder/utils"
+  import { checkForCollectStep } from "helpers/utils"
 
   export let blockIdx
   export let lastStep

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -42,7 +42,7 @@
   import {
     getSchemaForDatasourcePlus,
     getEnvironmentBindings,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
   import { onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -28,7 +28,7 @@
     PrettyRelationshipDefinitions,
     DB_TYPE_EXTERNAL,
   } from "constants/backend"
-  import { getAutoColumnInformation, buildAutoColumn } from "builder/utils"
+  import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
   import { getBindings } from "components/backend/DataTable/formula"

packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte

@@ -13,7 +13,7 @@
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { FIELDS } from "constants/backend"
-  import { generate } from "builder/schemaGenerator"
+  import { generate } from "helpers/schemaGenerator"
 
   export let schema = {}
   export let json

packages/builder/src/components/common/bindings/BindableCombobox.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 

packages/builder/src/components/common/bindings/BindingPanel.svelte

@@ -19,7 +19,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import { admin } from "stores/portal"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"

packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"

packages/builder/src/components/common/bindings/DrawerBindableInput.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"

packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"

packages/builder/src/components/common/bindings/ModalBindableInput.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"

packages/builder/src/components/design/ScreenDetailsModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { get } from "svelte/store"
   import { screenStore } from "stores/builder"
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte

@@ -16,7 +16,7 @@
     getActionBindings,
     makeStateBinding,
     updateReferencesInObject,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { cloneDeep } from "lodash/fp"
 
   const flipDurationMs = 150

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { getSchemaForDatasourcePlus } from "builder/dataBinding"
+  import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte

@@ -9,7 +9,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../../dataBinding"
 
   export let parameters
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { getSchemaForDatasourcePlus } from "builder/dataBinding"
+  import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte

@@ -1,7 +1,10 @@
 <script>
   import { currentAsset, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import { getActionProviders, buildFormSchema } from "builder/dataBinding"
+  import {
+    getActionProviders,
+    buildFormSchema,
+  } from "../../../../../../dataBinding"
   import { findComponent } from "stores/builder/components/utils"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte

@@ -3,7 +3,10 @@
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders, buildFormSchema } from "builder/dataBinding"
+  import {
+    getActionProviders,
+    buildFormSchema,
+  } from "../../../../../../dataBinding"
   import { findComponent } from "stores/builder/components/utils"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte

@@ -2,7 +2,7 @@
   import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getAllStateVariables } from "builder/dataBinding"
+  import { getAllStateVariables } from "../../../../../../dataBinding"
 
   export let parameters
   export let bindings = []

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js

@@ -1,4 +1,4 @@
-import { getComponentContexts } from "builder/dataBinding"
+import { getComponentContexts } from "../../../../../../dataBinding"
 import { capitalise } from "helpers"
 
 // Generates bindings for all components that provider "datasource like"

packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte

@@ -4,7 +4,7 @@
   import { createEventDispatcher } from "svelte"
   import { Helpers } from "@budibase/bbui"
   import { componentStore } from "stores/builder"
-  import { getEventContextBindings } from "builder/dataBinding"
+  import { getEventContextBindings } from "../../../../../dataBinding"
   import { cloneDeep, isEqual } from "lodash/fp"
 
   export let componentInstance

packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte

@@ -1,7 +1,7 @@
 <script>
   import EditComponentPopover from "../EditComponentPopover.svelte"
   import { Icon } from "@budibase/bbui"
-  import { runtimeToReadableBinding } from "builder/dataBinding"
+  import { runtimeToReadableBinding } from "../../../../../dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
 
   export let item

packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte

@@ -6,7 +6,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 

packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte

@@ -2,7 +2,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import {
     Button,
     Popover,

packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte

@@ -6,7 +6,7 @@
     getSchemaForDatasource,
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { selectedScreen, currentAsset, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"

packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte

@@ -3,7 +3,7 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { runtimeToReadableBinding } from "builder/dataBinding"
+  import { runtimeToReadableBinding } from "../../../../../dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
   import { componentStore } from "stores/builder"
 

packages/builder/src/components/design/settings/controls/FieldSelect.svelte

@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 

packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte

@@ -4,7 +4,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
   import { currentAsset } from "stores/builder"
 

packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte

@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher, setContext } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getDatasourceForProvider } from "builder/dataBinding"
+  import { getDatasourceForProvider } from "../../../../dataBinding"
   import { currentAsset, componentStore, previewStore } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte

@@ -2,7 +2,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { currentAsset, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"

packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte

@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 

packages/builder/src/components/design/settings/controls/PropertyControl.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { builderStore } from "stores/builder"
   import { onDestroy } from "svelte"
 

packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte

@@ -6,7 +6,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { tables, currentAsset, componentStore } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 

packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte

@@ -2,7 +2,7 @@
   import { ActionButton, notifications } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
   import { findClosestMatchingComponent } from "stores/builder/components/utils"
-  import { makeDatasourceFormComponents } from "builder/store/screenTemplates/utils/commonComponents"
+  import { makeDatasourceFormComponents } from "../../../../templates/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 
   export let componentInstance

packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte

@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset, tables } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"

packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte

@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"

packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte

@@ -15,7 +15,7 @@
   import {
     getSchemaForDatasource,
     getDatasourceForProvider,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 

packages/builder/src/components/integration/QueryBindingBuilder.svelte

@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { createEventDispatcher } from "svelte"
 

packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte

@@ -1,6 +1,6 @@
 <script>
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { getUserBindings } from "builder/dataBinding"
+  import { getUserBindings } from "../../dataBinding"
 
   export let queryBindings = []
 

packages/builder/src/components/integration/RestQueryViewer.svelte

@@ -48,7 +48,7 @@
     runtimeToReadableBinding,
     runtimeToReadableMap,
     toBindingsArray,
-  } from "builder/dataBinding"
+  } from "../../dataBinding"
 
   export let queryId
 

packages/builder/src/dataBinding.js

@@ -22,7 +22,7 @@ import {
   decodeJSBinding,
   encodeJSBinding,
 } from "@budibase/string-templates"
-import { TableNames } from "../constants"
+import { TableNames } from "constants"
 import { JSONUtils } from "@budibase/frontend-core"
 import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
 import { environment, licensing } from "stores/portal"

packages/builder/src/dataBinding.test.js

@@ -3,7 +3,7 @@ import {
   runtimeToReadableBinding,
   readableToRuntimeBinding,
   updateReferencesInObject,
-} from "builder/dataBinding"
+} from "./dataBinding"
 
 describe("Builder dataBinding", () => {
   beforeEach(() => {

packages/builder/src/helpers/formFields.js

@@ -2,7 +2,7 @@ import { findClosestMatchingComponent } from "stores/builder/components/utils"
 import {
   getDatasourceForProvider,
   getSchemaForDatasource,
-} from "builder/dataBinding"
+} from "../dataBinding"
 
 export const getComponentFieldOptions = (asset, id, type, loose = true) => {
   const form = findClosestMatchingComponent(

packages/builder/src/helpers/utils.js

@@ -1,11 +1,11 @@
 import { ActionStepID } from "constants/backend/automations"
-import { TableNames } from "../constants"
+import { TableNames } from "constants"
 import {
   AUTO_COLUMN_DISPLAY_NAMES,
   AUTO_COLUMN_SUB_TYPES,
   FIELDS,
   isAutoColumnUserRelationship,
-} from "../constants/backend"
+} from "constants/backend"
 
 export function getAutoColumnInformation(enabled = true) {
   let info = {}

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte

@@ -12,7 +12,10 @@
   } from "@budibase/bbui"
   import { AUTH_TYPE_LABELS, AUTH_TYPES } from "./authTypes"
   import BindableCombobox from "components/common/bindings/BindableCombobox.svelte"
-  import { getAuthBindings, getEnvironmentBindings } from "builder/dataBinding"
+  import {
+    getAuthBindings,
+    getEnvironmentBindings,
+  } from "../../../../../../../../../../dataBinding"
   import { environment, licensing, auth } from "stores/portal"
   import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
 

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte

@@ -5,7 +5,7 @@
     getRestBindings,
     readableToRuntimeBinding,
     runtimeToReadableMap,
-  } from "builder/dataBinding"
+  } from "../../../../../../../../../dataBinding"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "./SaveDatasourceButton.svelte"
   import Panel from "./Panel.svelte"

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte

@@ -2,7 +2,7 @@
   import { Heading, Layout } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
-  import { getEnvironmentBindings } from "builder/dataBinding"
+  import { getEnvironmentBindings } from "../../../../../../../../../../dataBinding"
   import { licensing } from "stores/portal"
   import { queries } from "stores/builder"
   import { cloneDeep } from "lodash/fp"

packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte

@@ -13,7 +13,7 @@
   import {
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builder/dataBinding"
+  } from "../../../../../../../../../dataBinding"
   import { ActionButton, notifications } from "@budibase/bbui"
   import { capitalise } from "helpers"
 

packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte

@@ -15,7 +15,7 @@
     getBindableProperties,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../../../../../../../dataBinding"
 
   export let componentInstance
   export let componentDefinition

packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte

@@ -11,9 +11,9 @@
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
   import { selectedScreen, screenStore } from "stores/builder"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
-  import { getBindableProperties } from "builder/dataBinding"
+  import { getBindableProperties } from "../../../../../../../../../dataBinding"
 
   $: bindings = getBindableProperties($selectedScreen, null)
 

packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte

@@ -10,7 +10,7 @@
     notifications,
   } from "@budibase/bbui"
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { makeComponentUnique } from "stores/builder/components/utils"
 
   export let screenId

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte

@@ -2,11 +2,11 @@
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import ScreenRoleModal from "./ScreenRoleModal.svelte"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { Modal, notifications } from "@budibase/bbui"
   import { screenStore, navigationStore, tables } from "stores/builder"
   import { get } from "svelte/store"
-  import getTemplates from "builder/store/screenTemplates"
+  import getTemplates from "templates"
   import { Roles } from "constants/backend"
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte

@@ -4,7 +4,7 @@
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { IntegrationNames } from "constants"
   import { onMount } from "svelte"
-  import rowListScreen from "builder/store/screenTemplates/rowListScreen"
+  import rowListScreen from "../../../../../../../templates/rowListScreen"
   import DatasourceTemplateRow from "./DatasourceTemplateRow.svelte"
 
   export let mode

packages/builder/src/stores/builder/automations.js

@@ -4,7 +4,7 @@ import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
 import { createHistoryStore } from "stores/builder/history"
 import { notifications } from "@budibase/bbui"
-import { updateReferencesInObject } from "builder/dataBinding"
+import { updateReferencesInObject } from "../../dataBinding"
 
 const initialAutomationState = {
   automations: [],

packages/builder/src/stores/builder/components/index.js

@@ -15,7 +15,7 @@ import {
 import { getComponentFieldOptions } from "helpers/formFields"
 import { selectedScreen } from "../screens"
 import { screenStore, appStore, previewStore, tables } from "stores/builder"
-import { buildFormSchema, getSchemaForDatasource } from "builder/dataBinding"
+import { buildFormSchema, getSchemaForDatasource } from "../../../dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DEFAULT_BB_DATASOURCE_ID,

packages/builder/src/stores/builder/tests/fixtures/index.js

@@ -1,6 +1,6 @@
 import { v4 } from "uuid"
-import { Component } from "builder/store/screenTemplates/utils/Component"
+import { Component } from "../../../../templates/Component"
-import { Screen } from "builder/store/screenTemplates/utils/Screen"
+import { Screen } from "../../../../templates/Screen"
 import { get } from "svelte/store"
 import {
   BUDIBASE_INTERNAL_DB_ID,

packages/builder/src/templates/commonComponents.js

@@ -1,5 +1,5 @@
 import { Component } from "./Component"
-import { getSchemaForDatasource } from "../../../dataBinding"
+import { getSchemaForDatasource } from "../dataBinding"
 
 const fieldTypeToComponentMap = {
   string: "stringfield",

packages/builder/src/templates/createFromScratchScreen.js

@@ -1,4 +1,4 @@
-import { Screen } from "./utils/Screen"
+import { Screen } from "./Screen"
 
 export default {
   name: `Create from scratch`,

packages/builder/src/templates/rowListScreen.js

@@ -1,6 +1,6 @@
-import sanitizeUrl from "./utils/sanitizeUrl"
+import sanitizeUrl from "helpers/sanitizeUrl"
-import { Screen } from "./utils/Screen"
+import { Screen } from "./Screen"
-import { Component } from "./utils/Component"
+import { Component } from "./Component"
 
 export default function (datasources, mode = "table") {
   if (!Array.isArray(datasources)) {

packages/builder/vite.config.js

@@ -99,8 +99,8 @@ export default defineConfig(({ mode }) => {
           replacement: path.resolve("./src/components"),
         },
         {
-          find: "builder",
+          find: "templates",
-          replacement: path.resolve("./src/builder"),
+          replacement: path.resolve("./src/templates"),
         },
         {
           find: "stores",