From bb7f9bcb59121c9420fe41020143911edfdca1dd Mon Sep 17 00:00:00 2001 From: William Lam Date: Thu, 29 Aug 2024 17:26:59 -0400 Subject: [PATCH] Replaced "process.env.BASE_URL" with ""import.meta.env.VITE_SITE_DOMAIN" (#1858) * Add trustedDependencies * Replaced "process.env.BASE_URL" with ""import.meta.env.VITE_SITE_DOMAIN" - Issue Link: https://github.com/Sendouc/sendou.ink/issues/1850 * biome linting fixes * Matched trustedDependencies to rewrite branch & rebuilt bun lock file --------- Co-authored-by: Kalle <38327916+Sendouc@users.noreply.github.com> --- app/features/auth/core/DiscordStrategy.server.ts | 6 +++--- app/features/tournament/TournamentRepository.server.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/features/auth/core/DiscordStrategy.server.ts b/app/features/auth/core/DiscordStrategy.server.ts index 01662510dc..1ad6e89c1d 100644 --- a/app/features/auth/core/DiscordStrategy.server.ts +++ b/app/features/auth/core/DiscordStrategy.server.ts @@ -172,12 +172,12 @@ function authEnvVars() { if (process.env.NODE_ENV === "production") { invariant(process.env.DISCORD_CLIENT_ID); invariant(process.env.DISCORD_CLIENT_SECRET); - invariant(process.env.BASE_URL); + invariant(import.meta.env.VITE_SITE_DOMAIN); return { DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID, DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET, - BASE_URL: process.env.BASE_URL, + BASE_URL: import.meta.env.VITE_SITE_DOMAIN, }; } @@ -185,6 +185,6 @@ function authEnvVars() { return { DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID ?? "", DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET ?? "", - BASE_URL: process.env.BASE_URL ?? "", + BASE_URL: import.meta.env.VITE_SITE_DOMAIN ?? "", }; } diff --git a/app/features/tournament/TournamentRepository.server.ts b/app/features/tournament/TournamentRepository.server.ts index 936d815d54..5cbde69844 100644 --- a/app/features/tournament/TournamentRepository.server.ts +++ b/app/features/tournament/TournamentRepository.server.ts @@ -266,7 +266,7 @@ export async function findById(id: number) { ...result, logoSrc: result.logoUrl ? userSubmittedImage(result.logoUrl) - : `${process.env.BASE_URL}${HACKY_resolvePicture(result)}`, + : `${import.meta.env.VITE_SITE_DOMAIN}${HACKY_resolvePicture(result)}`, participatedUsers: result.participatedUsers.map((user) => user.userId), }; }