Merge branch 'main' into docs/supabase-ffmpeg-deepgram-example

Author: D-K-P

.changeset/gentle-mails-smoke.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Local env files like `.env` will now correctly override dev env vars configured in the dashboard

apps/webapp/app/presenters/v3/RunPresenter.server.ts

@@ -74,7 +74,7 @@ export class RunPresenter {
       },
     });
 
-    const showLogs = showDeletedLogs ? true : run.logsDeletedAt ? false : true;
+    const showLogs = showDeletedLogs || !run.logsDeletedAt;
 
     const runData = {
       id: run.id,

apps/webapp/app/v3/services/triggerScheduledTask.server.ts

@@ -40,6 +40,23 @@ export class TriggerScheduledTaskService extends BaseService {
       }
 
       if (!instance.taskSchedule.active) {
+        shouldTrigger = false;
+      } else if (instance.environment.organization.deletedAt) {
+        logger.debug("Organization is deleted, disabling schedule", {
+          instanceId,
+          scheduleId: instance.taskSchedule.friendlyId,
+          organizationId: instance.environment.organization.id,
+        });
+
+        await this._prisma.taskSchedule.update({
+          where: {
+            id: instance.taskSchedule.id,
+          },
+          data: {
+            active: false,
+          },
+        });
+
         shouldTrigger = false;
       }
 

packages/cli-v3/src/dev/backgroundWorker.ts

@@ -319,9 +319,9 @@ export class BackgroundWorker {
     const processOptions: TaskRunProcessOptions = {
       payload,
       env: {
-        ...sanitizeEnvVars(this.params.env),
         // TODO: this needs the stripEmptyValues stuff too
         ...sanitizeEnvVars(payload.environment ?? {}),
+        ...sanitizeEnvVars(this.params.env),
         TRIGGER_WORKER_MANIFEST_PATH: this.workerManifestPath,
       },
       serverWorker: this.serverWorker,

references/v3-catalog/src/trigger/other.ts

@@ -156,3 +156,11 @@ export const returnZeroCharacters = task({
     };
   },
 });
+
+export const testEnvVars = task({
+  id: "test-env-vars",
+  run: async (payload: any) => {
+    console.log(`env.FOO: ${process.env.FOO}`);
+    console.log(`env.BAR: ${process.env.BAR}`);
+  },
+});