Skip to content

Commit 7e321f3

Browse files
nicktrnnicktrn
committed
Merge branch 'main' into v3/fix-dev-trigger-waits
2 parents 8cadf60 + 69f6891 commit 7e321f3

File tree

215 files changed

+7615
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+7615
-938
lines changed

‎.changeset/dry-walls-check.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"trigger.dev": patch
3+
"@trigger.dev/core": patch
4+
---
5+
6+
Add option to print console logs in the dev CLI locally (issue #1014)

‎.changeset/khaki-poems-lay.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/sdk": patch
3+
---
4+
5+
Export queue from the SDK

‎.changeset/ninety-pets-travel.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@trigger.dev/sdk": patch
3+
"@trigger.dev/core": patch
4+
---
5+
6+
Improve the SDK function types and expose a new APIError instead of the APIResult type

‎.changeset/pre.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@
4949
"clean-pianos-listen",
5050
"cool-glasses-bake",
5151
"cuddly-feet-approve",
52+
"dry-walls-check",
5253
"eight-pumas-float",
5354
"few-students-share",
5455
"green-bags-wink",
5556
"khaki-apricots-design",
57+
"khaki-poems-lay",
5658
"late-icons-lie",
5759
"late-steaks-behave",
5860
"lemon-jobs-repair",
@@ -62,22 +64,27 @@
6264
"many-ligers-pump",
6365
"mighty-camels-joke",
6466
"new-rivers-tell",
67+
"ninety-pets-travel",
6568
"odd-poets-own",
6669
"polite-ducks-switch",
6770
"poor-flowers-cross",
6871
"rare-roses-float",
6972
"real-planets-stare",
73+
"rotten-dryers-exercise",
7074
"sharp-zebras-serve",
7175
"silly-suits-switch",
7276
"smart-olives-eat",
7377
"spicy-lamps-smoke",
7478
"strange-ghosts-matter",
79+
"strong-lemons-add",
7580
"stupid-bulldogs-applaud",
7681
"sweet-lizards-press",
82+
"swift-dragons-peel",
7783
"tall-bees-wave",
7884
"tame-guests-know",
7985
"tender-oranges-rhyme",
8086
"tidy-balloons-suffer",
81-
"tiny-doors-type"
87+
"tiny-doors-type",
88+
"tricky-bulldogs-heal"
8289
]
8390
}

‎.changeset/rotten-dryers-exercise.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@trigger.dev/sdk": patch
3+
"trigger.dev": patch
4+
"@trigger.dev/core": patch
5+
---
6+
7+
Adding task with a triggerSource of schedule

‎.changeset/strong-lemons-add.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
Make optional schedule object fields nullish

‎.changeset/swift-dragons-peel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
Added JSDocs to the schedule SDK types

‎.changeset/tricky-bulldogs-heal.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@trigger.dev/sdk": patch
3+
"trigger.dev": patch
4+
"@trigger.dev/core": patch
5+
---
6+
7+
Added a new global - Task Catalog - to better handle task metadata

