From b0679f4b32a629cb4d4f81ede0f72c0866bc5105 Mon Sep 17 00:00:00 2001 From: Caleb Barnes Date: Wed, 12 Mar 2025 16:26:29 -0700 Subject: [PATCH 1/2] fix: remove siteId from getAccountEnv getEnvelope call It looks like this siteId was added here accidentally. This causes site builds to not include account envs because getEnvelope will only get the envvars for that specific site instead of the account. --- packages/config/src/env/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/src/env/main.ts b/packages/config/src/env/main.ts index 2c6ff08f94..0006cec801 100644 --- a/packages/config/src/env/main.ts +++ b/packages/config/src/env/main.ts @@ -184,7 +184,7 @@ const getAccountEnv = async function ({ context?: string }) { if (siteInfo.use_envelope) { - const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId: siteInfo.site_id, context }) + const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, context }) return envelope } const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {} From dd412e47a12b8d012e398a573d931c8a24d27aa9 Mon Sep 17 00:00:00 2001 From: Caleb Barnes Date: Thu, 13 Mar 2025 10:00:37 -0700 Subject: [PATCH 2/2] Update packages/config/src/env/main.ts Co-authored-by: Mateusz Bocian --- packages/config/src/env/main.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/config/src/env/main.ts b/packages/config/src/env/main.ts index 0a48a8351d..84454b7eb7 100644 --- a/packages/config/src/env/main.ts +++ b/packages/config/src/env/main.ts @@ -185,8 +185,7 @@ const getAccountEnv = async function ({ context?: string }) { if (siteInfo.use_envelope) { - const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, context }) - return envelope + return await getEnvelope({ api, accountId: siteInfo.account_slug, context }) } const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {} return siteEnv