Remove env accesses at build time

.dockerignore

@@ -1,12 +1,33 @@
+# VCS / CI
 .git
 .github
+
+# Build output
 .next
+dist
+out
+coverage
+
+# Dependencies
 node_modules
+
+# Logs
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
 bun-debug.log*
+
+# Local env (keep .env.example)
 .env
 .env.*
 !.env.example
-Dockerfile
-README.md
+
+# Tooling caches
 tsconfig.tsbuildinfo
+.turbo
+.cache
+
+# OS/editor junk
+.DS_Store
+.vscode

.github/workflows/fly-deploy.yml

@@ -14,6 +14,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --remote-only
+      - run: |
+          flyctl deploy --remote-only --verbose \
+            --build-arg NEXT_PUBLIC_SUPABASE_URL="${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}" \
+            --build-arg NEXT_PUBLIC_SUPABASE_ANON_KEY="${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}" \
+            --build-arg NEXT_PUBLIC_REOWN_PROJECT_ID="${{ secrets.NEXT_PUBLIC_REOWN_PROJECT_ID }}" \
+            --build-arg NEXT_PUBLIC_ADMIN_ADDRESS="${{ secrets.NEXT_PUBLIC_ADMIN_ADDRESS }}" \
+            --build-arg NEXT_PUBLIC_ADMIN_ADDRESSES="${{ secrets.NEXT_PUBLIC_ADMIN_ADDRESSES }}"
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.github/workflows/pr-check.yml

@@ -0,0 +1,23 @@
+name: PR Build
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  build:
+    name: Build Docker image (PR)
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Docker build (validates bun run build in Dockerfile)
+        run: |
+          docker build \
+            --build-arg NEXT_PUBLIC_SUPABASE_URL="${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}" \
+            --build-arg NEXT_PUBLIC_SUPABASE_ANON_KEY="${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}" \
+            --build-arg NEXT_PUBLIC_REOWN_PROJECT_ID="${{ secrets.NEXT_PUBLIC_REOWN_PROJECT_ID }}" \
+            --build-arg NEXT_PUBLIC_ADMIN_ADDRESS="${{ secrets.NEXT_PUBLIC_ADMIN_ADDRESS }}" \
+            --build-arg NEXT_PUBLIC_ADMIN_ADDRESSES="${{ secrets.NEXT_PUBLIC_ADMIN_ADDRESSES }}" \
+            -t web3copy:pr-${{ github.event.pull_request.number }} .

Dockerfile

@@ -32,8 +32,15 @@ COPY . .
 # inlines NEXT_PUBLIC_* values into the client bundle during next build.
 ARG NEXT_PUBLIC_ADMIN_ADDRESS
 ARG NEXT_PUBLIC_ADMIN_ADDRESSES
+ARG NEXT_PUBLIC_SUPABASE_URL
+ARG NEXT_PUBLIC_SUPABASE_ANON_KEY
+ARG NEXT_PUBLIC_REOWN_PROJECT_ID
+
 ENV NEXT_PUBLIC_ADMIN_ADDRESS="${NEXT_PUBLIC_ADMIN_ADDRESS}"
 ENV NEXT_PUBLIC_ADMIN_ADDRESSES="${NEXT_PUBLIC_ADMIN_ADDRESSES}"
+ENV NEXT_PUBLIC_SUPABASE_URL="${NEXT_PUBLIC_SUPABASE_URL}"
+ENV NEXT_PUBLIC_SUPABASE_ANON_KEY="${NEXT_PUBLIC_SUPABASE_ANON_KEY}"
+ENV NEXT_PUBLIC_REOWN_PROJECT_ID="${NEXT_PUBLIC_REOWN_PROJECT_ID}"
 
 # Build application (runs prisma generate + prisma:sync + next build via package.json)
 RUN bun run build

src/app/admin/page.tsx

@@ -6,6 +6,7 @@ import { useSignMessage } from "wagmi";
 import { Button } from "@/components/ui/button";
 import { WalletButton } from "@/components/wallet-button";
 
