Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

fix(frontend): CSR builds were missing env vars due to import.meta.env not being used (#657)

Carlos Alaniz0114795680e3
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index ab884280d..953e0d501 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -3,17 +3,25 @@
*/
import {SupportedLocales} from "./locales.ts";
-export type ConfigKeys = 'VITE_FRONTEND_URL'
- | 'VITE_API_URL_CLIENT'
- | 'VITE_STRIPE_PUBLISHABLE_KEY'
+export type ConfigKeys =
| 'VITE_API_URL_SERVER'
- | 'VITE_CHATWOOT_WEBSITE_TOKEN'
- | 'VITE_CHATWOOT_BASE_URL'
+ | 'VITE_API_URL_CLIENT'
+ | 'VITE_FRONTEND_URL'
+ | 'VITE_APP_PRIMARY_COLOR'
+ | 'VITE_APP_SECONDARY_COLOR'
| 'VITE_APP_NAME'
- | 'VITE_PLATFORM_SUPPORT_EMAIL'
+ | 'VITE_APP_FAVICON'
+ | 'VITE_APP_LOGO_DARK'
+ | 'VITE_APP_LOGO_LIGHT'
+ | 'VITE_CHATWOOT_BASE_URL'
+ | 'VITE_CHATWOOT_WEBSITE_TOKEN'
+ | 'VITE_HIDE_ABOUT_LINK'
| 'VITE_TOS_URL'
| 'VITE_PRIVACY_URL'
- | string;
+ | 'VITE_PLATFORM_SUPPORT_EMAIL'
+ | 'VITE_STRIPE_PUBLISHABLE_KEY'
+ | 'VITE_I_HAVE_PURCHASED_A_LICENCE'
+ | 'VITE_DEFAULT_IMAGE_URL';
export type IdParam = string | undefined | number;
diff --git a/frontend/src/utilites/config.ts b/frontend/src/utilites/config.ts
index 6c780f28b..84cd9e95b 100644
--- a/frontend/src/utilites/config.ts
+++ b/frontend/src/utilites/config.ts
@@ -2,12 +2,34 @@ import { ConfigKeys } from "../types.ts";
import { isSsr } from "./helpers.ts";
import process from "process";
-export const getConfig = ( key: ConfigKeys, fallback?: string ): string | undefined => {
+
+export const clientBuildEnv: { [K in ConfigKeys]: string } = {
+ 'VITE_APP_PRIMARY_COLOR': import.meta.env.VITE_APP_PRIMARY_COLOR,
+ 'VITE_APP_SECONDARY_COLOR': import.meta.env.VITE_APP_SECONDARY_COLOR,
+ 'VITE_APP_NAME': import.meta.env.VITE_APP_NAME,
+ 'VITE_APP_FAVICON': import.meta.env.VITE_APP_FAVICON,
+ 'VITE_APP_LOGO_DARK': import.meta.env.VITE_APP_LOGO_DARK,
+ 'VITE_APP_LOGO_LIGHT': import.meta.env.VITE_APP_LOGO_LIGHT,
+ 'VITE_CHATWOOT_BASE_URL': import.meta.env.VITE_CHATWOOT_BASE_URL,
+ 'VITE_CHATWOOT_WEBSITE_TOKEN': import.meta.env.VITE_CHATWOOT_WEBSITE_TOKEN,
+ 'VITE_HIDE_ABOUT_LINK': import.meta.env.VITE_HIDE_ABOUT_LINK,
+ 'VITE_TOS_URL': import.meta.env.VITE_TOS_URL,
+ 'VITE_PRIVACY_URL': import.meta.env.VITE_PRIVACY_URL,
+ 'VITE_PLATFORM_SUPPORT_EMAIL': import.meta.env.VITE_PLATFORM_SUPPORT_EMAIL,
+ 'VITE_STRIPE_PUBLISHABLE_KEY': import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY,
+ 'VITE_I_HAVE_PURCHASED_A_LICENCE': import.meta.env.VITE_I_HAVE_PURCHASED_A_LICENCE,
+ 'VITE_FRONTEND_URL': import.meta.env.VITE_FRONTEND_URL,
+ 'VITE_DEFAULT_IMAGE_URL': import.meta.env.VITE_DEFAULT_IMAGE_URL,
+ 'VITE_API_URL_SERVER': import.meta.env.VITE_API_URL_SERVER,
+ 'VITE_API_URL_CLIENT': import.meta.env.VITE_API_URL_CLIENT
+}
+
+export const getConfig = (key: ConfigKeys, fallback?: string): string | undefined => {
if (isSsr()) {
const serverEnv = typeof process !== "undefined" && process.env ? process.env : {};
- return serverEnv[ key ] as string | undefined || fallback;
+ return serverEnv[key] as string | undefined || fallback;
}
const clientEnv = typeof window !== "undefined" && window.hievents ? window.hievents : {};
- return clientEnv[key] || fallback;
+ return clientEnv[key] || clientBuildEnv[key] || fallback;
};