Merge branch 'upgrade/fix-mistakes' into develop

weni-ai · May 23, 2024 · 78eefef · 78eefef
2 parents 45c81aa + 96e76ae
commit 78eefef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 JSON_STRING='window.configs = { \
-  "VUE_APP_BASE_API":"'${VUE_APP_BASE_API}'", \
-  "VUE_APP_PARENT_DOMAIN":"'${VUE_APP_PARENT_DOMAIN}'", \
-  "VUE_APP_LOGROCKET_ID":"'${VUE_APP_LOGROCKET_ID}'", \
+  "VITE_BASE_API":"'${VITE_BASE_API}'", \
+  "VITE_PARENT_DOMAIN":"'${VITE_PARENT_DOMAIN}'", \
 }'
 sed "s@// CONFIGURATIONS_PLACEHOLDER@${JSON_STRING}@" /usr/share/nginx/html/academy/index.html.tmpl > /tmp/index.html
 

diff --git a/src/utils/env.js b/src/utils/env.js
@@ -1,3 +1,8 @@
-export default function getEnv(name) {
-  return window?.configs?.[name]
-}
+export default function env(name) {
+  return (
+    window?.configs?.[name] ||
+    import.meta.env[name] ||
+    window?.configs?.[`VITE_${name}`] ||
+    import.meta.env[`VITE_${name}`]
+  );
+}