‎apps/webapp/app/assets/icons/AISparkleIcon.tsx

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
export function AISparkleIcon({ className }: { className?: string }) {
2+
return (
3+
<svg className={className} viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
4+
<path
5+
d="M14.9806 0.803884C14.8871 0.33646 14.4767 0 14 0C13.5233 0 13.1129 0.33646 13.0194 0.803884L12.7809 1.99644C12.7017 2.3923 12.3923 2.70174 11.9964 2.78091L10.8039 3.01942C10.3365 3.1129 10 3.52332 10 4C10 4.47668 10.3365 4.8871 10.8039 4.98058L11.9964 5.21909C12.3923 5.29826 12.7017 5.6077 12.7809 6.00356L13.0194 7.19612C13.1129 7.66354 13.5233 8 14 8C14.4767 8 14.8871 7.66354 14.9806 7.19612L15.2191 6.00356C15.2983 5.6077 15.6077 5.29826 16.0036 5.21909L17.1961 4.98058C17.6635 4.8871 18 4.47668 18 4C18 3.52332 17.6635 3.1129 17.1961 3.01942L16.0036 2.78091C15.6077 2.70174 15.2983 2.3923 15.2191 1.99644L14.9806 0.803884Z"
6+
fill="url(#paint0_linear_11402_36656)"
7+
/>
8+
<path
9+
d="M5.94868 4.68377C5.81257 4.27543 5.43043 4 5 4C4.56957 4 4.18743 4.27543 4.05132 4.68377L3.36754 6.73509C3.26801 7.03369 3.03369 7.26801 2.73509 7.36754L0.683772 8.05132C0.27543 8.18743 0 8.56957 0 9C0 9.43043 0.27543 9.81257 0.683772 9.94868L2.73509 10.6325C3.03369 10.732 3.26801 10.9663 3.36754 11.2649L4.05132 13.3162C4.18743 13.7246 4.56957 14 5 14C5.43043 14 5.81257 13.7246 5.94868 13.3162L6.63246 11.2649C6.73199 10.9663 6.96631 10.732 7.26491 10.6325L9.31623 9.94868C9.72457 9.81257 10 9.43043 10 9C10 8.56957 9.72457 8.18743 9.31623 8.05132L7.26491 7.36754C6.96631 7.26801 6.73199 7.03369 6.63246 6.73509L5.94868 4.68377Z"
10+
fill="url(#paint1_linear_11402_36656)"
11+
/>
12+
<path
13+
d="M12.9487 12.6838C12.8126 12.2754 12.4304 12 12 12C11.5696 12 11.1874 12.2754 11.0513 12.6838L10.8675 13.2351C10.768 13.5337 10.5337 13.768 10.2351 13.8675L9.68377 14.0513C9.27543 14.1874 9 14.5696 9 15C9 15.4304 9.27543 15.8126 9.68377 15.9487L10.2351 16.1325C10.5337 16.232 10.768 16.4663 10.8675 16.7649L11.0513 17.3162C11.1874 17.7246 11.5696 18 12 18C12.4304 18 12.8126 17.7246 12.9487 17.3162L13.1325 16.7649C13.232 16.4663 13.4663 16.232 13.7649 16.1325L14.3162 15.9487C14.7246 15.8126 15 15.4304 15 15C15 14.5696 14.7246 14.1874 14.3162 14.0513L13.7649 13.8675C13.4663 13.768 13.232 13.5337 13.1325 13.2351L12.9487 12.6838Z"
14+
fill="url(#paint2_linear_11402_36656)"
15+
/>
16+
<defs>
17+
<linearGradient
18+
id="paint0_linear_11402_36656"
19+
x1="9"
20+
y1="0"
21+
x2="9"
22+
y2="18"
23+
gradientUnits="userSpaceOnUse"
24+
>
25+
<stop stopColor="#E543FF" />
26+
<stop offset="1" stopColor="#286399" />
27+
</linearGradient>
28+
<linearGradient
29+
id="paint1_linear_11402_36656"
30+
x1="9"
31+
y1="0"
32+
x2="9"
33+
y2="18"
34+
gradientUnits="userSpaceOnUse"
35+
>
36+
<stop stopColor="#E543FF" />
37+
<stop offset="1" stopColor="#286399" />
38+
</linearGradient>
39+
<linearGradient
40+
id="paint2_linear_11402_36656"
41+
x1="9"
42+
y1="0"
43+
x2="9"
44+
y2="18"
45+
gradientUnits="userSpaceOnUse"
46+
>
47+
<stop stopColor="#E543FF" />
48+
<stop offset="1" stopColor="#286399" />
49+
</linearGradient>
50+
</defs>
51+
</svg>
52+
);
53+
}

