Преглед изворни кода

app: make localhost urls work in isLocal

Brendan Allan пре 1 месец
родитељ
комит
50883cc1e9
1 измењених фајлова са 7 додато и 3 уклоњено
  1. 7 3
      packages/app/src/context/server.tsx

+ 7 - 3
packages/app/src/context/server.tsx

@@ -24,11 +24,15 @@ export function serverDisplayName(conn?: ServerConnection.Any) {
 function projectsKey(key: ServerConnection.Key) {
   if (!key) return ""
   if (key === "sidecar") return "local"
-  const host = key.replace(/^https?:\/\//, "").split(":")[0]
-  if (host === "localhost" || host === "127.0.0.1") return "local"
+  if (isLocalHost(key)) return "local"
   return key
 }
 
+function isLocalHost(url: string) {
+  const host = url.replace(/^https?:\/\//, "").split(":")[0]
+  if (host === "localhost" || host === "127.0.0.1") return "local"
+}
+
 export namespace ServerConnection {
   type Base = { displayName?: string }
 
@@ -197,7 +201,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
     )
     const isLocal = createMemo(() => {
       const c = current()
-      return c?.type === "sidecar" && c.variant === "base"
+      return (c?.type === "sidecar" && c.variant === "base") || (c?.type === "http" && isLocalHost(c.http.url))
     })
 
     return {