From dddd27930f47ca01cbb2006b28d83e12eb435cae Mon Sep 17 00:00:00 2001 From: Maximilian Kaske Date: Sun, 19 Jan 2025 10:49:13 +0100 Subject: [PATCH] chore: fix exports --- .../src/routes/v1/pageSubscribers/post.ts | 3 +- apps/web/src/lib/auth/index.ts | 3 +- packages/emails/emails/alert.tsx | 72 ------------------- packages/emails/emails/followup.tsx | 1 - packages/emails/emails/monitor-alert.tsx | 7 +- .../emails/emails/monitor-deactivation.tsx | 1 - packages/emails/emails/page-subscription.tsx | 1 - packages/emails/emails/status-report.tsx | 1 - packages/emails/emails/subscribe.tsx | 1 - packages/emails/emails/team-invitation.tsx | 1 - packages/emails/emails/welcome.tsx | 1 - packages/emails/src/client.tsx | 26 +++---- packages/emails/src/index.ts | 13 ++-- 13 files changed, 21 insertions(+), 110 deletions(-) delete mode 100644 packages/emails/emails/alert.tsx diff --git a/apps/server/src/routes/v1/pageSubscribers/post.ts b/apps/server/src/routes/v1/pageSubscribers/post.ts index e68801e1..703bcdf5 100644 --- a/apps/server/src/routes/v1/pageSubscribers/post.ts +++ b/apps/server/src/routes/v1/pageSubscribers/post.ts @@ -6,8 +6,7 @@ import { Events } from "@openstatus/analytics"; import { and, eq } from "@openstatus/db"; import { db } from "@openstatus/db/src/db"; import { page, pageSubscriber } from "@openstatus/db/src/schema"; -import { SubscribeEmail } from "@openstatus/emails"; -import { sendEmail } from "@openstatus/emails/src/send"; +import { SubscribeEmail, sendEmail } from "@openstatus/emails"; import type { pageSubscribersApi } from "./index"; import { PageSubscriberSchema, ParamsSchema } from "./schema"; diff --git a/apps/web/src/lib/auth/index.ts b/apps/web/src/lib/auth/index.ts index 0f362148..e07a0839 100644 --- a/apps/web/src/lib/auth/index.ts +++ b/apps/web/src/lib/auth/index.ts @@ -4,9 +4,8 @@ import NextAuth from "next-auth"; import { Events, setupAnalytics } from "@openstatus/analytics"; import { db, eq } from "@openstatus/db"; import { user } from "@openstatus/db/src/schema"; -import { sendEmail } from "@openstatus/emails/src/send"; -import { WelcomeEmail } from "@openstatus/emails/emails/welcome"; +import { WelcomeEmail, sendEmail } from "@openstatus/emails"; import { adapter } from "./adapter"; import { GitHubProvider, GoogleProvider, ResendProvider } from "./providers"; diff --git a/packages/emails/emails/alert.tsx b/packages/emails/emails/alert.tsx deleted file mode 100644 index f331cc77..00000000 --- a/packages/emails/emails/alert.tsx +++ /dev/null @@ -1,72 +0,0 @@ -/** @jsxImportSource react */ - -import { - Body, - Button, - Column, - Container, - Head, - Heading, - Html, - Preview, - Row, - Section, - Text, -} from "@react-email/components"; - -interface AlertProps { - monitorName: string; - monitorUrl: string; - recipientName: string; -} - -const Alert = ({ monitorName, monitorUrl, recipientName }: AlertProps) => { - return ( - - - New incident detected 🚨 - New incident detected : {monitorName} 🚨 - - - - New incident detected! - - - Hello {recipientName},
- We have detected a new incident. -
- -
- - Monitor - {monitorName} - - - URL - {monitorUrl} - -
- -
- -
-
- - - - ); -}; - -Alert.PreviewProps = { - monitorName: "My Monitor", - monitorUrl: "https://www.example.com", - recipientName: "John Doe", -} satisfies AlertProps; - -export { Alert }; -export default Alert; diff --git a/packages/emails/emails/followup.tsx b/packages/emails/emails/followup.tsx index 760ac47b..b51b271d 100644 --- a/packages/emails/emails/followup.tsx +++ b/packages/emails/emails/followup.tsx @@ -36,5 +36,4 @@ const FollowUpEmail = () => { ); }; -export { FollowUpEmail }; export default FollowUpEmail; diff --git a/packages/emails/emails/monitor-alert.tsx b/packages/emails/emails/monitor-alert.tsx index 9c2d6d07..22853878 100644 --- a/packages/emails/emails/monitor-alert.tsx +++ b/packages/emails/emails/monitor-alert.tsx @@ -10,6 +10,7 @@ import { Heading, Html, Img, + Link, Preview, Row, Text, @@ -54,7 +55,7 @@ function getIcon(type: MonitorAlertProps["type"]): { } } -export const MonitorAlertEmail = (props: MonitorAlertProps) => ( +const MonitorAlertEmail = (props: MonitorAlertProps) => ( @@ -142,7 +143,9 @@ export const MonitorAlertEmail = (props: MonitorAlertProps) => ( - + + View details + diff --git a/packages/emails/emails/monitor-deactivation.tsx b/packages/emails/emails/monitor-deactivation.tsx index 44e0c1cb..778c8152 100644 --- a/packages/emails/emails/monitor-deactivation.tsx +++ b/packages/emails/emails/monitor-deactivation.tsx @@ -64,5 +64,4 @@ MonitorDeactivationEmail.PreviewProps = { reminder: true, } satisfies MonitorDeactivationProps; -export { MonitorDeactivationEmail }; export default MonitorDeactivationEmail; diff --git a/packages/emails/emails/page-subscription.tsx b/packages/emails/emails/page-subscription.tsx index 2dc6abac..0f5fc33c 100644 --- a/packages/emails/emails/page-subscription.tsx +++ b/packages/emails/emails/page-subscription.tsx @@ -72,5 +72,4 @@ PageSubscriptionEmail.PreviewProps = { domain: "slug", } satisfies PageSubscriptionProps; -export { PageSubscriptionEmail }; export default PageSubscriptionEmail; diff --git a/packages/emails/emails/status-report.tsx b/packages/emails/emails/status-report.tsx index 1cc611d3..e05189e8 100644 --- a/packages/emails/emails/status-report.tsx +++ b/packages/emails/emails/status-report.tsx @@ -118,5 +118,4 @@ StatusReportEmail.PreviewProps = { monitors: ["OpenStatus API", "OpenStatus Webhook"], }; -export { StatusReportEmail }; export default StatusReportEmail; diff --git a/packages/emails/emails/subscribe.tsx b/packages/emails/emails/subscribe.tsx index 248d663b..85c7c846 100644 --- a/packages/emails/emails/subscribe.tsx +++ b/packages/emails/emails/subscribe.tsx @@ -43,5 +43,4 @@ SubscribeEmail.PreviewProps = { domain: "slug", } satisfies SubscribeProps; -export { SubscribeEmail }; export default SubscribeEmail; diff --git a/packages/emails/emails/team-invitation.tsx b/packages/emails/emails/team-invitation.tsx index 23a11d36..c6df6a76 100644 --- a/packages/emails/emails/team-invitation.tsx +++ b/packages/emails/emails/team-invitation.tsx @@ -60,5 +60,4 @@ TeamInvitationEmail.PreviewProps = { invitedBy: "max@openstatus.dev", } satisfies TeamInvitationProps; -export { TeamInvitationEmail }; export default TeamInvitationEmail; diff --git a/packages/emails/emails/welcome.tsx b/packages/emails/emails/welcome.tsx index 21c39420..9b37b4f5 100644 --- a/packages/emails/emails/welcome.tsx +++ b/packages/emails/emails/welcome.tsx @@ -57,5 +57,4 @@ const WelcomeEmail = () => { ); }; -export { WelcomeEmail }; export default WelcomeEmail; diff --git a/packages/emails/src/client.tsx b/packages/emails/src/client.tsx index 7d66da16..35d87d89 100644 --- a/packages/emails/src/client.tsx +++ b/packages/emails/src/client.tsx @@ -2,23 +2,15 @@ import { render } from "@react-email/render"; import { Resend } from "resend"; -import { FollowUpEmail } from "../emails/followup"; -import { - MonitorAlertEmail, - type MonitorAlertProps, -} from "../emails/monitor-alert"; -import { - PageSubscriptionEmail, - type PageSubscriptionProps, -} from "../emails/page-subscription"; -import { - StatusReportEmail, - type StatusReportProps, -} from "../emails/status-report"; -import { - TeamInvitationEmail, - type TeamInvitationProps, -} from "../emails/team-invitation"; +import FollowUpEmail from "../emails/followup"; +import MonitorAlertEmail from "../emails/monitor-alert"; +import type { MonitorAlertProps } from "../emails/monitor-alert"; +import PageSubscriptionEmail from "../emails/page-subscription"; +import type { PageSubscriptionProps } from "../emails/page-subscription"; +import StatusReportEmail from "../emails/status-report"; +import type { StatusReportProps } from "../emails/status-report"; +import TeamInvitationEmail from "../emails/team-invitation"; +import type { TeamInvitationProps } from "../emails/team-invitation"; export class EmailClient { public readonly client: Resend; diff --git a/packages/emails/src/index.ts b/packages/emails/src/index.ts index 4030c307..5d34587b 100644 --- a/packages/emails/src/index.ts +++ b/packages/emails/src/index.ts @@ -1,10 +1,7 @@ -export * from "../emails/alert"; -export * from "../emails/followup"; -export * from "../emails/subscribe"; -export * from "../emails/welcome"; -export * from "../emails/team-invitation"; -export * from "./utils"; - -export { sendEmail, sendEmailHtml } from "./send"; +export { default as FollowUpEmail } from "../emails/followup"; +export { default as SubscribeEmail } from "../emails/subscribe"; +export { default as WelcomeEmail } from "../emails/welcome"; +export { default as TeamInvitationEmail } from "../emails/team-invitation"; +export { sendEmail, sendEmailHtml, sendBatchEmailHtml } from "./send"; export { EmailClient } from "./client"; -- 2.51.2