Separate types & fix #private import

src/app/[orgId]/layout.tsx

@@ -10,7 +10,7 @@ import { redirect } from "next/navigation";
 import { cache } from "react";
 import SetLastOrgCookie from "@app/components/SetLastOrgCookie";
 import PrivateSubscriptionStatusProvider from "@app/providers/SubscriptionStatusProvider";
-import { GetOrgSubscriptionResponse } from "#private/routers/billing/getOrgSubscription";
+import { GetOrgSubscriptionResponse } from "@server/routers/billing/types";
 import { pullEnv } from "@app/lib/pullEnv";
 import { build } from "@server/build";
 

src/app/[orgId]/settings/(private)/billing/page.tsx

@@ -37,7 +37,7 @@ import { InfoPopup } from "@/components/ui/info-popup";
 import {
     GetOrgSubscriptionResponse,
     GetOrgUsageResponse
-} from "#private/routers/billing";
+} from "@server/routers/billing/types";
 import { useTranslations } from "use-intl";
 import Link from "next/link";
 

src/app/[orgId]/settings/(private)/idp/page.tsx

@@ -9,7 +9,7 @@ import { cache } from "react";
 import {
     GetOrgSubscriptionResponse,
     GetOrgTierResponse
-} from "#private/routers/billing";
+} from "@server/routers/billing/types";
 import { TierId } from "@server/lib/billing/tiers";
 import { build } from "@server/build";
 

src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/layout.tsx

@@ -1,5 +1,5 @@
 import { internal } from "@app/lib/api";
-import { GetRemoteExitNodeResponse } from "#private/routers/remoteExitNode";
+import { GetRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
 import { authCookieHeader } from "@app/lib/api/cookies";

src/app/[orgId]/settings/(private)/remote-exit-nodes/create/page.tsx

@@ -30,7 +30,7 @@ import { useEnvContext } from "@app/hooks/useEnvContext";
 import {
     QuickStartRemoteExitNodeResponse,
     PickRemoteExitNodeDefaultsResponse
-} from "#private/routers/remoteExitNode";
+} from "@server/routers/remoteExitNode/types";
 import { toast } from "@app/hooks/useToast";
 import { AxiosResponse } from "axios";
 import { useParams, useRouter, useSearchParams } from "next/navigation";

src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx

@@ -1,6 +1,6 @@
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
-import { ListRemoteExitNodesResponse } from "#private/routers/remoteExitNode";
+import { ListRemoteExitNodesResponse } from "@server/routers/remoteExitNode/types";
 import { AxiosResponse } from "axios";
 import ExitNodesTable, { RemoteExitNodeRow } from "./ExitNodesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";

src/app/[orgId]/settings/sites/create/page.tsx

@@ -53,7 +53,7 @@ import {
     CreateSiteResponse,
     PickSiteDefaultsResponse
 } from "@server/routers/site";
-import { ListRemoteExitNodesResponse } from "#private/routers/remoteExitNode";
+import { ListRemoteExitNodesResponse } from "@server/routers/remoteExitNode/types";
 import { toast } from "@app/hooks/useToast";
 import { AxiosResponse } from "axios";
 import { useParams, useRouter } from "next/navigation";

src/app/auth/(private)/org/page.tsx

@@ -6,13 +6,12 @@ import { verifySession } from "@app/lib/auth/verifySession";
 import { redirect } from "next/navigation";
 import { pullEnv } from "@app/lib/pullEnv";
 import { LoginFormIDP } from "@app/components/LoginForm";