‎apps/webapp/app/components/navigation/SideMenu.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
ArrowRightOnRectangleIcon,
55
BeakerIcon,
66
ChartBarIcon,
7+
ClockIcon,
78
CursorArrowRaysIcon,
89
IdentificationIcon,
910
KeyIcon,
@@ -47,6 +48,7 @@ import {
4748
v3ProjectPath,
4849
v3ProjectSettingsPath,
4950
v3RunsPath,
51+
v3SchedulesPath,
5052
v3TestPath,
5153
} from "~/utils/pathBuilder";
5254
import { Feedback } from "../Feedback";
@@ -571,6 +573,13 @@ function V3ProjectSideMenu({
571573
to={v3TestPath(organization, project)}
572574
data-action="test"
573575
/>
576+
<SideMenuItem
577+
name="Schedules"
578+
icon={ClockIcon}
579+
iconColor="text-sun-500"
580+
to={v3SchedulesPath(organization, project)}
581+
data-action="schedules"
582+
/>
574583
<SideMenuItem
575584
name="API keys"
576585
icon={KeyIcon}

‎apps/webapp/app/components/primitives/Buttons.tsx

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,15 @@ export const Button = forwardRef<HTMLButtonElement, ButtonPropsType>(
286286
type LinkPropsType = Pick<
287287
LinkProps,
288288
"to" | "target" | "onClick" | "onMouseDown" | "onMouseEnter" | "onMouseLeave" | "download"
289-
> &
290-
React.ComponentProps<typeof ButtonContent>;
289+
> & { disabled?: boolean } & React.ComponentProps<typeof ButtonContent>;
291290
export const LinkButton = ({
292291
to,
293292
onClick,
294293
onMouseDown,
295294
onMouseEnter,
296295
onMouseLeave,
297296
download,
297+
disabled = false,
298298
...props
299299
}: LinkPropsType) => {
300300
const innerRef = useRef<HTMLAnchorElement>(null);
@@ -309,6 +309,19 @@ export const LinkButton = ({
309309
});
310310
}
311311

312+
if (disabled) {
313+
return (
314+
<div
315+
className={cn(
316+
"group pointer-events-none cursor-default opacity-40 outline-none",
317+
props.fullWidth ? "w-full" : ""
318+
)}
319+
>
320+
<ButtonContent {...props} />
321+
</div>
322+
);
323+
}
324+
312325
if (to.toString().startsWith("http") || to.toString().startsWith("/resources")) {
313326
return (
314327
<ExtLink

‎apps/webapp/app/components/primitives/Checkbox.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const variants = {
2323
},
2424
"button/small": {
2525
button:
26-
"flex items-center w-fit h-8 pl-2 pr-3 rounded border border-charcoal-800 hover:bg-charcoal-850 hover:border-charcoal-750 transition",
26+
"flex items-center w-fit h-8 pl-2 pr-3 rounded border border-charcoal-600 hover:bg-charcoal-850 hover:border-charcoal-500 transition",
2727
label: "text-sm text-text-bright select-none",
2828
description: "text-text-dimmed",
2929
inputPosition: "mt-0",
@@ -32,7 +32,7 @@ const variants = {
3232
},
3333
button: {
3434
button:
35-
"w-fit py-2 pl-3 pr-4 rounded border border-charcoal-800 hover:bg-charcoal-850 hover:border-charcoal-750 transition",
35+
"w-fit py-2 pl-3 pr-4 rounded border border-charcoal-600 hover:bg-charcoal-850 hover:border-charcoal-500 transition",
3636
label: "text-text-bright select-none",
3737
description: "text-text-dimmed",
3838
inputPosition: "mt-1",
@@ -57,7 +57,7 @@ export type CheckboxProps = Omit<
5757
name?: string;
5858
value?: string;
5959
variant?: keyof typeof variants;
60-
label?: string;
60+
label?: React.ReactNode;
6161
description?: string;
6262
badges?: string[];
6363
className?: string;
@@ -137,7 +137,7 @@ export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
137137
className={cn(
138138
inputPositionClasses,
139139
props.readOnly || disabled ? "cursor-default" : "cursor-pointer",
140-
"read-only:border-charcoal-650 disabled:border-charcoal-650 rounded-sm border border-charcoal-700 bg-transparent transition checked:!bg-indigo-500 read-only:!bg-charcoal-700 group-hover:bg-charcoal-900 group-hover:checked:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-none focus-visible:ring-indigo-500 disabled:!bg-charcoal-700"
140+
"read-only:border-charcoal-650 disabled:border-charcoal-650 rounded-sm border border-charcoal-600 bg-transparent transition checked:!bg-indigo-500 read-only:!bg-charcoal-700 group-hover:bg-charcoal-900 group-hover:checked:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-none focus-visible:ring-indigo-500 disabled:!bg-charcoal-700"
141141
)}
142142
id={id}
143143
ref={ref}

0 commit comments

Comments
 (0)