refactor: make env validation be JS files so we can use them in our next config

Author: bassgeta

next.config.mjs

@@ -1,3 +1,8 @@
+import { validateClientEnv } from "./src/lib/env/client.js";
+import { validateServerEnv } from "./src/lib/env/server.js";
+
+validateServerEnv();
+validateClientEnv();
 /** @type {import('next').NextConfig} */
 const nextConfig = {};
 

src/app/layout.tsx

@@ -9,9 +9,6 @@ import type { Metadata } from "next";
 import localFont from "next/font/local";
 import { cookies } from "next/headers";
 import "./globals.css";
-import { validateClientEnv } from "@/lib/env/client";
-
-validateClientEnv();
 
 const geistSans = localFont({
   src: "./fonts/GeistVF.woff",

src/lib/env/client.ts src/lib/env/client.jssrc/lib/env/client.ts renamed to src/lib/env/client.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { isBuildTime } from "./helpers";
+import { shouldSkipValidation } from "./helpers.js";
 
 const clientEnvSchema = z.object({
   NEXT_PUBLIC_REOWN_PROJECT_ID: z
@@ -11,13 +11,9 @@ const clientEnvSchema = z.object({
   NEXT_PUBLIC_CRYPTO_TO_FIAT_TRUSTED_ORIGINS: z.string().optional(),
 });
 
-export type ClientEnv = z.infer<typeof clientEnvSchema>;
-
 export function validateClientEnv() {
-  if (isBuildTime()) {
-    console.warn(
-      "⚠️ Skipping client environment variable validation at build time.",
-    );
+  if (shouldSkipValidation()) {
+    console.warn("⚠️ Skipping client environment variable validation.");
     return;
   }
 
@@ -41,5 +37,3 @@ export function validateClientEnv() {
     throw new Error("Invalid client environment variables");
   }
 }
-
-export const clientEnv = validateClientEnv();

src/lib/env/helpers.js

@@ -0,0 +1,3 @@
+export function shouldSkipValidation() {
+  return process.env.SKIP_ENV_VALIDATION === "true";
+}

src/lib/env/helpers.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { isBuildTime } from "./helpers";
+import { shouldSkipValidation } from "./helpers.js";
 
 const serverEnvSchema = z.object({
   DATABASE_URL: z.string().min(1, "DATABASE_URL is required"),
@@ -17,16 +17,11 @@ const serverEnvSchema = z.object({
   FEE_ADDRESS_FOR_PAYMENT: z.string().optional(),
   REDIS_URL: z.string().url().optional(),
   INVOICE_PROCESSING_TTL: z.string().optional(),
-  VERCEL_URL: z.string().optional(),
 });
 
-export type ServerEnv = z.infer<typeof serverEnvSchema>;
-
 export function validateServerEnv() {
-  if (isBuildTime()) {
-    console.warn(
-      "⚠️ Skipping server environment variable validation at build time.",
-    );
+  if (shouldSkipValidation()) {
+    console.warn("⚠️ Skipping server environment variable validation.");
     return;
   }
 
@@ -56,5 +51,3 @@ export function validateServerEnv() {
     throw new Error("Invalid server environment variables");
   }
 }
-
-export const serverEnv = validateServerEnv();

src/lib/env/server.ts src/lib/env/server.jssrc/lib/env/server.ts renamed to src/lib/env/server.js

@@ -1,9 +1,6 @@
 import { NextResponse } from "next/server";
 
 import type { NextRequest } from "next/server";
-import { validateServerEnv } from "./lib/env/server";
-
-validateServerEnv();
 
 export async function middleware(request: NextRequest): Promise<NextResponse> {
   if (request.method === "GET") {

src/middleware.ts

@@ -21,6 +21,12 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    "src/lib/env/*.js"
+  ],
   "exclude": ["node_modules"]
 }