From d4066b5dd6bde11021272527fe529515afb6e29a Mon Sep 17 00:00:00 2001
From: majortom327 <me@valentin-thomas.com>
Date: Sun, 7 Jan 2024 14:42:30 -0800
Subject: [PATCH] Update .gitignore and env.server.ts files

---
 .gitignore                         | 2 ++
 app/lib/env.server.ts              | 6 +++++-
 app/routes/sitemap[.xml]/route.tsx | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 65e1c2a..cc6f738 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ node_modules
 /public/build
 .env
 
+.DS_Store
+
 coverage
 .vercel
 .react-email
diff --git a/app/lib/env.server.ts b/app/lib/env.server.ts
index d5f2537..46783fd 100644
--- a/app/lib/env.server.ts
+++ b/app/lib/env.server.ts
@@ -4,8 +4,12 @@ import zod from "zod";
 export const publicEnvSchema = zod.object({
   NODE_ENV: zod.enum(["development", "production", "test"]),
   APP_NAME: zod.string().default("Valentin Thomas"),
-  APP_URL: zod.string().default("https://valentin-thomas.com"),
+  APP_URL: zod.string().default("https://www.valentin-thomas.com"),
   VERCEL_ANALYTICS_ID: zod.string().optional(),
+  VERCEL_URL: zod
+    .string()
+    .optional()
+    .default("https://www.valentin-thomas.com"),
 });
 
 export const envSchema = zod
diff --git a/app/routes/sitemap[.xml]/route.tsx b/app/routes/sitemap[.xml]/route.tsx
index ed12f74..96661c1 100644
--- a/app/routes/sitemap[.xml]/route.tsx
+++ b/app/routes/sitemap[.xml]/route.tsx
@@ -3,7 +3,7 @@ import { flatten } from "ramda";
 import { xml } from "remix-utils/responses";
 import projects from "~/data/projects";
 
-import { isDevelopment } from "~/lib/env.server";
+import { getEnv, isDevelopment } from "~/lib/env.server";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   const routes = flatten([
@@ -19,12 +19,14 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
   const dateContent = isDevelopment() ? new Date().toISOString() : BUILD_DATE;
 
+  const host = getEnv("VERCEL_URL");
+
   const xmlContent = [
     `<?xml version="1.0" encoding="UTF-8"?>`,
     `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">`,
     ...routes.map(
       (route) =>
-        `<url><loc>https://valentin-thomas.com${route}</loc><lastmod>${dateContent}</lastmod></url>`
+        `<url><loc>https://${host}${route}</loc><lastmod>${dateContent}</lastmod></url>`
     ),
     `</urlset>`,
   ];