import.meta fixed

Author: vivek-devtron

.env

@@ -23,7 +23,7 @@ VITE_HIDE_DEPLOYMENT_GROUPS=true
 VITE_HIDE_GITOPS_OR_HELM_OPTION=true
 VITE_CONFIGURABLE_TIMEOUT=
 VITE_HIDE_APPLICATION_GROUPS=true
-VITE_REACT_APP_K8S_CLIENT=false
+VITE_K8S_CLIENT=false
 VITE_USE_V2=false
 VITE_CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
 VITE_CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7

.env.development

@@ -1,4 +1,5 @@
-VITE_REACT_APP_ORCHESTRATOR_ROOT="/orchestrator"
-VITE_REACT_APP_GRAFANA_ORG_ID=2
-VITE_REACT_APP_K8S_CLIENT=false
-VITE_NODE_ENV="development"
+VITE_ORCHESTRATOR_ROOT="/orchestrator"
+VITE_GRAFANA_ORG_ID=2
+VITE_K8S_CLIENT=false
+VITE_NODE_ENV="development"
+BASE_URL="/dashboard"

.env.production

@@ -1,3 +1,4 @@
-VITE_REACT_APP_ORCHESTRATOR_ROOT="/orchestrator"
-VITE_REACT_APP_GRAFANA_ORG_ID=2
-VITE_NODE_ENV="production"
+VITE_ORCHESTRATOR_ROOT="/orchestrator"
+VITE_GRAFANA_ORG_ID=2
+VITE_NODE_ENV="production"
+BASE_URL="/dashboard"

README.md

@@ -148,9 +148,9 @@ module.exports = function (app) {
 #### **`.env.development`**
 
 ```console
-GRAFANA_ORG_ID=2
+VITE_GRAFANA_ORG_ID=2
 REACT_APP_EDITOR=code
-VITE_REACT_APP_ORCHESTRATOR_ROOT=/orchestrator
+VITE_ORCHESTRATOR_ROOT=/orchestrator
 REACT_APP_PASSWORD=argocd-server-74b7b94945-nxxnh
 ```
 
@@ -159,9 +159,9 @@ REACT_APP_PASSWORD=argocd-server-74b7b94945-nxxnh
 #### **`.env.development`**
 
 ```console
-GRAFANA_ORG_ID=2
+VITE_GRAFANA_ORG_ID=2
 REACT_APP_EDITOR=code
-VITE_REACT_APP_ORCHESTRATOR_ROOT=http://demo.devtron.info:32080/orchestrator
+VITE_ORCHESTRATOR_ROOT=http://demo.devtron.info:32080/orchestrator
 REACT_APP_PASSWORD=argocd-server-74b7b94945-nxxnh
 ```
 

package.json

@@ -65,7 +65,7 @@
         "build": "NODE_OPTIONS=--max_old_space_size=8192 vite build",
         "serve": "vite preview",
         "build-light": "GENERATE_SOURCEMAP=false NODE_OPTIONS=--max_old_space_size=8192 vite build",
-        "build-k8s-app": "GENERATE_SOURCEMAP=false NODE_OPTIONS=--max_old_space_size=8192 VITE_REACT_APP_K8S_CLIENT=true vite build",
+        "build-k8s-app": "GENERATE_SOURCEMAP=false NODE_OPTIONS=--max_old_space_size=8192 VITE_K8S_CLIENT=true vite build",
         "test": "vitest test",
         "test-coverage:watch": "npm run test -- --coverage",
         "test-coverage": "npm run test -- --coverage --watchAll=false",

src/components/app/details/appDetails/utils.tsx

@@ -402,7 +402,7 @@ export function addQueryParamToGrafanaURL(
 ): string {
     const startTime: string = calendarInputs.startDate
     const endTime: string = calendarInputs.endDate
-    url += `?orgId=${import.meta.env.VITE_REACT_APP_GRAFANA_ORG_ID}`
+    url += `?orgId=${window.__VITE_GRAFANA_ORG_ID__}`
     url += `&refresh=10s`
     url += `&var-app=${appId}`
     url += `&var-env=${envId}`

src/index.tsx

@@ -64,12 +64,14 @@ declare global {
         Worker: any
         __BASE_URL__: string
         __REACT_APP_ORCHESTRATOR_ROOT__: string
+        __VITE_GRAFANA_ORG_ID__: number
     }
 }
 
 if (!window.__BASE_URL__ || !window.__REACT_APP_ORCHESTRATOR_ROOT__) {
-    window.__BASE_URL__ = '/dashboard'
-    window.__REACT_APP_ORCHESTRATOR_ROOT__ = 'orchestrator'
+    window.__BASE_URL__ = import.meta.env.BASE_URL || '/dashboard'
+    window.__REACT_APP_ORCHESTRATOR_ROOT__ = import.meta.env.VITE_ORCHESTRATOR_ROOT || 'orchestrator'
+    window.__VITE_GRAFANA_ORG_ID__ = import.meta.env.VITE_GRAFANA_ORG_ID || 2
 }
 
 const root = document.getElementById('root')
@@ -150,7 +152,7 @@ if (!window || !window._env_) {
         VITE_HIDE_DEPLOYMENT_GROUPS: true,
         VITE_HIDE_GITOPS_OR_HELM_OPTION: false,
         VITE_HIDE_APPLICATION_GROUPS: false,
-        K8S_CLIENT: import.meta.env.VITE_REACT_APP_K8S_CLIENT === 'true',
+        K8S_CLIENT: import.meta.env.VITE_K8S_CLIENT === 'true',
         VITE_USE_V2: true,
         VITE_CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL: 7000,
         VITE_CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT: 7,

vite.config.ts

@@ -94,8 +94,6 @@ export default defineConfig(({ mode }) => {
         console.log(mode)
         // Global override for node environment
         baseConfig['define'] = {
-            // __BASE_URL__: '/dashboard/',
-            // __REACT_APP_ORCHESTRATOR_ROOT__: '/orchestrator',
             global: 'globalThis',
         }
     // } else {