triggerdotdev · matt-aitken · Jan 26, 2023 · Jan 25, 2023 · Jan 25, 2023 · Jan 25, 2023
diff --git a/.changeset/nine-planets-raise.md b/.changeset/nine-planets-raise.md
diff --git a/.changeset/quick-hairs-punch.md b/.changeset/quick-hairs-punch.md
diff --git a/apps/docs/images/webhook-url.png b/apps/docs/images/webhook-url.png
diff --git a/apps/docs/triggers/scheduled.mdx b/apps/docs/triggers/scheduled.mdx
@@ -11,7 +11,7 @@ description: "Run a workflow on a recurring schedule"
 This job will run every 5 minutes, starting 5 minutes after this code is first run on your server (that includes running locally).

 ```ts
-import { Trigger, schedule } from "@trigger.dev/sdk";
+import { Trigger, scheduleEvent } from "@trigger.dev/sdk";

 new Trigger({
  id: "scheduled-workflow",
@@ -34,7 +34,7 @@ new Trigger({
 This job will run at 2:30pm every Monday. You can get help with [CRON syntax](https://crontab.guru/).

 ```ts
-import { Trigger, schedule } from "@trigger.dev/sdk";
+import { Trigger, scheduleEvent } from "@trigger.dev/sdk";

 new Trigger({
  id: "cron-scheduled-workflow",

diff --git a/apps/webapp/app/assets/images/triggers/event-bridge.png b/apps/webapp/app/assets/images/triggers/event-bridge.png
diff --git a/apps/webapp/app/assets/images/triggers/http-endpoint.png b/apps/webapp/app/assets/images/triggers/http-endpoint.png
diff --git a/apps/webapp/app/assets/images/triggers/http-polling.png b/apps/webapp/app/assets/images/triggers/http-polling.png
diff --git a/apps/webapp/app/assets/images/triggers/schedule.png b/apps/webapp/app/assets/images/triggers/schedule.png
diff --git a/apps/webapp/app/assets/images/triggers/webhook.png b/apps/webapp/app/assets/images/triggers/webhook.png
diff --git a/apps/webapp/app/components/CopyTextButton.tsx b/apps/webapp/app/components/CopyTextButton.tsx
@@ -6,7 +6,7 @@ import { CopyText } from "./CopyText";
 const variantStyle = {
  slate:
    "bg-slate-800 text-white rounded px-2 py-1 transition hover:text-slate-700 hover:bg-slate-700 hover:bg-slate-700 hover:text-slate-100 active:bg-slate-800 active:text-slate-300 focus-visible:outline-slate-900",
-  blue: "bg-indigo-600 rounded px-2 py-1 transition text-white hover:bg-indigo-500 active:bg-indigo-800 active:text-indigo-100 focus-visible:outline-indigo-600",
+  blue: "text-sm bg-indigo-700 rounded px-3 py-2 transition text-white hover:bg-indigo-600 active:bg-indigo-800 active:text-indigo-100 focus-visible:outline-indigo-600",
  darkTransparent:
    "bg-black/10 text-slate-900 rounded px-2 py-1 transition hover:bg-blue-50 active:bg-blue-200 active:text-slate-600 focus-visible:outline-white",
  lightTransparent:
@@ -37,7 +37,7 @@ export function CopyTextButton({
      {copied ? (
        <div
          className={classNames(
-            "flex items-center  hover:cursor-pointer",
+            "flex items-center hover:cursor-pointer",
            variantStyle[variant]
          )}
        >
@@ -46,7 +46,7 @@ export function CopyTextButton({
      ) : (
        <div
          className={classNames(
-            "flex items-center  hover:cursor-pointer",
+            "flex items-center hover:cursor-pointer",
            variantStyle[variant]
          )}
        >

diff --git a/apps/webapp/app/components/triggers/TriggerIcons.tsx b/apps/webapp/app/components/triggers/TriggerIcons.tsx
@@ -4,6 +4,7 @@ import { ApiLogoIcon } from "../code/ApiLogoIcon";
 import CustomEvent from "../../assets/images/triggers/custom-event.png";
 import HttpEndpoint from "../../assets/images/triggers/http-endpoint.png";
 import Schedule from "../../assets/images/triggers/schedule.png";
+import Webhook from "../../assets/images/triggers/webhook.png";
 import { triggerLabel } from "./triggerLabel";

 type TriggerType = Workflow["type"];
@@ -49,11 +50,7 @@ export function TriggerTypeIcon({
      );
    case "WEBHOOK":
      return (
-        <img
-          src={CustomEvent}
-          alt={triggerLabel(type)}
-          className={iconClasses}
-        />
+        <img src={Webhook} alt={triggerLabel(type)} className={iconClasses} />
      );
    default:
      return null;

diff --git a/apps/webapp/app/routes/__app/orgs/$organizationSlug/workflows/$workflowSlug/index.tsx b/apps/webapp/app/routes/__app/orgs/$organizationSlug/workflows/$workflowSlug/index.tsx
@@ -93,50 +93,45 @@ export default function Page() {
          eventRule.trigger.type === "WEBHOOK" &&
          eventRule.trigger.manualRegistration &&
          workflow.externalSourceUrl ? (
-            <PanelInfo className="mb-6">
+            <PanelInfo className="mb-6 pb-4">
              <div className="flex flex-col">
-                <Body className="mb-6">
+                <Body className="mb-4">
                  Use these details to register your webhook – this usually
                  involves logging in to the developer section of the service.
                </Body>
-                <div className="flex gap-8">
-                  <div className="flex items-center gap-2">
-                    <div className="flex flex-col gap-2">
-                      <Body
-                        size="extra-small"
-                        className="text-slate-300 uppercase tracking-wide"
-                      >
-                        URL
-                      </Body>
-                      <div className="flex items-center gap-2">
-                        <Input value={workflow.externalSourceUrl} />
-                        <CopyTextButton
-                          value={workflow.externalSourceUrl}
-                        ></CopyTextButton>
-                      </div>
-                    </div>
+                <div className="flex flex-col gap-2">
+                  <Body
+                    size="extra-small"
+                    className="text-slate-300 uppercase tracking-wide"
+                  >
+                    URL
+                  </Body>
+                  <div className="flex items-center gap-2 mb-4">
+                    <Input value={workflow.externalSourceUrl} />
+                    <CopyTextButton
+                      value={workflow.externalSourceUrl}
+                    ></CopyTextButton>
                  </div>
-                  {workflow.externalSourceSecret && (
-                    <div className="flex flex-col">
-                      <Body
-                        size="extra-small"
-                        className="text-slate-300 uppercase tracking-wide"
-                      >
-                        Secret
-                      </Body>
-                      <div className="flex items-center gap-2">
-                        <Input
-                          type="password"
-                          value={workflow.externalSourceSecret}
-                          className="mt-2"
-                        />
-                        <CopyTextButton
-                          value={workflow.externalSourceSecret}
-                        ></CopyTextButton>
-                      </div>
-                    </div>
-                  )}
                </div>
+                {workflow.externalSourceSecret && (
+                  <div className="flex flex-col gap-2">
+                    <Body
+                      size="extra-small"
+                      className="text-slate-300 uppercase tracking-wide"
+                    >
+                      Secret
+                    </Body>
+                    <div className="flex items-center gap-2">
+                      <Input
+                        type="password"
+                        value={workflow.externalSourceSecret}
+                      />
+                      <CopyTextButton
+                        value={workflow.externalSourceSecret}
+                      ></CopyTextButton>
+                    </div>
+                  </div>
+                )}
              </div>
            </PanelInfo>
          ) : (

diff --git a/apps/webapp/app/services/externalSources/registerExternalSource.server.ts b/apps/webapp/app/services/externalSources/registerExternalSource.server.ts
@@ -67,7 +67,7 @@ export class RegisterExternalSource {
      externalSource.secret ?? crypto.randomBytes(32).toString("hex");

    const webhookUrl = buildExternalSourceUrl(
-      externalSource,
+      externalSource.id,
      connection.apiIdentifier
    );


diff --git a/apps/webapp/public/integrations/Webhook.png b/apps/webapp/public/integrations/Webhook.png
diff --git a/packages/trigger-integrations/CHANGELOG.md b/packages/trigger-integrations/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @trigger.dev/integrations

+## 0.1.12
+
+### Patch Changes
+
+- 039321f: Improved types for the Resend integration
+- Updated dependencies [039321f]
+  - @trigger.dev/providers@0.1.7
+  - @trigger.dev/sdk@0.2.9
+
+## 0.1.11
+
+### Patch Changes
+
+- ddf4255: Added support for webhookEvent trigger
+- Updated dependencies [ddf4255]
+- Updated dependencies [2fd9e4f]
+  - @trigger.dev/sdk@0.2.8
+
 ## 0.1.10

 ### Patch Changes

diff --git a/packages/trigger-integrations/package.json b/packages/trigger-integrations/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@trigger.dev/integrations",
-  "version": "0.1.10",
+  "version": "0.1.12",
  "description": "trigger.dev integrations",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",

diff --git a/packages/trigger-providers/CHANGELOG.md b/packages/trigger-providers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @trigger.dev/providers

+## 0.1.7
+
+### Patch Changes
+
+- 039321f: Improved types for the Resend integration
+
 ## 0.1.6

 ### Patch Changes

diff --git a/packages/trigger-providers/package.json b/packages/trigger-providers/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@trigger.dev/providers",
-  "version": "0.1.6",
+  "version": "0.1.7",
  "description": "trigger.dev API providers with schemas",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -20,6 +20,7 @@
  "devDependencies": {
    "@trigger.dev/tsconfig": "workspace:*",
    "@types/node": "16",
+    "@types/react": "^18.0.26",
    "rimraf": "^3.0.2",
    "tsup": "^6.5.0",
    "typescript": "^4.9.4"

diff --git a/packages/trigger-providers/src/providers/resend/schemas.ts b/packages/trigger-providers/src/providers/resend/schemas.ts
@@ -1,10 +1,7 @@
+import { ReactElement } from "react";
 import { z } from "zod";

-const SimplifiedReactElementSchema = z.object({
-  type: z.any(),
-  props: z.any(),
-  key: z.union([z.string(), z.number()]).nullable(),
-});
+const ReactElementSchema = z.custom<ReactElement>();

 export const BaseSendFieldsSchema = z.object({
  from: z.string(),
@@ -19,7 +16,7 @@ export const SendEmailOptionsSchema = z
  .object({
    text: z.string().optional(),
    html: z.string().optional(),
-    react: SimplifiedReactElementSchema.optional(),
+    react: ReactElementSchema.optional(),
  })
  .and(BaseSendFieldsSchema);


diff --git a/packages/trigger-providers/tsup.config.ts b/packages/trigger-providers/tsup.config.ts
@@ -13,7 +13,16 @@ export default defineConfig([
    bundle: true,
    splitting: false,
    dts: true,
-    external: ["http", "https", "util", "events", "tty", "os", "timers"],
+    external: [
+      "http",
+      "https",
+      "util",
+      "events",
+      "tty",
+      "os",
+      "timers",
+      "react",
+    ],
    esbuildPlugins: [],
  },
 ]);
diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @trigger.dev/sdk

+## 0.2.9
+
+### Patch Changes
+
+- 039321f: Improved types for the Resend integration
+
+## 0.2.8
+
+### Patch Changes
+
+- ddf4255: Added support for webhookEvent trigger
+- 2fd9e4f: Added retry options to fetch
+
 ## 0.2.7

 ### 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": "0.2.7",
+  "version": "0.2.9",
  "description": "trigger.dev Node.JS SDK",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml