Skip to content

Commit 65908c6

Browse files
H4adH4ad
committed
Merge branch 'main' into feat/nestjs
2 parents 6ce3c18 + 454cad6 commit 65908c6

File tree

121 files changed

+4568
-646
lines changed

Some content is hidden

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

121 files changed

+4568
-646
lines changed

‎.changeset/eighty-crews-switch.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/funny-flies-reply.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/healthy-carpets-fold.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- "turbo.json"
2424
- "docker/Dockerfile"
2525
- "docker/scripts/**"
26+
- "tests/**"
2627

2728
permissions:
2829
id-token: write

‎apps/webapp/app/components/SetupNuxt.tsx‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎apps/webapp/app/components/StepContentContainer.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
export function StepContentContainer({ children }: { children: React.ReactNode }) {
2-
return <div className="mb-6 ml-9 mt-1">{children}</div>;
1+
import { cn } from "~/utils/cn";
2+
3+
export function StepContentContainer({
4+
children,
5+
className,
6+
}: {
7+
children: React.ReactNode;
8+
className?: string;
9+
}) {
10+
return <div className={cn("mb-6 ml-9 mt-1", className)}>{children}</div>;
311
}

‎apps/webapp/app/components/frameworks/FrameworkSelector.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ export function FrameworkSelector() {
5454
<FrameworkLink to={projectSetupExpressPath(organization, project)}>
5555
<ExpressLogo className="w-36" />
5656
</FrameworkLink>
57-
<FrameworkLink to={projectSetupRemixPath(organization, project)}>
57+
<FrameworkLink to={projectSetupRemixPath(organization, project)} supported>
5858
<RemixLogo className="w-32" />
5959
</FrameworkLink>
6060
<FrameworkLink to={projectSetupRedwoodPath(organization, project)}>
6161
<RedwoodLogo className="w-44" />
6262
</FrameworkLink>
63-
<FrameworkLink to={projectSetupAstroPath(organization, project)}>
63+
<FrameworkLink to={projectSetupAstroPath(organization, project)} supported>
6464
<AstroLogo className="w-32" />
6565
</FrameworkLink>
6666
<FrameworkLink to={projectSetupNuxtPath(organization, project)}>

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.setup.astro/route.tsx‎

Lines changed: 108 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,119 @@
11
import { AstroLogo } from "~/assets/logos/AstroLogo";
2-
import { FrameworkComingSoon } from "~/components/frameworks/FrameworkComingSoon";
2+
import { ChatBubbleLeftRightIcon, Squares2X2Icon } from "@heroicons/react/20/solid";
3+
import invariant from "tiny-invariant";
4+
import { Feedback } from "~/components/Feedback";
5+
import { PageGradient } from "~/components/PageGradient";
6+
import { InitCommand, RunDevCommand, TriggerDevStep } from "~/components/SetupCommands";
7+
import { StepContentContainer } from "~/components/StepContentContainer";
8+
import { InlineCode } from "~/components/code/InlineCode";
39
import { BreadcrumbLink } from "~/components/navigation/NavBar";
10+
import { Button, LinkButton } from "~/components/primitives/Buttons";
11+
import {
12+
ClientTabs,
13+
ClientTabsContent,
14+
ClientTabsList,
15+
ClientTabsTrigger,
16+
} from "~/components/primitives/ClientTabs";
17+
import { ClipboardField } from "~/components/primitives/ClipboardField";
18+
import { Header1 } from "~/components/primitives/Headers";
19+
import { NamedIcon } from "~/components/primitives/NamedIcon";
20+
import { Paragraph } from "~/components/primitives/Paragraph";
21+
import { StepNumber } from "~/components/primitives/StepNumber";
22+
import { useAppOrigin } from "~/hooks/useAppOrigin";
23+
import { useProjectSetupComplete } from "~/hooks/useProjectSetupComplete";
24+
import { useDevEnvironment } from "~/hooks/useEnvironments";
25+
import { useOrganization } from "~/hooks/useOrganizations";
26+
import { useProject } from "~/hooks/useProject";
427
import { Handle } from "~/utils/handle";
5-
import { trimTrailingSlash } from "~/utils/pathBuilder";
28+
import { projectSetupPath, trimTrailingSlash } from "~/utils/pathBuilder";
29+
import { Callout } from "~/components/primitives/Callout";
30+
import { Badge } from "~/components/primitives/Badge";
631

732
export const handle: Handle = {
833
breadcrumb: (match) => <BreadcrumbLink to={trimTrailingSlash(match.pathname)} title="Astro" />,
934
};
1035

11-
export default function Page() {
36+
export default function SetUpAstro() {
37+
const organization = useOrganization();
38+
const project = useProject();
39+
useProjectSetupComplete();
40+
const devEnvironment = useDevEnvironment();
41+
invariant(devEnvironment, "Dev environment must be defined");
1242
return (
13-
<FrameworkComingSoon
14-
frameworkName="Astro"
15-
githubIssueUrl="https://github.com/triggerdotdev/trigger.dev/issues/452"
16-
githubIssueNumber={452}
17-
>
18-
<AstroLogo className="w-56" />
19-
</FrameworkComingSoon>
43+
<PageGradient>
44+
<div className="mx-auto max-w-3xl">
45+
<div className="flex items-center justify-between">
46+
<Header1 spacing className="text-bright">
47+
Get setup in 5 minutes
48+
</Header1>
49+
<div className="flex items-center gap-2">
50+
<LinkButton
51+
to={projectSetupPath(organization, project)}
52+
variant="tertiary/small"
53+
LeadingIcon={Squares2X2Icon}
54+
>
55+
Choose a different framework
56+
</LinkButton>
57+
<Feedback
58+
button={
59+
<Button variant="tertiary/small" LeadingIcon={ChatBubbleLeftRightIcon}>
60+
I'm stuck!
61+
</Button>
62+
}
63+
defaultValue="help"
64+
/>
65+
</div>
66+
</div>
67+
<div>
68+
<Callout
69+
variant={"info"}
70+
to="https://github.com/triggerdotdev/trigger.dev/discussions/430"
71+
className="mb-8"
72+
>
73+
Trigger.dev has full support for serverless. We will be adding support for long-running
74+
servers soon.
75+
</Callout>
76+
<div>
77+
<StepNumber
78+
stepNumber="1"
79+
title="Follow the steps from the Astro manual installation guide"
80+
/>
81+
<StepContentContainer className="flex flex-col gap-2">
82+
<Paragraph className="mt-2">Copy your server API Key to your clipboard:</Paragraph>
83+
<div className="mb-2 flex w-full items-center justify-between">
84+
<ClipboardField
85+
secure
86+
className="w-fit"
87+
value={devEnvironment.apiKey}
88+
variant={"secondary/medium"}
89+
icon={<Badge variant="outline">Server</Badge>}
90+
/>
91+
</div>
92+
<Paragraph>Now follow this guide:</Paragraph>
93+
<LinkButton
94+
to="https://trigger.dev/docs/documentation/guides/manual/astro"
95+
variant="primary/medium"
96+
TrailingIcon="external-link"
97+
>
98+
Manual installation guide
99+
</LinkButton>
100+
<div className="flex items-start justify-start gap-2"></div>
101+
</StepContentContainer>
102+
<StepNumber stepNumber="2" title="Run your Astro app" />
103+
<StepContentContainer>
104+
<RunDevCommand />
105+
</StepContentContainer>
106+
<StepNumber stepNumber="3" title="Run the CLI 'dev' command" />
107+
<StepContentContainer>
108+
<TriggerDevStep />
109+
</StepContentContainer>
110+
<StepNumber stepNumber="6" title="Wait for Jobs" displaySpinner />
111+
<StepContentContainer>
112+
<Paragraph>This page will automatically refresh.</Paragraph>
113+
</StepContentContainer>
114+
</div>
115+
</div>
116+
</div>
117+
</PageGradient>
20118
);
21119
}

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.setup.remix/route.tsx‎

Lines changed: 108 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,118 @@
1-
import { RemixLogo } from "~/assets/logos/RemixLogo";
2-
import { FrameworkComingSoon } from "~/components/frameworks/FrameworkComingSoon";
1+
import { ChatBubbleLeftRightIcon, Squares2X2Icon } from "@heroicons/react/20/solid";
2+
import invariant from "tiny-invariant";
3+
import { Feedback } from "~/components/Feedback";
4+
import { PageGradient } from "~/components/PageGradient";
5+
import { StepContentContainer } from "~/components/StepContentContainer";
6+
import { InlineCode } from "~/components/code/InlineCode";
37
import { BreadcrumbLink } from "~/components/navigation/NavBar";
8+
import { Button, LinkButton } from "~/components/primitives/Buttons";
9+
import {
10+
ClientTabs,
11+
ClientTabsContent,
12+
ClientTabsList,
13+
ClientTabsTrigger,
14+
} from "~/components/primitives/ClientTabs";
15+
import { ClipboardField } from "~/components/primitives/ClipboardField";
16+
import { Header1 } from "~/components/primitives/Headers";
17+
import { NamedIcon } from "~/components/primitives/NamedIcon";
18+
import { Paragraph } from "~/components/primitives/Paragraph";
19+
import { StepNumber } from "~/components/primitives/StepNumber";
20+
import { useAppOrigin } from "~/hooks/useAppOrigin";
21+
import { useProjectSetupComplete } from "~/hooks/useProjectSetupComplete";
22+
import { useDevEnvironment } from "~/hooks/useEnvironments";
23+
import { useOrganization } from "~/hooks/useOrganizations";
24+
import { useProject } from "~/hooks/useProject";
425
import { Handle } from "~/utils/handle";
5-
import { trimTrailingSlash } from "~/utils/pathBuilder";
26+
import { projectSetupPath, trimTrailingSlash } from "~/utils/pathBuilder";
27+
import { Callout } from "~/components/primitives/Callout";
28+
import { RunDevCommand, TriggerDevStep } from "~/components/SetupCommands";
29+
import { Badge } from "~/components/primitives/Badge";
630

731
export const handle: Handle = {
832
breadcrumb: (match) => <BreadcrumbLink to={trimTrailingSlash(match.pathname)} title="Remix" />,
933
};
1034

11-
export default function Page() {
35+
export default function SetUpRemix() {
36+
const organization = useOrganization();
37+
const project = useProject();
38+
useProjectSetupComplete();
39+
const devEnvironment = useDevEnvironment();
40+
invariant(devEnvironment, "Dev environment must be defined");
1241
return (
13-
<FrameworkComingSoon
14-
frameworkName="Remix"
15-
githubIssueUrl="https://github.com/triggerdotdev/trigger.dev/issues/445"
16-
githubIssueNumber={445}
17-
>
18-
<RemixLogo className="w-56" />
19-
</FrameworkComingSoon>
42+
<PageGradient>
43+
<div className="mx-auto max-w-3xl">
44+
<div className="flex items-center justify-between">
45+
<Header1 spacing className="text-bright">
46+
Get setup in 5 minutes
47+
</Header1>
48+
<div className="flex items-center gap-2">
49+
<LinkButton
50+
to={projectSetupPath(organization, project)}
51+
variant="tertiary/small"
52+
LeadingIcon={Squares2X2Icon}
53+
>
54+
Choose a different framework
55+
</LinkButton>
56+
<Feedback
57+
button={
58+
<Button variant="tertiary/small" LeadingIcon={ChatBubbleLeftRightIcon}>
59+
I'm stuck!
60+
</Button>
61+
}
62+
defaultValue="help"
63+
/>
64+
</div>
65+
</div>
66+
<div>
67+
<Callout
68+
variant={"info"}
69+
to="https://github.com/triggerdotdev/trigger.dev/discussions/430"
70+
className="mb-8"
71+
>
72+
Trigger.dev has full support for serverless. We will be adding support for long-running
73+
servers soon.
74+
</Callout>
75+
<div>
76+
<StepNumber
77+
stepNumber="1"
78+
title="Follow the steps from the Remix manual installation guide"
79+
/>
80+
<StepContentContainer className="flex flex-col gap-2">
81+
<Paragraph className="mt-2">Copy your server API Key to your clipboard:</Paragraph>
82+
<div className="mb-2 flex w-full items-center justify-between">
83+
<ClipboardField
84+
secure
85+
className="w-fit"
86+
value={devEnvironment.apiKey}
87+
variant={"secondary/medium"}
88+
icon={<Badge variant="outline">Server</Badge>}
89+
/>
90+
</div>
91+
<Paragraph>Now follow this guide:</Paragraph>
92+
<LinkButton
93+
to="https://trigger.dev/docs/documentation/guides/manual/remix"
94+
variant="primary/medium"
95+
TrailingIcon="external-link"
96+
>
97+
Manual installation guide
98+
</LinkButton>
99+
<div className="flex items-start justify-start gap-2"></div>
100+
</StepContentContainer>
101+
<StepNumber stepNumber="2" title="Run your Remix app" />
102+
<StepContentContainer>
103+
<RunDevCommand />
104+
</StepContentContainer>
105+
<StepNumber stepNumber="3" title="Run the CLI 'dev' command" />
106+
<StepContentContainer>
107+
<TriggerDevStep />
108+
</StepContentContainer>
109+
<StepNumber stepNumber="6" title="Wait for Jobs" displaySpinner />
110+
<StepContentContainer>
111+
<Paragraph>This page will automatically refresh.</Paragraph>
112+
</StepContentContainer>
113+
</div>
114+
</div>
115+
</div>
116+
</PageGradient>
20117
);
21118
}

‎apps/webapp/tsconfig.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"paths": {
2020
"~/*": ["./app/*"],
2121
"@/*": ["./*"],
22+
"@trigger.dev/sdk": ["../../packages/trigger-sdk/src/index"],
23+
"@trigger.dev/sdk/*": ["../../packages/trigger-sdk/src/*"],
2224
"@trigger.dev/core": ["../../packages/core/src/index"],
2325
"@trigger.dev/core/*": ["../../packages/core/src/*"],
2426
"@trigger.dev/database": ["../../packages/database/src/index"],

0 commit comments

Comments
 (0)