From 71e73c7359a9b12d4b28e41f05406e2d11b055ab Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Mon, 2 Jun 2025 18:48:52 +0100 Subject: [PATCH 1/2] syncVercelEnvVars fix for syncing the wrong preview branch env vars --- .../src/extensions/core/vercelSyncEnvVars.ts | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/build/src/extensions/core/vercelSyncEnvVars.ts b/packages/build/src/extensions/core/vercelSyncEnvVars.ts index 26d3ddcd1a..7f58e8a120 100644 --- a/packages/build/src/extensions/core/vercelSyncEnvVars.ts +++ b/packages/build/src/extensions/core/vercelSyncEnvVars.ts @@ -3,6 +3,14 @@ import { syncEnvVars } from "../core.js"; type EnvVar = { name: string; value: string; isParentEnv?: boolean }; +type VercelEnvVar = { + key: string; + value: string; + type: string; + target: string[]; + gitBranch?: string; +}; + export function syncVercelEnvVars(options?: { projectId?: string; vercelAccessToken?: string; @@ -72,11 +80,13 @@ export function syncVercelEnvVars(options?: { const isBranchable = ctx.environment === "preview"; const filteredEnvs: EnvVar[] = data.envs - .filter( - (env: { type: string; value: string; target: string[] }) => - env.value && env.target.includes(vercelEnvironment) - ) - .map((env: { key: string; value: string; gitBranch?: string }) => { + .filter((env: VercelEnvVar) => { + if (!env.value) return false; + if (!env.target.includes(vercelEnvironment)) return false; + if (isBranchable && env.gitBranch && env.gitBranch !== branch) return false; + return true; + }) + .map((env: VercelEnvVar) => { return { name: env.key, value: env.value, From 9af701e44e94a0f1e116c6a8fd9fd4d25d850b0a Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 3 Jun 2025 13:11:31 +0100 Subject: [PATCH 2/2] syncVercelEnvVars() fix for syncing the wrong preview branch env vars --- .changeset/lazy-plums-fetch.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lazy-plums-fetch.md diff --git a/.changeset/lazy-plums-fetch.md b/.changeset/lazy-plums-fetch.md new file mode 100644 index 0000000000..515d6f85d0 --- /dev/null +++ b/.changeset/lazy-plums-fetch.md @@ -0,0 +1,5 @@ +--- +"@trigger.dev/build": patch +--- + +syncVercelEnvVars() fix for syncing the wrong preview branch env vars