From 0a3fd6d5e2ffd40da6dfe3694553b4878ea691b7 Mon Sep 17 00:00:00 2001
From: Felipe Barso <77860630+aprendendofelipe@users.noreply.github.com>
Date: Thu, 18 Dec 2025 11:31:33 -0300
Subject: [PATCH] fix(baseUrl): improve environment variable resolution for
 Next.js/Turbo

---
 packages/helpers/src/environment.js | 4 +++-
 packages/helpers/src/url.js         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/helpers/src/environment.js b/packages/helpers/src/environment.js
index ffb67dd9..cffa0406 100644
--- a/packages/helpers/src/environment.js
+++ b/packages/helpers/src/environment.js
@@ -1,4 +1,6 @@
-const { NEXT_PHASE, NEXT_PUBLIC_VERCEL_ENV, VERCEL } = process.env;
+const NEXT_PHASE = process.env.NEXT_PHASE;
+const NEXT_PUBLIC_VERCEL_ENV = process.env.NEXT_PUBLIC_VERCEL_ENV;
+const VERCEL = process.env.VERCEL;
 
 export const isBuildTime = NEXT_PHASE === 'phase-production-build';
 
diff --git a/packages/helpers/src/url.js b/packages/helpers/src/url.js
index 55ab08a9..2521dd48 100644
--- a/packages/helpers/src/url.js
+++ b/packages/helpers/src/url.js
@@ -28,7 +28,9 @@ export const trustedDomains = [webserverDomain, ...externalTrustedDomains.filter
  * @returns {string} The resolved base URL.
  */
 export function getBaseUrl() {
-  const { NEXT_PUBLIC_VERCEL_URL, NEXT_PUBLIC_WEBSERVER_HOST, NEXT_PUBLIC_WEBSERVER_PORT } = process.env;
+  const NEXT_PUBLIC_VERCEL_URL = process.env.NEXT_PUBLIC_VERCEL_URL;
+  const NEXT_PUBLIC_WEBSERVER_HOST = process.env.NEXT_PUBLIC_WEBSERVER_HOST;
+  const NEXT_PUBLIC_WEBSERVER_PORT = process.env.NEXT_PUBLIC_WEBSERVER_PORT;
 
   const protocol = isServerlessRuntime ? 'https' : 'http';