Merge branch 'main' into chore/prisma-v6-multi-file-schema

Author: jackall3n

.changeset/pre.json

@@ -24,6 +24,7 @@
     "curvy-dogs-share",
     "eighty-rings-divide",
     "four-needles-add",
+    "fuzzy-snakes-beg",
     "gentle-waves-suffer",
     "gold-insects-invite",
     "green-lions-relate",
@@ -33,8 +34,10 @@
     "itchy-frogs-care",
     "itchy-games-sort",
     "late-chairs-ring",
+    "late-dancers-smile",
     "lazy-panthers-shop",
     "moody-squids-count",
+    "nasty-cobras-wonder",
     "nice-colts-boil",
     "orange-rocks-grow",
     "plenty-dolphins-act",
@@ -45,6 +48,9 @@
     "red-chairs-begin",
     "red-wasps-cover",
     "shiny-kiwis-beam",
+    "silly-cows-serve",
+    "silly-timers-repair",
+    "small-dancers-smell",
     "smart-coins-hammer",
     "sour-mirrors-accept",
     "spotty-ducks-punch",
@@ -62,6 +68,7 @@
     "wet-deers-think",
     "wet-steaks-reflect",
     "wild-mirrors-return",
+    "witty-cherries-tan",
     "witty-donkeys-unite"
   ]
 }

.changeset/witty-cherries-tan.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix `syncEnvVars` for non-preview deployments

.github/workflows/unit-tests-internal.yml

@@ -127,4 +127,4 @@ jobs:
           merge-multiple: true
 
       - name: Merge reports
-        run: pnpm dlx vitest run --merge-reports
+        run: pnpm dlx vitest@3.1.4 run --merge-reports

.github/workflows/unit-tests-packages.yml

@@ -127,4 +127,4 @@ jobs:
           merge-multiple: true
 
       - name: Merge reports
-        run: pnpm dlx vitest run --merge-reports
+        run: pnpm dlx vitest@3.1.4 run --merge-reports

.github/workflows/unit-tests-webapp.yml

@@ -133,4 +133,4 @@ jobs:
           merge-multiple: true
 
       - name: Merge reports
-        run: pnpm dlx vitest run --merge-reports
+        run: pnpm dlx vitest@3.1.4 run --merge-reports

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx

@@ -50,9 +50,9 @@ const FormSchema = z
       .min(1)
       .or(z.enum(["TASK_RUN", "DEPLOYMENT_FAILURE", "DEPLOYMENT_SUCCESS"])),
     environmentTypes: z
-      .array(z.enum(["STAGING", "PRODUCTION"]))
+      .array(z.enum(["STAGING", "PRODUCTION", "PREVIEW"]))
       .min(1)
-      .or(z.enum(["STAGING", "PRODUCTION"])),
+      .or(z.enum(["STAGING", "PRODUCTION", "PREVIEW"])),
     type: z.enum(["WEBHOOK", "SLACK", "EMAIL"]).default("EMAIL"),
     channelValue: z.string().nonempty(),
     integrationId: z.string().optional(),
@@ -441,7 +441,7 @@ export default function Page() {
             <InputGroup>
               <Label>Environment</Label>
               <input type="hidden" name={environmentTypes.name} value={environment.type} />
-              <EnvironmentCombo environment={environment} />
+              <EnvironmentCombo environment={{ type: environment.type }} />
               <FormError id={environmentTypes.errorId}>{environmentTypes.error}</FormError>
             </InputGroup>
             <FormError>{form.error}</FormError>

apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.import.ts

@@ -47,6 +47,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
     })),
   });
 
+  // Only sync parent variables if this is a branch environment
   if (environment.parentEnvironmentId && body.parentVariables) {
     const parentResult = await repository.create(environment.project.id, {
       override: typeof body.override === "boolean" ? body.override : false,

apps/webapp/app/v3/services/alerts/deliverAlert.server.ts

@@ -40,6 +40,7 @@ import { type ProjectAlertChannelType, type ProjectAlertType } from "@trigger.de
 import { alertsRateLimiter } from "~/v3/alertsRateLimiter.server";
 import { v3RunPath } from "~/utils/pathBuilder";
 import { ApiRetrieveRunPresenter } from "~/presenters/v3/ApiRetrieveRunPresenter.server";
+import { environmentTitle } from "~/components/environments/EnvironmentLabel";
 
 type FoundAlert = Prisma.Result<
   typeof prisma.projectAlert,
@@ -56,6 +57,12 @@ type FoundAlert = Prisma.Result<
         include: {
           lockedBy: true;
           lockedToVersion: true;
+          runtimeEnvironment: {
+            select: {
+              type: true;
+              branchName: true;
+            };
+          };
         };
       };
       workerDeployment: {
@@ -65,6 +72,12 @@ type FoundAlert = Prisma.Result<
               tasks: true;
             };
           };
+          environment: {
+            select: {
+              type: true;
+              branchName: true;
+            };
+          };
         };
       };
     };
