Merge pull request #9 from akshayanv/add-prod-runtime-NEXT_PUBLIC-vars

ashokmarannannvidia · web-flow · commit a4809c221010 · 2025-05-19T15:05:54.000-07:00
Use NEXT_PUBLIC env vars as runtime vars for prod builds
diff --git a/components/Chat/ChatHeader.tsx b/components/Chat/ChatHeader.tsx
@@ -1,5 +1,7 @@
 'use client'
 
+import { env } from 'next-runtime-env'
+
 import React, { useContext, useState, useRef, useEffect } from 'react';
 import { 
   IconArrowsSort, 
@@ -15,7 +17,7 @@ import { getWorkflowName } from '@/utils/app/helper';
 
 export const ChatHeader = ({ webSocketModeRef = {} }) => {
     const [isMenuOpen, setIsMenuOpen] = useState(false);
-    const [isExpanded, setIsExpanded] = useState(process?.env?.NEXT_PUBLIC_RIGHT_MENU_OPEN === 'true' ? true : false);
+    const [isExpanded, setIsExpanded] = useState(env('NEXT_PUBLIC_RIGHT_MENU_OPEN') === 'true' || process?.env?.NEXT_PUBLIC_RIGHT_MENU_OPEN === 'true' ? true : false);
     const menuRef = useRef(null);
 
     const workflow = getWorkflowName()
diff --git a/next.config.js b/next.config.js
@@ -1,4 +1,9 @@
+const { configureRuntimeEnv } = require('next-runtime-env/build/configure');
+
 const nextConfig = {
+  env: {
+    ...configureRuntimeEnv(),
+  },
   output: 'standalone',
   typescript: {
     // !! WARN !!
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,6 +70,7 @@
     "prettier-plugin-tailwindcss": "^0.2.5",
     "tailwindcss": "^3.3.3",
     "typescript": "4.9.5",
-    "vitest": "^0.29.7"
+    "vitest": "^0.29.7",
+    "next-runtime-env": "^1.3.0"
   }
 }
diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -1,6 +1,5 @@
 import { DocumentProps, Head, Html, Main, NextScript } from 'next/document';
 import i18nextConfig from '../next-i18next.config';
-
 type Props = DocumentProps & {
   // add custom document props
 };
@@ -13,6 +12,7 @@ export default function Document(props: Props) {
       <Head>
         <meta name="apple-mobile-web-app-capable" content="yes" />
         <meta name="apple-mobile-web-app-title" content="AIQ Toolkit-UI"></meta>
+        <script src="/__ENV.js" />
       </Head>
       <body>
         <Main />
diff --git a/pages/api/home/home.state.tsx b/pages/api/home/home.state.tsx
@@ -1,6 +1,7 @@
 import { Conversation, Message } from '@/types/chat';
 import { FolderInterface } from '@/types/folder';
 import { t } from 'i18next';
+import { env } from 'next-runtime-env'
 
 export interface HomeInitialState {
   loading: boolean;
@@ -40,14 +41,14 @@ export const initialState: HomeInitialState = {
   currentFolder: undefined,
   messageError: false,
   searchTerm: '',
-  chatHistory: process?.env?.NEXT_PUBLIC_CHAT_HISTORY_DEFAULT_ON === 'true' || false,
-  chatCompletionURL: process?.env?.NEXT_PUBLIC_HTTP_CHAT_COMPLETION_URL || 'http://127.0.0.1:8000/chat/stream',
-  webSocketMode: process?.env?.NEXT_PUBLIC_WEB_SOCKET_DEFAULT_ON === 'true' || false,
+  chatHistory: env('NEXT_PUBLIC_CHAT_HISTORY_DEFAULT_ON') === 'true' || process?.env?.NEXT_PUBLIC_CHAT_HISTORY_DEFAULT_ON === 'true' ? true : false,
+  chatCompletionURL: env('NEXT_PUBLIC_HTTP_CHAT_COMPLETION_URL') || process?.env?.NEXT_PUBLIC_HTTP_CHAT_COMPLETION_URL || 'http://127.0.0.1:8000/chat/stream',
+  webSocketMode: env('NEXT_PUBLIC_WEB_SOCKET_DEFAULT_ON') === 'true' || process?.env?.NEXT_PUBLIC_WEB_SOCKET_DEFAULT_ON === 'true' ? true : false,
   webSocketConnected: false,
-  webSocketURL: process?.env?.NEXT_PUBLIC_WEBSOCKET_CHAT_COMPLETION_URL || 'ws://127.0.0.1:8000/websocket',
+  webSocketURL: env('NEXT_PUBLIC_WEBSOCKET_CHAT_COMPLETION_URL') || process?.env?.NEXT_PUBLIC_WEBSOCKET_CHAT_COMPLETION_URL || 'ws://127.0.0.1:8000/websocket',
   webSocketSchema: 'chat_stream',
   webSocketSchemas: ['chat_stream', 'chat', 'generate_stream', 'generate'],
-  enableIntermediateSteps: process?.env?.NEXT_PUBLIC_ENABLE_INTERMEDIATE_STEPS ? process.env.NEXT_PUBLIC_ENABLE_INTERMEDIATE_STEPS === 'true' : true,
+  enableIntermediateSteps: env('NEXT_PUBLIC_ENABLE_INTERMEDIATE_STEPS') === 'true' || process?.env?.NEXT_PUBLIC_ENABLE_INTERMEDIATE_STEPS === 'true' ? true : false,
   expandIntermediateSteps: false,
   intermediateStepOverride: true,
   autoScroll: true,
diff --git a/utils/app/helper.ts b/utils/app/helper.ts
@@ -1,4 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
+import { env } from 'next-runtime-env'
 export const getInitials = (fullName = '') => {
     if (!fullName) {
         return "";
@@ -86,7 +87,7 @@ export const getURLQueryParam = ({ param = '' }) => {
 
 
 export const getWorkflowName = () => {
-    const workflow = getURLQueryParam({ param: 'workflow' }) || process?.env?.NEXT_PUBLIC_WORKFLOW || 'AIQ Toolkit';
+    const workflow = getURLQueryParam({ param: 'workflow' }) || env('NEXT_PUBLIC_WORKFLOW') || process?.env?.NEXT_PUBLIC_WORKFLOW || 'AIQ Toolkit';
     return workflow
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@`
`70`	`70`	`"prettier-plugin-tailwindcss": "^0.2.5",`
`71`	`71`	`"tailwindcss": "^3.3.3",`
`72`	`72`	`"typescript": "4.9.5",`
`73`		`- "vitest": "^0.29.7"`
	`73`	`+ "vitest": "^0.29.7",`
	`74`	`+ "next-runtime-env": "^1.3.0"`
`74`	`75`	`}`
`75`	`76`	`}`