+export const dynamic = "force-dynamic";
 export default function AdminPage() {
   const { address, isConnected, mounted } = useWallet();
   const { signMessageAsync } = useSignMessage();

src/app/api/admin/approve/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib/prisma";
+import { getPrisma } from "@/lib/prisma";
 import { setName } from "@/lib/namestone";
 import { verifyMessage } from "viem";
 import { isAllowedAdminAddress } from "@/lib/admin-auth";
@@ -28,8 +28,9 @@ export async function POST(req: NextRequest) {
   const isAuth = await verifyAdminAuth(req);
   if (!isAuth)
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-
+  
   try {
+    const prisma = getPrisma();
     const { claimId } = await req.json();
 
     const claim = await prisma.claimRequest.findUnique({

src/app/api/admin/claims/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib/prisma";
+import { getPrisma } from "@/lib/prisma";
 import { verifyMessage } from "viem";
 import { isAllowedAdminAddress } from "@/lib/admin-auth";
 
@@ -36,7 +36,9 @@ export async function GET(req: NextRequest) {
   const { searchParams } = new URL(req.url);
   const status = searchParams.get("status");
 
+
   try {
+    const prisma = getPrisma();
     const claims = await prisma.claimRequest.findMany({
       where: status ? { status } : undefined,
       orderBy: { createdAt: "desc" },
@@ -56,7 +58,9 @@ export async function PUT(req: NextRequest) {
   if (!isAuth)
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 
+
   try {
+    const prisma = getPrisma(); 
     const body = await req.json();
     const { id, status } = body; // status can be "APPROVED", "REJECTED"
 

src/app/api/admin/revoke/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib/prisma";
+import { getPrisma } from "@/lib/prisma";
 import { deleteName } from "@/lib/namestone";
 import { verifyMessage } from "viem";
 import { isAllowedAdminAddress } from "@/lib/admin-auth";
@@ -29,7 +29,10 @@ export async function POST(req: NextRequest) {
   if (!isAuth)
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 
+
+
   try {
+    const prisma = getPrisma();
     const { name, claimId } = await req.json();
 
     // Delete from NameStone

src/app/api/claims/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib/prisma";
+import { getPrisma } from "@/lib/prisma";
 
 export async function GET(req: NextRequest) {
   const { searchParams } = new URL(req.url);
@@ -9,7 +9,9 @@ export async function GET(req: NextRequest) {
     return NextResponse.json({ error: "Address is required" }, { status: 400 });
   }
 
+
   try {
+    const prisma = getPrisma();
     const claims = await prisma.claimRequest.findMany({
       where: {
         walletAddress: address.toLowerCase(),
@@ -29,7 +31,9 @@ export async function GET(req: NextRequest) {
 }
 
 export async function POST(req: NextRequest) {
+
   try {
+    const prisma = getPrisma();
     const body = await req.json();
     const { walletAddress, requestedName } = body;
     const normalizedWalletAddress = walletAddress?.toLowerCase();

src/lib/prisma.ts

@@ -7,7 +7,7 @@ const normalizeDatabaseUrl = (value?: string) => {
   return value.trim().replace(/^['\"]+|['\"]+$/g, "");
 };
 
-const prismaClientSingleton = () => {
+const createPrismaClient = () => {
   const databaseUrl = normalizeDatabaseUrl(process.env.DATABASE_URL);
 
   if (!databaseUrl) {
@@ -24,21 +24,25 @@ const prismaClientSingleton = () => {
   }
 
   if (protocol !== "postgresql:" && protocol !== "postgres:") {
-    throw new Error(
-      "DATABASE_URL must start with postgresql:// or postgres://",
-    );
+    throw new Error("DATABASE_URL must start with postgresql:// or postgres://");
   }
 
   const pool = new Pool({ connectionString: databaseUrl });
   const adapter = new PrismaPg(pool);
-  const client = new PrismaClient({ adapter });
-  return client;
+  return new PrismaClient({ adapter });
 };
 
-declare const globalThis: {
-  prismaGlobal: ReturnType<typeof prismaClientSingleton>;
-} & typeof global;
-
-export const prisma = globalThis.prismaGlobal ?? prismaClientSingleton();
-
-if (process.env.NODE_ENV !== "production") globalThis.prismaGlobal = prisma;
+declare global {
+  // eslint-disable-next-line no-var
+  var prismaGlobal: PrismaClient | undefined;
+}
+
+/**
+ * Lazy Prisma accessor.
+ * Safe to import during `next build` because it does not read env / connect
+ * until you call it inside a request handler.
+ */
+export const getPrisma = (): PrismaClient => {
+      globalThis.prismaGlobal ??= createPrismaClient();
+    return globalThis.prismaGlobal;
+};

src/services/registrations/registrations-service.tsx

@@ -1,10 +1,11 @@
 import { RegistrationData } from "../../lib/schemas/registration";
-import { supabase } from "../supabase";
+import { getSupabase } from "../supabase";
 
 const PROFILE_PICTURE_BUCKET = "profile_pictures";
-
+export const dynamic = "force-dynamic";
 export const RegistrationService = {
   submitRegistration: async (registrationData: RegistrationData) => {
+    const supabase = getSupabase();
     const { data, error } = await supabase
       .from("registrations")
       .insert([registrationData])
@@ -19,7 +20,7 @@ export const RegistrationService = {
 
   isEmailTaken: async (email: string) => {
     const cleanEmail = email.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase.rpc("is_email_registered", {
       search_email: cleanEmail,
     });
@@ -33,7 +34,7 @@ export const RegistrationService = {
 
   isWalletEmpty: async (email: string) => {
     const cleanEmail = email.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase.rpc("is_wallet_id_empty", {
       input_email: cleanEmail,
     });
@@ -47,7 +48,7 @@ export const RegistrationService = {
 
   isWalletRegistered: async (walletAddress: string) => {
     const cleanWalletAddress = walletAddress.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase.rpc("is_wallet_registered", {
       search_wallet: cleanWalletAddress,
     });
@@ -62,7 +63,7 @@ export const RegistrationService = {
   linkWalletToEmail: async (email: string, walletAddress: string) => {
     const cleanEmail = email.trim().toLowerCase();
     const cleanWalletAddress = walletAddress.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase.rpc("link_wallet_to_email", {
       input_email: cleanEmail,
       input_wallet: cleanWalletAddress,
@@ -90,11 +91,12 @@ export const RegistrationService = {
   },
 
   uploadProfilePicture: async (email: string, file: File) => {
+    const supabase = getSupabase();
     const profilePicturePath = RegistrationService.getProfilePicturePath(
       email,
       file,
     );
-
+    
     const { error } = await supabase.storage
       .from(PROFILE_PICTURE_BUCKET)
       .upload(profilePicturePath, file, {
@@ -128,6 +130,7 @@ export const RegistrationService = {
     profilePicturePath?: string;
     profilePictureUrl?: string;
   }) => {
+    const supabase = getSupabase();
     const cleanEmail = email.trim().toLowerCase();
 
     const updateData: {
@@ -163,6 +166,7 @@ export const RegistrationService = {
   },
 
   getRegistrationByWallet: async (walletAddress: string) => {
+    const supabase = getSupabase();
     const cleanWalletAddress =
       RegistrationService.normalizeWalletAddress(walletAddress);
 
@@ -251,7 +255,7 @@ export const RegistrationService = {
 
   getRegistrationByEmail: async (email: string) => {
     const cleanEmail = email.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase
       .from("registrations")
       .select("*")
@@ -267,7 +271,7 @@ export const RegistrationService = {
 
   updateBadges: async (email: string, badges: string[]) => {
     const cleanEmail = email.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase
       .from("registrations")
       .update({
@@ -332,7 +336,7 @@ export const RegistrationService = {
 
   updateEventsAttended: async (email: string, eventsAttended: string[]) => {
     const cleanEmail = email.trim().toLowerCase();
-
+    const supabase = getSupabase();
     const { data, error } = await supabase
       .from("registrations")
       .update({

src/services/supabase.tsx

@@ -1,4 +1,5 @@
-import { createClient } from "@supabase/supabase-js";
+import { createClient, SupabaseClient } from "@supabase/supabase-js";
+let _supabase: SupabaseClient | null = null;
 
 /**
  * Creates and exports a Supabase client instance.
@@ -7,17 +8,20 @@ import { createClient } from "@supabase/supabase-js";
  *
  * @see https://supabase.com/docs/client/imports
  */
-export const supabase = (() => {
+export function getSupabase(): SupabaseClient {
+  if (_supabase) return _supabase;
+
   const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL?.trim();
   const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY?.trim();
 
   if (!supabaseUrl || !supabaseAnonKey) {
     throw new Error(
       "Missing Supabase environment variables " +
-        (supabaseUrl ? "" : "NEXT_PUBLIC_SUPABASE_URL") +
+        (supabaseUrl ? "" : "NEXT_PUBLIC_SUPABASE_URL ") +
         (supabaseAnonKey ? "" : "NEXT_PUBLIC_SUPABASE_ANON_KEY"),
     );
   }
 
-  return createClient(supabaseUrl, supabaseAnonKey);
-})();
+  _supabase = createClient(supabaseUrl, supabaseAnonKey);
+  return _supabase;
+}