Skip to content

Open-source status page, incident response and uptime monitoring

fix: raw email for pause (#1660)

Thibault Le Ouayccc93778d4b0
diff --git a/apps/server/.dockerignore b/apps/server/.dockerignore
index a6903313b..c4ac6dd1e 100644
--- a/apps/server/.dockerignore
+++ b/apps/server/.dockerignore
@@ -1,4 +1,4 @@
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.5.1
# See https://github.com/lenra-io/dofigen
node_modules
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index 606151235..9bf344dac 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -1,5 +1,5 @@
-# syntax=docker/dockerfile:1.19.0
-# This file is generated by Dofigen v2.6.0
+# syntax=docker/dockerfile:1.11
+# This file is generated by Dofigen v2.5.1
# See https://github.com/lenra-io/dofigen
# install
@@ -12,7 +12,6 @@ WORKDIR /app/
RUN \
--mount=type=bind,target=bunfig.toml,source=bunfig.toml \
--mount=type=bind,target=package.json,source=package.json \
- --mount=type=bind,target=patches,source=patches \
--mount=type=bind,target=apps/server/package.json,source=apps/server/package.json \
--mount=type=bind,target=packages/analytics/package.json,source=packages/analytics/package.json \
--mount=type=bind,target=packages/db/package.json,source=packages/db/package.json \
@@ -49,7 +48,7 @@ RUN bun build --compile --sourcemap src/index.ts --outfile=app
# runtime
FROM debian@sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b AS runtime
LABEL \
- io.dofigen.version="2.6.0" \
+ io.dofigen.version="2.5.1" \
org.opencontainers.image.authors="OpenStatus Team" \
org.opencontainers.image.base.digest="sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b" \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
diff --git a/apps/server/dofigen.lock b/apps/server/dofigen.lock
index 90ae43d70..96361b6a9 100644
--- a/apps/server/dofigen.lock
+++ b/apps/server/dofigen.lock
@@ -10,14 +10,35 @@ effective: |
- /packages/api
- /packages/integrations/vercel
builders:
- install:
+ build:
fromImage:
path: oven/bun
digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
label:
+ org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ org.opencontainers.image.stage: build
org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
+ workdir: /app/apps/server
+ env:
+ NODE_ENV: production
+ copy:
+ - paths:
+ - .
+ target: /app/
+ - fromBuilder: install
+ paths:
+ - /app/node_modules
+ target: /app/node_modules
+ run:
+ - bun build --compile --sourcemap src/index.ts --outfile=app
+ install:
+ fromImage:
+ path: oven/bun
+ digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ label:
org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
org.opencontainers.image.stage: install
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
workdir: /app/
run:
- bun install --production --frozen-lockfile --verbose
@@ -28,8 +49,6 @@ effective: |
source: bunfig.toml
- target: package.json
source: package.json
- - target: patches
- source: patches
- target: apps/server/package.json
source: apps/server/package.json
- target: packages/analytics/package.json
@@ -56,39 +75,18 @@ effective: |
source: packages/assertions/package.json
- target: packages/theme-store/package.json
source: packages/theme-store/package.json
- build:
- fromImage:
- path: oven/bun
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- label:
- org.opencontainers.image.stage: build
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
- org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- workdir: /app/apps/server
- env:
- NODE_ENV: production
- copy:
- - paths:
- - .
- target: /app/
- - fromBuilder: install
- paths:
- - /app/node_modules
- target: /app/node_modules
- run:
- - bun build --compile --sourcemap src/index.ts --outfile=app
fromImage:
path: debian
digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
label:
- org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
org.opencontainers.image.vendor: OpenStatus
- org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
org.opencontainers.image.description: REST API server with Hono framework for OpenStatus
- org.opencontainers.image.title: OpenStatus Server
- io.dofigen.version: 2.6.0
org.opencontainers.image.authors: OpenStatus Team
+ org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
+ org.opencontainers.image.title: OpenStatus Server
+ org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
+ io.dofigen.version: 2.5.1
+ org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
user:
user: '1000'
group: '1000'
@@ -115,17 +113,17 @@ effective: |
retries: 3
images:
docker.io:
- oven:
- bun:
- 1.3.3:
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
library:
debian:
bullseye-slim:
digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
+ oven:
+ bun:
+ 1.3.3:
+ digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
resources:
dofigen.yml:
- hash: 792c6663065e391b2fc4c3dfc18eedc3c7777b3244674f74651bba79f9ea05cb
+ hash: f2069730c7b0f5e8be704cbfc3ae77ac031f05b2a3b916bcbe758f7955edfa5e
content: |
# Files to exclude from Docker context
ignore:
@@ -149,7 +147,6 @@ resources:
bind:
- bunfig.toml
- package.json
- - patches
- apps/server/package.json
- packages/analytics/package.json
- packages/db/package.json
diff --git a/apps/server/dofigen.yml b/apps/server/dofigen.yml
index 0b75d7a00..615cc9d17 100644
--- a/apps/server/dofigen.yml
+++ b/apps/server/dofigen.yml
@@ -20,7 +20,6 @@ builders:
bind:
- bunfig.toml
- package.json
- - patches
- apps/server/package.json
- packages/analytics/package.json
- packages/db/package.json
diff --git a/apps/workflows/.dockerignore b/apps/workflows/.dockerignore
index 5e73b32b9..5dad7bbcf 100644
--- a/apps/workflows/.dockerignore
+++ b/apps/workflows/.dockerignore
@@ -1,4 +1,4 @@
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.5.1
# See https://github.com/lenra-io/dofigen
node_modules
diff --git a/apps/workflows/Dockerfile b/apps/workflows/Dockerfile
index 1702cfdfb..fdfd756a4 100644
--- a/apps/workflows/Dockerfile
+++ b/apps/workflows/Dockerfile
@@ -1,5 +1,5 @@
-# syntax=docker/dockerfile:1.19.0
-# This file is generated by Dofigen v2.6.0
+# syntax=docker/dockerfile:1.11
+# This file is generated by Dofigen v2.5.1
# See https://github.com/lenra-io/dofigen
# ca-certs
@@ -30,7 +30,6 @@ WORKDIR /app/
RUN \
--mount=type=bind,target=bunfig.toml,source=bunfig.toml \
--mount=type=bind,target=package.json,source=package.json \
- --mount=type=bind,target=patches,source=patches \
--mount=type=bind,target=apps/workflows/package.json,source=apps/workflows/package.json \
--mount=type=bind,target=packages/assertions/package.json,source=packages/assertions/package.json \
--mount=type=bind,target=packages/db/package.json,source=packages/db/package.json \
@@ -86,7 +85,7 @@ RUN bun install
# runtime
FROM debian@sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b AS runtime
LABEL \
- io.dofigen.version="2.6.0" \
+ io.dofigen.version="2.5.1" \
org.opencontainers.image.authors="OpenStatus Team" \
org.opencontainers.image.base.digest="sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b" \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
diff --git a/apps/workflows/dofigen.lock b/apps/workflows/dofigen.lock
index b0bf5936f..2d31e6f61 100644
--- a/apps/workflows/dofigen.lock
+++ b/apps/workflows/dofigen.lock
@@ -12,15 +12,42 @@ effective: |
- /packages/error
- /packages/tracker
builders:
- ca-certs:
+ build:
fromImage:
- path: debian
- digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
+ path: oven/bun
+ digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
label:
- org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
+ org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ org.opencontainers.image.stage: build
+ workdir: /app/apps/workflows
+ env:
+ NODE_ENV: production
+ copy:
+ - paths:
+ - .
+ target: /app/
+ - fromBuilder: install
+ paths:
+ - /app/node_modules
+ target: /app/node_modules
run:
- - apt update && apt install -y ca-certificates && update-ca-certificates
+ - bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app --external '@libsql/*' --external libsql
+ libsql:
+ fromImage:
+ path: oven/bun
+ digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ label:
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
+ org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ workdir: /app/
+ copy:
+ - fromBuilder: docker
+ paths:
+ - /app/apps/build-docker/package.json
+ target: /app/package.json
+ run:
+ - bun install
install:
fromImage:
path: oven/bun
@@ -39,8 +66,6 @@ effective: |
source: bunfig.toml
- target: package.json
source: package.json
- - target: patches
- source: patches
- target: apps/workflows/package.json
source: apps/workflows/package.json
- target: packages/assertions/package.json
@@ -81,68 +106,41 @@ effective: |
source: packages/upstash/package.json
- target: packages/theme-store/package.json
source: packages/theme-store/package.json
- libsql:
+ ca-certs:
fromImage:
- path: oven/bun
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ path: debian
+ digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
label:
- org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
- workdir: /app/
- copy:
- - fromBuilder: docker
- paths:
- - /app/apps/build-docker/package.json
- target: /app/package.json
+ org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
+ org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
run:
- - bun install
+ - apt update && apt install -y ca-certificates && update-ca-certificates
docker:
- fromImage:
- path: oven/bun
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- label:
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
- org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- workdir: /app/apps/workflows
- copy:
- - paths:
- - .
- target: /app/
- run:
- - bun run src/build-docker.ts
- build:
fromImage:
path: oven/bun
digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
label:
org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- org.opencontainers.image.stage: build
org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
workdir: /app/apps/workflows
- env:
- NODE_ENV: production
copy:
- paths:
- .
target: /app/
- - fromBuilder: install
- paths:
- - /app/node_modules
- target: /app/node_modules
run:
- - bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app --external '@libsql/*' --external libsql
+ - bun run src/build-docker.ts
fromImage:
path: debian
digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
label:
- io.dofigen.version: 2.6.0
- org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
- org.opencontainers.image.title: OpenStatus Workflows
+ org.opencontainers.image.authors: OpenStatus Team
org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.vendor: OpenStatus
- org.opencontainers.image.authors: OpenStatus Team
+ org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
org.opencontainers.image.description: Background job processing and probe scheduling for OpenStatus
+ org.opencontainers.image.vendor: OpenStatus
+ org.opencontainers.image.title: OpenStatus Workflows
+ io.dofigen.version: 2.5.1
workdir: /app/
copy:
- fromBuilder: build
@@ -168,17 +166,17 @@ effective: |
- port: 3000
images:
docker.io:
- library:
- debian:
- bullseye-slim:
- digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
oven:
bun:
1.3.3:
digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ library:
+ debian:
+ bullseye-slim:
+ digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
resources:
dofigen.yml:
- hash: 2e5154caff216dd012001bfb09b4c3d811dc7cbd437cd325f6de9c311b2e771e
+ hash: 7e59e1efd94f649c01720f89c8966945798a8a0c4572e2fb783d6e406e5384c4
content: |
ignore:
- node_modules
@@ -201,7 +199,6 @@ resources:
bind:
- bunfig.toml
- package.json
- - patches
- apps/workflows/package.json
- packages/assertions/package.json
- packages/db/package.json
diff --git a/apps/workflows/dofigen.yml b/apps/workflows/dofigen.yml
index c89791b9f..625c24a7e 100644
--- a/apps/workflows/dofigen.yml
+++ b/apps/workflows/dofigen.yml
@@ -19,7 +19,6 @@ builders:
bind:
- bunfig.toml
- package.json
- - patches
- apps/workflows/package.json
- packages/assertions/package.json
- packages/db/package.json
diff --git a/apps/workflows/src/cron/monitor.ts b/apps/workflows/src/cron/monitor.ts
index ece126195..b379b92ed 100644
--- a/apps/workflows/src/cron/monitor.ts
+++ b/apps/workflows/src/cron/monitor.ts
@@ -13,10 +13,10 @@ import {
} from "@openstatus/db";
import { session, user } from "@openstatus/db/src/schema";
import {
- MonitorDeactivationEmail,
- MonitorPausedEmail,
+ monitorDeactivationEmail,
+ monitorPausedEmail,
} from "@openstatus/emails";
-import { sendWithRender } from "@openstatus/emails/src/send";
+import { sendBatchEmailHtml } from "@openstatus/emails/src/send";
import { Redis } from "@openstatus/upstash";
import { RateLimiter } from "limiter";
import { z } from "zod";
@@ -194,16 +194,19 @@ export async function Step14Days(userId: number, workFlowRunTimestamp: number) {
// TODO: Send email
if (user.email) {
- await sendWithRender({
- to: [user.email],
- subject: "Your OpenStatus monitors will be paused soon",
- from: "Thibault From OpenStatus <[email protected]>",
- reply_to: "[email protected]",
-
- react: MonitorDeactivationEmail({
- deactivateAt: new Date(new Date().setDate(new Date().getDate() + 14)),
- }),
- });
+ await sendBatchEmailHtml([
+ {
+ to: user.email,
+ subject: "Your OpenStatus monitors will be paused in 14 days",
+ from: "Thibault From OpenStatus <[email protected]>",
+ reply_to: "[email protected]",
+ html: monitorDeactivationEmail({
+ date: new Date(
+ new Date().setDate(new Date().getDate() + 14),
+ ).toDateString(),
+ }),
+ },
+ ]);
await CreateTask({
parent,
@@ -231,16 +234,19 @@ export async function Step3Days(userId: number, workFlowRunTimestamp: number) {
const user = await getUser(userId);
if (user.email) {
- await sendWithRender({
- to: [user.email],
- subject: "Your OpenStatus monitors will be paused in 3 days",
- from: "Thibault From OpenStatus <[email protected]>",
- reply_to: "[email protected]",
-
- react: MonitorDeactivationEmail({
- deactivateAt: new Date(new Date().setDate(new Date().getDate() + 3)),
- }),
- });
+ await sendBatchEmailHtml([
+ {
+ to: user.email,
+ subject: "Your OpenStatus monitors will be paused in 3 days",
+ from: "Thibault From OpenStatus <[email protected]>",
+ reply_to: "[email protected]",
+ html: monitorDeactivationEmail({
+ date: new Date(
+ new Date().setDate(new Date().getDate() + 3),
+ ).toDateString(),
+ }),
+ },
+ ]);
}
// Send second email
@@ -303,13 +309,15 @@ export async function StepPaused(userId: number, workFlowRunTimestamp: number) {
// Remove user for workflow
if (currentUser.email) {
- await sendWithRender({
- to: [currentUser.email],
- subject: "Your monitors have been paused",
- from: "Thibault From OpenStatus <[email protected]>",
- reply_to: "[email protected]",
- react: MonitorPausedEmail(),
- });
+ await sendBatchEmailHtml([
+ {
+ to: currentUser.email,
+ subject: "Your monitors have been paused",
+ from: "Thibault From OpenStatus <[email protected]>",
+ reply_to: "[email protected]",
+ html: monitorPausedEmail(),
+ },
+ ]);
}
await redis.srem("workflow:users", userId);
}
diff --git a/package.json b/package.json
index 926ca12f2..5ba803885 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,5 @@
}
},
"name": "openstatus",
- "workspaces": ["apps/*", "packages/**/*"],
- "patchedDependencies": {
- "@react-email/[email protected]": "patches/@react-email%[email protected]"
- }
+ "workspaces": ["apps/*", "packages/**/*"]
}
diff --git a/packages/emails/hotfix/monitor-alert.ts b/packages/emails/hotfix/monitor-alert.ts
index 7ca198cf6..fe5ddb5d0 100644
--- a/packages/emails/hotfix/monitor-alert.ts
+++ b/packages/emails/hotfix/monitor-alert.ts
@@ -18,8 +18,6 @@ export function monitorAlertEmail(props: MonitorAlertEmailProps) {
<ul>
<li>URL: ${props.url || "N/A"}</li>
<li>Status: ${props.status || "N/A"}</li>
- <li>Latency: ${props.latency || "N/A"}</li>
- <li>Region: ${props.region || "N/A"}</li>
<li>Timestamp: ${props.timestamp || "N/A"}</li>
<li>Message: ${props.message || "N/A"}</li>
</ul>
diff --git a/packages/emails/hotfix/monitor-deactivation.ts b/packages/emails/hotfix/monitor-deactivation.ts
new file mode 100644
index 000000000..4b6bd6e4e
--- /dev/null
+++ b/packages/emails/hotfix/monitor-deactivation.ts
@@ -0,0 +1,26 @@
+interface MonitorDeactivationEmailProps {
+ date: string;
+}
+
+export const monitorDeactivationEmail = (
+ props: MonitorDeactivationEmailProps,
+) => {
+ return `
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Login to your OpenStatus account to keep your monitors active.</title>
+ <style>
+ body {
+ font-family: Arial, sans-serif;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Hello, </p><p>To save on cloud resources and avoid having stale monitors. We are deactivating monitors for free account if you have not logged in for the last 2 months.</p><p>Your monitor(s) will be deactivated on ${props.date}</p><p>If you would like to keep your monitor(s) active, please login to your account or upgrade to a paid plan.</p><p>If you have any questions, please reply to this email.</p><p>Merci,</p><p>Thibault</p>
+ </body>
+ </html>
+`;
+};
diff --git a/packages/emails/hotfix/monitor-paused.ts b/packages/emails/hotfix/monitor-paused.ts
new file mode 100644
index 000000000..b902930ba
--- /dev/null
+++ b/packages/emails/hotfix/monitor-paused.ts
@@ -0,0 +1,21 @@
+export const monitorPausedEmail = () => {
+ return `
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Your monitors have been paused</title>
+ <style>
+ body {
+ font-family: Arial, sans-serif;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Hello, </p><p>To save on cloud resources, your monitor(s) has been paused due to inactivity.</p><p>If you would like to unpause your monitor(s), please login to your account or upgrade to a paid plan.</p><p>If you have any questions, please reply to this email.</p><p>Merci,</p><p>Thibault</p>
+ </body>
+ </html>
+
+`;
+};
diff --git a/packages/emails/src/index.ts b/packages/emails/src/index.ts
index d7bc99005..16e5327e2 100644
--- a/packages/emails/src/index.ts
+++ b/packages/emails/src/index.ts
@@ -5,6 +5,8 @@ export { default as TeamInvitationEmail } from "../emails/team-invitation";
export { default as MonitorPausedEmail } from "../emails/monitor-paused";
export { default as MonitorDeactivationEmail } from "../emails/monitor-deactivation";
+export { monitorDeactivationEmail } from "../hotfix/monitor-deactivation";
+export { monitorPausedEmail } from "../hotfix/monitor-paused";
export { sendEmail, sendEmailHtml, sendBatchEmailHtml } from "./send";
export { EmailClient } from "./client";
diff --git a/packages/emails/src/send.ts b/packages/emails/src/send.ts
index be1f4879e..147876a1d 100644
--- a/packages/emails/src/send.ts
+++ b/packages/emails/src/send.ts
@@ -19,6 +19,7 @@ export type EmailHtml = {
subject: string;
to: string;
from: string;
+ reply_to?: string;
};
export const sendEmail = async (email: Emails) => {
if (process.env.NODE_ENV !== "production") return;
diff --git a/patches/@react-email%[email protected] b/patches/@react-email%[email protected]
deleted file mode 100644
index f47a70a2f..000000000
--- a/patches/@react-email%[email protected]
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/dist/node/index.mjs b/dist/node/index.mjs
-index a4cc76316326b3c5a60e00416321355f5782797e..edac4c159b3bb0990f1cd19eaf9d38a4807a38b2 100644
---- a/dist/node/index.mjs
-+++ b/dist/node/index.mjs
-@@ -4,6 +4,7 @@ import { convert } from "html-to-text";
- import { Suspense } from "react";
- import { Writable } from "node:stream";
- import { jsx } from "react/jsx-runtime";
-+import reactDOMServer from "react-dom/server";
-
- //#region src/shared/utils/pretty.ts
- function recursivelyMapDoc(doc, callback) {
-@@ -125,7 +126,6 @@ const readStream = async (stream) => {
- //#region src/node/render.tsx
- const render = async (node, options) => {
- const suspendedElement = /* @__PURE__ */ jsx(Suspense, { children: node });
-- const reactDOMServer = await import("react-dom/server").then((m) => m.default);
- let html$1;
- if (Object.hasOwn(reactDOMServer, "renderToReadableStream") && typeof WritableStream !== "undefined") html$1 = await readStream(await reactDOMServer.renderToReadableStream(suspendedElement, { progressiveChunkSize: Number.POSITIVE_INFINITY }));
- else await new Promise((resolve, reject) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 368f133dd..bed1d3bea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1747,6 +1747,8 @@ importers:
specifier: 5.9.3
version: 5.9.3
+ packages/react/dist: {}
+
packages/regions:
dependencies:
zod: