From c2b16c02915931eb69e830f2695db05132ed1e88 Mon Sep 17 00:00:00 2001
From: Michael Freno <michaelt.freno@gmail.com>
Date: Fri, 19 Dec 2025 16:09:31 -0500
Subject: [PATCH] this should work, then we can add back

---
 src/entry-server.tsx                | 7 -------
 src/lib/api.ts                      | 2 +-
 src/routes/account.tsx              | 2 +-
 src/routes/blog/[title]/index.tsx   | 8 ++------
 src/routes/blog/create/index.tsx    | 3 +--
 src/routes/blog/edit/[id]/index.tsx | 5 ++---
 src/routes/index.tsx                | 2 +-
 src/routes/login/index.tsx          | 2 +-
 src/routes/test.tsx                 | 3 +--
 src/server/database.ts              | 2 +-
 10 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/entry-server.tsx b/src/entry-server.tsx
index 1f76c0e..401eff8 100644
--- a/src/entry-server.tsx
+++ b/src/entry-server.tsx
@@ -1,12 +1,5 @@
 // @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
-import { validateServerEnv } from "./env/server";
-
-try {
-  validateServerEnv(process.env);
-} catch (error) {
-  console.error("Environment validation failed:", error);
-}
 
 export default createHandler(() => (
   <StartServer
diff --git a/src/lib/api.ts b/src/lib/api.ts
index ed2dffc..aec4088 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -1,5 +1,5 @@
 import { createTRPCProxyClient, httpBatchLink, loggerLink } from "@trpc/client";
-import { AppRouter } from "~/server/api/root";
+import type { AppRouter } from "~/server/api/root";
 
 const getBaseUrl = () => {
   // Browser: use relative URL
diff --git a/src/routes/account.tsx b/src/routes/account.tsx
index 3bc5f9d..3c91809 100644
--- a/src/routes/account.tsx
+++ b/src/routes/account.tsx
@@ -7,7 +7,6 @@ import XCircle from "~/components/icons/XCircle";
 import Dropzone from "~/components/blog/Dropzone";
 import AddImageToS3 from "~/lib/s3upload";
 import { validatePassword, isValidEmail } from "~/lib/validation";
-import { checkAuthStatus } from "~/server/utils";
 
 type UserProfile = {
   id: string;
@@ -21,6 +20,7 @@ type UserProfile = {
 
 const checkAuth = cache(async () => {
   "use server";
+  const { checkAuthStatus } = await import("~/server/utils");
   const event = getEvent()!;
   const { isAuthenticated } = await checkAuthStatus(event);
 
diff --git a/src/routes/blog/[title]/index.tsx b/src/routes/blog/[title]/index.tsx
index 3b462a3..23cb265 100644
--- a/src/routes/blog/[title]/index.tsx
+++ b/src/routes/blog/[title]/index.tsx
@@ -2,11 +2,6 @@ import { Show, Suspense, For } from "solid-js";
 import { useParams, A, Navigate, query } from "@solidjs/router";
 import { Title } from "@solidjs/meta";
 import { createAsync } from "@solidjs/router";
-import {
-  ConnectionFactory,
-  getUserID,
-  getPrivilegeLevel
-} from "~/server/utils";
 import { getRequestEvent } from "solid-js/web";
 import SessionDependantLike from "~/components/blog/SessionDependantLike";
 import CommentIcon from "~/components/icons/CommentIcon";
@@ -19,7 +14,8 @@ import { TerminalSplash } from "~/components/TerminalSplash";
 // Server function to fetch post by title
 const getPostByTitle = query(async (title: string) => {
   "use server";
-
+  const { ConnectionFactory, getUserID, getPrivilegeLevel } =
+    await import("~/server/utils");
   const event = getRequestEvent()!;
   const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
   const userID = await getUserID(event.nativeEvent);
diff --git a/src/routes/blog/create/index.tsx b/src/routes/blog/create/index.tsx
index 2c47e39..59a3815 100644
--- a/src/routes/blog/create/index.tsx
+++ b/src/routes/blog/create/index.tsx
@@ -3,7 +3,6 @@ import { useNavigate, query } from "@solidjs/router";
 import { Title } from "@solidjs/meta";
 import { createAsync } from "@solidjs/router";
 import { getRequestEvent } from "solid-js/web";
-import { getPrivilegeLevel, getUserID } from "~/server/utils";
 import { api } from "~/lib/api";
 import { debounce } from "~/lib/client-utils";
 import Dropzone from "~/components/blog/Dropzone";
@@ -15,7 +14,7 @@ import AddImageToS3 from "~/lib/s3upload";
 
 const getAuthState = query(async () => {
   "use server";
-
+  const { getPrivilegeLevel, getUserID } = await import("~/server/utils");
   const event = getRequestEvent()!;
   const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
   const userID = await getUserID(event.nativeEvent);
diff --git a/src/routes/blog/edit/[id]/index.tsx b/src/routes/blog/edit/[id]/index.tsx
index 48a6798..8435035 100644
--- a/src/routes/blog/edit/[id]/index.tsx
+++ b/src/routes/blog/edit/[id]/index.tsx
@@ -3,10 +3,8 @@ import { useParams, useNavigate, query } from "@solidjs/router";
 import { Title } from "@solidjs/meta";
 import { createAsync } from "@solidjs/router";
 import { getRequestEvent } from "solid-js/web";
-import { getPrivilegeLevel, getUserID } from "~/server/utils";
 import { api } from "~/lib/api";
 import { debounce } from "~/lib/client-utils";
-import { ConnectionFactory } from "~/server/utils";
 import Dropzone from "~/components/blog/Dropzone";
 import TextEditor from "~/components/blog/TextEditor";
 import TagMaker from "~/components/blog/TagMaker";
@@ -16,7 +14,8 @@ import AddImageToS3 from "~/lib/s3upload";
 
 const getPostForEdit = query(async (id: string) => {
   "use server";
-
+  const { getPrivilegeLevel, getUserID, ConnectionFactory } =
+    await import("~/server/utils");
   const event = getRequestEvent()!;
   const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
   const userID = await getUserID(event.nativeEvent);
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 11e92f4..8dd73b7 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -134,7 +134,7 @@ export default function Home() {
         </div>
       </div>
 
-      <div class="flex flex-col items-end gap-4">
+      <div class="flex flex-col items-end gap-4 pr-4">
         <Typewriter speed={50} keepAlive={false}>
           <div>
             My Collection of
diff --git a/src/routes/login/index.tsx b/src/routes/login/index.tsx
index e5e50aa..667e027 100644
--- a/src/routes/login/index.tsx
+++ b/src/routes/login/index.tsx
@@ -14,10 +14,10 @@ import EyeSlash from "~/components/icons/EyeSlash";
 import CountdownCircleTimer from "~/components/CountdownCircleTimer";
 import { isValidEmail, validatePassword } from "~/lib/validation";
 import { getClientCookie } from "~/lib/cookies.client";
-import { checkAuthStatus } from "~/server/utils";
 
 const checkAuth = cache(async () => {
   "use server";
+  const { checkAuthStatus } = await import("~/server/utils");
   const event = getEvent()!;
   const { isAuthenticated } = await checkAuthStatus(event);
 
diff --git a/src/routes/test.tsx b/src/routes/test.tsx
index 56a90e0..a4863ec 100644
--- a/src/routes/test.tsx
+++ b/src/routes/test.tsx
@@ -1,12 +1,11 @@
 import { createSignal, For, Show } from "solid-js";
 import { query, createAsync } from "@solidjs/router";
 import { getRequestEvent } from "solid-js/web";
-import { getPrivilegeLevel } from "~/server/utils";
 import { api } from "~/lib/api";
 
 const getAuthState = query(async () => {
   "use server";
-
+  const { getPrivilegeLevel } = await import("~/server/utils");
   const event = getRequestEvent()!;
   const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
 
diff --git a/src/server/database.ts b/src/server/database.ts
index 71ee4ae..51f2dc2 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -3,6 +3,7 @@ import { createClient as createAPIClient } from "@tursodatabase/api";
 import { v4 as uuid } from "uuid";
 import { env } from "~/env/server";
 import type { H3Event } from "vinxi/http";
+import { getUserID } from "./auth";
 
 let mainDBConnection: ReturnType<typeof createClient> | null = null;
 let lineageDBConnection: ReturnType<typeof createClient> | null = null;
@@ -139,7 +140,6 @@ export async function getUserBasicInfo(event: H3Event): Promise<{
   email: string | null;
   isAuthenticated: boolean;
 } | null> {
-  const { getUserID } = await import("./auth");
   const userId = await getUserID(event);
 
   if (!userId) {