Merge remote-tracking branch 'origin/main' into coordinator-observability

nicktrn · nicktrn · commit 6446b14638ad · 2024-10-08T14:13:30.000+01:00
diff --git a/.changeset/fuzzy-files-hunt.md b/.changeset/fuzzy-files-hunt.md
diff --git a/.changeset/three-ducks-act.md b/.changeset/three-ducks-act.md
diff --git a/apps/webapp/app/presenters/v3/RunPresenter.server.ts b/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,
diff --git a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts b/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;
       }
 
diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/build
 
+## 3.0.11
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@3.0.11`
+
 ## 3.0.10
 
 ### Patch Changes
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -65,7 +65,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:3.0.10",
+    "@trigger.dev/core": "workspace:3.0.11",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"
diff --git a/packages/cli-v3/CHANGELOG.md b/packages/cli-v3/CHANGELOG.md
@@ -1,5 +1,16 @@
 # trigger.dev
 
+## 3.0.11
+
+### Patch Changes
+
+- Fix downgrade check by correctly comparing semvers ([#1380](https://github.com/triggerdotdev/trigger.dev/pull/1380))
+- Local env files like `.env` will now correctly override dev env vars configured in the dashboard ([#1388](https://github.com/triggerdotdev/trigger.dev/pull/1388))
+- Always include push output in logs for self-hosted deploys ([#1382](https://github.com/triggerdotdev/trigger.dev/pull/1382))
+- Updated dependencies:
+  - `@trigger.dev/build@3.0.11`
+  - `@trigger.dev/core@3.0.11`
+
 ## 3.0.10
 
 ### Patch Changes
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "type": "module",
   "license": "MIT",
@@ -87,8 +87,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:3.0.10",
-    "@trigger.dev/core": "workspace:3.0.10",
+    "@trigger.dev/build": "workspace:3.0.11",
+    "@trigger.dev/core": "workspace:3.0.11",
     "c12": "^1.11.1",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",
diff --git a/packages/cli-v3/src/dev/backgroundWorker.ts b/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,
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,7 @@
 # internal-platform
 
+## 3.0.11
+
 ## 3.0.10
 
 ### Patch Changes
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/core",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/sdk
 
+## 3.0.11
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@3.0.11`
+
 ## 3.0.10
 
 ### Patch Changes
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/sdk",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "trigger.dev Node.JS SDK",
   "license": "MIT",
   "publishConfig": {
@@ -48,7 +48,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "0.52.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/core": "workspace:3.0.10",
+    "@trigger.dev/core": "workspace:3.0.11",
     "chalk": "^5.2.0",
     "cronstrue": "^2.21.0",
     "debug": "^4.3.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/references/v3-catalog/src/trigger/other.ts b/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}`);
+  },
+});
