Merge remote-tracking branch 'origin/main' into feat/detect-self-hosted

Author: nicktrn

.changeset/lazy-plums-fetch.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+syncVercelEnvVars() fix for syncing the wrong preview branch env vars

.changeset/pre.json

@@ -36,6 +36,7 @@
     "late-chairs-ring",
     "late-dancers-smile",
     "lazy-panthers-shop",
+    "lazy-plums-fetch",
     "moody-squids-count",
     "nasty-cobras-wonder",
     "nice-colts-boil",

apps/supervisor/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@kubernetes/client-node": "^1.0.0",
     "@trigger.dev/core": "workspace:*",
-    "dockerode": "^4.0.3",
+    "dockerode": "^4.0.6",
     "prom-client": "^15.1.0",
     "socket.io": "4.7.4",
     "std-env": "^3.8.0",

internal-packages/testcontainers/package.json

@@ -11,11 +11,11 @@
     "ioredis": "^5.3.2"
   },
   "devDependencies": {
-    "@testcontainers/postgresql": "^10.25.0",
-    "@testcontainers/redis": "^10.25.0",
+    "@testcontainers/postgresql": "^10.28.0",
+    "@testcontainers/redis": "^10.28.0",
     "@trigger.dev/core": "workspace:*",
     "std-env": "^3.9.0",
-    "testcontainers": "^10.25.0",
+    "testcontainers": "^10.28.0",
     "tinyexec": "^0.3.0"
   },
   "scripts": {

package.json

@@ -82,7 +82,9 @@
       "@kubernetes/client-node@1.0.0": "patches/@kubernetes__client-node@1.0.0.patch"
     },
     "overrides": {
-      "express@^4>body-parser": "1.20.3"
+      "express@^4>body-parser": "1.20.3",
+      "@remix-run/dev@2.1.0>tar-fs": "2.1.3",
+      "testcontainers@10.28.0>tar-fs": "3.0.9"
     }
   }
 }

packages/build/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @trigger.dev/build
 
+## 4.0.0-v4-beta.20
+
+### Patch Changes
+
+- syncVercelEnvVars() fix for syncing the wrong preview branch env vars ([#2141](https://github.com/triggerdotdev/trigger.dev/pull/2141))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.20`
+
 ## 4.0.0-v4-beta.19
 
 ### Patch Changes

packages/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "4.0.0-v4-beta.19",
+  "version": "4.0.0-v4-beta.20",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -73,7 +73,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.19",
+    "@trigger.dev/core": "workspace:4.0.0-v4-beta.20",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"

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,

packages/cli-v3/CHANGELOG.md

@@ -1,5 +1,13 @@
 # trigger.dev
 
+## 4.0.0-v4-beta.20
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.20`
+  - `@trigger.dev/core@4.0.0-v4-beta.20`
+
 ## 4.0.0-v4-beta.19
 
 ### Patch Changes

packages/cli-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "4.0.0-v4-beta.19",
+  "version": "4.0.0-v4-beta.20",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "type": "module",
   "license": "MIT",
@@ -93,8 +93,8 @@
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-node": "1.25.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/build": "workspace:4.0.0-v4-beta.19",
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.19",
+    "@trigger.dev/build": "workspace:4.0.0-v4-beta.20",
+    "@trigger.dev/core": "workspace:4.0.0-v4-beta.20",
     "ansi-escapes": "^7.0.0",
     "braces": "^3.0.3",
     "c12": "^1.11.1",