From c36be7692c2f1587816e6a3b5529f8813b6f4249 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 11:58:34 +0200
Subject: [PATCH] fix(deps): update dependency react-email to v6 (#32143)

* fix(deps): update dependency react-email to v6

* fix: move all react email imports to react-email

* fix: linting

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
(cherry picked from commit 9755f64684de63f1e9c5d14d31d00f599f8925b9)
---
 server/package.json                               |  4 +---
 server/src/emails/album-invite.email.tsx          |  2 +-
 server/src/emails/album-update.email.tsx          |  2 +-
 server/src/emails/components/button.component.tsx |  2 +-
 server/src/emails/components/footer.template.tsx  |  2 +-
 server/src/emails/components/futo.layout.tsx      | 15 +--------------
 server/src/emails/components/immich.layout.tsx    |  2 +-
 server/src/emails/license.email.tsx               |  2 +-
 server/src/emails/test.email.tsx                  |  2 +-
 server/src/emails/welcome.email.tsx               |  2 +-
 server/src/repositories/email.repository.ts       |  2 +-
 web/package.json                                  |  2 +-
 web/src/lib/utils/ocr-utils.ts                    |  2 --
 web/src/lib/utils/wakelock.svelte.ts              |  4 +---
 14 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/server/package.json b/server/package.json
index 7946093e2..9138a9fe6 100644
--- a/server/package.json
+++ b/server/package.json
@@ -61,8 +61,6 @@
     "@opentelemetry/sdk-metrics": "^2.0.1",
     "@opentelemetry/sdk-node": "^0.222.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
-    "@react-email/components": "^1.0.0",
-    "@react-email/render": "^2.0.0",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.0",
     "async-lock": "^1.4.0",
@@ -104,7 +102,7 @@
     "postgres": "3.4.9",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-email": "^5.0.0",
+    "react-email": "^6.0.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
     "sanitize-filename": "^1.6.3",
diff --git a/server/src/emails/album-invite.email.tsx b/server/src/emails/album-invite.email.tsx
index d1ea2ac10..49adb25e5 100644
--- a/server/src/emails/album-invite.email.tsx
+++ b/server/src/emails/album-invite.email.tsx
@@ -1,4 +1,4 @@
-import { Img, Link, Section, Text } from '@react-email/components';
+import { Img, Link, Section, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichButton } from 'src/emails/components/button.component.js';
 import ImmichLayout from 'src/emails/components/immich.layout.js';
diff --git a/server/src/emails/album-update.email.tsx b/server/src/emails/album-update.email.tsx
index 7e7e366f5..443e54228 100644
--- a/server/src/emails/album-update.email.tsx
+++ b/server/src/emails/album-update.email.tsx
@@ -1,4 +1,4 @@
-import { Img, Link, Section, Text } from '@react-email/components';
+import { Img, Link, Section, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichButton } from 'src/emails/components/button.component.js';
 import ImmichLayout from 'src/emails/components/immich.layout.js';
diff --git a/server/src/emails/components/button.component.tsx b/server/src/emails/components/button.component.tsx
index a1fc4636c..15e6ea69b 100644
--- a/server/src/emails/components/button.component.tsx
+++ b/server/src/emails/components/button.component.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Button, ButtonProps, Text } from '@react-email/components';
+import { Button, ButtonProps, Text } from 'react-email';
 
 export const ImmichButton = ({ children, ...props }: ButtonProps) => (
   <Button
diff --git a/server/src/emails/components/footer.template.tsx b/server/src/emails/components/footer.template.tsx
index 324d7dc00..61dca954c 100644
--- a/server/src/emails/components/footer.template.tsx
+++ b/server/src/emails/components/footer.template.tsx
@@ -1,4 +1,4 @@
-import { Column, Img, Link, Row, Text } from '@react-email/components';
+import { Column, Img, Link, Row, Text } from 'react-email';
 import * as React from 'react';
 
 export const ImmichFooter = () => (
diff --git a/server/src/emails/components/futo.layout.tsx b/server/src/emails/components/futo.layout.tsx
index abf08e9a0..bdd839bd8 100644
--- a/server/src/emails/components/futo.layout.tsx
+++ b/server/src/emails/components/futo.layout.tsx
@@ -1,17 +1,4 @@
-import {
-  Body,
-  Container,
-  Font,
-  Head,
-  Hr,
-  Html,
-  Img,
-  Link,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '@react-email/components';
+import { Body, Container, Font, Head, Hr, Html, Img, Link, Preview, Section, Tailwind, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichFooter } from './footer.template.js';
 // @ts-expect-error
diff --git a/server/src/emails/components/immich.layout.tsx b/server/src/emails/components/immich.layout.tsx
index 673ff4d56..644febef6 100644
--- a/server/src/emails/components/immich.layout.tsx
+++ b/server/src/emails/components/immich.layout.tsx
@@ -1,4 +1,4 @@
-import { Body, Container, Font, Head, Hr, Html, Img, Preview, Section, Tailwind, Text } from '@react-email/components';
+import { Body, Container, Font, Head, Hr, Html, Img, Preview, Section, Tailwind, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichFooter } from 'src/emails/components/footer.template.js';
 // @ts-expect-error
diff --git a/server/src/emails/license.email.tsx b/server/src/emails/license.email.tsx
index 86fe48275..6e59c8c0f 100644
--- a/server/src/emails/license.email.tsx
+++ b/server/src/emails/license.email.tsx
@@ -1,4 +1,4 @@
-import { Link, Section, Text } from '@react-email/components';
+import { Link, Section, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichButton } from 'src/emails/components/button.component.js';
 import FutoLayout from 'src/emails/components/futo.layout.js';
diff --git a/server/src/emails/test.email.tsx b/server/src/emails/test.email.tsx
index 619581f5a..956b27969 100644
--- a/server/src/emails/test.email.tsx
+++ b/server/src/emails/test.email.tsx
@@ -1,4 +1,4 @@
-import { Link, Row, Text } from '@react-email/components';
+import { Link, Row, Text } from 'react-email';
 import * as React from 'react';
 import ImmichLayout from 'src/emails/components/immich.layout.js';
 import { TestEmailProps } from 'src/repositories/email.repository.js';
diff --git a/server/src/emails/welcome.email.tsx b/server/src/emails/welcome.email.tsx
index b330b1929..2de52b0c8 100644
--- a/server/src/emails/welcome.email.tsx
+++ b/server/src/emails/welcome.email.tsx
@@ -1,4 +1,4 @@
-import { Link, Section, Text } from '@react-email/components';
+import { Link, Section, Text } from 'react-email';
 import * as React from 'react';
 import { ImmichButton } from 'src/emails/components/button.component.js';
 import ImmichLayout from 'src/emails/components/immich.layout.js';
diff --git a/server/src/repositories/email.repository.ts b/server/src/repositories/email.repository.ts
index 580476fdd..35b3e8cf7 100644
--- a/server/src/repositories/email.repository.ts
+++ b/server/src/repositories/email.repository.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { render } from '@react-email/render';
 import { createTransport } from 'nodemailer';
 import React, { createElement } from 'react';
+import { render } from 'react-email';
 import type { EmailImageAttachment } from 'src/types.js';
 import { AlbumInviteEmail } from 'src/emails/album-invite.email.js';
 import { AlbumUpdateEmail } from 'src/emails/album-update.email.js';
diff --git a/web/package.json b/web/package.json
index 985b9290c..d25b77a1d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -113,7 +113,7 @@
     "svelte-eslint-parser": "^1.8.1",
     "tailwindcss": "^4.2.4",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
-    "typescript-eslint": "^8.45.0",
+    "typescript-eslint": "8.71.1",
     "vite": "^8.0.0",
     "vitest": "^4.0.0"
   }
diff --git a/web/src/lib/utils/ocr-utils.ts b/web/src/lib/utils/ocr-utils.ts
index e21cfb3fb..fdf39322d 100644
--- a/web/src/lib/utils/ocr-utils.ts
+++ b/web/src/lib/utils/ocr-utils.ts
@@ -121,7 +121,6 @@ export const calculateFittedFontSize = (
       return clamp(fontSize, MIN_FONT_SIZE, MAX_FONT_SIZE);
     }
 
-    // eslint-disable-next-line tscompat/tscompat
     context.font = getReferenceFont();
 
     let maxCharWidth = 0;
@@ -147,7 +146,6 @@ export const calculateFittedFontSize = (
   }
 
   // Unsupported in Safari iOS <16.6; falls back to default canvas font, giving less accurate but functional sizing
-  // eslint-disable-next-line tscompat/tscompat
   context.font = getReferenceFont();
 
   const metrics = context.measureText(text);
diff --git a/web/src/lib/utils/wakelock.svelte.ts b/web/src/lib/utils/wakelock.svelte.ts
index 78e0ee1da..2f6dc6ac5 100644
--- a/web/src/lib/utils/wakelock.svelte.ts
+++ b/web/src/lib/utils/wakelock.svelte.ts
@@ -10,7 +10,7 @@ export async function acquireWakeLock() {
   if (!isSupported) {
     return;
   }
-  // eslint-disable-next-line tscompat/tscompat
+
   if (sentinel && !sentinel.released) {
     return;
   }
@@ -19,7 +19,6 @@ export async function acquireWakeLock() {
   }
   acquiring = true;
   try {
-    // eslint-disable-next-line tscompat/tscompat
     sentinel = await navigator.wakeLock.request('screen');
   } catch (error) {
     console.warn('Failed to acquire wake lock:', error);
@@ -37,7 +36,6 @@ export async function releaseWakeLock() {
   // Unset first to avoid race condition after await
   sentinel = undefined;
 
-  // eslint-disable-next-line tscompat/tscompat
   await toReleaseSentinel.release();
 }