Merge branch 'update-aliasing' of github.com:Budibase/budibase into update-aliasing

packages/builder/src/stores/builder/datasources.ts

@@ -18,6 +18,11 @@ import {
 import { TableNames } from "@/constants"
 import { DerivedBudiStore } from "@/stores/BudiStore"
 
+// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
+interface InternalDatasource extends Omit<Datasource, "entities"> {
+  entities: Table[]
+}
+
 class TableImportError extends Error {
   errors: Record<string, string>
 

packages/builder/src/stores/builder/hover.js

@@ -1,6 +1,6 @@
 import { get } from "svelte/store"
-import { previewStore } from "@/stores/builder"
 import { BudiStore } from "../BudiStore"
+import { previewStore } from "@/stores/builder"
 
 export const INITIAL_HOVER_STATE = {
   componentId: null,

packages/builder/src/stores/builder/layouts.js

@@ -1,7 +1,7 @@
 import { derived, get } from "svelte/store"
 import { componentStore } from "@/stores/builder"
-import { BudiStore } from "../BudiStore"
 import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
 
 export const INITIAL_LAYOUT_STATE = {
   layouts: [],

packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts

@@ -1,6 +1,12 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
+<<<<<<< HEAD
 import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
 import { DatasourceTypes } from "@/constants/backend"
+=======
+import { DatasourceTypes } from "@/constants/backend"
+import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
+
+>>>>>>> 094e337f0288652e71c7bebd1ed32003f62af90a
 import { derived } from "svelte/store"
 import { integrations } from "@/stores/builder/integrations"