Merge branch 'dev' into feature/heartbeat

# Conflicts:
#	src/app/App.svelte
#	src/app/store.svelte.ts
#	src/app/store.test.ts
#	src/features/workspaces/ui/WorkspaceCard.test.ts

1 files changed, 15 insertions, 15 deletions

diff --git a/src/app/resolve-http-url.ts b/src/app/resolve-http-url.ts
index 357d2fc..1e20eb2 100644
--- a/src/app/resolve-http-url.ts
+++ b/src/app/resolve-http-url.ts
@@ -1,28 +1,28 @@
 export interface HttpUrlEnv {
-	readonly VITE_HTTP_URL?: string;
-	readonly VITE_HTTP_PORT?: string;
+  readonly VITE_HTTP_URL?: string;
+  readonly VITE_HTTP_PORT?: string;
 }
 
 export interface HttpUrlLocation {
-	readonly protocol: string;
-	readonly hostname: string;
+  readonly protocol: string;
+  readonly hostname: string;
 }
 
 const DEFAULT_PORT = "24203";
 const DEFAULT_FALLBACK = "http://localhost:24203";
 
 export function resolveHttpUrl(env: HttpUrlEnv, location?: HttpUrlLocation): string {
-	if (env.VITE_HTTP_URL !== undefined && env.VITE_HTTP_URL !== "") {
-		return env.VITE_HTTP_URL;
-	}
+  if (env.VITE_HTTP_URL !== undefined && env.VITE_HTTP_URL !== "") {
+    return env.VITE_HTTP_URL;
+  }
 
-	if (location === undefined) {
-		return DEFAULT_FALLBACK;
-	}
+  if (location === undefined) {
+    return DEFAULT_FALLBACK;
+  }
 
-	const port =
-		env.VITE_HTTP_PORT !== undefined && env.VITE_HTTP_PORT !== ""
-			? env.VITE_HTTP_PORT
-			: DEFAULT_PORT;
-	return `${location.protocol}//${location.hostname}:${port}`;
+  const port =
+    env.VITE_HTTP_PORT !== undefined && env.VITE_HTTP_PORT !== ""
+      ? env.VITE_HTTP_PORT
+      : DEFAULT_PORT;
+  return `${location.protocol}//${location.hostname}:${port}`;
 }