@gsa-tts/graymatter-ui 0.3.21 → 0.3.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsa-tts/graymatter-ui",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/layouts/GlobalAppLayout.astro

@@ -8,7 +8,8 @@ import MobileBottomNav from '../components/MobileBottomNav.svelte';
 import MobileSideMenu from '../components/MobileSideMenu.svelte';
 import Logo from '../components/Logo.svelte';
 import { siteName } from '../constants';
-import { getAppUrls } from '../utils/getAppUrls';
+import { getUrlFromBase } from '../helpers/url.js';
+import { getSecret } from 'astro:env/server';
 
 const {
   componentOptions = {},
@@ -24,7 +25,17 @@ const {
   hideDiscover = true,
 } = Astro.props;
 
-const { api, chat, console, discover } = getAppUrls();
+// Use getSecret directly for better environment variable handling
+const chatUrl = getSecret('CHAT_URL') || getSecret('PUBLIC_CHAT_URL');
+const consoleUrl = getSecret('CONSOLE_URL') || getSecret('PUBLIC_CONSOLE_URL');
+const apiUrl = getSecret('API_URL') || getSecret('PUBLIC_API_URL');
+const discoverUrl =
+  getSecret('DISCOVER_URL') || getSecret('PUBLIC_DISCOVER_URL');
+
+const chat = chatUrl || '#';
+const console = consoleUrl || '#';
+const api = apiUrl || getUrlFromBase('/api/documentation');
+const discover = discoverUrl || '#';
 ---
 
 <BaseLayout title={pageTitle} {gtmID} {description} {openGraphImage}>

package/src/utils/getAppUrls.ts

@@ -66,7 +66,7 @@ function processUrl(url: string | undefined, fallback: string): string {
  *
  * @param envArg - Optional environment object to use instead of `import.meta.env`.
  *                 Useful for testing or when you want to override environment variables.
- *                 If not provided, uses Vite's `import.meta.env`.
+ *                 If not provided, uses `process.env` (server) or `import.meta.env` (client).
  *
  * @returns An object containing processed URLs/paths for each application section:
  *   - `chat`: Chat application URL or path
@@ -102,31 +102,51 @@ function processUrl(url: string | undefined, fallback: string): string {
  * ```
  *
  * @remarks
+ * - Uses `process.env` in server context, `import.meta.env` in client context
+ * - Supports both `CHAT_URL` and `PUBLIC_CHAT_URL` naming conventions
  * - URLs are processed through `processUrl()` which handles both absolute and relative URLs
- * - Relative URLs are processed through `getUrlFromBase()` to create full URLs
  * - Missing environment variables result in fallback values (`#` for most, `/api/documentation` for API)
  * - Warnings are logged in development when environment variables are missing
- * - The function is designed to work with Vite's `import.meta.env` system
+ * - The function is designed to work with both Vite's `import.meta.env` and Node.js `process.env`
+ * - Note: Astro layouts (like GlobalAppLayout.astro) use `getSecret()` directly for better performance
  *
  * @see {@link processUrl} - URL processing logic
  * @see {@link getUrlFromBase} - Base URL resolution
  */
 export function getAppUrls(envArg?: Record<string, string | undefined>) {
-  const env = envArg || import.meta.env;
-  const fallback = '#';
+  // If envArg is provided, use it directly (for testing)
+  if (envArg) {
+    const chatUrl = envArg.CHAT_URL || envArg.PUBLIC_CHAT_URL;
+    const consoleUrl = envArg.CONSOLE_URL || envArg.PUBLIC_CONSOLE_URL;
+    const apiUrl = envArg.API_URL || envArg.PUBLIC_API_URL;
+    const discoverUrl = envArg.DISCOVER_URL || envArg.PUBLIC_DISCOVER_URL;
 
-  const chatUrl = env.PUBLIC_CHAT_URL;
-  const consoleUrl = env.PUBLIC_CONSOLE_URL;
-  const apiUrl = env.PUBLIC_API_URL;
-  const discoverUrl = env.PUBLIC_DISCOVER_URL;
+    warnIfMissing('chat', chatUrl);
+    warnIfMissing('console', consoleUrl);
+    warnIfMissing('api', apiUrl);
+
+    return {
+      chat: processUrl(chatUrl, '#'),
+      console: processUrl(consoleUrl, '#'),
+      api: processUrl(apiUrl, getUrlFromBase('/api/documentation')),
+      discover: processUrl(discoverUrl, '#'),
+    };
+  }
+
+  // Use process.env in server context, import.meta.env in client context
+  const env = typeof window === 'undefined' ? process.env : import.meta.env;
+  const chatUrl = env.CHAT_URL || env.PUBLIC_CHAT_URL;
+  const consoleUrl = env.CONSOLE_URL || env.PUBLIC_CONSOLE_URL;
+  const apiUrl = env.API_URL || env.PUBLIC_API_URL;
+  const discoverUrl = env.DISCOVER_URL || env.PUBLIC_DISCOVER_URL;
 
   warnIfMissing('chat', chatUrl);
   warnIfMissing('console', consoleUrl);
   warnIfMissing('api', apiUrl);
 
   return {
-    chat: processUrl(chatUrl, fallback),
-    console: processUrl(consoleUrl, fallback),
+    chat: processUrl(chatUrl, '#'),
+    console: processUrl(consoleUrl, '#'),
     api: processUrl(apiUrl, getUrlFromBase('/api/documentation')),
     discover: processUrl(discoverUrl, '#'),
   };