Put root first

Author: TrySound

apps/builder/app/builder/features/topbar/domains.tsx

@@ -29,7 +29,7 @@ import {
   useState,
   type ReactNode,
 } from "react";
-import { Entri } from "./entri";
+import { Entri, type DnsRecord } from "./entri";
 import { nativeClient } from "~/shared/trpc/trpc-client";
 import { useStore } from "@nanostores/react";
 import { $publisherHost } from "~/shared/nano-states";
@@ -288,28 +288,32 @@ const DomainItem = ({
 
   const publisherHost = useStore($publisherHost);
   const cname = extractCname(projectDomain.domain);
-  const dnsRecords = [
-    {
-      type: "CNAME",
-      host: cname,
-      value: `${projectDomain.cname}.customers.${publisherHost}`,
-      ttl: 300,
-    } as const,
-    {
-      type: "TXT",
-      host: cname === "@" ? "_webstudio_is" : `_webstudio_is.${cname}`,
-      value: projectDomain.expectedTxtRecord,
-      ttl: 300,
-    } as const,
-  ];
-  // add both www and root cname to support root -> www redirect
-  if (cname === "www") {
-    dnsRecords.push({
-      type: "TXT",
-      host: "_webstudio_is",
-      value: projectDomain.expectedTxtRecord,
-      ttl: 300,
-    });
+  const cnameRecord: DnsRecord = {
+    type: "CNAME",
+    host: cname,
+    value: `${projectDomain.cname}.customers.${publisherHost}`,
+    ttl: 300,
+  };
+  const rootTxtRecord: DnsRecord = {
+    type: "TXT",
+    host: "_webstudio_is",
+    value: projectDomain.expectedTxtRecord,
+    ttl: 300,
+  };
+  const subdomainTxtRecord: DnsRecord = {
+    type: "TXT",
+    host: `_webstudio_is.${cname}`,
+    value: projectDomain.expectedTxtRecord,
+    ttl: 300,
+  };
+  const dnsRecords: DnsRecord[] = [cnameRecord];
+  if (cname === "@") {
+    dnsRecords.push(rootTxtRecord);
+  } else if (cname === "www") {
+    // add both www and root cname to support root -> www redirect
+    dnsRecords.push(rootTxtRecord, subdomainTxtRecord);
+  } else {
+    dnsRecords.push(subdomainTxtRecord);
   }
 
   return (

apps/builder/app/builder/features/topbar/entri.tsx

@@ -7,7 +7,7 @@ import { $userPlanFeatures } from "~/shared/nano-states";
 import { extractCname } from "./cname";
 
 // https://developers.entri.com/docs/install
-type DnsRecord = {
+export type DnsRecord = {
   type: "CNAME" | "ALIAS" | "TXT";
   host: string;
   value: string;