diff --git a/app.config.ts b/app.config.ts
index 98c9d36..334fdd0 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -14,13 +14,19 @@ export default defineConfig({
             }
             // Split other large vendor libraries
             if (id.includes("node_modules")) {
-              if (id.includes("@solidjs") || id.includes("solid-js")) {
+              // Keep all solid-related packages together to avoid circular deps
+              if (
+                id.includes("@solidjs") ||
+                id.includes("solid-js") ||
+                id.includes("seroval")
+              ) {
                 return "solid";
               }
               if (id.includes("@trpc")) {
                 return "trpc";
               }
-              return "vendor";
+              // Don't create a generic vendor chunk - let Vite handle it
+              // to avoid circular dependencies with solid
             }
           }
         }
diff --git a/src/env/server.ts b/src/env/server.ts
index 444ad44..0ee4477 100644
--- a/src/env/server.ts
+++ b/src/env/server.ts
@@ -24,7 +24,13 @@ const serverEnvSchema = z.object({
   LINEAGE_OFFLINE_SERIALIZATION_SECRET: z.string().min(1),
   GITEA_URL: z.string().min(1),
   GITEA_TOKEN: z.string().min(1),
-  GITHUB_API_TOKEN: z.string().min(1)
+  GITHUB_API_TOKEN: z.string().min(1),
+  VITE_DOMAIN: z.string().min(1),
+  VITE_AWS_BUCKET_STRING: z.string().min(1),
+  VITE_GOOGLE_CLIENT_ID: z.string().min(1),
+  VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE: z.string().min(1),
+  VITE_GITHUB_CLIENT_ID: z.string().min(1),
+  VITE_WEBSOCKET: z.string().min(1)
 });
 
 // Type inference
@@ -128,7 +134,13 @@ export const getMissingEnvVars = (): string[] => {
     "LINEAGE_OFFLINE_SERIALIZATION_SECRET",
     "GITEA_URL",
     "GITEA_TOKEN",
-    "GITHUB_API_TOKEN"
+    "GITHUB_API_TOKEN",
+    "VITE_DOMAIN",
+    "VITE_AWS_BUCKET_STRING",
+    "VITE_GOOGLE_CLIENT_ID",
+    "VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE",
+    "VITE_GITHUB_CLIENT_ID",
+    "VITE_WEBSOCKET"
   ];
 
   return requiredServerVars.filter((varName) => isMissingEnvVar(varName));