-import { ListOrgIdpsResponse } from "#private/routers/orgIdp";
+import { ListOrgIdpsResponse } from "@server/routers/orgIdp/types";
 import { build } from "@server/build";
 import { headers } from "next/headers";
 import {
-    GetLoginPageResponse,
     LoadLoginPageResponse
-} from "#private/routers/loginPage";
+} from "@server/routers/loginPage/types";
 import IdpLoginButtons from "@app/components/private/IdpLoginButtons";
 import {
     Card,
@@ -26,7 +25,7 @@ import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { GetSessionTransferTokenRenponse } from "#private/routers/auth/getSessionTransferToken";
 import ValidateSessionTransferToken from "@app/components/private/ValidateSessionTransferToken";
-import { GetOrgTierResponse } from "#private/routers/billing";
+import { GetOrgTierResponse } from "@server/routers/billing/types";
 import { TierId } from "@server/lib/billing/tiers";
 
 export const dynamic = "force-dynamic";

src/app/auth/idp/[idpId]/oidc/callback/page.tsx

@@ -6,7 +6,7 @@ import { AxiosResponse } from "axios";
 import { GetIdpResponse } from "@server/routers/idp";
 import { getTranslations } from "next-intl/server";
 import { pullEnv } from "@app/lib/pullEnv";
-import { LoadLoginPageResponse } from "#private/routers/loginPage";
+import { LoadLoginPageResponse } from "@server/routers/loginPage/types";
 import { redirect } from "next/navigation";
 
 export const dynamic = "force-dynamic";

src/app/auth/resource/[resourceGuid]/page.tsx

@@ -15,12 +15,12 @@ import AccessToken from "@app/components/AccessToken";
 import { pullEnv } from "@app/lib/pullEnv";
 import { LoginFormIDP } from "@app/components/LoginForm";
 import { ListIdpsResponse } from "@server/routers/idp";
-import { ListOrgIdpsResponse } from "#private/routers/orgIdp";
+import { ListOrgIdpsResponse } from "@server/routers/orgIdp/types";
 import AutoLoginHandler from "@app/components/AutoLoginHandler";
 import { build } from "@server/build";
 import { headers } from "next/headers";
-import { GetLoginPageResponse } from "#private/routers/loginPage";
-import { GetOrgTierResponse } from "#private/routers/billing";
+import { GetLoginPageResponse } from "@server/routers/loginPage/types";
+import { GetOrgTierResponse } from "@server/routers/billing/types";
 import { TierId } from "@server/lib/billing/tiers";
 
 export const dynamic = "force-dynamic";

src/components/DomainPicker.tsx

@@ -32,7 +32,7 @@ import { createApiClient, formatAxiosError } from "@/lib/api";
 import { useEnvContext } from "@/hooks/useEnvContext";
 import { toast } from "@/hooks/useToast";
 import { ListDomainsResponse } from "@server/routers/domain/listDomains";
-import { CheckDomainAvailabilityResponse } from "#private/routers/domain/checkDomainNamespaceAvailability";
+import { CheckDomainAvailabilityResponse } from "@server/routers/domain/types";
 import { AxiosResponse } from "axios";
 import { cn } from "@/lib/cn";
 import { useTranslations } from "next-intl";

src/components/private/AuthPageSettings.tsx

@@ -30,7 +30,7 @@ import {
     SettingsSectionForm
 } from "@app/components/Settings";
 import { useTranslations } from "next-intl";
-import { GetLoginPageResponse } from "#private/routers/loginPage";
+import { GetLoginPageResponse } from "@server/routers/loginPage/types";
 import { ListDomainsResponse } from "@server/routers/domain";
 import { DomainRow } from "@app/components/DomainsTable";
 import { toUnicode } from "punycode";

src/components/private/ValidateSessionTransferToken.tsx

@@ -8,7 +8,7 @@ import { useEffect, useState } from "react";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { AlertCircle } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { TransferSessionResponse } from "#private/routers/auth/transferSession";
+import { TransferSessionResponse } from "@server/routers/auth/types";
 
 type ValidateSessionTransferTokenParams = {
     token: string;

src/contexts/remoteExitNodeContext.ts

@@ -1,4 +1,4 @@
-import { GetRemoteExitNodeResponse } from "#private/routers/remoteExitNode";
+import { GetRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 import { createContext } from "react";
 
 type RemoteExitNodeContextType = {

src/contexts/subscriptionStatusContext.ts

@@ -1,4 +1,4 @@
-import { GetOrgSubscriptionResponse } from "#private/routers/billing";
+import { GetOrgSubscriptionResponse } from "@server/routers/billing/types";
 import { createContext } from "react";
 
 type SubscriptionStatusContextType = {

src/hooks/useCertificate.ts

@@ -2,7 +2,7 @@
 
 import { useState, useCallback, useEffect } from "react";
 import { AxiosResponse } from "axios";
-import { GetCertificateResponse } from "#private/routers/certificates";
+import { GetCertificateResponse } from "@server/routers/certificates/types";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 

src/providers/RemoteExitNodeProvider.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import RemoteExitNodeContext from "@app/contexts/remoteExitNodeContext";
-import { GetRemoteExitNodeResponse } from "#private/routers/remoteExitNode";
+import { GetRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 import { useState } from "react";
 import { useTranslations } from "next-intl";
 

src/providers/SubscriptionStatusProvider.tsx

@@ -2,7 +2,7 @@
 
 import SubscriptionStatusContext from "@app/contexts/subscriptionStatusContext";
 import { getTierPriceSet } from "@server/lib/billing/tiers";
-import { GetOrgSubscriptionResponse } from "#private/routers/billing";
+import { GetOrgSubscriptionResponse } from "@server/routers/billing/types";
 import { useState } from "react";
 
 interface ProviderProps {