Merge remote-tracking branch 'origin/main' into fix/controller-rework

Author: nicktrn

.changeset/moody-squids-count.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Init command will now correctly install v4-beta packages

.changeset/pre.json

@@ -20,8 +20,12 @@
     "breezy-turtles-talk",
     "four-needles-add",
     "honest-files-decide",
+    "late-chairs-ring",
+    "moody-squids-count",
     "nice-colts-boil",
+    "polite-lies-fix",
     "red-wasps-cover",
+    "shiny-kiwis-beam",
     "smart-coins-hammer",
     "weak-jobs-hide"
   ]

docs/docs.json

@@ -23,19 +23,16 @@
               "quick-start",
               "video-walkthrough",
               "how-it-works",
-              "limits"
+              "limits",
+              "upgrade-to-v4"
             ]
           },
           {
             "group": "Fundamentals",
             "pages": [
               {
                 "group": "Tasks",
-                "pages": [
-                  "tasks/overview",
-                  "tasks/schemaTask",
-                  "tasks/scheduled"
-                ]
+                "pages": ["tasks/overview", "tasks/schemaTask", "tasks/scheduled"]
               },
               "triggering",
               "runs",
@@ -50,12 +47,7 @@
               "errors-retrying",
               {
                 "group": "Wait",
-                "pages": [
-                  "wait",
-                  "wait-for",
-                  "wait-until",
-                  "wait-for-token"
-                ]
+                "pages": ["wait", "wait-for", "wait-until", "wait-for-token"]
               },
               "queue-concurrency",
               "versioning",
@@ -99,9 +91,7 @@
           },
           {
             "group": "Development",
-            "pages": [
-              "cli-dev"
-            ]
+            "pages": ["cli-dev"]
           },
           {
             "group": "Deployment",
@@ -112,9 +102,7 @@
               "deployment/atomic-deployment",
               {
                 "group": "Deployment integrations",
-                "pages": [
-                  "vercel-integration"
-                ]
+                "pages": ["vercel-integration"]
               }
             ]
           },
@@ -165,20 +153,15 @@
           },
           {
             "group": "Using the Dashboard",
-            "pages": [
-              "run-tests",
-              "troubleshooting-alerts",
-              "replaying",
-              "bulk-actions"
-            ]
+            "pages": ["run-tests", "troubleshooting-alerts", "replaying", "bulk-actions"]
           },
           {
             "group": "Troubleshooting",
             "pages": [
               "troubleshooting",
               "troubleshooting-debugging-in-vscode",
               "upgrading-packages",
-              "upgrade-to-v4",
+
               "troubleshooting-uptime-status",
               "troubleshooting-github-issues",
               "request-feature"
@@ -196,11 +179,7 @@
           },
           {
             "group": "Help",
-            "pages": [
-              "community",
-              "help-slack",
-              "help-email"
-            ]
+            "pages": ["community", "help-slack", "help-email"]
           }
         ]
       },
@@ -221,10 +200,7 @@
           },
           {
             "group": "Tasks API",
-            "pages": [
-              "management/tasks/trigger",
-              "management/tasks/batch-trigger"
-            ]
+            "pages": ["management/tasks/trigger", "management/tasks/batch-trigger"]
           },
           {
             "group": "Runs API",
@@ -270,9 +246,7 @@
         "groups": [
           {
             "group": "Introduction",
-            "pages": [
-              "guides/introduction"
-            ]
+            "pages": ["guides/introduction"]
           },
           {
             "group": "Frameworks",
@@ -397,10 +371,7 @@
     "href": "https://trigger.dev"
   },
   "api": {
-    "openapi": [
-      "openapi.yml",
-      "v3-openapi.yaml"
-    ],
+    "openapi": ["openapi.yml", "v3-openapi.yaml"],
     "playground": {
       "display": "simple"
     }
@@ -575,4 +546,4 @@
       "destination": "/management/overview"
     }
   ]
-}
+}

docs/guides/examples/react-email.mdx