@@ -90,6 +103,12 @@ export class DeliverAlertService extends BaseService {
           include: {
             lockedBy: true,
             lockedToVersion: true,
+            runtimeEnvironment: {
+              select: {
+                type: true,
+                branchName: true,
+              },
+            },
           },
         },
         workerDeployment: {
@@ -99,6 +118,12 @@ export class DeliverAlertService extends BaseService {
                 tasks: true,
               },
             },
+            environment: {
+              select: {
+                type: true,
+                branchName: true,
+              },
+            },
           },
         },
       },
@@ -177,10 +202,9 @@ export class DeliverAlertService extends BaseService {
             runId: alert.taskRun.friendlyId,
             taskIdentifier: alert.taskRun.taskIdentifier,
             fileName: alert.taskRun.lockedBy?.filePath ?? "Unknown",
-            exportName: alert.taskRun.lockedBy?.exportName ?? "Unknown",
             version: alert.taskRun.lockedToVersion?.version ?? "Unknown",
             project: alert.project.name,
-            environment: alert.environment.slug,
+            environment: environmentTitle(alert.taskRun.runtimeEnvironment),
             error: createJsonErrorObject(taskRunError),
             runLink: `${env.APP_ORIGIN}/projects/v3/${alert.project.externalRef}/runs/${alert.taskRun.friendlyId}`,
             organization: alert.project.organization.title,
@@ -211,7 +235,7 @@ export class DeliverAlertService extends BaseService {
             email: "alert-deployment-failure",
             to: emailProperties.data.email,
             version: alert.workerDeployment.version,
-            environment: alert.environment.slug,
+            environment: environmentTitle(alert.workerDeployment.environment),
             shortCode: alert.workerDeployment.shortCode,
             failedAt: alert.workerDeployment.failedAt ?? new Date(),
             error: preparedError,
@@ -232,7 +256,7 @@ export class DeliverAlertService extends BaseService {
             email: "alert-deployment-success",
             to: emailProperties.data.email,
             version: alert.workerDeployment.version,
-            environment: alert.environment.slug,
+            environment: environmentTitle(alert.workerDeployment.environment),
             shortCode: alert.workerDeployment.shortCode,
             deployedAt: alert.workerDeployment.deployedAt ?? new Date(),
             deploymentLink: `${env.APP_ORIGIN}/projects/v3/${alert.project.externalRef}/deployments/${alert.workerDeployment.shortCode}`,
@@ -292,6 +316,7 @@ export class DeliverAlertService extends BaseService {
                   id: alert.environment.id,
                   type: alert.environment.type,
                   slug: alert.environment.slug,
+                  branchName: alert.environment.branchName ?? undefined,
                 },
                 organization: {
                   id: alert.project.organizationId,
@@ -349,6 +374,7 @@ export class DeliverAlertService extends BaseService {
                     id: alert.environment.id,
                     type: alert.environment.type,
                     slug: alert.environment.slug,
+                    branchName: alert.environment.branchName ?? undefined,
                   },
                   organization: {
                     id: alert.project.organizationId,
@@ -648,9 +674,8 @@ export class DeliverAlertService extends BaseService {
           const taskRunError = this.#getRunError(alert);
           const error = createJsonErrorObject(taskRunError);
 
-          const exportName = alert.taskRun.lockedBy?.exportName ?? "Unknown";
           const version = alert.taskRun.lockedToVersion?.version ?? "Unknown";
-          const environment = alert.environment.slug;
+          const environment = environmentTitle(alert.taskRun.runtimeEnvironment);
           const taskIdentifier = alert.taskRun.taskIdentifier;
           const timestamp = alert.taskRun.completedAt ?? new Date();
           const runId = alert.taskRun.friendlyId;
@@ -664,7 +689,7 @@ export class DeliverAlertService extends BaseService {
                 type: "section",
                 text: {
                   type: "mrkdwn",
-                  text: `:rotating_light: Error in *${exportName}* _<!date^${Math.round(
+                  text: `:rotating_light: Error in *${taskIdentifier}* _<!date^${Math.round(
                     timestamp.getTime() / 1000
                   )}^at {date_num} {time_secs}|${timestamp.toLocaleString()}>_`,
                 },

apps/webapp/app/v3/services/alerts/performTaskRunAlerts.server.ts

@@ -16,7 +16,11 @@ export class PerformTaskRunAlertsService extends BaseService {
       where: { id: runId },
       include: {
         lockedBy: true,
-        runtimeEnvironment: true,
+        runtimeEnvironment: {
+          include: {
+            parentEnvironment: true,
+          },
+        },
       },
     });
 
@@ -32,7 +36,7 @@ export class PerformTaskRunAlertsService extends BaseService {
           has: "TASK_RUN",
         },
         environmentTypes: {
-          has: run.runtimeEnvironment.type,
+          has: run.runtimeEnvironment.parentEnvironment?.type ?? run.runtimeEnvironment.type,
         },
         enabled: true,
       },

docs/apikeys.mdx

@@ -11,18 +11,25 @@ Each environment has its own secret key. You can find the value on the API keys
 
 ![How to find your secret key](/images/api-keys.png)
 
+<Note>
+  For preview branches, you need to also set the `TRIGGER_PREVIEW_BRANCH` environment variable as
+  well. You can find the value on the API keys page when you're on the preview branch.
+</Note>
+
 ### Automatically Configuring the SDK
 
 To automatically configure the SDK with your secret key, you can set the `TRIGGER_SECRET_KEY` environment variable. The SDK will automatically use this value when calling API methods (like `trigger`).
 
 ```bash .env
 TRIGGER_SECRET_KEY="tr_dev_…"
+TRIGGER_PREVIEW_BRANCH="my-branch" # Only needed for preview branches
 ```
 
 You can do the same if you are self-hosting and need to change the default URL by using `TRIGGER_API_URL`.
 
 ```bash .env
 TRIGGER_API_URL="https://trigger.example.com"
+TRIGGER_PREVIEW_BRANCH="my-branch" # Only needed for preview branches
 ```
 
 The default URL is `https://api.trigger.dev`.
@@ -37,6 +44,7 @@ import { myTask } from "./trigger/myTasks";
 
 configure({
   secretKey: "tr_dev_1234", // WARNING: Never actually hardcode your secret key like this
+  previewBranch: "my-branch", // Only needed for preview branches
   baseURL: "https://mytrigger.example.com", // Optional
 });
 

docs/cli-preview-archive.mdx

@@ -0,0 +1,62 @@
+---
+title: "CLI preview archive command"
+sidebarTitle: "preview archive"
+description: "The `trigger.dev preview archive` command can be used to archive a preview branch."
+---
+
+import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
+import ProjectPathArg from "/snippets/cli-args-project-path.mdx";
+import CommonOptions from "/snippets/cli-options-common.mdx";
+import ProjectRefOption from "/snippets/cli-options-project-ref.mdx";
+import EnvFileOption from "/snippets/cli-options-env-file.mdx";
+import ConfigFileOption from "/snippets/cli-options-config-file.mdx";
+import SkipUpdateCheckOption from "/snippets/cli-options-skip-update-check.mdx";
+import BranchOption from "/snippets/cli-options-branch.mdx";
+
+<UpgradeToV4Note />
+
+Run the command like this:
+
+<CodeGroup>
+
+```bash npm
+npx trigger.dev@v4-beta preview archive
+```
+
+```bash pnpm
+pnpm dlx trigger.dev@v4-beta preview archive
+```
+
+```bash yarn
+yarn dlx trigger.dev@v4-beta preview archive
+```
+
+</CodeGroup>
+
+It will archive the preview branch, automatically detecting the branch name from git. You can manually specify the branch using the `--branch` option.
+
+## Arguments
+
+```
+npx trigger.dev@v4-beta preview archive [path]
+```
+
+<ProjectPathArg />
+
+## Options
+
+<BranchOption />
+
+<ConfigFileOption />
+
+<ProjectRefOption />
+
+<EnvFileOption />
+
+<SkipUpdateCheckOption />
+
+### Common options
+
+These options are available on most commands.
+
+<CommonOptions />