@@ -144,12 +144,13 @@ We recommend using our [Cursor rules](https://trigger.dev/changelog/cursor-rules
 
 #### The generated code
 
-```tsx trigger/welcome.tsx
+```tsx emails/trigger-welcome-email.tsx
 import {
   Body,
-  Button,reac
+  Button,
   Container,
   Head,
+  Heading,
   Hr,
   Html,
   Img,
@@ -159,11 +160,13 @@ import {
   Text,
 } from "@react-email/components";
 
-const baseUrl = process.env.VERCEL_URL
-  ? `https://${process.env.VERCEL_URL}`
-  : "";
+const baseUrl = process.env.VERCEL_URL ? `https://${process.env.VERCEL_URL}` : "";
 
-export const TriggerDevWelcomeEmail = () => (
+export interface TriggerWelcomeEmailProps {
+  name: string;
+}
+
+export const TriggerWelcomeEmail = ({ name }: TriggerWelcomeEmailProps) => (
   <Html>
     <Head />
     <Preview>Welcome to Trigger.dev - Your background jobs platform!</Preview>
@@ -177,13 +180,14 @@ export const TriggerDevWelcomeEmail = () => (
             alt="Trigger.dev"
           />
           <Hr style={hr} />
+          <Heading>Welcome, {name}!</Heading>
           <Text style={paragraph}>
-            Thanks for signing up for Trigger.dev! You're now ready to start
-            creating powerful background jobs and workflows.
+            Thanks for signing up for Trigger.dev! You're now ready to start creating powerful
+            background jobs and workflows.
           </Text>
           <Text style={paragraph}>
-            You can monitor your jobs, view runs, and manage your projects right
-            from your dashboard.
+            You can monitor your jobs, view runs, and manage your projects right from your
+            dashboard.
           </Text>
           <Button style={button} href="https://cloud.trigger.dev/dashboard">
             View your Trigger.dev Dashboard
@@ -201,9 +205,8 @@ export const TriggerDevWelcomeEmail = () => (
             .
           </Text>
           <Text style={paragraph}>
-            You can create your first job using our SDK, set up integrations,
-            and configure triggers to automate your workflows. Take a look at
-            our{" "}
+            You can create your first job using our SDK, set up integrations, and configure triggers
+            to automate your workflows. Take a look at our{" "}
             <Link style={anchor} href="https://trigger.dev/docs/examples">
               examples
             </Link>{" "}
@@ -217,8 +220,7 @@ export const TriggerDevWelcomeEmail = () => (
             to connect with other developers and get help when you need it.
           </Text>
           <Text style={paragraph}>
-            We're here to help you build amazing things. If you have any
-            questions, check out our{" "}
+            We're here to help you build amazing things. If you have any questions, check out our{" "}
             <Link style={anchor} href="https://trigger.dev/docs">
               documentation
             </Link>{" "}
@@ -233,7 +235,7 @@ export const TriggerDevWelcomeEmail = () => (
   </Html>
 );
 
-export default TriggerDevWelcomeEmail;
+export default TriggerWelcomeEmail;
 
 const main = {
   backgroundColor: "#0E0C15",
@@ -288,6 +290,50 @@ const footer = {
 };
 ```
 
+And then to trigger the email, you can use the following task:
+
+```tsx trigger/triggerWelcomeEmail.tsx
+import { logger, task } from "@trigger.dev/sdk/v3";
+import { Resend } from "resend";
+import TriggerWelcomeEmail from "emails/trigger-welcome-email";
+
+// Initialize Resend client
+const resend = new Resend(process.env.RESEND_API_KEY);
+
+export const sendEmail = task({
+  id: "trigger-welcome-email",
+  run: async (payload: { to: string; name: string; subject: string; from?: string }) => {
+    try {
+        to: payload.to,
+      });
+
+      const { data, error } = await resend.emails.send({
+        // The from address needs to be a verified email address
+        from: payload.from || "email@acmeinc.com", // Default from address
+        to: payload.to,
+        subject: payload.subject,
+        react: <TriggerWelcomeEmail name={payload.name} />,
+      });
+
+      if (error) {
+        logger.error("Failed to send email", { error });
+        throw new Error(`Failed to send email: ${error.message}`);
+      }
+
+      logger.info("Email sent successfully", { emailId: data?.id });
+
+      return {
+        id: data?.id,
+        status: "sent",
+      };
+    } catch (error) {
+      logger.error("Unexpected error sending email", { error });
+      throw error;
+    }
+  },
+});
+```
+
 ## Learn more
 
 ### React Email docs

docs/guides/examples/sentry-error-tracking.mdx

@@ -49,6 +49,7 @@ export default defineConfig({
   },
   init: async () => {
     Sentry.init({
+      defaultIntegrations: false,
       // The Data Source Name (DSN) is a unique identifier for your Sentry project.
       dsn: process.env.SENTRY_DSN,
       // Update this to match the environment you want to track errors for

docs/guides/examples/vercel-sync-env-vars.mdx

@@ -28,7 +28,21 @@ export default defineConfig({
   // Your other config settings...
   build: {
     // Add the syncVercelEnvVars build extension
-    extensions: [syncVercelEnvVars()],
+    extensions: [
+      syncVercelEnvVars({
+        // A personal access token created in your Vercel account settings
+        // Used to authenticate API requests to Vercel
+        // Generate at: https://vercel.com/account/tokens
+        vercelAccessToken: process.env.VERCEL_ACCESS_TOKEN,
+        // The unique identifier of your Vercel project
+        // Found in Project Settings > General > Project ID
+        projectId: process.env.VERCEL_PROJECT_ID,
+        // Optional: The ID of your Vercel team
+        // Only required for team projects
+        // Found in Team Settings > General > Team ID
+        vercelTeamId: process.env.VERCEL_TEAM_ID,
+      }),
+    ],
   },
 });
 ```

docs/guides/introduction.mdx

@@ -68,7 +68,9 @@ Task code you can copy and paste to use in your project. They can all be extende
 | [PDF to image](/guides/examples/pdf-to-image)                                 | Use `MuPDF` to turn a PDF into images and save them to Cloudflare R2.                                                                                |
 | [React to PDF](/guides/examples/react-pdf)                                    | Use `react-pdf` to generate a PDF and save it to Cloudflare R2.                                                                                      |
 | [Puppeteer](/guides/examples/puppeteer)                                       | Use Puppeteer to generate a PDF or scrape a webpage.                                                                                                 |
+| [React email](/guides/examples/react-email)                                   | Send an email using React Email.                                                                                                                     |
 | [Resend email sequence](/guides/examples/resend-email-sequence)               | Send a sequence of emails over several days using Resend with Trigger.dev.                                                                           |
+| [Satori](/guides/examples/satori)                                             | Generate OG images using React Satori.                                                                                                               |
 | [Scrape Hacker News](/guides/examples/scrape-hacker-news)                     | Scrape Hacker News using BrowserBase and Puppeteer, summarize the articles with ChatGPT and send an email of the summary every weekday using Resend. |
 | [Sentry error tracking](/guides/examples/sentry-error-tracking)               | Automatically send errors to Sentry from your tasks.                                                                                                 |
 | [Sharp image processing](/guides/examples/sharp-image-processing)             | Use Sharp to process an image and save it to Cloudflare R2.                                                                                          |

packages/build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @trigger.dev/build
 
+## 4.0.0-v4-beta.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.1`
+
 ## 4.0.0-v4-beta.0
 
 ### Major Changes

packages/build/package.json

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

packages/cli-v3/CHANGELOG.md

@@ -1,5 +1,17 @@
 # trigger.dev
 
+## 4.0.0-v4-beta.1
+
+### Patch Changes
+
+- Fix init.ts in custom trigger dirs ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Init command will now correctly install v4-beta packages ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Update nypm package to support test-based bun.lock files ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Handle flush errors gracefully in dev ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.1`
+  - `@trigger.dev/core@4.0.0-v4-beta.1`
+
 ## 4.0.0-v4-beta.0
 
 ### Major Changes