From 56fb226ae6cc4929f0db5fe9f24fff47e3c58039 Mon Sep 17 00:00:00 2001
From: Sjoert <63722509+Sjoertjuh@users.noreply.github.com>
Date: Wed, 26 Feb 2025 21:25:10 +0100
Subject: [PATCH 01/51] feat(tailwind): extract pseudo classes to stylesheet
 (#1864)

Co-authored-by: gabriel miranda <gabrielmfern@outlook.com>
---
 .changeset/great-parrots-yell.md              |   5 +
 .../src/__snapshots__/tailwind.spec.tsx.snap  |  41 +-----
 packages/tailwind/src/tailwind.spec.tsx       |  10 +-
 .../sanitize-media-queries.spec.ts            |  88 ------------
 .../media-queries/sanitize-media-queries.ts   |  64 ---------
 .../sanitize-non-inlinable-classes.spec.ts    | 130 ++++++++++++++++++
 .../css/sanitize-non-inlinable-classes.ts     |  92 +++++++++++++
 .../clone-element-with-inlined-styles.ts      |  14 +-
 8 files changed, 240 insertions(+), 204 deletions(-)
 create mode 100644 .changeset/great-parrots-yell.md
 delete mode 100644 packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.spec.ts
 delete mode 100644 packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.ts
 create mode 100644 packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.spec.ts
 create mode 100644 packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
diff --git a/.changeset/great-parrots-yell.md b/.changeset/great-parrots-yell.md
new file mode 100644
index 0000000000..429c2c034d
--- /dev/null
+++ b/.changeset/great-parrots-yell.md
@@ -0,0 +1,5 @@
+---
+"@react-email/tailwind": minor
+---
+
+Extract tailwind pseudo classes to stylesheet
diff --git a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
index 76d7a2b1da..90d35508af 100644
--- a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
+++ b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
@@ -14,45 +14,7 @@ exports[`Custom theme config > should be able to use custom spacing 1`] = `"<!DO
 
 exports[`Custom theme config > should be able to use custom text alignment 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="text-align:justify"></div><!--/$-->"`;
 
-exports[`Responsive styles > should add css to <head/> and keep responsive class names 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
-
-exports[`Responsive styles > should not have duplicate media queries 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media(min-width:768px){.md_px-64px{padding-left:64px !important;padding-right:64px !important}}</style></head><body class="md_px-64px" style="margin-top:auto;margin-bottom:auto;margin-left:auto;margin-right:auto;background-color:rgb(255,255,255);font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;"><div class="md_px-64px"></div><!--/$--></body>"`;
-
-exports[`Responsive styles > should persist existing <head/> elements 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style></style><link/><style>@media(min-width:640px){.sm_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
-
-exports[`Responsive styles > should throw an error when used without a <head/> 1`] = `
-[Error: You are trying to use the following Tailwind classes that cannot be inlined: sm:bg-red-500.
-For the media queries to work properly on rendering, they need to be added into a <style> tag inside of a <head> tag,
-the Tailwind component tried finding a <head> element but just wasn't able to find it.
-
-Make sure that you have a <head> element at some point inside of the <Tailwind> component at any depth. 
-This can also be our <Head> component.
-
-If you do already have a <head> element at some depth, 
-please file a bug https://github.com/resend/react-email/issues/new?assignees=&labels=Type%3A+Bug&projects=&template=1.bug_report.yml.]
-`;
-
-exports[`Responsive styles > should throw error when used without the head and with media query class names only very deeply nested 1`] = `
-[Error: You are trying to use the following Tailwind classes that cannot be inlined: sm:h-10 sm:w-10.
-For the media queries to work properly on rendering, they need to be added into a <style> tag inside of a <head> tag,
-the Tailwind component tried finding a <head> element but just wasn't able to find it.
-
-Make sure that you have a <head> element at some point inside of the <Tailwind> component at any depth. 
-This can also be our <Head> component.
-
-If you do already have a <head> element at some depth, 
-please file a bug https://github.com/resend/react-email/issues/new?assignees=&labels=Type%3A+Bug&projects=&template=1.bug_report.yml.]
-`;
-
-exports[`Responsive styles > should work with arbitrarily deep (in the React tree) <head> elements 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
-
-exports[`Responsive styles > should work with arbitrarily deep (in the React tree) <head> elements 2`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
-
-exports[`Responsive styles > should work with relatively complex media query utilities 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media not all and(min-width:640px){.max-sm_text-red-600{color:rgb(220,38,38) !important}}</style></head><p class="max-sm_text-red-600" style="color:rgb(29,78,216)">I am some text</p><!--/$-->"`;
-
-exports[`Tailwind component > <Button className="px-3 py-2 mt-8 text-sm text-gray-200 bg-blue-600 rounded-md"> 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><a style="margin-top:2rem;border-radius:0.375rem;background-color:rgb(37,99,235);padding-left:12px;padding-right:12px;padding-top:8px;padding-bottom:8px;color:rgb(229,231,235);font-size:0.875rem;line-height:1.25rem;text-decoration:none;display:inline-block;max-width:100%;mso-padding-alt:0px" target="_blank"><span><!--[if mso]><i style="mso-font-width:300%;mso-text-raise:12" hidden>&#8202;&#8202;</i><![endif]--></span><span style="max-width:100%;display:inline-block;line-height:120%;mso-padding-alt:0px;mso-text-raise:6px">Testing button</span><span><!--[if mso]><i style="mso-font-width:300%" hidden>&#8202;&#8202;&#8203;</i><![endif]--></span></a>Testing<!--/$-->"`;
-
-exports[`Tailwind component > it should not generate styles from text 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$-->container bg-red-500 bg-blue-300<!--/$-->"`;
+exports[`Tailwind component > it should not generate styles from text 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$-->container bg-red-500 bg-blue-300<!--/$-->"`;D
 
 exports[`Tailwind component > should allow for complex children manipulation 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;font-size:0"><tbody><tr><td style="padding:0px 0px 0px 0px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:300px;display:inline-block;vertical-align:top;font-size:16px;box-sizing:border-box"><tbody><tr><td>This is the first column</td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:300px;display:inline-block;vertical-align:top;font-size:16px;box-sizing:border-box"><tbody><tr><td>This is the second column</td></tr></tbody></table></td></tr></tbody></table><!--/$-->"`;
 
@@ -76,4 +38,3 @@ exports[`Tailwind component > should work with components that return children 1
 
 exports[`Tailwind component > should work with components that use React.forwardRef 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="margin-top:100px;font-size:50px;line-height:1">Hello world</div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><!--/$-->"`;
 
-exports[`Tailwind component > should work with custom components with fragment at the root 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="margin-top:100px;font-size:50px;line-height:1">Hello world</div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><!--/$-->"`;
diff --git a/packages/tailwind/src/tailwind.spec.tsx b/packages/tailwind/src/tailwind.spec.tsx
index aafa0abb93..0c13ef1226 100644
--- a/packages/tailwind/src/tailwind.spec.tsx
+++ b/packages/tailwind/src/tailwind.spec.tsx
@@ -336,7 +336,7 @@ describe('Tailwind component', () => {
   });
 });
 
-describe('Responsive styles', () => {
+describe('non-inlinable styles', () => {
   /*
     This test is because of https://github.com/resend/react-email/issues/1112
     which was being caused because we required to, either have our <Head> component,
@@ -387,8 +387,8 @@ describe('Responsive styles', () => {
     const output = await render(
       <Tailwind>
         <Head />
-        <Body className="my-auto mx-auto bg-white font-sans md:px-[64px]">
-          <div className="md:px-[64px]" />
+        <Body className="bg-white my-auto mx-auto font-sans md:px-[64px] hover:underline">
+          <div className="md:px-[64px] hover:underline" />
         </Body>
       </Tailwind>,
     );
@@ -396,13 +396,13 @@ describe('Responsive styles', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('should add css to <head/> and keep responsive class names', async () => {
+  it('should add css to <head/> and keep class names', async () => {
     const actualOutput = await render(
       <html lang="en">
         <Tailwind>
           <head />
           <body>
-            <div className="bg-red-200 sm:bg-red-300 md:bg-red-400 lg:bg-red-500" />
+            <div className="bg-red-200 sm:bg-red-300 md:bg-red-400 lg:bg-red-500 hover:bg-red-600 focus:bg-red-700 sm:hover:bg-red-200" />
           </body>
         </Tailwind>
       </html>,
diff --git a/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.spec.ts b/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.spec.ts
deleted file mode 100644
index e275bdbad5..0000000000
--- a/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import postcss, { Root } from 'postcss';
-import { sanitizeMediaQueries } from './sanitize-media-queries';
-
-test('sanitizeMediaQueries()', async () => {
-  const { root } = await postcss()
-    .process(
-      `
-.ring-gray-900\\/5{
-  --tw-ring-color: rgb(17 24 39 / 0.05)
-}
-.\\[mask-image\\:linear-gradient\\(180deg\\2c white\\2c rgba\\(255\\2c 255\\2c 255\\2c 0\\)\\)\\]{
-  -webkit-mask-image: linear-gradient(180deg,white,rgba(255,255,255,0));
-          mask-image: linear-gradient(180deg,white,rgba(255,255,255,0))
-}
-
-.hover\\:text-sky-600:hover{
-  --tw-text-opacity: 1;
-  color: rgb(2 132 199 / var(--tw-text-opacity))
-}
-@media (min-width: 640px){
-  .sm\\:mx-auto{
-    margin-left: auto;
-    margin-right: auto
-  }
-
-  .hover\\:text-sky-600:hover{
-    --tw-text-opacity: 1;
-    color: rgb(2 132 199 / var(--tw-text-opacity))
-  }
-
-  .sm\\:max-w-lg{
-    max-width: 32rem
-  }
-
-  .sm\\:rounded-lg{
-    border-radius: 0.5rem
-  }
-
-  .sm\\:px-10{
-    padding-left: 2.5rem;
-    padding-right: 2.5rem
-  }
-
-  .sm\\:py-12{
-    padding-top: 3rem;
-    padding-bottom: 3rem
-  }
-}
-`,
-    )
-    .async();
-
-  const { mediaQueryClasses, sanitizedAtRules } = sanitizeMediaQueries(
-    root as Root,
-  );
-  expect(mediaQueryClasses).toEqual([
-    'sm:mx-auto',
-    'sm:max-w-lg',
-    'sm:rounded-lg',
-    'sm:px-10',
-    'sm:py-12',
-  ]);
-  expect(new Root({ nodes: sanitizedAtRules }).toString()).toBe(`
-@media (min-width: 640px){
-  .sm_mx-auto{
-    margin-left: auto !important;
-    margin-right: auto !important
-  }
-
-  .sm_max-w-lg{
-    max-width: 32rem !important
-  }
-
-  .sm_rounded-lg{
-    border-radius: 0.5rem !important
-  }
-
-  .sm_px-10{
-    padding-left: 2.5rem !important;
-    padding-right: 2.5rem !important
-  }
-
-  .sm_py-12{
-    padding-top: 3rem !important;
-    padding-bottom: 3rem !important
-  }
-}`);
-});
diff --git a/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.ts b/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.ts
deleted file mode 100644
index 7d69e3871d..0000000000
--- a/packages/tailwind/src/utils/css/media-queries/sanitize-media-queries.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { AtRule, Root } from 'postcss';
-import selectorParser from 'postcss-selector-parser';
-import { sanitizeClassName } from '../../compatibility/sanitize-class-name';
-
-/**
- * This function goes through a few steps to ensure the best email client support and
- * to ensure that the media queries are going to applied correctly alongisde
- * the inline styles.
- *
- * What it does is:
- * 1. Ignore all the rules that have any pseudo selectors
- * 2. Converts all declarations in all rules into being important ones
- * 3. Sanitizes all the selectors of all rules in the media queries
- * 4. Merges at rules that have equivalent parameters
- */
-export const sanitizeMediaQueries = (root: Root) => {
-  const sanitizedAtRules: AtRule[] = [];
-  const mediaQueryClasses: string[] = [];
-
-  root.walkAtRules((atRule) => {
-    const sanitizedAtRule = atRule.clone();
-
-    sanitizedAtRule.walkRules((rule) => {
-      let hasPseudoSelector = false as boolean;
-      rule.selector = selectorParser((selectorRoot) => {
-        selectorRoot.walkPseudos(() => {
-          hasPseudoSelector = true;
-        });
-        if (!hasPseudoSelector) {
-          selectorRoot.walkClasses((singleClass) => {
-            mediaQueryClasses.push(singleClass.value);
-            singleClass.replaceWith(
-              selectorParser.className({
-                ...singleClass,
-                value: sanitizeClassName(singleClass.value),
-              }),
-            );
-          });
-        }
-      }).processSync(rule.selector);
-
-      if (!hasPseudoSelector) {
-        rule.walkDecls((declaration) => {
-          declaration.important = true;
-        });
-      } else {
-        sanitizedAtRule.removeChild(rule);
-      }
-    });
-    const equivalentRule = sanitizedAtRules.find(
-      (r) => r.params === sanitizedAtRule.params,
-    );
-    if (equivalentRule) {
-      equivalentRule.append(sanitizedAtRule.nodes);
-    } else {
-      sanitizedAtRules.push(sanitizedAtRule);
-    }
-  });
-
-  return {
-    mediaQueryClasses,
-    sanitizedAtRules,
-  };
-};
diff --git a/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.spec.ts b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.spec.ts
new file mode 100644
index 0000000000..fb93df510b
--- /dev/null
+++ b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.spec.ts
@@ -0,0 +1,130 @@
+import postcss, { Root } from 'postcss';
+import { sanitizeNonInlinableClasses } from './sanitize-non-inlinable-classes';
+
+test('sanitizeNonInlinableClasses()', async () => {
+  const { root } = await postcss()
+    .process(
+      `
+.ring-gray-900\\/5{
+  --tw-ring-color: rgb(17 24 39 / 0.05)
+}
+.\\[mask-image\\:linear-gradient\\(180deg\\2c white\\2c rgba\\(255\\2c 255\\2c 255\\2c 0\\)\\)\\]{
+  -webkit-mask-image: linear-gradient(180deg,white,rgba(255,255,255,0));
+          mask-image: linear-gradient(180deg,white,rgba(255,255,255,0))
+}
+
+.hover\\:text-sky-600:hover{
+  --tw-text-opacity: 1;
+  color: rgb(2 132 199 / var(--tw-text-opacity))
+}
+
+@media (min-width: 640px){
+  .sm\\:mx-auto{
+    margin-left: auto;
+    margin-right: auto
+  }
+
+  .sm\\:focus\\:outline-none:focus{
+    outline: 2px solid transparent;
+    outline-offset: 2px
+  }
+
+  .sm\\:max-w-lg{
+    max-width: 32rem
+  }
+
+  .sm\\:rounded-lg{
+    border-radius: 0.5rem
+  }
+}
+
+@media (min-width: 768px){
+  .md\\:hover\\:bg-gray-100:hover{
+    --tw-bg-opacity: 1;
+    background-color: rgb(243 244 246 / var(--tw-bg-opacity))
+  }
+
+  .md\\:px-10{
+    padding-left: 2.5rem;
+    padding-right: 2.5rem
+  }
+
+  .md\\:py-12{
+    padding-top: 3rem;
+    padding-bottom: 3rem
+  }
+}
+
+@media (min-width: 1024px){
+  .lg\\:focus\\:underline:focus{
+    text-decoration-line: underline
+  }
+}
+`,
+    )
+    .async();
+
+  const { nonInlinableClasses, sanitizedRules } = sanitizeNonInlinableClasses(
+    root as Root,
+  );
+  expect(nonInlinableClasses).toEqual([
+    'sm:mx-auto',
+    'sm:focus:outline-none',
+    'sm:max-w-lg',
+    'sm:rounded-lg',
+    'md:hover:bg-gray-100',
+    'md:px-10',
+    'md:py-12',
+    'lg:focus:underline',
+    'hover:text-sky-600',
+  ]);
+  expect(new Root({ nodes: sanitizedRules }).toString()).toBe(`
+
+@media (min-width: 640px){
+  .sm_mx-auto{
+    margin-left: auto !important;
+    margin-right: auto !important
+  }
+
+  .sm_focus_outline-none:focus{
+    outline: 2px solid transparent !important;
+    outline-offset: 2px !important
+  }
+
+  .sm_max-w-lg{
+    max-width: 32rem !important
+  }
+
+  .sm_rounded-lg{
+    border-radius: 0.5rem !important
+  }
+}
+
+@media (min-width: 768px){
+  .md_hover_bg-gray-100:hover{
+    --tw-bg-opacity: 1 !important;
+    background-color: rgb(243 244 246 / var(--tw-bg-opacity)) !important
+  }
+
+  .md_px-10{
+    padding-left: 2.5rem !important;
+    padding-right: 2.5rem !important
+  }
+
+  .md_py-12{
+    padding-top: 3rem !important;
+    padding-bottom: 3rem !important
+  }
+}
+
+@media (min-width: 1024px){
+  .lg_focus_underline:focus{
+    text-decoration-line: underline !important
+  }
+}
+
+.hover_text-sky-600:hover{
+  --tw-text-opacity: 1 !important;
+  color: rgb(2 132 199 / var(--tw-text-opacity)) !important
+}`);
+});
diff --git a/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
new file mode 100644
index 0000000000..fa2a84d82d
--- /dev/null
+++ b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
@@ -0,0 +1,92 @@
+import { AtRule, type Root, type Rule } from 'postcss';
+import selectorParser from 'postcss-selector-parser';
+import { sanitizeClassName } from '../compatibility/sanitize-class-name';
+
+/**
+ * This function goes through a few steps to ensure the best email client support and
+ * to ensure that the media queries and pseudo classes are going to applied correctly alongisde
+ * the inline styles.
+ *
+ * What it does is:
+ * 1. Converts all declarations in all rules into being important ones
+ * 2. Sanitizes all the selectors of all rules in the media queries
+ * 3. Sanitizes all the selectors of all rules using pseudo classes
+ * 4. Merges at rules that have equivalent parameters
+ */
+export const sanitizeNonInlinableClasses = (root: Root) => {
+  const sanitizedRules: (Rule | AtRule)[] = [];
+  const nonInlinableClasses: string[] = [];
+
+  // Process rules within at-rules (like media queries)
+  root.walkAtRules((atRule) => {
+    const sanitizedAtRule = atRule.clone();
+
+    sanitizedAtRule.walkRules((rule) => {
+      const processedSelector = selectorParser((selectorRoot) => {
+        selectorRoot.walkClasses((className) => {
+          sanitizeSelectorClassName(className);
+          nonInlinableClasses.push(className.value);
+        });
+      }).processSync(rule.selector);
+
+      const processedRule = rule.clone({ selector: processedSelector });
+      processedRule.walkDecls((decl) => {
+        decl.important = true;
+      });
+
+      sanitizedAtRule.append(processedRule);
+    });
+
+    const equivalentRule = sanitizedRules.find(
+      (r) => r instanceof AtRule && r.params === sanitizedAtRule.params,
+    );
+
+    if (equivalentRule) {
+      equivalentRule.append(sanitizedAtRule.nodes);
+    } else {
+      sanitizedRules.push(sanitizedAtRule);
+    }
+  });
+
+  // Process top-level rules
+  root.walkRules((rule) => {
+    if (rule.parent && rule.parent.type !== 'root') return;
+
+    let hasPseudoSelector = false as boolean;
+
+    const processedSelector = selectorParser((selectorRoot) => {
+      selectorRoot.walkPseudos(() => {
+        hasPseudoSelector = true;
+      });
+
+      if (!hasPseudoSelector) return;
+
+      selectorRoot.walkClasses((className) => {
+        sanitizeSelectorClassName(className);
+        nonInlinableClasses.push(className.value);
+      });
+    }).processSync(rule.selector);
+
+    if (hasPseudoSelector) {
+      const processedRule = rule.clone({ selector: processedSelector });
+      processedRule.walkDecls((decl) => {
+        decl.important = true;
+      });
+
+      sanitizedRules.push(processedRule);
+    }
+  });
+
+  return {
+    nonInlinableClasses,
+    sanitizedRules,
+  };
+};
+
+const sanitizeSelectorClassName = (className: selectorParser.ClassName) => {
+  className.replaceWith(
+    className.clone({
+      value: sanitizeClassName(className.value),
+    }),
+  );
+};
diff --git a/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts b/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
index d8540bb76a..8c8e360f71 100644
--- a/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
+++ b/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
@@ -3,7 +3,7 @@ import React from 'react';
 import type { EmailElementProps } from '../../tailwind';
 import { sanitizeClassName } from '../compatibility/sanitize-class-name';
 import { makeInlineStylesFor } from '../css/make-inline-styles-for';
-import { sanitizeMediaQueries } from '../css/media-queries/sanitize-media-queries';
+import { sanitizeNonInlinableClasses } from '../css/sanitize-non-inlinable-classes';
 import { sanitizeDeclarations } from '../css/sanitize-declarations';
 import { isComponent } from '../react/is-component';
 import type { setupTailwind } from './setup-tailwind';
@@ -23,10 +23,10 @@ export const cloneElementWithInlinedStyles = (
     );
     sanitizeDeclarations(rootForClasses);
 
-    const { sanitizedAtRules, mediaQueryClasses } =
-      sanitizeMediaQueries(rootForClasses);
-    nonInlinableClasses = mediaQueryClasses;
-    nonInlineStyleNodes = sanitizedAtRules;
+    ({
+      sanitizedRules: nonInlineStyleNodes,
+      nonInlinableClasses: nonInlinableClasses,
+    } = sanitizeNonInlinableClasses(rootForClasses));
 
     const { styles, residualClassName } = makeInlineStylesFor(
       element.props.className,
@@ -44,10 +44,10 @@ export const cloneElementWithInlinedStyles = (
         /*
           We sanitize only the class names of Tailwind classes that we are not going to inline
           to avoid unpredictable behavior on the user's code. If we did sanitize all classes
-          a user-defined class could end up also being sanitized which would lead to unexpected 
+          a user-defined class could end up also being sanitized which would lead to unexpected
           behavior and bugs that are hard to track.
         */
-        for (const singleClass of mediaQueryClasses) {
+        for (const singleClass of nonInlinableClasses) {
           propsToOverwrite.className = propsToOverwrite.className.replace(
             singleClass,
             sanitizeClassName(singleClass),

From 71b2a5ee6ba58a3955a5ff6b63657f6f5c49bb59 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Thu, 27 Feb 2025 10:17:26 -0300
Subject: [PATCH 02/51] fix(tailwind): Infinite loop during sanitization

cause by me
---
 .../css/sanitize-non-inlinable-classes.ts     | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
index fa2a84d82d..c2d3077049 100644
--- a/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
+++ b/packages/tailwind/src/utils/css/sanitize-non-inlinable-classes.ts
@@ -17,24 +17,25 @@ export const sanitizeNonInlinableClasses = (root: Root) => {
   const sanitizedRules: (Rule | AtRule)[] = [];
   const nonInlinableClasses: string[] = [];
 
+  const selectorProcessor = selectorParser();
+
   // Process rules within at-rules (like media queries)
   root.walkAtRules((atRule) => {
     const sanitizedAtRule = atRule.clone();
 
     sanitizedAtRule.walkRules((rule) => {
-      const processedSelector = selectorParser((selectorRoot) => {
-        selectorRoot.walkClasses((className) => {
-          sanitizeSelectorClassName(className);
-          nonInlinableClasses.push(className.value);
-        });
-      }).processSync(rule.selector);
-
-      const processedRule = rule.clone({ selector: processedSelector });
+      const selectorRoot = selectorProcessor.astSync(rule.selector);
+      selectorRoot.walkClasses((className) => {
+        nonInlinableClasses.push(className.value);
+        sanitizeSelectorClassName(className);
+      });
+
+      const processedRule = rule.clone({ selector: selectorRoot.toString() });
       processedRule.walkDecls((decl) => {
         decl.important = true;
       });
 
-      sanitizedAtRule.append(processedRule);
+      rule.replaceWith(processedRule);
     });
 
     const equivalentRule = sanitizedRules.find(
@@ -52,23 +53,22 @@ export const sanitizeNonInlinableClasses = (root: Root) => {
   root.walkRules((rule) => {
     if (rule.parent && rule.parent.type !== 'root') return;
 
-    let hasPseudoSelector = false as boolean;
+    const selectorRoot = selectorProcessor.astSync(rule.selector);
 
-    const processedSelector = selectorParser((selectorRoot) => {
-      selectorRoot.walkPseudos(() => {
-        hasPseudoSelector = true;
-      });
+    let hasPseudoSelector = false as boolean;
+    selectorRoot.walkPseudos(() => {
+      hasPseudoSelector = true;
+    });
 
-      if (!hasPseudoSelector) return;
+    if (!hasPseudoSelector) return;
 
-      selectorRoot.walkClasses((className) => {
-        sanitizeSelectorClassName(className);
-        nonInlinableClasses.push(className.value);
-      });
-    }).processSync(rule.selector);
+    selectorRoot.walkClasses((className) => {
+      nonInlinableClasses.push(className.value);
+      sanitizeSelectorClassName(className);
+    });
 
     if (hasPseudoSelector) {
-      const processedRule = rule.clone({ selector: processedSelector });
+      const processedRule = rule.clone({ selector: selectorRoot.toString() });
       processedRule.walkDecls((decl) => {
         decl.important = true;
       });

From 107bef8161933906c79b2cf9e633be2ced06c302 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Thu, 27 Feb 2025 10:31:14 -0300
Subject: [PATCH 03/51] chore(tailwind): Improve code for running Tailwind
 integration test (#1935)

---
 .../src/utils/tailwindcss/clone-element-with-inlined-styles.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts b/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
index 8c8e360f71..e73390abb8 100644
--- a/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
+++ b/packages/tailwind/src/utils/tailwindcss/clone-element-with-inlined-styles.ts
@@ -3,8 +3,8 @@ import React from 'react';
 import type { EmailElementProps } from '../../tailwind';
 import { sanitizeClassName } from '../compatibility/sanitize-class-name';
 import { makeInlineStylesFor } from '../css/make-inline-styles-for';
-import { sanitizeNonInlinableClasses } from '../css/sanitize-non-inlinable-classes';
 import { sanitizeDeclarations } from '../css/sanitize-declarations';
+import { sanitizeNonInlinableClasses } from '../css/sanitize-non-inlinable-classes';
 import { isComponent } from '../react/is-component';
 import type { setupTailwind } from './setup-tailwind';
 

From 8abdae66d394e8769d0c10d6eb07d0bd0112dcb8 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Tue, 8 Apr 2025 16:08:48 -0300
Subject: [PATCH 04/51] chore: Enter pre-release

---
 .changeset/pre.json | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000000..bc909e2043
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,36 @@
+{
+  "mode": "pre",
+  "tag": "canary",
+  "initialVersions": {
+    "@benchmarks/preview-server": "0.0.0",
+    "@benchmarks/tailwind-component": "0.0.0",
+    "@react-email/body": "0.0.11",
+    "@react-email/button": "0.1.0",
+    "@react-email/code-block": "0.1.0",
+    "@react-email/code-inline": "0.0.5",
+    "@react-email/column": "0.0.13",
+    "@react-email/components": "0.1.1",
+    "@react-email/container": "0.0.15",
+    "@react-email/font": "0.0.9",
+    "@react-email/head": "0.0.12",
+    "@react-email/heading": "0.0.15",
+    "@react-email/hr": "0.0.11",
+    "@react-email/html": "0.0.11",
+    "@react-email/img": "0.0.11",
+    "@react-email/link": "0.0.12",
+    "@react-email/markdown": "0.0.15",
+    "@react-email/preview": "0.0.13",
+    "@react-email/render": "1.1.3",
+    "@react-email/row": "0.0.12",
+    "@react-email/section": "0.0.16",
+    "@react-email/tailwind": "1.0.5",
+    "@react-email/text": "0.1.5",
+    "create-email": "1.2.1",
+    "demo": "0.0.0",
+    "docs": "0.0.0",
+    "react-email": "4.0.17",
+    "tsconfig": "0.0.0",
+    "web": "0.0.0"
+  },
+  "changesets": []
+}

From 69e6435a1dcebe390f437743ec117b0f7393a232 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 16:24:06 -0300
Subject: [PATCH 05/51] chore(root): Version packages (canary) (#2064)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                           |  2 +-
 packages/components/CHANGELOG.md              |  7 ++++
 packages/create-email/CHANGELOG.md            |  2 +
 packages/create-email/template/CHANGELOG.md   |  6 +++
 packages/react-email/CHANGELOG.md             |  6 +++
 packages/react-email/package.json             |  2 +-
 .../src/__snapshots__/tailwind.spec.tsx.snap  | 41 ++++++++++++++++++-
 7 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index bc909e2043..bb9d27e211 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -32,5 +32,5 @@
     "tsconfig": "0.0.0",
     "web": "0.0.0"
   },
-  "changesets": []
+  "changesets": ["dirty-needles-chew"]
 }
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 58d09cbfba..f7d170cd21 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -145,6 +145,13 @@
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
 
+## 0.0.37-canary.0
+
+### Patch Changes
+
+- Updated dependencies [ae8c007]
+  - @react-email/tailwind@1.1.0-canary.0
+
 ## 0.0.36
 
 ### Patch Changes
diff --git a/packages/create-email/CHANGELOG.md b/packages/create-email/CHANGELOG.md
index d1e08b112a..1788341530 100644
--- a/packages/create-email/CHANGELOG.md
+++ b/packages/create-email/CHANGELOG.md
@@ -22,6 +22,8 @@
 
 - 31fd7cc: use caret for dependency on react-email and @react-email/components
 
+## 1.0.8-canary.0
+
 ## 1.0.7
 
 ### Patch Changes
diff --git a/packages/create-email/template/CHANGELOG.md b/packages/create-email/template/CHANGELOG.md
index 195b70b0d4..7870c01034 100644
--- a/packages/create-email/template/CHANGELOG.md
+++ b/packages/create-email/template/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## 1.1.0
 
+## 1.0.8-canary.0
+
+### Patch Changes
+
+- @react-email/components@0.0.37-canary.0
+
 ## 1.0.7
 
 ## 1.0.6
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index fa2d6c9053..18d42c01f9 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.0
+
+### Minor Changes
+
+- 4a0d4e3: Theme switcher for email template
+
 ## 4.0.17
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index fe7400c512..c7195b151b 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.0.17",
+  "version": "4.1.0-canary.0",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"
diff --git a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
index 90d35508af..740eafa397 100644
--- a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
+++ b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
@@ -14,7 +14,9 @@ exports[`Custom theme config > should be able to use custom spacing 1`] = `"<!DO
 
 exports[`Custom theme config > should be able to use custom text alignment 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="text-align:justify"></div><!--/$-->"`;
 
-exports[`Tailwind component > it should not generate styles from text 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$-->container bg-red-500 bg-blue-300<!--/$-->"`;D
+exports[`Tailwind component > <Button className="px-3 py-2 mt-8 text-sm text-gray-200 bg-blue-600 rounded-md"> 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><a style="margin-top:2rem;border-radius:0.375rem;background-color:rgb(37,99,235);padding-left:0.75rem;padding-right:0.75rem;padding-top:0.5rem;padding-bottom:0.5rem;color:rgb(229,231,235);font-size:0.875rem;line-height:1.25rem;text-decoration:none;display:inline-block;max-width:100%;mso-padding-alt:0px;padding:8px 12px 8px 12px" target="_blank"><span><!--[if mso]><i style="mso-font-width:300%;mso-text-raise:12" hidden>&#8202;&#8202;</i><![endif]--></span><span style="max-width:100%;display:inline-block;line-height:120%;mso-padding-alt:0px;mso-text-raise:6px">Testing button</span><span><!--[if mso]><i style="mso-font-width:300%" hidden>&#8202;&#8202;&#8203;</i><![endif]--></span></a>Testing<!--/$-->"`;
+
+exports[`Tailwind component > it should not generate styles from text 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$-->container bg-red-500 bg-blue-300<!--/$-->"`;
 
 exports[`Tailwind component > should allow for complex children manipulation 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;font-size:0"><tbody><tr><td style="padding:0px 0px 0px 0px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:300px;display:inline-block;vertical-align:top;font-size:16px;box-sizing:border-box"><tbody><tr><td>This is the first column</td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:300px;display:inline-block;vertical-align:top;font-size:16px;box-sizing:border-box"><tbody><tr><td>This is the second column</td></tr></tbody></table></td></tr></tbody></table><!--/$-->"`;
 
@@ -38,3 +40,40 @@ exports[`Tailwind component > should work with components that return children 1
 
 exports[`Tailwind component > should work with components that use React.forwardRef 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="margin-top:100px;font-size:50px;line-height:1">Hello world</div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><!--/$-->"`;
 
+exports[`Tailwind component > should work with custom components with fragment at the root 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="margin-top:100px;font-size:50px;line-height:1">Hello world</div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><!--/$-->"`;
+
+exports[`non-inlinable styles > should add css to <head/> and keep class names 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}.sm_hover_bg-red-200:hover{background-color:rgb(254,202,202) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}.hover_bg-red-600:hover{background-color:rgb(220,38,38) !important}.focus_bg-red-700:focus{background-color:rgb(185,28,28) !important}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500 hover_bg-red-600 focus_bg-red-700 sm_hover_bg-red-200" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
+
+exports[`non-inlinable styles > should not have duplicate media queries 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media(min-width:768px){.md_px-64px{padding-left:64px !important;padding-right:64px !important}}.hover_underline:hover{text-decoration-line:underline !important}</style></head><body class="md_px-64px hover_underline" style="background-color:rgb(255,255,255);margin-top:auto;margin-bottom:auto;margin-left:auto;margin-right:auto;font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;"><div class="md_px-64px hover_underline"></div><!--/$--></body>"`;
+
+exports[`non-inlinable styles > should persist existing <head/> elements 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style></style><link/><style>@media(min-width:640px){.sm_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
+
+exports[`non-inlinable styles > should throw an error when used without a <head/> 1`] = `
+[Error: You are trying to use the following Tailwind classes that cannot be inlined: sm:bg-red-500.
+For the media queries to work properly on rendering, they need to be added into a <style> tag inside of a <head> tag,
+the Tailwind component tried finding a <head> element but just wasn't able to find it.
+
+Make sure that you have a <head> element at some point inside of the <Tailwind> component at any depth. 
+This can also be our <Head> component.
+
+If you do already have a <head> element at some depth, 
+please file a bug https://github.com/resend/react-email/issues/new?assignees=&labels=Type%3A+Bug&projects=&template=1.bug_report.yml.]
+`;
+
+exports[`non-inlinable styles > should throw error when used without the head and with media query class names only very deeply nested 1`] = `
+[Error: You are trying to use the following Tailwind classes that cannot be inlined: sm:h-10 sm:w-10.
+For the media queries to work properly on rendering, they need to be added into a <style> tag inside of a <head> tag,
+the Tailwind component tried finding a <head> element but just wasn't able to find it.
+
+Make sure that you have a <head> element at some point inside of the <Tailwind> component at any depth. 
+This can also be our <Head> component.
+
+If you do already have a <head> element at some depth, 
+please file a bug https://github.com/resend/react-email/issues/new?assignees=&labels=Type%3A+Bug&projects=&template=1.bug_report.yml.]
+`;
+
+exports[`non-inlinable styles > should work with arbitrarily deep (in the React tree) <head> elements 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
+
+exports[`non-inlinable styles > should work with arbitrarily deep (in the React tree) <head> elements 2`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
+
+exports[`non-inlinable styles > should work with relatively complex media query utilities 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media not all and(min-width:640px){.max-sm_text-red-600{color:rgb(220,38,38) !important}}</style></head><p class="max-sm_text-red-600" style="color:rgb(29,78,216)">I am some text</p><!--/$-->"`;

From 22595052271037f87c5b209f0a5d0681aa9c63e3 Mon Sep 17 00:00:00 2001
From: Bu Kinoshita <6929565+bukinoshita@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:12:35 +0000
Subject: [PATCH 06/51] fix(tailwind): linter (#2021)

Co-authored-by: gabriel miranda <gabrielmfern@outlook.com>
---
 packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap | 4 ++--
 packages/tailwind/src/tailwind.spec.tsx                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
index 740eafa397..8bafe01377 100644
--- a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
+++ b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
@@ -42,9 +42,9 @@ exports[`Tailwind component > should work with components that use React.forward
 
 exports[`Tailwind component > should work with custom components with fragment at the root 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="margin-top:100px;font-size:50px;line-height:1">Hello world</div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><div style="padding:20px"><p style="font-weight:700;font-size:50px">React Email</p></div><!--/$-->"`;
 
-exports[`non-inlinable styles > should add css to <head/> and keep class names 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}.sm_hover_bg-red-200:hover{background-color:rgb(254,202,202) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}.hover_bg-red-600:hover{background-color:rgb(220,38,38) !important}.focus_bg-red-700:focus{background-color:rgb(185,28,28) !important}</style></head><body><div class="sm_bg-red-300 md_bg-red-400 lg_bg-red-500 hover_bg-red-600 focus_bg-red-700 sm_hover_bg-red-200" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
+exports[`non-inlinable styles > should add css to <head/> and keep class names 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style>@media(min-width:640px){.sm_bg-red-300{background-color:rgb(252,165,165) !important}.sm_hover_bg-red-200:hover{background-color:rgb(254,202,202) !important}}@media(min-width:768px){.md_bg-red-400{background-color:rgb(248,113,113) !important}}@media(min-width:1024px){.lg_bg-red-500{background-color:rgb(239,68,68) !important}}.hover_bg-red-600:hover{background-color:rgb(220,38,38) !important}.focus_bg-red-700:focus{background-color:rgb(185,28,28) !important}</style></head><body><div class="hover_bg-red-600 focus_bg-red-700 sm_bg-red-300 sm_hover_bg-red-200 md_bg-red-400 lg_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
 
-exports[`non-inlinable styles > should not have duplicate media queries 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media(min-width:768px){.md_px-64px{padding-left:64px !important;padding-right:64px !important}}.hover_underline:hover{text-decoration-line:underline !important}</style></head><body class="md_px-64px hover_underline" style="background-color:rgb(255,255,255);margin-top:auto;margin-bottom:auto;margin-left:auto;margin-right:auto;font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;"><div class="md_px-64px hover_underline"></div><!--/$--></body>"`;
+exports[`non-inlinable styles > should not have duplicate media queries 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/><!--$--><style>@media(min-width:768px){.md_px-64px{padding-left:64px !important;padding-right:64px !important}}.hover_underline:hover{text-decoration-line:underline !important}</style></head><body class="hover_underline md_px-64px" style="margin-left:auto;margin-right:auto;margin-top:auto;margin-bottom:auto;background-color:rgb(255,255,255);font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;"><div class="hover_underline md_px-64px"></div><!--/$--></body>"`;
 
 exports[`non-inlinable styles > should persist existing <head/> elements 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><!--$--><style></style><link/><style>@media(min-width:640px){.sm_bg-red-500{background-color:rgb(239,68,68) !important}}</style></head><body><div class="sm_bg-red-500" style="background-color:rgb(254,202,202)"></div><!--/$--></body></html>"`;
 
diff --git a/packages/tailwind/src/tailwind.spec.tsx b/packages/tailwind/src/tailwind.spec.tsx
index 0c13ef1226..f3d1726e3f 100644
--- a/packages/tailwind/src/tailwind.spec.tsx
+++ b/packages/tailwind/src/tailwind.spec.tsx
@@ -387,8 +387,8 @@ describe('non-inlinable styles', () => {
     const output = await render(
       <Tailwind>
         <Head />
-        <Body className="bg-white my-auto mx-auto font-sans md:px-[64px] hover:underline">
-          <div className="md:px-[64px] hover:underline" />
+        <Body className="mx-auto my-auto bg-white font-sans hover:underline md:px-[64px]">
+          <div className="hover:underline md:px-[64px]" />
         </Body>
       </Tailwind>,
     );
@@ -402,7 +402,7 @@ describe('non-inlinable styles', () => {
         <Tailwind>
           <head />
           <body>
-            <div className="bg-red-200 sm:bg-red-300 md:bg-red-400 lg:bg-red-500 hover:bg-red-600 focus:bg-red-700 sm:hover:bg-red-200" />
+            <div className="bg-red-200 hover:bg-red-600 focus:bg-red-700 sm:bg-red-300 sm:hover:bg-red-200 md:bg-red-400 lg:bg-red-500" />
           </body>
         </Tailwind>
       </html>,

From 835e21d3f4778ba06a07b97704e4ea02c09884de Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 18:04:28 -0300
Subject: [PATCH 07/51] chore(root): Version packages (canary) (#2087)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/create-email/CHANGELOG.md | 6 ++++++
 packages/react-email/CHANGELOG.md  | 7 +++++++
 packages/react-email/package.json  | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/create-email/CHANGELOG.md b/packages/create-email/CHANGELOG.md
index 1788341530..568f1f0100 100644
--- a/packages/create-email/CHANGELOG.md
+++ b/packages/create-email/CHANGELOG.md
@@ -16,6 +16,12 @@
 
 - d689346: Show package.json's version on --version for create-email
 
+## 1.2.0-canary.0
+
+### Minor Changes
+
+- 237d115: Fetch react-email package versions at runtime from `--tag` option
+
 ## 1.1.0
 
 ### Minor Changes
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 18d42c01f9..6f2b6bbc02 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,12 @@
 # react-email
 
+## 4.1.0-canary.1
+
+### Patch Changes
+
+- a587e17: Fix dependent of dependents not causing hot reloads
+- dbf3a64: Add error message for when an email template does not have a default export
+
 ## 4.1.0-canary.0
 
 ### Minor Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index c7195b151b..1dcb4f84d7 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.0",
+  "version": "4.1.0-canary.1",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"

From 14a3a24a5464f731eff634ba8027478b24113202 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:30:47 -0300
Subject: [PATCH 08/51] chore(root): Version packages (canary) (#2088)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/components/CHANGELOG.md | 26 ++++++++++++++++++++++++++
 packages/render/CHANGELOG.md     |  6 ++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index f7d170cd21..8b0a8ea954 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -145,6 +145,32 @@
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
 
+## 0.0.37-canary.1
+
+### Patch Changes
+
+- Updated dependencies [32372da]
+  - @react-email/render@1.1.0-canary.0
+  - @react-email/body@0.0.11
+  - @react-email/button@0.0.19
+  - @react-email/code-block@0.0.12
+  - @react-email/code-inline@0.0.5
+  - @react-email/column@0.0.13
+  - @react-email/container@0.0.15
+  - @react-email/font@0.0.9
+  - @react-email/head@0.0.12
+  - @react-email/heading@0.0.15
+  - @react-email/hr@0.0.11
+  - @react-email/html@0.0.11
+  - @react-email/img@0.0.11
+  - @react-email/link@0.0.12
+  - @react-email/markdown@0.0.14
+  - @react-email/preview@0.0.12
+  - @react-email/row@0.0.12
+  - @react-email/section@0.0.16
+  - @react-email/tailwind@1.1.0-canary.0
+  - @react-email/text@0.1.1
+
 ## 0.0.37-canary.0
 
 ### Patch Changes
diff --git a/packages/render/CHANGELOG.md b/packages/render/CHANGELOG.md
index 93efc14067..0b4622698c 100644
--- a/packages/render/CHANGELOG.md
+++ b/packages/render/CHANGELOG.md
@@ -30,6 +30,12 @@
 
 - 9aa033c: Use range of versions for dependencies
 
+## 1.1.0-canary.0
+
+### Minor Changes
+
+- 32372da: Deprecate the `pretty` option for `render` in favor of standalone `pretty` function
+
 ## 1.0.6
 
 ### Patch Changes

From 058e022884006de1b5a3ffe6bac4252a94f868d9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:50:25 -0300
Subject: [PATCH 09/51] chore(root): Version packages (canary) (#2090)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/code-block/CHANGELOG.md  |  6 ++++++
 packages/components/CHANGELOG.md  | 26 ++++++++++++++++++++++++++
 packages/markdown/CHANGELOG.md    |  6 ++++++
 packages/react-email/CHANGELOG.md |  6 ++++++
 packages/react-email/package.json |  2 +-
 packages/render/CHANGELOG.md      |  6 ++++++
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/packages/code-block/CHANGELOG.md b/packages/code-block/CHANGELOG.md
index 861d8d5580..3f6703f5c5 100644
--- a/packages/code-block/CHANGELOG.md
+++ b/packages/code-block/CHANGELOG.md
@@ -12,6 +12,12 @@
 
 - 9aa033c: Use range of versions for dependencies
 
+## 0.0.13-canary.0
+
+### Patch Changes
+
+- 9b1adb0: Use range of versions for dependencies
+
 ## 0.0.12
 
 ### Patch Changes
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 8b0a8ea954..028d440c8b 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -145,6 +145,32 @@
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
 
+## 0.0.37-canary.2
+
+### Patch Changes
+
+- Updated dependencies [9b1adb0]
+  - @react-email/code-block@0.0.13-canary.0
+  - @react-email/markdown@0.0.15-canary.0
+  - @react-email/render@1.1.0-canary.1
+  - @react-email/body@0.0.11
+  - @react-email/button@0.0.19
+  - @react-email/code-inline@0.0.5
+  - @react-email/column@0.0.13
+  - @react-email/container@0.0.15
+  - @react-email/font@0.0.9
+  - @react-email/head@0.0.12
+  - @react-email/heading@0.0.15
+  - @react-email/hr@0.0.11
+  - @react-email/html@0.0.11
+  - @react-email/img@0.0.11
+  - @react-email/link@0.0.12
+  - @react-email/preview@0.0.12
+  - @react-email/row@0.0.12
+  - @react-email/section@0.0.16
+  - @react-email/tailwind@1.1.0-canary.0
+  - @react-email/text@0.1.1
+
 ## 0.0.37-canary.1
 
 ### Patch Changes
diff --git a/packages/markdown/CHANGELOG.md b/packages/markdown/CHANGELOG.md
index 6eb2ce0d6e..d0cd8933e0 100644
--- a/packages/markdown/CHANGELOG.md
+++ b/packages/markdown/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - 9aa033c: Use range of versions for dependencies
 
+## 0.0.15-canary.0
+
+### Patch Changes
+
+- 9b1adb0: Use range of versions for dependencies
+
 ## 0.0.14
 
 ### Patch Changes
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 6f2b6bbc02..7c9db68b1f 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.2
+
+### Patch Changes
+
+- 9b1adb0: Use range of versions for dependencies
+
 ## 4.1.0-canary.1
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 1dcb4f84d7..a5c23d29fe 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.1",
+  "version": "4.1.0-canary.2",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"
diff --git a/packages/render/CHANGELOG.md b/packages/render/CHANGELOG.md
index 0b4622698c..7fe6710035 100644
--- a/packages/render/CHANGELOG.md
+++ b/packages/render/CHANGELOG.md
@@ -30,6 +30,12 @@
 
 - 9aa033c: Use range of versions for dependencies
 
+## 1.1.0-canary.1
+
+### Patch Changes
+
+- 9b1adb0: Use range of versions for dependencies
+
 ## 1.1.0-canary.0
 
 ### Minor Changes

From 069ade02534e18183d3664ffdb88bb07255b9724 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Apr 2025 12:01:15 -0300
Subject: [PATCH 10/51] chore(root): Version packages (canary) (#2092)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/components/CHANGELOG.md  | 7 +++++++
 packages/react-email/CHANGELOG.md | 6 ++++++
 packages/react-email/package.json | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 028d440c8b..a742df4c51 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -145,6 +145,13 @@
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
 
+## 0.0.37-canary.3
+
+### Patch Changes
+
+- Updated dependencies [8179dc6]
+  - @react-email/tailwind@1.1.0-canary.1
+
 ## 0.0.37-canary.2
 
 ### Patch Changes
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 7c9db68b1f..b804c622f7 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.3
+
+### Patch Changes
+
+- 681d4ed: fix backwards compatibility with `render` versions
+
 ## 4.1.0-canary.2
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index a5c23d29fe..afa5dcbdbd 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.2",
+  "version": "4.1.0-canary.3",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"

From 1367e9a0b5c40baadfb8db76dde25fafe0e0983e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Apr 2025 13:17:25 -0300
Subject: [PATCH 11/51] chore(root): Version packages (canary) (#2096)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/react-email/CHANGELOG.md | 8 ++++++++
 packages/react-email/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index b804c622f7..d53c71affa 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,13 @@
 # react-email
 
+## 4.1.0-canary.4
+
+### Patch Changes
+
+- 5c6150d: Add .json import support for hot reloading
+- aae2f59: Ensure dependencies outside emails directory are completely resolved
+- b4b2373: Fix non-email files being rendered during hot reloading
+
 ## 4.1.0-canary.3
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index afa5dcbdbd..dd3ed0c10d 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.3",
+  "version": "4.1.0-canary.4",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"

From 8a21851de6027fd1026418a775eaf7b1d1778b7c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Apr 2025 16:49:18 -0300
Subject: [PATCH 12/51] chore(root): Version packages (canary) (#2098)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/create-email/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/create-email/CHANGELOG.md b/packages/create-email/CHANGELOG.md
index 568f1f0100..5b12d75b84 100644
--- a/packages/create-email/CHANGELOG.md
+++ b/packages/create-email/CHANGELOG.md
@@ -16,6 +16,12 @@
 
 - d689346: Show package.json's version on --version for create-email
 
+## 1.2.0-canary.1
+
+### Patch Changes
+
+- 0c3aaa3: Show package.json's version on --version for create-email
+
 ## 1.2.0-canary.0
 
 ### Minor Changes

From 58b359437f634fb456faf8c36c2780f25a904d36 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Apr 2025 14:40:51 -0300
Subject: [PATCH 13/51] chore(root): Version packages (canary) (#2175)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/components/CHANGELOG.md | 7 +++++++
 packages/text/CHANGELOG.md       | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index a742df4c51..277a2fa81e 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -145,6 +145,13 @@
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
 
+## 0.0.37-canary.4
+
+### Patch Changes
+
+- Updated dependencies [bd58fa9]
+  - @react-email/text@0.1.2-canary.0
+
 ## 0.0.37-canary.3
 
 ### Patch Changes
diff --git a/packages/text/CHANGELOG.md b/packages/text/CHANGELOG.md
index 4ec47f84b5..8e362a3ef7 100644
--- a/packages/text/CHANGELOG.md
+++ b/packages/text/CHANGELOG.md
@@ -24,6 +24,12 @@
 
 - 7918a4b: Fix priority of margin styles not being kept
 
+## 0.1.2-canary.0
+
+### Patch Changes
+
+- bd58fa9: Fix priority of margin styles not being kept
+
 ## 0.1.1
 
 ### Patch Changes

From 598a27b0fb071d2c5ca00782be4d74aca4c0a971 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 08:41:47 -0300
Subject: [PATCH 14/51] chore(deps): update changesets/action digest to 5f15b43
 (#2198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/release-canary.yml | 2 +-
 .github/workflows/version.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
index a7ba292919..be79fa51c1 100644
--- a/.github/workflows/release-canary.yml
+++ b/.github/workflows/release-canary.yml
@@ -44,7 +44,7 @@ jobs:
         continue-on-error: true
         run: pnpm canary:enter
       - name: Create "Version packages" PR or publish release
-        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
+        uses: changesets/action@5f15b43b429db9083a86b852c3a1b3a6973e8225
         with:
           version: pnpm run version
           publish: pnpm run release
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index 1c64d39f98..5a8e49bdbf 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -40,7 +40,7 @@ jobs:
         continue-on-error: true
         run: pnpm canary:exit
       - name: Create Release Pull Request
-        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
+        uses: changesets/action@5f15b43b429db9083a86b852c3a1b3a6973e8225
         with:
           version: pnpm run version
           title: "chore(root): Version packages"

From 6585cea71f9843ef2e9d17531cb4bed198a88b03 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 08:42:02 -0300
Subject: [PATCH 15/51] chore(deps): update buildjet/cache digest to 9347ea1
 (#2197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/lint.yml            | 2 +-
 .github/workflows/preview-release.yml | 2 +-
 .github/workflows/release-canary.yml  | 2 +-
 .github/workflows/tests.yml           | 2 +-
 .github/workflows/version.yml         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5940842a7d..370f054766 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
       - name: pnpm Cache
         id: pnpm-cache
-        uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4
+        uses: buildjet/cache@9347ea1c7c1f331d397aa98b3894420448373372
         with:
           path: |
             ~/.pnpm-store
diff --git a/.github/workflows/preview-release.yml b/.github/workflows/preview-release.yml
index eda5ee8085..e7749044a1 100644
--- a/.github/workflows/preview-release.yml
+++ b/.github/workflows/preview-release.yml
@@ -20,7 +20,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
       - name: pnpm Cache
         id: pnpm-cache
-        uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4
+        uses: buildjet/cache@9347ea1c7c1f331d397aa98b3894420448373372
         with:
           path: |
             ~/.pnpm-store
diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
index be79fa51c1..8d106ba0f1 100644
--- a/.github/workflows/release-canary.yml
+++ b/.github/workflows/release-canary.yml
@@ -27,7 +27,7 @@ jobs:
           corepack prepare pnpm@9.15.0 --activate
           pnpm config set script-shell "/usr/bin/bash"
       - name: pnpm Cache
-        uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4
+        uses: buildjet/cache@9347ea1c7c1f331d397aa98b3894420448373372
         with:
           path: |
             ~/.pnpm-store
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fe39bd5dcb..ed8a3897ff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
       - name: pnpm Cache
         id: pnpm-cache
-        uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4
+        uses: buildjet/cache@9347ea1c7c1f331d397aa98b3894420448373372
         with:
           path: |
             ~/.pnpm-store
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index 5a8e49bdbf..a6492c2072 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -23,7 +23,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
       - name: pnpm Cache
         id: pnpm-cache
-        uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4
+        uses: buildjet/cache@9347ea1c7c1f331d397aa98b3894420448373372
         with:
           path: |
             ~/.pnpm-store

From ed196ad0a79911947bf547da6cc344b93c32b78f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 09:01:21 -0300
Subject: [PATCH 16/51] chore(deps): update dependency vite to v6.3.4
 [security] (#2196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/tailwind/package.json |  2 +-
 pnpm-lock.yaml                 | 82 ++++++++++++++++++++++++++++------
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
index fab11dce3b..fe70b4e5e4 100644
--- a/packages/tailwind/package.json
+++ b/packages/tailwind/package.json
@@ -64,7 +64,7 @@
     "tsconfig": "workspace:*",
     "tsup": "8.4.0",
     "typescript": "5.8.3",
-    "vite": "6.3.2",
+    "vite": "6.3.4",
     "vite-plugin-dts": "4.5.3",
     "yalc": "1.0.0-pre.53"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8c80c6571c..6943ff3209 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -912,7 +912,7 @@ importers:
         version: 0.8.15
       '@vitejs/plugin-react':
         specifier: 4.4.1
-        version: 4.4.1(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.4.1(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
       postcss:
         specifier: 8.5.3
         version: 8.5.3
@@ -938,11 +938,11 @@ importers:
         specifier: 5.8.3
         version: 5.8.3
       vite:
-        specifier: 6.3.2
-        version: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+        specifier: 6.3.4
+        version: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
       vite-plugin-dts:
         specifier: 4.5.3
-        version: 4.5.3(@types/node@22.14.1)(rollup@4.39.0)(typescript@5.8.3)(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 4.5.3(@types/node@22.14.1)(rollup@4.39.0)(typescript@5.8.3)(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
       yalc:
         specifier: 1.0.0-pre.53
         version: 1.0.0-pre.53
@@ -7992,6 +7992,46 @@ packages:
       yaml:
         optional: true
 
+  vite@6.3.4:
+    resolution: {integrity: sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   vitest@3.2.3:
     resolution: {integrity: sha512-E6U2ZFXe3N/t4f5BwUaVCKRLHqUpk1CBWeMh78UT4VaTPH/2dyvH6ALl29JTovEPu9dVKr/K/J4PkXgrMbw4Ww==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -11257,14 +11297,14 @@ snapshots:
       next: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react: 19.0.0
 
-  '@vitejs/plugin-react@4.4.1(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitejs/plugin-react@4.4.1(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@babel/core': 7.26.10
       '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.10)
       '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.10)
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -11276,13 +11316,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.3(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitest/mocker@3.2.3(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@vitest/spy': 3.2.3
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@vitest/pretty-format@3.2.3':
     dependencies:
@@ -16520,7 +16560,7 @@ snapshots:
       debug: 4.4.1
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -16535,7 +16575,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-dts@4.5.3(@types/node@22.14.1)(rollup@4.39.0)(typescript@5.8.3)(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)):
+  vite-plugin-dts@4.5.3(@types/node@22.14.1)(rollup@4.39.0)(typescript@5.8.3)(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)):
     dependencies:
       '@microsoft/api-extractor': 7.52.4(@types/node@22.14.1)
       '@rollup/pluginutils': 5.1.4(rollup@4.39.0)
@@ -16548,13 +16588,29 @@ snapshots:
       magic-string: 0.30.17
       typescript: 5.8.3
     optionalDependencies:
-      vite: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
   vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1):
+    dependencies:
+      esbuild: 0.25.0
+      fdir: 6.4.4(picomatch@4.0.2)
+      picomatch: 4.0.2
+      postcss: 8.5.3
+      rollup: 4.39.0
+      tinyglobby: 0.2.14
+    optionalDependencies:
+      '@types/node': 22.14.1
+      fsevents: 2.3.3
+      jiti: 2.4.2
+      terser: 5.37.0
+      tsx: 4.19.3
+      yaml: 2.6.1
+
+  vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
       esbuild: 0.25.0
       fdir: 6.4.4(picomatch@4.0.2)
@@ -16574,7 +16630,7 @@ snapshots:
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.3
-      '@vitest/mocker': 3.2.3(vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@vitest/mocker': 3.2.3(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))
       '@vitest/pretty-format': 3.2.3
       '@vitest/runner': 3.2.3
       '@vitest/snapshot': 3.2.3
@@ -16592,7 +16648,7 @@ snapshots:
       tinyglobby: 0.2.14
       tinypool: 1.1.0
       tinyrainbow: 2.0.0
-      vite: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
       vite-node: 3.2.3(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
       why-is-node-running: 2.3.0
     optionalDependencies:

From 5da038e3a42de1419a6d3cfc115541553136c085 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 11:23:27 -0300
Subject: [PATCH 17/51] chore(root): Version packages (canary) (#2184)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json              | 2 +-
 packages/components/CHANGELOG.md | 7 +++++++
 packages/tailwind/CHANGELOG.md   | 6 ++++++
 packages/tailwind/package.json   | 2 +-
 pnpm-lock.yaml                   | 2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index bb9d27e211..fe8721b0b5 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -32,5 +32,5 @@
     "tsconfig": "0.0.0",
     "web": "0.0.0"
   },
-  "changesets": ["dirty-needles-chew"]
+  "changesets": ["dirty-needles-chew", "great-parrots-yell"]
 }
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 277a2fa81e..ad609e5b4d 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -109,6 +109,13 @@
 - Updated dependencies [0a7b555]
   - @react-email/text@0.1.4
 
+## 0.0.39-canary.0
+
+### Patch Changes
+
+- Updated dependencies [934bc53]
+  - @react-email/tailwind@1.1.0-canary.0
+
 ## 0.0.38
 
 ### Patch Changes
diff --git a/packages/tailwind/CHANGELOG.md b/packages/tailwind/CHANGELOG.md
index 8be91b1914..119d9ddb1b 100644
--- a/packages/tailwind/CHANGELOG.md
+++ b/packages/tailwind/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @react-email/tailwind
 
+## 1.1.0-canary.0
+
+### Minor Changes
+
+- 934bc53: Extract tailwind pseudo classes to stylesheet
+
 ## 1.0.5
 
 ### Patch Changes
diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
index fe70b4e5e4..f210dceb8f 100644
--- a/packages/tailwind/package.json
+++ b/packages/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-email/tailwind",
-  "version": "1.0.5",
+  "version": "1.1.0-canary.0",
   "description": "A React component to wrap emails with Tailwind CSS",
   "sideEffects": false,
   "main": "./dist/index.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6943ff3209..ea8d4a69fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -408,7 +408,7 @@ importers:
         specifier: workspace:0.0.16
         version: link:../section
       '@react-email/tailwind':
-        specifier: workspace:1.0.5
+        specifier: workspace:1.1.0-canary.0
         version: link:../tailwind
       '@react-email/text':
         specifier: workspace:0.1.5

From 6adf863d98b812ed2df82497c8678d756b5647ab Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Mon, 5 May 2025 11:27:34 -0300
Subject: [PATCH 18/51] Revert "chore(deps): update changesets/action digest to
 5f15b43 (#2198)"

This reverts commit 6c632363a35b8264f2663389979291857f1c8b08.
---
 .github/workflows/release-canary.yml | 2 +-
 .github/workflows/version.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
index 8d106ba0f1..ef272335d1 100644
--- a/.github/workflows/release-canary.yml
+++ b/.github/workflows/release-canary.yml
@@ -44,7 +44,7 @@ jobs:
         continue-on-error: true
         run: pnpm canary:enter
       - name: Create "Version packages" PR or publish release
-        uses: changesets/action@5f15b43b429db9083a86b852c3a1b3a6973e8225
+        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
         with:
           version: pnpm run version
           publish: pnpm run release
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index a6492c2072..af699de363 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -40,7 +40,7 @@ jobs:
         continue-on-error: true
         run: pnpm canary:exit
       - name: Create Release Pull Request
-        uses: changesets/action@5f15b43b429db9083a86b852c3a1b3a6973e8225
+        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
         with:
           version: pnpm run version
           title: "chore(root): Version packages"

From 97aa255abee110bbde2cbf3ab4b8a10407cde1fb Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Tue, 6 May 2025 11:19:51 -0300
Subject: [PATCH 19/51] chore(root): Add `minor` changeset for
 @react-email/components

from now on minor and major updates will bump the
@react-email/components version accordingly
---
 .changeset/crazy-seas-eat.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/crazy-seas-eat.md

diff --git a/.changeset/crazy-seas-eat.md b/.changeset/crazy-seas-eat.md
new file mode 100644
index 0000000000..7761436aee
--- /dev/null
+++ b/.changeset/crazy-seas-eat.md
@@ -0,0 +1,5 @@
+---
+"@react-email/components": minor
+---
+
+Update `@react-email/tailwind@1.1.0-canary.0`

From 7b59811e4a92860a546682b61f965b9d7961e22c Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Wed, 7 May 2025 08:33:14 -0300
Subject: [PATCH 20/51] chore(react-email): 'email: not found' error during CI
 after caching of `react-email` and not `demo` (#2223)

---
 packages/react-email/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index dd3ed0c10d..a13d5f23c8 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -6,7 +6,8 @@
     "email": "./dist/cli/index.mjs"
   },
   "scripts": {
-    "build": "tsup-node && node ./scripts/build-preview-server.mjs && pnpm install --frozen-lockfile",
+    "build": "tsup-node && node ./scripts/build-preview-server.mjs",
+    "prepare": "pnpm turbo build",
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
     "clean": "rm -rf dist",
     "dev": "tsup-node --watch",

From ce726ab4e6ea4a823d8b338c0031959f52125081 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Wed, 7 May 2025 09:31:05 -0300
Subject: [PATCH 21/51] feat(react-email): Polished way of ensuring `email`
 binary is available for `demo` & `web` (#2224)

---
 packages/react-email/package.json              |  2 +-
 packages/react-email/src/cli/commands/build.ts |  1 +
 turbo.json                                     | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index a13d5f23c8..205cacb765 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -7,7 +7,7 @@
   },
   "scripts": {
     "build": "tsup-node && node ./scripts/build-preview-server.mjs",
-    "prepare": "pnpm turbo build",
+    "postbuild": "pnpm install --frozen-lockfile",
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
     "clean": "rm -rf dist",
     "dev": "tsup-node --watch",
diff --git a/packages/react-email/src/cli/commands/build.ts b/packages/react-email/src/cli/commands/build.ts
index 56e529ee8d..04647740bf 100644
--- a/packages/react-email/src/cli/commands/build.ts
+++ b/packages/react-email/src/cli/commands/build.ts
@@ -170,6 +170,7 @@ const updatePackageJson = async (builtPreviewAppPath: string) => {
   };
   packageJson.scripts.build = 'next build';
   packageJson.scripts.start = 'next start';
+  delete packageJson.scripts.postbuild;
 
   packageJson.name = 'preview-server';
   // We remove this one to avoid having resolve issues on our demo build process.
diff --git a/turbo.json b/turbo.json
index 1b8fd94177..a10d59c6fc 100644
--- a/turbo.json
+++ b/turbo.json
@@ -10,11 +10,15 @@
   ],
   "tasks": {
     "build": {
-      "dependsOn": ["^build"],
+      "dependsOn": ["^build", "^postbuild"],
       "outputs": ["dist/**"]
     },
+    "postbuild": {
+      "dependsOn": ["build"],
+      "cache": false
+    },
     "web#build": {
-      "dependsOn": ["^build"],
+      "dependsOn": ["^build", "^postbuild"],
       "env": [
         "RESEND_API_KEY",
         "NEXT_PUBLIC_SUPABASE_URL",
@@ -23,7 +27,7 @@
       "outputs": [".next/**", "!.next/cache/**"]
     },
     "demo#build": {
-      "dependsOn": ["^build"],
+      "dependsOn": ["^build", "^postbuild"],
       "outputs": [".react-email/**", "!.react-email/.next/cache/**"]
     },
     "react-email#build": {

From 38ae798ecd5de6c298d81d48c33fc4a2c4449fd3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 May 2025 11:29:42 -0300
Subject: [PATCH 22/51] chore(root): Version packages (canary) (#2217)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json               |  7 ++++++-
 packages/components/CHANGELOG.md  | 32 ++++++++++++++++++++++++++++++-
 packages/react-email/CHANGELOG.md |  6 ++++++
 packages/react-email/package.json |  2 +-
 packages/render/CHANGELOG.md      |  6 ++++++
 pnpm-lock.yaml                    |  2 +-
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index fe8721b0b5..06c20f680a 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -32,5 +32,10 @@
     "tsconfig": "0.0.0",
     "web": "0.0.0"
   },
-  "changesets": ["dirty-needles-chew", "great-parrots-yell"]
+  "changesets": [
+    "crazy-seas-eat",
+    "dirty-needles-chew",
+    "great-parrots-yell",
+    "tidy-geese-cross"
+  ]
 }
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index ad609e5b4d..ab2252e7c5 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -41,6 +41,36 @@
   - @react-email/button@0.1.0
   - @react-email/tailwind@1.0.5
 
+## 0.1.0-canary.1
+
+### Minor Changes
+
+- b6a1941: Update `@react-email/tailwind@1.1.0-canary.0`
+
+### Patch Changes
+
+- Updated dependencies [57ddfd9]
+  - @react-email/render@1.1.1-canary.0
+  - @react-email/body@0.0.11
+  - @react-email/button@0.0.19
+  - @react-email/code-block@0.0.13
+  - @react-email/code-inline@0.0.5
+  - @react-email/column@0.0.13
+  - @react-email/container@0.0.15
+  - @react-email/font@0.0.9
+  - @react-email/head@0.0.12
+  - @react-email/heading@0.0.15
+  - @react-email/hr@0.0.11
+  - @react-email/html@0.0.11
+  - @react-email/img@0.0.11
+  - @react-email/link@0.0.12
+  - @react-email/markdown@0.0.15
+  - @react-email/preview@0.0.13
+  - @react-email/row@0.0.12
+  - @react-email/section@0.0.16
+  - @react-email/tailwind@1.0.5
+  - @react-email/text@0.1.4
+
 ## 0.0.42
 
 ### Patch Changes
@@ -81,7 +111,6 @@
 ### Patch Changes
 
 - Updated dependencies [a77ef6f]
-  - @react-email/preview@0.0.13
   - @react-email/render@1.1.1
   - @react-email/body@0.0.11
   - @react-email/button@0.0.19
@@ -97,6 +126,7 @@
   - @react-email/img@0.0.11
   - @react-email/link@0.0.12
   - @react-email/markdown@0.0.15
+  - @react-email/preview@0.0.13
   - @react-email/row@0.0.12
   - @react-email/section@0.0.16
   - @react-email/tailwind@1.0.5
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index d53c71affa..ab5409ad73 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.5
+
+### Patch Changes
+
+- b947f98: Pre-render email templates on hover
+
 ## 4.1.0-canary.4
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 205cacb765..1c72b112f0 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.4",
+  "version": "4.1.0-canary.5",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"
diff --git a/packages/render/CHANGELOG.md b/packages/render/CHANGELOG.md
index 7fe6710035..5c56e13a80 100644
--- a/packages/render/CHANGELOG.md
+++ b/packages/render/CHANGELOG.md
@@ -20,6 +20,12 @@
 
 - a77ef6f: fix preview being rendered in plain-text
 
+## 1.1.1-canary.0
+
+### Patch Changes
+
+- 57ddfd9: fix react-dom/server import for the browser and some bundlers
+
 ## 1.1.0
 
 ### Minor Changes
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea8d4a69fd..6943ff3209 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -408,7 +408,7 @@ importers:
         specifier: workspace:0.0.16
         version: link:../section
       '@react-email/tailwind':
-        specifier: workspace:1.1.0-canary.0
+        specifier: workspace:1.0.5
         version: link:../tailwind
       '@react-email/text':
         specifier: workspace:0.1.5

From 453d4626904c97982c287c26f31c3057644d4953 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 12:03:26 -0300
Subject: [PATCH 23/51] chore(root): Version packages (canary) (#2233)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 packages/components/CHANGELOG.md | 26 ++++++++++++++++++++++++++
 packages/components/package.json |  2 +-
 packages/render/CHANGELOG.md     |  6 ++++++
 pnpm-lock.yaml                   |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index ab2252e7c5..cc16ac7b1d 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -41,6 +41,32 @@
   - @react-email/button@0.1.0
   - @react-email/tailwind@1.0.5
 
+## 0.1.0-canary.2
+
+### Patch Changes
+
+- Updated dependencies [0405e2b]
+  - @react-email/render@1.1.2-canary.0
+  - @react-email/body@0.0.11
+  - @react-email/button@0.0.19
+  - @react-email/code-block@0.0.13
+  - @react-email/code-inline@0.0.5
+  - @react-email/column@0.0.13
+  - @react-email/container@0.0.15
+  - @react-email/font@0.0.9
+  - @react-email/head@0.0.12
+  - @react-email/heading@0.0.15
+  - @react-email/hr@0.0.11
+  - @react-email/html@0.0.11
+  - @react-email/img@0.0.11
+  - @react-email/link@0.0.12
+  - @react-email/markdown@0.0.15
+  - @react-email/preview@0.0.13
+  - @react-email/row@0.0.12
+  - @react-email/section@0.0.16
+  - @react-email/tailwind@1.1.0-canary.0
+  - @react-email/text@0.1.4
+
 ## 0.1.0-canary.1
 
 ### Minor Changes
diff --git a/packages/components/package.json b/packages/components/package.json
index 1627f32d4b..0e6fd92a0c 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -58,7 +58,7 @@
     "@react-email/render": "workspace:1.1.3",
     "@react-email/row": "workspace:0.0.12",
     "@react-email/section": "workspace:0.0.16",
-    "@react-email/tailwind": "workspace:1.0.5",
+    "@react-email/tailwind": "workspace:1.1.0-canary.0",
     "@react-email/text": "workspace:0.1.5"
   },
   "peerDependencies": {
diff --git a/packages/render/CHANGELOG.md b/packages/render/CHANGELOG.md
index 5c56e13a80..511f96d1c3 100644
--- a/packages/render/CHANGELOG.md
+++ b/packages/render/CHANGELOG.md
@@ -14,6 +14,12 @@
 - e4598ab: Fixes `pretty` option breaking CJS projects
 - faa6944: accept React.ReactNode instead of React.ReactElement
 
+## 1.1.2-canary.0
+
+### Patch Changes
+
+- 0405e2b: fix react-dom/server import for the browser and some bundlers
+
 ## 1.1.1
 
 ### Patch Changes
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6943ff3209..ea8d4a69fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -408,7 +408,7 @@ importers:
         specifier: workspace:0.0.16
         version: link:../section
       '@react-email/tailwind':
-        specifier: workspace:1.0.5
+        specifier: workspace:1.1.0-canary.0
         version: link:../tailwind
       '@react-email/text':
         specifier: workspace:0.1.5

From 036c77afba9af49eb9d0a251218cb0d1a06b5ea3 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Mon, 12 May 2025 14:30:05 -0300
Subject: [PATCH 24/51] feat(button): respect the user's order of padding
 properties (#2234)

---
 packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
index 8bafe01377..5c36b87c7a 100644
--- a/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
+++ b/packages/tailwind/src/__snapshots__/tailwind.spec.tsx.snap
@@ -14,7 +14,7 @@ exports[`Custom theme config > should be able to use custom spacing 1`] = `"<!DO
 
 exports[`Custom theme config > should be able to use custom text alignment 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><div style="text-align:justify"></div><!--/$-->"`;
 
-exports[`Tailwind component > <Button className="px-3 py-2 mt-8 text-sm text-gray-200 bg-blue-600 rounded-md"> 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><a style="margin-top:2rem;border-radius:0.375rem;background-color:rgb(37,99,235);padding-left:0.75rem;padding-right:0.75rem;padding-top:0.5rem;padding-bottom:0.5rem;color:rgb(229,231,235);font-size:0.875rem;line-height:1.25rem;text-decoration:none;display:inline-block;max-width:100%;mso-padding-alt:0px;padding:8px 12px 8px 12px" target="_blank"><span><!--[if mso]><i style="mso-font-width:300%;mso-text-raise:12" hidden>&#8202;&#8202;</i><![endif]--></span><span style="max-width:100%;display:inline-block;line-height:120%;mso-padding-alt:0px;mso-text-raise:6px">Testing button</span><span><!--[if mso]><i style="mso-font-width:300%" hidden>&#8202;&#8202;&#8203;</i><![endif]--></span></a>Testing<!--/$-->"`;
+exports[`Tailwind component > <Button className="px-3 py-2 mt-8 text-sm text-gray-200 bg-blue-600 rounded-md"> 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$--><a style="margin-top:2rem;border-radius:0.375rem;background-color:rgb(37,99,235);padding-left:12px;padding-right:12px;padding-top:8px;padding-bottom:8px;color:rgb(229,231,235);font-size:0.875rem;line-height:1.25rem;text-decoration:none;display:inline-block;max-width:100%;mso-padding-alt:0px" target="_blank"><span><!--[if mso]><i style="mso-font-width:300%;mso-text-raise:12" hidden>&#8202;&#8202;</i><![endif]--></span><span style="max-width:100%;display:inline-block;line-height:120%;mso-padding-alt:0px;mso-text-raise:6px">Testing button</span><span><!--[if mso]><i style="mso-font-width:300%" hidden>&#8202;&#8202;&#8203;</i><![endif]--></span></a>Testing<!--/$-->"`;
 
 exports[`Tailwind component > it should not generate styles from text 1`] = `"<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!--$-->container bg-red-500 bg-blue-300<!--/$-->"`;
 

From 97167eec3d9ffac29b5d260d79d12c25e2e53a61 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Mon, 12 May 2025 14:34:24 -0300
Subject: [PATCH 25/51] chore(root): Add changesets

---
 .changeset/tasty-swans-taste.md | 5 +++++
 .changeset/tiny-rice-give.md    | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .changeset/tasty-swans-taste.md
 create mode 100644 .changeset/tiny-rice-give.md

diff --git a/.changeset/tasty-swans-taste.md b/.changeset/tasty-swans-taste.md
new file mode 100644
index 0000000000..3271b756e3
--- /dev/null
+++ b/.changeset/tasty-swans-taste.md
@@ -0,0 +1,5 @@
+---
+"@react-email/components": minor
+---
+
+Updated @react-email/button
diff --git a/.changeset/tiny-rice-give.md b/.changeset/tiny-rice-give.md
new file mode 100644
index 0000000000..5daf11b7ce
--- /dev/null
+++ b/.changeset/tiny-rice-give.md
@@ -0,0 +1,5 @@
+---
+"@react-email/button": minor
+---
+
+respect the order in which padding properties are defined

From ffbec0f247918b7549c632a31c6f3e8ee2618955 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Mon, 12 May 2025 14:37:04 -0300
Subject: [PATCH 26/51] chore(root): Improve changeset for components

---
 .changeset/tasty-swans-taste.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/tasty-swans-taste.md b/.changeset/tasty-swans-taste.md
index 3271b756e3..fec9f52cfb 100644
--- a/.changeset/tasty-swans-taste.md
+++ b/.changeset/tasty-swans-taste.md
@@ -2,4 +2,4 @@
 "@react-email/components": minor
 ---
 
-Updated @react-email/button
+Updated @react-email/button@0.1.0-canary.0

From 2e6947d54c2743ede4e2dd0fdf1e7d5a27aa9152 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 14:44:43 -0300
Subject: [PATCH 27/51] chore(root): Version packages (canary) (#2236)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json               |  5 ++++-
 packages/button/CHANGELOG.md      |  6 ++++++
 packages/components/CHANGELOG.md  | 12 ++++++++++++
 packages/react-email/CHANGELOG.md |  6 ++++++
 packages/react-email/package.json |  2 +-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 06c20f680a..51c2a9625b 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -36,6 +36,9 @@
     "crazy-seas-eat",
     "dirty-needles-chew",
     "great-parrots-yell",
-    "tidy-geese-cross"
+    "mighty-pigs-add",
+    "tasty-swans-taste",
+    "tidy-geese-cross",
+    "tiny-rice-give"
   ]
 }
diff --git a/packages/button/CHANGELOG.md b/packages/button/CHANGELOG.md
index bf65fb977e..e260c750fc 100644
--- a/packages/button/CHANGELOG.md
+++ b/packages/button/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - 4c4c5ef: respect the order in which padding properties are defined
 
+## 0.1.0-canary.0
+
+### Minor Changes
+
+- 11c4600: respect the order in which padding properties are defined
+
 ## 0.0.19
 
 ### Patch Changes
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index cc16ac7b1d..af66ee2451 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -41,6 +41,18 @@
   - @react-email/button@0.1.0
   - @react-email/tailwind@1.0.5
 
+## 0.1.0-canary.3
+
+### Minor Changes
+
+- 11c4600: Updated @react-email/button@0.1.0-canary.0
+
+### Patch Changes
+
+- Updated dependencies [11c4600]
+  - @react-email/button@0.1.0-canary.0
+  - @react-email/tailwind@1.1.0-canary.0
+
 ## 0.1.0-canary.2
 
 ### Patch Changes
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index ab5409ad73..7e8f695786 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.6
+
+### Patch Changes
+
+- 11c4600: Add support for hot reloading with tsconfig path aliases
+
 ## 4.1.0-canary.5
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 1c72b112f0..f83b9026a7 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.5",
+  "version": "4.1.0-canary.6",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"

From 8a9a82b2898dd5850ed2da654caff9f3576f21aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 May 2025 10:01:32 -0300
Subject: [PATCH 28/51] chore(root): Version packages (canary) (#2238)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json               | 1 +
 packages/react-email/CHANGELOG.md | 6 ++++++
 packages/react-email/package.json | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 51c2a9625b..1eebc578f9 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -37,6 +37,7 @@
     "dirty-needles-chew",
     "great-parrots-yell",
     "mighty-pigs-add",
+    "stupid-ghosts-decide",
     "tasty-swans-taste",
     "tidy-geese-cross",
     "tiny-rice-give"
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 7e8f695786..4f162bb236 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.7
+
+### Patch Changes
+
+- f00aff6: Fix prettier errors causing NextJS serialization error
+
 ## 4.1.0-canary.6
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index f83b9026a7..e71af09715 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.6",
+  "version": "4.1.0-canary.7",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"

From b1d469cdf55fe5981b100a41a269eaa080f63d41 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Tue, 20 May 2025 12:36:54 -0300
Subject: [PATCH 29/51] feat: Separate preview server from `react-email`
 (#2182)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Kaylee <65376239+KayleeWilliams@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bu Kinoshita <6929565+bukinoshita@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                           |   1 -
 .changeset/puny-chicken-argue.md              |   5 +
 apps/demo/package.json                        |   5 +-
 biome.json                                    |   2 +-
 packages/preview-server/.gitignore            |   5 +
 packages/preview-server/.npmignore            |   5 +
 packages/preview-server/_index.js             |   4 +
 packages/preview-server/license.md            |   7 +
 .../module-punycode.d.ts                      |   0
 .../next-env.d.ts                             |   0
 .../next.config.js                            |   0
 packages/preview-server/package.json          |  82 +++++
 .../postcss.config.js                         |   0
 .../scripts/build-preview-server.mjs          |  29 ++
 .../scripts/fill-caniemail-data.mjs           |   0
 .../email-validation/caniemail-data.ts        |   0
 .../email-validation/check-compatibility.ts   |   0
 .../email-validation/check-images.spec.tsx    |   0
 .../actions/email-validation/check-images.ts  |   0
 .../email-validation/check-links.spec.tsx     |   0
 .../actions/email-validation/check-links.ts   |   0
 .../get-code-location-from-ast-element.ts     |   0
 .../actions/email-validation/quick-fetch.ts   |   0
 .../src/actions/get-email-path-from-slug.ts   |   0
 .../get-emails-directory-metadata-action.ts   |   0
 .../src/actions/render-email-by-path.tsx      |   0
 .../src/animated-icons-data/help.json         |   0
 .../src/animated-icons-data/link.json         |   0
 .../src/animated-icons-data/load.json         |   0
 .../src/animated-icons-data/mail.json         |   0
 .../src/app/env.ts                            |   0
 .../src/app/favicon.ico                       | Bin
 .../src/app/fonts.ts                          |   0
 .../src/app/fonts/SFMono/SFMonoBold.otf       | Bin
 .../src/app/fonts/SFMono/SFMonoBoldItalic.otf | Bin
 .../src/app/fonts/SFMono/SFMonoHeavy.otf      | Bin
 .../app/fonts/SFMono/SFMonoHeavyItalic.otf    | Bin
 .../src/app/fonts/SFMono/SFMonoLight.otf      | Bin
 .../app/fonts/SFMono/SFMonoLightItalic.otf    | Bin
 .../src/app/fonts/SFMono/SFMonoMedium.otf     | Bin
 .../app/fonts/SFMono/SFMonoMediumItalic.otf   | Bin
 .../src/app/fonts/SFMono/SFMonoRegular.otf    | Bin
 .../app/fonts/SFMono/SFMonoRegularItalic.otf  | Bin
 .../src/app/fonts/SFMono/SFMonoSemibold.otf   | Bin
 .../app/fonts/SFMono/SFMonoSemiboldItalic.otf | Bin
 .../src/app/globals.css                       |   0
 .../src/app/layout.tsx                        |   0
 .../src/app/logo.png                          | Bin
 .../src/app/page.tsx                          |   0
 .../src/app/preview/[...slug]/page.tsx        |   0
 .../src/app/preview/[...slug]/preview.tsx     |   0
 .../app/preview/[...slug]/rendering-error.tsx |   0
 .../src/components/button.tsx                 |   0
 .../src/components/code-container.tsx         |   0
 .../src/components/code-snippet.tsx           |   0
 .../src/components/code.tsx                   |   0
 .../src/components/heading.tsx                |   0
 .../src/components/icons/icon-arrow-down.tsx  |   0
 .../src/components/icons/icon-base.tsx        |   0
 .../src/components/icons/icon-bug.tsx         |   0
 .../src/components/icons/icon-button.tsx      |   0
 .../src/components/icons/icon-check.tsx       |   0
 .../src/components/icons/icon-clipboard.tsx   |   0
 .../src/components/icons/icon-download.tsx    |   0
 .../src/components/icons/icon-email.tsx       |   0
 .../src/components/icons/icon-file.tsx        |   0
 .../src/components/icons/icon-folder-open.tsx |   0
 .../src/components/icons/icon-folder.tsx      |   0
 .../components/icons/icon-hide-sidebar.tsx    |   0
 .../src/components/icons/icon-image.tsx       |   0
 .../src/components/icons/icon-info.tsx        |   0
 .../src/components/icons/icon-link.tsx        |   0
 .../src/components/icons/icon-monitor.tsx     |   0
 .../src/components/icons/icon-phone.tsx       |   0
 .../src/components/icons/icon-reload.tsx      |   0
 .../src/components/icons/icon-source.tsx      |   0
 .../src/components/icons/icon-stamp.tsx       |   0
 .../src/components/icons/icon-warning.tsx     |   0
 .../src/components/index.ts                   |   0
 .../src/components/logo.tsx                   |   0
 .../src/components/resizable-wrapper.tsx      |   0
 .../src/components/send.tsx                   |   0
 .../src/components/shell.tsx                  |   0
 .../sidebar/file-tree-directory-children.tsx  |   0
 .../sidebar/file-tree-directory.tsx           |   0
 .../src/components/sidebar/file-tree.tsx      |   0
 .../src/components/sidebar/index.ts           |   0
 .../src/components/sidebar/sidebar.tsx        |   0
 .../src/components/text.tsx                   |   0
 .../src/components/toolbar.tsx                |   0
 .../components/toolbar/checking-results.tsx   |   0
 .../toolbar/code-preview-line-link.tsx        |   0
 .../src/components/toolbar/compatibility.tsx  |   0
 .../src/components/toolbar/linter.tsx         |   0
 .../src/components/toolbar/results-table.tsx  |   0
 .../src/components/toolbar/results.tsx        |   0
 .../src/components/toolbar/spam-assassin.tsx  |   0
 .../src/components/toolbar/toolbar-button.tsx |   0
 .../components/toolbar/use-cached-state.ts    |   0
 .../src/components/tooltip-content.tsx        |   0
 .../src/components/tooltip.tsx                |   0
 .../src/components/topbar.tsx                 |   0
 .../topbar/active-view-toggle-group.tsx       |   0
 .../components/topbar/view-size-controls.tsx  |   0
 .../src/contexts/emails.tsx                   |   0
 .../src/contexts/fragment-identifier.tsx      |   0
 .../src/contexts/preview.tsx                  |   0
 .../src/hooks/use-clamped-state.ts            |   0
 .../src/hooks/use-email-rendering-result.ts   |   0
 .../src/hooks/use-fragment-identifier.ts      |   0
 .../src/hooks/use-hot-reload.ts               |   0
 .../src/hooks/use-icon-animation.ts           |   0
 .../src/hooks/use-rendering-metadata.ts       |   0
 .../get-email-component.spec.ts.snap          |   0
 .../src/utils/caniemail/all-css-properties.ts |   0
 .../get-object-variables.spec.ts.snap         |   0
 .../get-used-style-properties.spec.ts.snap    |   0
 .../ast/get-object-variables.spec.ts          |   0
 .../caniemail/ast/get-object-variables.ts     |   0
 .../ast/get-used-style-properties.spec.ts     |   0
 .../ast/get-used-style-properties.ts          |   0
 .../get-compatibility-stats-for-entry.ts      |   0
 .../src/utils/caniemail/get-css-functions.ts  |   0
 .../utils/caniemail/get-css-property-names.ts |   0
 .../caniemail/get-css-property-with-value.ts  |   0
 .../src/utils/caniemail/get-css-unit.ts       |   0
 .../utils/caniemail/get-element-attributes.ts |   0
 .../src/utils/caniemail/get-element-names.ts  |   0
 .../tailwind/generate-tailwind-rules.ts       |   0
 .../caniemail/tailwind/get-tailwind-config.ts |   0
 .../tailwind/get-tailwind-metadata.spec.ts    |   0
 .../tailwind/get-tailwind-metadata.ts         |   0
 .../tailwind/setup-tailwind-context.ts        |   0
 .../src/utils/cn.ts                           |   0
 .../src/utils/constants.ts                    |   0
 .../src/utils/contains-email-template.spec.ts |   0
 .../src/utils/contains-email-template.ts      |   0
 .../src/utils/copy-text-to-clipboard.ts       |   0
 .../utils/esbuild/escape-string-for-regex.ts  |   3 +
 .../esbuild/renderring-utilities-exporter.ts  |  63 ++++
 .../src/utils/get-email-component.spec.ts     |   0
 .../src/utils/get-email-component.ts          |   0
 .../get-emails-directory-metadata.spec.ts     |  82 +++++
 .../utils/get-emails-directory-metadata.ts    | 141 ++++++++
 .../get-line-and-column-from-offset.spec.ts   |   0
 .../utils/get-line-and-column-from-offset.ts  |   0
 .../src/utils/improve-error-with-sourcemap.ts |   0
 packages/preview-server/src/utils/index.ts    |   6 +
 .../src/utils/js-email-detection.spec.ts      |   0
 .../src/utils/language-map.ts                 |   0
 .../src/utils/linting.ts                      |   0
 .../src/utils/load-stream.ts                  |   0
 .../utils/register-spinner-autostopping.ts    |  28 ++
 .../src/utils/result.ts                       |   0
 .../src/utils/run-bundled-code.ts             |   0
 .../src/utils/sanitize.ts                     |   0
 .../src/utils/static-node-modules-for-vm.ts   |   0
 .../utils/testing/js-email-export-default.js  |   0
 .../src/utils/testing/js-email-test.js        |   0
 .../src/utils/testing/mdx-email-test.js       |   0
 .../utils/testing/request-response-email.tsx  |   0
 .../src/utils/types/as.ts                     |   0
 .../src/utils/types/email-template.ts         |   0
 .../src/utils/types/error-object.ts           |   0
 .../src/utils/types/hot-reload-change.ts      |  13 +
 .../src/utils/unreachable.ts                  |   0
 .../tailwind-internals.d.ts                   |   0
 .../tailwind.config.ts                        |   0
 packages/preview-server/tsconfig.json         |  45 +++
 packages/preview-server/vitest.config.ts      |  15 +
 packages/react-email/package.json             |  55 +--
 .../scripts/build-preview-server.mjs          |  33 --
 .../src/cli/commands/testing/export.spec.ts   |  30 --
 packages/react-email/src/cli/utils/index.ts   |   2 -
 .../src/cli/utils/preview/index.ts            |   2 -
 .../react-email/src/cli/utils/tree.spec.ts    |  14 -
 .../src/{cli => }/commands/.npmignore         |   0
 .../src/{cli => }/commands/build.ts           |  80 +++--
 .../react-email/src/{cli => }/commands/dev.ts |   2 +-
 .../src/{cli => }/commands/export.ts          |   8 +-
 .../src/{cli => }/commands/start.ts           |   7 +-
 .../src/{cli => }/commands/testing/.gitignore |   0
 .../testing/__snapshots__/export.spec.ts.snap |   0
 .../src/commands/testing/export.spec.ts       |  23 ++
 packages/react-email/src/{cli => }/index.ts   |  10 +-
 .../src/utils/__snapshots__/tree.spec.ts.snap |  27 ++
 .../esbuild/renderring-utilities-exporter.ts  |   2 +-
 .../get-emails-directory-metadata.spec.ts     |   2 +-
 .../src/utils/get-preview-server-location.ts  |  32 ++
 packages/react-email/src/utils/index.ts       |   8 +-
 packages/react-email/src/utils/packageJson.ts |   4 +
 .../get-env-variables-for-preview-app.ts      |   2 +-
 .../create-dependency-graph.spec.ts           |  71 ++--
 .../hot-reloading/create-dependency-graph.ts  |   8 +-
 .../get-imported-modules.spec.ts              |   4 +-
 .../hot-reloading/get-imported-modules.ts     |   4 +-
 .../resolve-path-aliases.spec.ts              |   2 +-
 .../hot-reloading/resolve-path-aliases.ts     |   0
 .../hot-reloading/setup-hot-reloading.ts      |   4 +-
 .../preview/hot-reloading/test/some-file.ts   |   0
 .../preview/hot-reloading/test/tsconfig.json  |   0
 .../react-email/src/utils/preview/index.ts    |   2 +
 .../utils/preview/serve-static-file.ts        |   0
 .../utils/preview/start-dev-server.ts         |  33 +-
 packages/react-email/src/utils/tree.spec.ts   |   5 +
 .../react-email/src/{cli => }/utils/tree.ts   |   0
 .../src/utils/types/hot-reload-change.ts      |   2 +-
 .../src/utils/types/hot-reload-event.ts       |   2 +-
 packages/react-email/tsconfig.json            |  14 +-
 packages/react-email/tsup.config.ts           |   4 +-
 pnpm-lock.yaml                                | 328 +++++++++++-------
 turbo.json                                    |   4 +
 212 files changed, 988 insertions(+), 383 deletions(-)
 create mode 100644 .changeset/puny-chicken-argue.md
 create mode 100644 packages/preview-server/.gitignore
 create mode 100644 packages/preview-server/.npmignore
 create mode 100644 packages/preview-server/_index.js
 create mode 100644 packages/preview-server/license.md
 rename packages/{react-email => preview-server}/module-punycode.d.ts (100%)
 rename packages/{react-email => preview-server}/next-env.d.ts (100%)
 rename packages/{react-email => preview-server}/next.config.js (100%)
 create mode 100644 packages/preview-server/package.json
 rename packages/{react-email => preview-server}/postcss.config.js (100%)
 create mode 100644 packages/preview-server/scripts/build-preview-server.mjs
 rename packages/{react-email => preview-server}/scripts/fill-caniemail-data.mjs (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/caniemail-data.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/check-compatibility.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/check-images.spec.tsx (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/check-images.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/check-links.spec.tsx (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/check-links.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/get-code-location-from-ast-element.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/email-validation/quick-fetch.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/get-email-path-from-slug.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/get-emails-directory-metadata-action.ts (100%)
 rename packages/{react-email => preview-server}/src/actions/render-email-by-path.tsx (100%)
 rename packages/{react-email => preview-server}/src/animated-icons-data/help.json (100%)
 rename packages/{react-email => preview-server}/src/animated-icons-data/link.json (100%)
 rename packages/{react-email => preview-server}/src/animated-icons-data/load.json (100%)
 rename packages/{react-email => preview-server}/src/animated-icons-data/mail.json (100%)
 rename packages/{react-email => preview-server}/src/app/env.ts (100%)
 rename packages/{react-email => preview-server}/src/app/favicon.ico (100%)
 rename packages/{react-email => preview-server}/src/app/fonts.ts (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoBold.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoBoldItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoHeavy.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoHeavyItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoLight.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoLightItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoMedium.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoMediumItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoRegular.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoRegularItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoSemibold.otf (100%)
 rename packages/{react-email => preview-server}/src/app/fonts/SFMono/SFMonoSemiboldItalic.otf (100%)
 rename packages/{react-email => preview-server}/src/app/globals.css (100%)
 rename packages/{react-email => preview-server}/src/app/layout.tsx (100%)
 rename packages/{react-email => preview-server}/src/app/logo.png (100%)
 rename packages/{react-email => preview-server}/src/app/page.tsx (100%)
 rename packages/{react-email => preview-server}/src/app/preview/[...slug]/page.tsx (100%)
 rename packages/{react-email => preview-server}/src/app/preview/[...slug]/preview.tsx (100%)
 rename packages/{react-email => preview-server}/src/app/preview/[...slug]/rendering-error.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/button.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/code-container.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/code-snippet.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/code.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/heading.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-arrow-down.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-base.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-bug.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-button.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-check.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-clipboard.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-download.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-email.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-file.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-folder-open.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-folder.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-hide-sidebar.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-image.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-info.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-link.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-monitor.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-phone.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-reload.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-source.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-stamp.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/icons/icon-warning.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/index.ts (100%)
 rename packages/{react-email => preview-server}/src/components/logo.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/resizable-wrapper.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/send.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/shell.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/sidebar/file-tree-directory-children.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/sidebar/file-tree-directory.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/sidebar/file-tree.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/sidebar/index.ts (100%)
 rename packages/{react-email => preview-server}/src/components/sidebar/sidebar.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/text.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/checking-results.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/code-preview-line-link.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/compatibility.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/linter.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/results-table.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/results.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/spam-assassin.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/toolbar-button.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/toolbar/use-cached-state.ts (100%)
 rename packages/{react-email => preview-server}/src/components/tooltip-content.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/tooltip.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/topbar.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/topbar/active-view-toggle-group.tsx (100%)
 rename packages/{react-email => preview-server}/src/components/topbar/view-size-controls.tsx (100%)
 rename packages/{react-email => preview-server}/src/contexts/emails.tsx (100%)
 rename packages/{react-email => preview-server}/src/contexts/fragment-identifier.tsx (100%)
 rename packages/{react-email => preview-server}/src/contexts/preview.tsx (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-clamped-state.ts (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-email-rendering-result.ts (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-fragment-identifier.ts (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-hot-reload.ts (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-icon-animation.ts (100%)
 rename packages/{react-email => preview-server}/src/hooks/use-rendering-metadata.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/__snapshots__/get-email-component.spec.ts.snap (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/all-css-properties.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/__snapshots__/get-object-variables.spec.ts.snap (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/__snapshots__/get-used-style-properties.spec.ts.snap (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/get-object-variables.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/get-object-variables.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/get-used-style-properties.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/ast/get-used-style-properties.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-compatibility-stats-for-entry.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-css-functions.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-css-property-names.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-css-property-with-value.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-css-unit.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-element-attributes.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/get-element-names.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/tailwind/generate-tailwind-rules.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/tailwind/get-tailwind-config.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/tailwind/get-tailwind-metadata.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/tailwind/get-tailwind-metadata.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/caniemail/tailwind/setup-tailwind-context.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/cn.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/constants.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/contains-email-template.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/contains-email-template.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/copy-text-to-clipboard.ts (100%)
 create mode 100644 packages/preview-server/src/utils/esbuild/escape-string-for-regex.ts
 create mode 100644 packages/preview-server/src/utils/esbuild/renderring-utilities-exporter.ts
 rename packages/{react-email => preview-server}/src/utils/get-email-component.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/get-email-component.ts (100%)
 create mode 100644 packages/preview-server/src/utils/get-emails-directory-metadata.spec.ts
 create mode 100644 packages/preview-server/src/utils/get-emails-directory-metadata.ts
 rename packages/{react-email => preview-server}/src/utils/get-line-and-column-from-offset.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/get-line-and-column-from-offset.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/improve-error-with-sourcemap.ts (100%)
 create mode 100644 packages/preview-server/src/utils/index.ts
 rename packages/{react-email => preview-server}/src/utils/js-email-detection.spec.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/language-map.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/linting.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/load-stream.ts (100%)
 create mode 100644 packages/preview-server/src/utils/register-spinner-autostopping.ts
 rename packages/{react-email => preview-server}/src/utils/result.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/run-bundled-code.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/sanitize.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/static-node-modules-for-vm.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/testing/js-email-export-default.js (100%)
 rename packages/{react-email => preview-server}/src/utils/testing/js-email-test.js (100%)
 rename packages/{react-email => preview-server}/src/utils/testing/mdx-email-test.js (100%)
 rename packages/{react-email => preview-server}/src/utils/testing/request-response-email.tsx (100%)
 rename packages/{react-email => preview-server}/src/utils/types/as.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/types/email-template.ts (100%)
 rename packages/{react-email => preview-server}/src/utils/types/error-object.ts (100%)
 create mode 100644 packages/preview-server/src/utils/types/hot-reload-change.ts
 rename packages/{react-email => preview-server}/src/utils/unreachable.ts (100%)
 rename packages/{react-email => preview-server}/tailwind-internals.d.ts (100%)
 rename packages/{react-email => preview-server}/tailwind.config.ts (100%)
 create mode 100644 packages/preview-server/tsconfig.json
 create mode 100644 packages/preview-server/vitest.config.ts
 delete mode 100644 packages/react-email/scripts/build-preview-server.mjs
 delete mode 100644 packages/react-email/src/cli/commands/testing/export.spec.ts
 delete mode 100644 packages/react-email/src/cli/utils/index.ts
 delete mode 100644 packages/react-email/src/cli/utils/preview/index.ts
 delete mode 100644 packages/react-email/src/cli/utils/tree.spec.ts
 rename packages/react-email/src/{cli => }/commands/.npmignore (100%)
 rename packages/react-email/src/{cli => }/commands/build.ts (95%)
 rename packages/react-email/src/{cli => }/commands/dev.ts (90%)
 rename packages/react-email/src/{cli => }/commands/export.ts (95%)
 rename packages/react-email/src/{cli => }/commands/start.ts (73%)
 rename packages/react-email/src/{cli => }/commands/testing/.gitignore (100%)
 rename packages/react-email/src/{cli => }/commands/testing/__snapshots__/export.spec.ts.snap (100%)
 create mode 100644 packages/react-email/src/commands/testing/export.spec.ts
 rename packages/react-email/src/{cli => }/index.ts (86%)
 create mode 100644 packages/react-email/src/utils/__snapshots__/tree.spec.ts.snap
 create mode 100644 packages/react-email/src/utils/get-preview-server-location.ts
 create mode 100644 packages/react-email/src/utils/packageJson.ts
 rename packages/react-email/src/{cli => }/utils/preview/get-env-variables-for-preview-app.ts (89%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/create-dependency-graph.spec.ts (80%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/create-dependency-graph.ts (97%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/get-imported-modules.spec.ts (96%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/get-imported-modules.ts (87%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/resolve-path-aliases.spec.ts (77%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/resolve-path-aliases.ts (100%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/setup-hot-reloading.ts (97%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/test/some-file.ts (100%)
 rename packages/react-email/src/{cli => }/utils/preview/hot-reloading/test/tsconfig.json (100%)
 create mode 100644 packages/react-email/src/utils/preview/index.ts
 rename packages/react-email/src/{cli => }/utils/preview/serve-static-file.ts (100%)
 rename packages/react-email/src/{cli => }/utils/preview/start-dev-server.ts (87%)
 create mode 100644 packages/react-email/src/utils/tree.spec.ts
 rename packages/react-email/src/{cli => }/utils/tree.ts (100%)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 1eebc578f9..9cf05c313f 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -34,7 +34,6 @@
   },
   "changesets": [
     "crazy-seas-eat",
-    "dirty-needles-chew",
     "great-parrots-yell",
     "mighty-pigs-add",
     "stupid-ghosts-decide",
diff --git a/.changeset/puny-chicken-argue.md b/.changeset/puny-chicken-argue.md
new file mode 100644
index 0000000000..cfd78a07a2
--- /dev/null
+++ b/.changeset/puny-chicken-argue.md
@@ -0,0 +1,5 @@
+---
+"react-email": minor
+---
+
+use a separate package for storing the preview server (@react-email/preview-server)
diff --git a/apps/demo/package.json b/apps/demo/package.json
index a493d3a061..b886a9659b 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "email build",
+    "build": "pnpm install --frozen-lockfile && email build",
     "dev": "email dev",
     "start": "email start",
     "export": "email export"
@@ -15,7 +15,8 @@
     "react-email": "workspace:*"
   },
   "devDependencies": {
-    "next": "15.3.1",
+    "@react-email/preview-server": "workspace:*",
+    "next": "^15.2.4",
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "tsx": "4.19.3"
diff --git a/biome.json b/biome.json
index 21871acfbb..8f3beaf4e1 100644
--- a/biome.json
+++ b/biome.json
@@ -87,7 +87,7 @@
       "!**/pnpm-lock.yaml",
       "!**/.next",
       "!**/public",
-      "!packages/react-email/src/actions/email-validation/caniemail-data.ts",
+      "!packages/preview-server/src/actions/email-validation/caniemail-data.ts",
       "!**/.react-email/**/*",
       "!**/node_modules/**/*",
       "!**/*.d.ts",
diff --git a/packages/preview-server/.gitignore b/packages/preview-server/.gitignore
new file mode 100644
index 0000000000..659fa846ed
--- /dev/null
+++ b/packages/preview-server/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+.next
+
+# for testing
+static
diff --git a/packages/preview-server/.npmignore b/packages/preview-server/.npmignore
new file mode 100644
index 0000000000..365b417e3c
--- /dev/null
+++ b/packages/preview-server/.npmignore
@@ -0,0 +1,5 @@
+.react-email
+./emails
+./emails/static
+node_modules
+.turbo
diff --git a/packages/preview-server/_index.js b/packages/preview-server/_index.js
new file mode 100644
index 0000000000..e3eb1b23d6
--- /dev/null
+++ b/packages/preview-server/_index.js
@@ -0,0 +1,4 @@
+/**
+ * this file is just a placeholder file so that import.meta.resolve and require.resolve can properly
+ * find out the path to this module. This file does not do anything nor does it need to export anything of value.
+ */
diff --git a/packages/preview-server/license.md b/packages/preview-server/license.md
new file mode 100644
index 0000000000..5058f53ebb
--- /dev/null
+++ b/packages/preview-server/license.md
@@ -0,0 +1,7 @@
+Copyright 2024 Plus Five Five, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/react-email/module-punycode.d.ts b/packages/preview-server/module-punycode.d.ts
similarity index 100%
rename from packages/react-email/module-punycode.d.ts
rename to packages/preview-server/module-punycode.d.ts
diff --git a/packages/react-email/next-env.d.ts b/packages/preview-server/next-env.d.ts
similarity index 100%
rename from packages/react-email/next-env.d.ts
rename to packages/preview-server/next-env.d.ts
diff --git a/packages/react-email/next.config.js b/packages/preview-server/next.config.js
similarity index 100%
rename from packages/react-email/next.config.js
rename to packages/preview-server/next.config.js
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
new file mode 100644
index 0000000000..e57564649b
--- /dev/null
+++ b/packages/preview-server/package.json
@@ -0,0 +1,82 @@
+{
+  "name": "@react-email/preview-server",
+  "version": "1.0.0-canary.0",
+  "description": "A live preview of your emails right in your browser.",
+  "scripts": {
+    "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
+    "clean": "rm -rf dist",
+    "build": "node ./scripts/build-preview-server.mjs",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "main": "./_index.js",
+  "dependencies": {
+    "@babel/core": "7.26.10",
+    "@babel/parser": "^7.27.0",
+    "@babel/traverse": "^7.27.0",
+    "@lottiefiles/dotlottie-react": "0.13.3",
+    "@radix-ui/colors": "3.0.0",
+    "@radix-ui/react-collapsible": "1.1.7",
+    "@radix-ui/react-dropdown-menu": "2.1.10",
+    "@radix-ui/react-popover": "1.1.10",
+    "@radix-ui/react-slot": "1.2.0",
+    "@radix-ui/react-tabs": "1.1.7",
+    "@radix-ui/react-toggle-group": "1.1.6",
+    "@radix-ui/react-tooltip": "1.2.3",
+    "@types/node": "22.14.1",
+    "@types/normalize-path": "3.0.2",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
+    "@types/webpack": "5.28.5",
+    "autoprefixer": "10.4.21",
+    "chalk": "^4.1.2",
+    "clsx": "2.1.1",
+    "esbuild": "^0.25.0",
+    "framer-motion": "12.7.5",
+    "json5": "2.2.3",
+    "log-symbols": "^4.1.0",
+    "module-punycode": "npm:punycode@2.3.1",
+    "next": "^15.2.4",
+    "node-html-parser": "7.0.1",
+    "ora": "^5.4.1",
+    "pretty-bytes": "6.1.1",
+    "prism-react-renderer": "2.4.1",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "sharp": "0.34.1",
+    "socket.io-client": "4.8.1",
+    "sonner": "2.0.3",
+    "source-map-js": "1.2.1",
+    "spamc": "0.0.5",
+    "stacktrace-parser": "0.1.11",
+    "tailwind-merge": "3.2.0",
+    "tailwindcss": "3.4.0",
+    "use-debounce": "10.0.4",
+    "zod": "3.24.3"
+  },
+  "devDependencies": {
+    "@react-email/components": "workspace:*",
+    "@types/babel__core": "7.20.5",
+    "@types/babel__traverse": "7.20.7",
+    "@types/fs-extra": "11.0.1",
+    "@types/mime-types": "2.1.4",
+    "@types/node": "22.10.2",
+    "@types/normalize-path": "3.0.2",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
+    "@types/webpack": "5.28.5",
+    "autoprefixer": "10.4.21",
+    "postcss": "8.5.3",
+    "tailwindcss": "3.4.0",
+    "typescript": "5.8.3"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/resend/react-email.git",
+    "directory": "packages/preview-server"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}
diff --git a/packages/react-email/postcss.config.js b/packages/preview-server/postcss.config.js
similarity index 100%
rename from packages/react-email/postcss.config.js
rename to packages/preview-server/postcss.config.js
diff --git a/packages/preview-server/scripts/build-preview-server.mjs b/packages/preview-server/scripts/build-preview-server.mjs
new file mode 100644
index 0000000000..36c0236651
--- /dev/null
+++ b/packages/preview-server/scripts/build-preview-server.mjs
@@ -0,0 +1,29 @@
+import { spawn } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
+
+const filename = url.fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+
+const nextBuildProcess = spawn('pnpm', ['next', 'build'], {
+  detached: true,
+  shell: true,
+  stdio: 'inherit',
+  cwd: path.resolve(dirname, '../'),
+});
+
+process.on('SIGINT', () => {
+  nextBuildProcess.kill('SIGINT');
+});
+
+nextBuildProcess.on('exit', (code) => {
+  if (code !== 0) {
+    console.error(`next build failed with exit code ${code}`);
+    process.exit(code);
+  }
+
+  fs.rmSync(path.resolve(dirname, '../.next/cache'), {
+    recursive: true,
+  });
+});
diff --git a/packages/react-email/scripts/fill-caniemail-data.mjs b/packages/preview-server/scripts/fill-caniemail-data.mjs
similarity index 100%
rename from packages/react-email/scripts/fill-caniemail-data.mjs
rename to packages/preview-server/scripts/fill-caniemail-data.mjs
diff --git a/packages/react-email/src/actions/email-validation/caniemail-data.ts b/packages/preview-server/src/actions/email-validation/caniemail-data.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/caniemail-data.ts
rename to packages/preview-server/src/actions/email-validation/caniemail-data.ts
diff --git a/packages/react-email/src/actions/email-validation/check-compatibility.ts b/packages/preview-server/src/actions/email-validation/check-compatibility.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/check-compatibility.ts
rename to packages/preview-server/src/actions/email-validation/check-compatibility.ts
diff --git a/packages/react-email/src/actions/email-validation/check-images.spec.tsx b/packages/preview-server/src/actions/email-validation/check-images.spec.tsx
similarity index 100%
rename from packages/react-email/src/actions/email-validation/check-images.spec.tsx
rename to packages/preview-server/src/actions/email-validation/check-images.spec.tsx
diff --git a/packages/react-email/src/actions/email-validation/check-images.ts b/packages/preview-server/src/actions/email-validation/check-images.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/check-images.ts
rename to packages/preview-server/src/actions/email-validation/check-images.ts
diff --git a/packages/react-email/src/actions/email-validation/check-links.spec.tsx b/packages/preview-server/src/actions/email-validation/check-links.spec.tsx
similarity index 100%
rename from packages/react-email/src/actions/email-validation/check-links.spec.tsx
rename to packages/preview-server/src/actions/email-validation/check-links.spec.tsx
diff --git a/packages/react-email/src/actions/email-validation/check-links.ts b/packages/preview-server/src/actions/email-validation/check-links.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/check-links.ts
rename to packages/preview-server/src/actions/email-validation/check-links.ts
diff --git a/packages/react-email/src/actions/email-validation/get-code-location-from-ast-element.ts b/packages/preview-server/src/actions/email-validation/get-code-location-from-ast-element.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/get-code-location-from-ast-element.ts
rename to packages/preview-server/src/actions/email-validation/get-code-location-from-ast-element.ts
diff --git a/packages/react-email/src/actions/email-validation/quick-fetch.ts b/packages/preview-server/src/actions/email-validation/quick-fetch.ts
similarity index 100%
rename from packages/react-email/src/actions/email-validation/quick-fetch.ts
rename to packages/preview-server/src/actions/email-validation/quick-fetch.ts
diff --git a/packages/react-email/src/actions/get-email-path-from-slug.ts b/packages/preview-server/src/actions/get-email-path-from-slug.ts
similarity index 100%
rename from packages/react-email/src/actions/get-email-path-from-slug.ts
rename to packages/preview-server/src/actions/get-email-path-from-slug.ts
diff --git a/packages/react-email/src/actions/get-emails-directory-metadata-action.ts b/packages/preview-server/src/actions/get-emails-directory-metadata-action.ts
similarity index 100%
rename from packages/react-email/src/actions/get-emails-directory-metadata-action.ts
rename to packages/preview-server/src/actions/get-emails-directory-metadata-action.ts
diff --git a/packages/react-email/src/actions/render-email-by-path.tsx b/packages/preview-server/src/actions/render-email-by-path.tsx
similarity index 100%
rename from packages/react-email/src/actions/render-email-by-path.tsx
rename to packages/preview-server/src/actions/render-email-by-path.tsx
diff --git a/packages/react-email/src/animated-icons-data/help.json b/packages/preview-server/src/animated-icons-data/help.json
similarity index 100%
rename from packages/react-email/src/animated-icons-data/help.json
rename to packages/preview-server/src/animated-icons-data/help.json
diff --git a/packages/react-email/src/animated-icons-data/link.json b/packages/preview-server/src/animated-icons-data/link.json
similarity index 100%
rename from packages/react-email/src/animated-icons-data/link.json
rename to packages/preview-server/src/animated-icons-data/link.json
diff --git a/packages/react-email/src/animated-icons-data/load.json b/packages/preview-server/src/animated-icons-data/load.json
similarity index 100%
rename from packages/react-email/src/animated-icons-data/load.json
rename to packages/preview-server/src/animated-icons-data/load.json
diff --git a/packages/react-email/src/animated-icons-data/mail.json b/packages/preview-server/src/animated-icons-data/mail.json
similarity index 100%
rename from packages/react-email/src/animated-icons-data/mail.json
rename to packages/preview-server/src/animated-icons-data/mail.json
diff --git a/packages/react-email/src/app/env.ts b/packages/preview-server/src/app/env.ts
similarity index 100%
rename from packages/react-email/src/app/env.ts
rename to packages/preview-server/src/app/env.ts
diff --git a/packages/react-email/src/app/favicon.ico b/packages/preview-server/src/app/favicon.ico
similarity index 100%
rename from packages/react-email/src/app/favicon.ico
rename to packages/preview-server/src/app/favicon.ico
diff --git a/packages/react-email/src/app/fonts.ts b/packages/preview-server/src/app/fonts.ts
similarity index 100%
rename from packages/react-email/src/app/fonts.ts
rename to packages/preview-server/src/app/fonts.ts
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoBold.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoBold.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoBold.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoBold.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoBoldItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoBoldItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoBoldItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoBoldItalic.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoHeavy.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoHeavy.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoHeavy.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoHeavy.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoHeavyItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoHeavyItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoHeavyItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoHeavyItalic.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoLight.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoLight.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoLight.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoLight.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoLightItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoLightItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoLightItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoLightItalic.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoMedium.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoMedium.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoMedium.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoMedium.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoMediumItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoMediumItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoMediumItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoMediumItalic.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoRegular.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoRegular.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoRegular.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoRegular.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoRegularItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoRegularItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoRegularItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoRegularItalic.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoSemibold.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoSemibold.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoSemibold.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoSemibold.otf
diff --git a/packages/react-email/src/app/fonts/SFMono/SFMonoSemiboldItalic.otf b/packages/preview-server/src/app/fonts/SFMono/SFMonoSemiboldItalic.otf
similarity index 100%
rename from packages/react-email/src/app/fonts/SFMono/SFMonoSemiboldItalic.otf
rename to packages/preview-server/src/app/fonts/SFMono/SFMonoSemiboldItalic.otf
diff --git a/packages/react-email/src/app/globals.css b/packages/preview-server/src/app/globals.css
similarity index 100%
rename from packages/react-email/src/app/globals.css
rename to packages/preview-server/src/app/globals.css
diff --git a/packages/react-email/src/app/layout.tsx b/packages/preview-server/src/app/layout.tsx
similarity index 100%
rename from packages/react-email/src/app/layout.tsx
rename to packages/preview-server/src/app/layout.tsx
diff --git a/packages/react-email/src/app/logo.png b/packages/preview-server/src/app/logo.png
similarity index 100%
rename from packages/react-email/src/app/logo.png
rename to packages/preview-server/src/app/logo.png
diff --git a/packages/react-email/src/app/page.tsx b/packages/preview-server/src/app/page.tsx
similarity index 100%
rename from packages/react-email/src/app/page.tsx
rename to packages/preview-server/src/app/page.tsx
diff --git a/packages/react-email/src/app/preview/[...slug]/page.tsx b/packages/preview-server/src/app/preview/[...slug]/page.tsx
similarity index 100%
rename from packages/react-email/src/app/preview/[...slug]/page.tsx
rename to packages/preview-server/src/app/preview/[...slug]/page.tsx
diff --git a/packages/react-email/src/app/preview/[...slug]/preview.tsx b/packages/preview-server/src/app/preview/[...slug]/preview.tsx
similarity index 100%
rename from packages/react-email/src/app/preview/[...slug]/preview.tsx
rename to packages/preview-server/src/app/preview/[...slug]/preview.tsx
diff --git a/packages/react-email/src/app/preview/[...slug]/rendering-error.tsx b/packages/preview-server/src/app/preview/[...slug]/rendering-error.tsx
similarity index 100%
rename from packages/react-email/src/app/preview/[...slug]/rendering-error.tsx
rename to packages/preview-server/src/app/preview/[...slug]/rendering-error.tsx
diff --git a/packages/react-email/src/components/button.tsx b/packages/preview-server/src/components/button.tsx
similarity index 100%
rename from packages/react-email/src/components/button.tsx
rename to packages/preview-server/src/components/button.tsx
diff --git a/packages/react-email/src/components/code-container.tsx b/packages/preview-server/src/components/code-container.tsx
similarity index 100%
rename from packages/react-email/src/components/code-container.tsx
rename to packages/preview-server/src/components/code-container.tsx
diff --git a/packages/react-email/src/components/code-snippet.tsx b/packages/preview-server/src/components/code-snippet.tsx
similarity index 100%
rename from packages/react-email/src/components/code-snippet.tsx
rename to packages/preview-server/src/components/code-snippet.tsx
diff --git a/packages/react-email/src/components/code.tsx b/packages/preview-server/src/components/code.tsx
similarity index 100%
rename from packages/react-email/src/components/code.tsx
rename to packages/preview-server/src/components/code.tsx
diff --git a/packages/react-email/src/components/heading.tsx b/packages/preview-server/src/components/heading.tsx
similarity index 100%
rename from packages/react-email/src/components/heading.tsx
rename to packages/preview-server/src/components/heading.tsx
diff --git a/packages/react-email/src/components/icons/icon-arrow-down.tsx b/packages/preview-server/src/components/icons/icon-arrow-down.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-arrow-down.tsx
rename to packages/preview-server/src/components/icons/icon-arrow-down.tsx
diff --git a/packages/react-email/src/components/icons/icon-base.tsx b/packages/preview-server/src/components/icons/icon-base.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-base.tsx
rename to packages/preview-server/src/components/icons/icon-base.tsx
diff --git a/packages/react-email/src/components/icons/icon-bug.tsx b/packages/preview-server/src/components/icons/icon-bug.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-bug.tsx
rename to packages/preview-server/src/components/icons/icon-bug.tsx
diff --git a/packages/react-email/src/components/icons/icon-button.tsx b/packages/preview-server/src/components/icons/icon-button.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-button.tsx
rename to packages/preview-server/src/components/icons/icon-button.tsx
diff --git a/packages/react-email/src/components/icons/icon-check.tsx b/packages/preview-server/src/components/icons/icon-check.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-check.tsx
rename to packages/preview-server/src/components/icons/icon-check.tsx
diff --git a/packages/react-email/src/components/icons/icon-clipboard.tsx b/packages/preview-server/src/components/icons/icon-clipboard.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-clipboard.tsx
rename to packages/preview-server/src/components/icons/icon-clipboard.tsx
diff --git a/packages/react-email/src/components/icons/icon-download.tsx b/packages/preview-server/src/components/icons/icon-download.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-download.tsx
rename to packages/preview-server/src/components/icons/icon-download.tsx
diff --git a/packages/react-email/src/components/icons/icon-email.tsx b/packages/preview-server/src/components/icons/icon-email.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-email.tsx
rename to packages/preview-server/src/components/icons/icon-email.tsx
diff --git a/packages/react-email/src/components/icons/icon-file.tsx b/packages/preview-server/src/components/icons/icon-file.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-file.tsx
rename to packages/preview-server/src/components/icons/icon-file.tsx
diff --git a/packages/react-email/src/components/icons/icon-folder-open.tsx b/packages/preview-server/src/components/icons/icon-folder-open.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-folder-open.tsx
rename to packages/preview-server/src/components/icons/icon-folder-open.tsx
diff --git a/packages/react-email/src/components/icons/icon-folder.tsx b/packages/preview-server/src/components/icons/icon-folder.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-folder.tsx
rename to packages/preview-server/src/components/icons/icon-folder.tsx
diff --git a/packages/react-email/src/components/icons/icon-hide-sidebar.tsx b/packages/preview-server/src/components/icons/icon-hide-sidebar.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-hide-sidebar.tsx
rename to packages/preview-server/src/components/icons/icon-hide-sidebar.tsx
diff --git a/packages/react-email/src/components/icons/icon-image.tsx b/packages/preview-server/src/components/icons/icon-image.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-image.tsx
rename to packages/preview-server/src/components/icons/icon-image.tsx
diff --git a/packages/react-email/src/components/icons/icon-info.tsx b/packages/preview-server/src/components/icons/icon-info.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-info.tsx
rename to packages/preview-server/src/components/icons/icon-info.tsx
diff --git a/packages/react-email/src/components/icons/icon-link.tsx b/packages/preview-server/src/components/icons/icon-link.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-link.tsx
rename to packages/preview-server/src/components/icons/icon-link.tsx
diff --git a/packages/react-email/src/components/icons/icon-monitor.tsx b/packages/preview-server/src/components/icons/icon-monitor.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-monitor.tsx
rename to packages/preview-server/src/components/icons/icon-monitor.tsx
diff --git a/packages/react-email/src/components/icons/icon-phone.tsx b/packages/preview-server/src/components/icons/icon-phone.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-phone.tsx
rename to packages/preview-server/src/components/icons/icon-phone.tsx
diff --git a/packages/react-email/src/components/icons/icon-reload.tsx b/packages/preview-server/src/components/icons/icon-reload.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-reload.tsx
rename to packages/preview-server/src/components/icons/icon-reload.tsx
diff --git a/packages/react-email/src/components/icons/icon-source.tsx b/packages/preview-server/src/components/icons/icon-source.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-source.tsx
rename to packages/preview-server/src/components/icons/icon-source.tsx
diff --git a/packages/react-email/src/components/icons/icon-stamp.tsx b/packages/preview-server/src/components/icons/icon-stamp.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-stamp.tsx
rename to packages/preview-server/src/components/icons/icon-stamp.tsx
diff --git a/packages/react-email/src/components/icons/icon-warning.tsx b/packages/preview-server/src/components/icons/icon-warning.tsx
similarity index 100%
rename from packages/react-email/src/components/icons/icon-warning.tsx
rename to packages/preview-server/src/components/icons/icon-warning.tsx
diff --git a/packages/react-email/src/components/index.ts b/packages/preview-server/src/components/index.ts
similarity index 100%
rename from packages/react-email/src/components/index.ts
rename to packages/preview-server/src/components/index.ts
diff --git a/packages/react-email/src/components/logo.tsx b/packages/preview-server/src/components/logo.tsx
similarity index 100%
rename from packages/react-email/src/components/logo.tsx
rename to packages/preview-server/src/components/logo.tsx
diff --git a/packages/react-email/src/components/resizable-wrapper.tsx b/packages/preview-server/src/components/resizable-wrapper.tsx
similarity index 100%
rename from packages/react-email/src/components/resizable-wrapper.tsx
rename to packages/preview-server/src/components/resizable-wrapper.tsx
diff --git a/packages/react-email/src/components/send.tsx b/packages/preview-server/src/components/send.tsx
similarity index 100%
rename from packages/react-email/src/components/send.tsx
rename to packages/preview-server/src/components/send.tsx
diff --git a/packages/react-email/src/components/shell.tsx b/packages/preview-server/src/components/shell.tsx
similarity index 100%
rename from packages/react-email/src/components/shell.tsx
rename to packages/preview-server/src/components/shell.tsx
diff --git a/packages/react-email/src/components/sidebar/file-tree-directory-children.tsx b/packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx
similarity index 100%
rename from packages/react-email/src/components/sidebar/file-tree-directory-children.tsx
rename to packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx
diff --git a/packages/react-email/src/components/sidebar/file-tree-directory.tsx b/packages/preview-server/src/components/sidebar/file-tree-directory.tsx
similarity index 100%
rename from packages/react-email/src/components/sidebar/file-tree-directory.tsx
rename to packages/preview-server/src/components/sidebar/file-tree-directory.tsx
diff --git a/packages/react-email/src/components/sidebar/file-tree.tsx b/packages/preview-server/src/components/sidebar/file-tree.tsx
similarity index 100%
rename from packages/react-email/src/components/sidebar/file-tree.tsx
rename to packages/preview-server/src/components/sidebar/file-tree.tsx
diff --git a/packages/react-email/src/components/sidebar/index.ts b/packages/preview-server/src/components/sidebar/index.ts
similarity index 100%
rename from packages/react-email/src/components/sidebar/index.ts
rename to packages/preview-server/src/components/sidebar/index.ts
diff --git a/packages/react-email/src/components/sidebar/sidebar.tsx b/packages/preview-server/src/components/sidebar/sidebar.tsx
similarity index 100%
rename from packages/react-email/src/components/sidebar/sidebar.tsx
rename to packages/preview-server/src/components/sidebar/sidebar.tsx
diff --git a/packages/react-email/src/components/text.tsx b/packages/preview-server/src/components/text.tsx
similarity index 100%
rename from packages/react-email/src/components/text.tsx
rename to packages/preview-server/src/components/text.tsx
diff --git a/packages/react-email/src/components/toolbar.tsx b/packages/preview-server/src/components/toolbar.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar.tsx
rename to packages/preview-server/src/components/toolbar.tsx
diff --git a/packages/react-email/src/components/toolbar/checking-results.tsx b/packages/preview-server/src/components/toolbar/checking-results.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/checking-results.tsx
rename to packages/preview-server/src/components/toolbar/checking-results.tsx
diff --git a/packages/react-email/src/components/toolbar/code-preview-line-link.tsx b/packages/preview-server/src/components/toolbar/code-preview-line-link.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/code-preview-line-link.tsx
rename to packages/preview-server/src/components/toolbar/code-preview-line-link.tsx
diff --git a/packages/react-email/src/components/toolbar/compatibility.tsx b/packages/preview-server/src/components/toolbar/compatibility.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/compatibility.tsx
rename to packages/preview-server/src/components/toolbar/compatibility.tsx
diff --git a/packages/react-email/src/components/toolbar/linter.tsx b/packages/preview-server/src/components/toolbar/linter.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/linter.tsx
rename to packages/preview-server/src/components/toolbar/linter.tsx
diff --git a/packages/react-email/src/components/toolbar/results-table.tsx b/packages/preview-server/src/components/toolbar/results-table.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/results-table.tsx
rename to packages/preview-server/src/components/toolbar/results-table.tsx
diff --git a/packages/react-email/src/components/toolbar/results.tsx b/packages/preview-server/src/components/toolbar/results.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/results.tsx
rename to packages/preview-server/src/components/toolbar/results.tsx
diff --git a/packages/react-email/src/components/toolbar/spam-assassin.tsx b/packages/preview-server/src/components/toolbar/spam-assassin.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/spam-assassin.tsx
rename to packages/preview-server/src/components/toolbar/spam-assassin.tsx
diff --git a/packages/react-email/src/components/toolbar/toolbar-button.tsx b/packages/preview-server/src/components/toolbar/toolbar-button.tsx
similarity index 100%
rename from packages/react-email/src/components/toolbar/toolbar-button.tsx
rename to packages/preview-server/src/components/toolbar/toolbar-button.tsx
diff --git a/packages/react-email/src/components/toolbar/use-cached-state.ts b/packages/preview-server/src/components/toolbar/use-cached-state.ts
similarity index 100%
rename from packages/react-email/src/components/toolbar/use-cached-state.ts
rename to packages/preview-server/src/components/toolbar/use-cached-state.ts
diff --git a/packages/react-email/src/components/tooltip-content.tsx b/packages/preview-server/src/components/tooltip-content.tsx
similarity index 100%
rename from packages/react-email/src/components/tooltip-content.tsx
rename to packages/preview-server/src/components/tooltip-content.tsx
diff --git a/packages/react-email/src/components/tooltip.tsx b/packages/preview-server/src/components/tooltip.tsx
similarity index 100%
rename from packages/react-email/src/components/tooltip.tsx
rename to packages/preview-server/src/components/tooltip.tsx
diff --git a/packages/react-email/src/components/topbar.tsx b/packages/preview-server/src/components/topbar.tsx
similarity index 100%
rename from packages/react-email/src/components/topbar.tsx
rename to packages/preview-server/src/components/topbar.tsx
diff --git a/packages/react-email/src/components/topbar/active-view-toggle-group.tsx b/packages/preview-server/src/components/topbar/active-view-toggle-group.tsx
similarity index 100%
rename from packages/react-email/src/components/topbar/active-view-toggle-group.tsx
rename to packages/preview-server/src/components/topbar/active-view-toggle-group.tsx
diff --git a/packages/react-email/src/components/topbar/view-size-controls.tsx b/packages/preview-server/src/components/topbar/view-size-controls.tsx
similarity index 100%
rename from packages/react-email/src/components/topbar/view-size-controls.tsx
rename to packages/preview-server/src/components/topbar/view-size-controls.tsx
diff --git a/packages/react-email/src/contexts/emails.tsx b/packages/preview-server/src/contexts/emails.tsx
similarity index 100%
rename from packages/react-email/src/contexts/emails.tsx
rename to packages/preview-server/src/contexts/emails.tsx
diff --git a/packages/react-email/src/contexts/fragment-identifier.tsx b/packages/preview-server/src/contexts/fragment-identifier.tsx
similarity index 100%
rename from packages/react-email/src/contexts/fragment-identifier.tsx
rename to packages/preview-server/src/contexts/fragment-identifier.tsx
diff --git a/packages/react-email/src/contexts/preview.tsx b/packages/preview-server/src/contexts/preview.tsx
similarity index 100%
rename from packages/react-email/src/contexts/preview.tsx
rename to packages/preview-server/src/contexts/preview.tsx
diff --git a/packages/react-email/src/hooks/use-clamped-state.ts b/packages/preview-server/src/hooks/use-clamped-state.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-clamped-state.ts
rename to packages/preview-server/src/hooks/use-clamped-state.ts
diff --git a/packages/react-email/src/hooks/use-email-rendering-result.ts b/packages/preview-server/src/hooks/use-email-rendering-result.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-email-rendering-result.ts
rename to packages/preview-server/src/hooks/use-email-rendering-result.ts
diff --git a/packages/react-email/src/hooks/use-fragment-identifier.ts b/packages/preview-server/src/hooks/use-fragment-identifier.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-fragment-identifier.ts
rename to packages/preview-server/src/hooks/use-fragment-identifier.ts
diff --git a/packages/react-email/src/hooks/use-hot-reload.ts b/packages/preview-server/src/hooks/use-hot-reload.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-hot-reload.ts
rename to packages/preview-server/src/hooks/use-hot-reload.ts
diff --git a/packages/react-email/src/hooks/use-icon-animation.ts b/packages/preview-server/src/hooks/use-icon-animation.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-icon-animation.ts
rename to packages/preview-server/src/hooks/use-icon-animation.ts
diff --git a/packages/react-email/src/hooks/use-rendering-metadata.ts b/packages/preview-server/src/hooks/use-rendering-metadata.ts
similarity index 100%
rename from packages/react-email/src/hooks/use-rendering-metadata.ts
rename to packages/preview-server/src/hooks/use-rendering-metadata.ts
diff --git a/packages/react-email/src/utils/__snapshots__/get-email-component.spec.ts.snap b/packages/preview-server/src/utils/__snapshots__/get-email-component.spec.ts.snap
similarity index 100%
rename from packages/react-email/src/utils/__snapshots__/get-email-component.spec.ts.snap
rename to packages/preview-server/src/utils/__snapshots__/get-email-component.spec.ts.snap
diff --git a/packages/react-email/src/utils/caniemail/all-css-properties.ts b/packages/preview-server/src/utils/caniemail/all-css-properties.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/all-css-properties.ts
rename to packages/preview-server/src/utils/caniemail/all-css-properties.ts
diff --git a/packages/react-email/src/utils/caniemail/ast/__snapshots__/get-object-variables.spec.ts.snap b/packages/preview-server/src/utils/caniemail/ast/__snapshots__/get-object-variables.spec.ts.snap
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/__snapshots__/get-object-variables.spec.ts.snap
rename to packages/preview-server/src/utils/caniemail/ast/__snapshots__/get-object-variables.spec.ts.snap
diff --git a/packages/react-email/src/utils/caniemail/ast/__snapshots__/get-used-style-properties.spec.ts.snap b/packages/preview-server/src/utils/caniemail/ast/__snapshots__/get-used-style-properties.spec.ts.snap
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/__snapshots__/get-used-style-properties.spec.ts.snap
rename to packages/preview-server/src/utils/caniemail/ast/__snapshots__/get-used-style-properties.spec.ts.snap
diff --git a/packages/react-email/src/utils/caniemail/ast/get-object-variables.spec.ts b/packages/preview-server/src/utils/caniemail/ast/get-object-variables.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/get-object-variables.spec.ts
rename to packages/preview-server/src/utils/caniemail/ast/get-object-variables.spec.ts
diff --git a/packages/react-email/src/utils/caniemail/ast/get-object-variables.ts b/packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/get-object-variables.ts
rename to packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts
diff --git a/packages/react-email/src/utils/caniemail/ast/get-used-style-properties.spec.ts b/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/get-used-style-properties.spec.ts
rename to packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.spec.ts
diff --git a/packages/react-email/src/utils/caniemail/ast/get-used-style-properties.ts b/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/ast/get-used-style-properties.ts
rename to packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts
diff --git a/packages/react-email/src/utils/caniemail/get-compatibility-stats-for-entry.ts b/packages/preview-server/src/utils/caniemail/get-compatibility-stats-for-entry.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-compatibility-stats-for-entry.ts
rename to packages/preview-server/src/utils/caniemail/get-compatibility-stats-for-entry.ts
diff --git a/packages/react-email/src/utils/caniemail/get-css-functions.ts b/packages/preview-server/src/utils/caniemail/get-css-functions.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-css-functions.ts
rename to packages/preview-server/src/utils/caniemail/get-css-functions.ts
diff --git a/packages/react-email/src/utils/caniemail/get-css-property-names.ts b/packages/preview-server/src/utils/caniemail/get-css-property-names.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-css-property-names.ts
rename to packages/preview-server/src/utils/caniemail/get-css-property-names.ts
diff --git a/packages/react-email/src/utils/caniemail/get-css-property-with-value.ts b/packages/preview-server/src/utils/caniemail/get-css-property-with-value.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-css-property-with-value.ts
rename to packages/preview-server/src/utils/caniemail/get-css-property-with-value.ts
diff --git a/packages/react-email/src/utils/caniemail/get-css-unit.ts b/packages/preview-server/src/utils/caniemail/get-css-unit.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-css-unit.ts
rename to packages/preview-server/src/utils/caniemail/get-css-unit.ts
diff --git a/packages/react-email/src/utils/caniemail/get-element-attributes.ts b/packages/preview-server/src/utils/caniemail/get-element-attributes.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-element-attributes.ts
rename to packages/preview-server/src/utils/caniemail/get-element-attributes.ts
diff --git a/packages/react-email/src/utils/caniemail/get-element-names.ts b/packages/preview-server/src/utils/caniemail/get-element-names.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/get-element-names.ts
rename to packages/preview-server/src/utils/caniemail/get-element-names.ts
diff --git a/packages/react-email/src/utils/caniemail/tailwind/generate-tailwind-rules.ts b/packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
rename to packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
diff --git a/packages/react-email/src/utils/caniemail/tailwind/get-tailwind-config.ts b/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/tailwind/get-tailwind-config.ts
rename to packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts
diff --git a/packages/react-email/src/utils/caniemail/tailwind/get-tailwind-metadata.spec.ts b/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-metadata.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/tailwind/get-tailwind-metadata.spec.ts
rename to packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-metadata.spec.ts
diff --git a/packages/react-email/src/utils/caniemail/tailwind/get-tailwind-metadata.ts b/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-metadata.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/tailwind/get-tailwind-metadata.ts
rename to packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-metadata.ts
diff --git a/packages/react-email/src/utils/caniemail/tailwind/setup-tailwind-context.ts b/packages/preview-server/src/utils/caniemail/tailwind/setup-tailwind-context.ts
similarity index 100%
rename from packages/react-email/src/utils/caniemail/tailwind/setup-tailwind-context.ts
rename to packages/preview-server/src/utils/caniemail/tailwind/setup-tailwind-context.ts
diff --git a/packages/react-email/src/utils/cn.ts b/packages/preview-server/src/utils/cn.ts
similarity index 100%
rename from packages/react-email/src/utils/cn.ts
rename to packages/preview-server/src/utils/cn.ts
diff --git a/packages/react-email/src/utils/constants.ts b/packages/preview-server/src/utils/constants.ts
similarity index 100%
rename from packages/react-email/src/utils/constants.ts
rename to packages/preview-server/src/utils/constants.ts
diff --git a/packages/react-email/src/utils/contains-email-template.spec.ts b/packages/preview-server/src/utils/contains-email-template.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/contains-email-template.spec.ts
rename to packages/preview-server/src/utils/contains-email-template.spec.ts
diff --git a/packages/react-email/src/utils/contains-email-template.ts b/packages/preview-server/src/utils/contains-email-template.ts
similarity index 100%
rename from packages/react-email/src/utils/contains-email-template.ts
rename to packages/preview-server/src/utils/contains-email-template.ts
diff --git a/packages/react-email/src/utils/copy-text-to-clipboard.ts b/packages/preview-server/src/utils/copy-text-to-clipboard.ts
similarity index 100%
rename from packages/react-email/src/utils/copy-text-to-clipboard.ts
rename to packages/preview-server/src/utils/copy-text-to-clipboard.ts
diff --git a/packages/preview-server/src/utils/esbuild/escape-string-for-regex.ts b/packages/preview-server/src/utils/esbuild/escape-string-for-regex.ts
new file mode 100644
index 0000000000..71d343cd9a
--- /dev/null
+++ b/packages/preview-server/src/utils/esbuild/escape-string-for-regex.ts
@@ -0,0 +1,3 @@
+export function escapeStringForRegex(string: string) {
+  return string.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d');
+}
diff --git a/packages/preview-server/src/utils/esbuild/renderring-utilities-exporter.ts b/packages/preview-server/src/utils/esbuild/renderring-utilities-exporter.ts
new file mode 100644
index 0000000000..4856b15577
--- /dev/null
+++ b/packages/preview-server/src/utils/esbuild/renderring-utilities-exporter.ts
@@ -0,0 +1,63 @@
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import type { Loader, PluginBuild, ResolveOptions } from 'esbuild';
+import { escapeStringForRegex } from './escape-string-for-regex';
+
+/**
+ * Made to export the `render` function out of the user's email template
+ * so that issues like https://github.com/resend/react-email/issues/649 don't
+ * happen.
+ *
+ * This also exports the `createElement` from the user's React version as well
+ * to avoid mismatches.
+ *
+ * This avoids multiple versions of React being involved, i.e., the version
+ * in the CLI vs. the version the user has on their emails.
+ */
+export const renderingUtilitiesExporter = (emailTemplates: string[]) => ({
+  name: 'rendering-utilities-exporter',
+  setup: (b: PluginBuild) => {
+    b.onLoad(
+      {
+        filter: new RegExp(
+          emailTemplates
+            .map((emailPath) => escapeStringForRegex(emailPath))
+            .join('|'),
+        ),
+      },
+      async ({ path: pathToFile }) => {
+        return {
+          contents: `${await fs.readFile(pathToFile, 'utf8')};
+          export { render } from 'react-email-module-that-will-export-render'
+          export { createElement as reactEmailCreateReactElement } from 'react';
+        `,
+          loader: path.extname(pathToFile).slice(1) as Loader,
+        };
+      },
+    );
+
+    b.onResolve(
+      { filter: /^react-email-module-that-will-export-render$/ },
+      async (args) => {
+        const options: ResolveOptions = {
+          kind: 'import-statement',
+          importer: args.importer,
+          resolveDir: args.resolveDir,
+          namespace: args.namespace,
+        };
+        let result = await b.resolve('@react-email/render', options);
+        if (result.errors.length === 0) {
+          return result;
+        }
+
+        // If @react-email/render does not exist, resolve to @react-email/components
+        result = await b.resolve('@react-email/components', options);
+        if (result.errors.length > 0 && result.errors[0]) {
+          result.errors[0].text =
+            "Failed trying to import `render` from either `@react-email/render` or `@react-email/components` to be able to render your email template.\n Maybe you don't have either of them installed?";
+        }
+        return result;
+      },
+    );
+  },
+});
diff --git a/packages/react-email/src/utils/get-email-component.spec.ts b/packages/preview-server/src/utils/get-email-component.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/get-email-component.spec.ts
rename to packages/preview-server/src/utils/get-email-component.spec.ts
diff --git a/packages/react-email/src/utils/get-email-component.ts b/packages/preview-server/src/utils/get-email-component.ts
similarity index 100%
rename from packages/react-email/src/utils/get-email-component.ts
rename to packages/preview-server/src/utils/get-email-component.ts
diff --git a/packages/preview-server/src/utils/get-emails-directory-metadata.spec.ts b/packages/preview-server/src/utils/get-emails-directory-metadata.spec.ts
new file mode 100644
index 0000000000..1f7aaae36b
--- /dev/null
+++ b/packages/preview-server/src/utils/get-emails-directory-metadata.spec.ts
@@ -0,0 +1,82 @@
+import path from 'node:path';
+import { getEmailsDirectoryMetadata } from './get-emails-directory-metadata';
+
+test('getEmailsDirectoryMetadata on demo emails', async () => {
+  const emailsDirectoryPath = path.resolve(
+    __dirname,
+    '../../../../apps/demo/emails',
+  );
+  expect(await getEmailsDirectoryMetadata(emailsDirectoryPath)).toEqual({
+    absolutePath: emailsDirectoryPath,
+    directoryName: 'emails',
+    relativePath: '',
+    emailFilenames: [],
+    subDirectories: [
+      {
+        absolutePath: `${emailsDirectoryPath}/magic-links`,
+        directoryName: 'magic-links',
+        relativePath: 'magic-links',
+        emailFilenames: [
+          'aws-verify-email',
+          'linear-login-code',
+          'notion-magic-link',
+          'plaid-verify-identity',
+          'raycast-magic-link',
+          'slack-confirm',
+        ],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/newsletters`,
+        directoryName: 'newsletters',
+        relativePath: 'newsletters',
+        emailFilenames: [
+          'codepen-challengers',
+          'google-play-policy-update',
+          'stack-overflow-tips',
+        ],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/notifications`,
+        directoryName: 'notifications',
+        relativePath: 'notifications',
+        emailFilenames: [
+          'github-access-token',
+          'papermark-year-in-review',
+          'vercel-invite-user',
+          'yelp-recent-login',
+        ],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/receipts`,
+        directoryName: 'receipts',
+        relativePath: 'receipts',
+        emailFilenames: ['apple-receipt', 'nike-receipt'],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/reset-password`,
+        directoryName: 'reset-password',
+        relativePath: 'reset-password',
+        emailFilenames: ['dropbox-reset-password', 'twitch-reset-password'],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/reviews`,
+        directoryName: 'reviews',
+        relativePath: 'reviews',
+        emailFilenames: ['airbnb-review', 'amazon-review'],
+        subDirectories: [],
+      },
+      {
+        absolutePath: `${emailsDirectoryPath}/welcome`,
+        directoryName: 'welcome',
+        relativePath: 'welcome',
+        emailFilenames: ['koala-welcome', 'netlify-welcome', 'stripe-welcome'],
+        subDirectories: [],
+      },
+    ],
+  });
+});
diff --git a/packages/preview-server/src/utils/get-emails-directory-metadata.ts b/packages/preview-server/src/utils/get-emails-directory-metadata.ts
new file mode 100644
index 0000000000..939f71f895
--- /dev/null
+++ b/packages/preview-server/src/utils/get-emails-directory-metadata.ts
@@ -0,0 +1,141 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import fs from 'node:fs';
+import path from 'node:path';
+
+const isFileAnEmail = async (fullPath: string): Promise<boolean> => {
+  let fileHandle: fs.promises.FileHandle;
+  try {
+    fileHandle = await fs.promises.open(fullPath, 'r');
+  } catch (exception) {
+    console.warn(exception);
+    return false;
+  }
+  const stat = await fileHandle.stat();
+
+  if (stat.isDirectory()) {
+    await fileHandle.close();
+    return false;
+  }
+
+  const { ext } = path.parse(fullPath);
+
+  if (!['.js', '.tsx', '.jsx'].includes(ext)) {
+    await fileHandle.close();
+    return false;
+  }
+
+  // check with a heuristic to see if the file has at least
+  // a default export (ES6) or module.exports (CommonJS) or named exports (MDX)
+  const fileContents = await fileHandle.readFile('utf8');
+
+  await fileHandle.close();
+
+  // Check for ES6 export default syntax
+  const hasES6DefaultExport = /\bexport\s+default\b/gm.test(fileContents);
+
+  // Check for CommonJS module.exports syntax
+  const hasCommonJSExport = /\bmodule\.exports\s*=/gm.test(fileContents);
+
+  // Check for named exports (used in MDX files) and ensure at least one is marked as default
+  const hasNamedExport = /\bexport\s+\{[^}]*\bdefault\b[^}]*\}/gm.test(
+    fileContents,
+  );
+
+  return hasES6DefaultExport || hasCommonJSExport || hasNamedExport;
+};
+
+export interface EmailsDirectory {
+  absolutePath: string;
+  relativePath: string;
+  directoryName: string;
+  emailFilenames: string[];
+  subDirectories: EmailsDirectory[];
+}
+
+const mergeDirectoriesWithSubDirectories = (
+  emailsDirectoryMetadata: EmailsDirectory,
+): EmailsDirectory => {
+  let currentResultingMergedDirectory: EmailsDirectory =
+    emailsDirectoryMetadata;
+
+  while (
+    currentResultingMergedDirectory.emailFilenames.length === 0 &&
+    currentResultingMergedDirectory.subDirectories.length === 1
+  ) {
+    const onlySubDirectory = currentResultingMergedDirectory.subDirectories[0]!;
+    currentResultingMergedDirectory = {
+      ...onlySubDirectory,
+      directoryName: path.join(
+        currentResultingMergedDirectory.directoryName,
+        onlySubDirectory.directoryName,
+      ),
+    };
+  }
+
+  return currentResultingMergedDirectory;
+};
+
+export const getEmailsDirectoryMetadata = async (
+  absolutePathToEmailsDirectory: string,
+  keepFileExtensions = false,
+  isSubDirectory = false,
+
+  baseDirectoryPath = absolutePathToEmailsDirectory,
+): Promise<EmailsDirectory | undefined> => {
+  if (!fs.existsSync(absolutePathToEmailsDirectory)) return;
+
+  const dirents = await fs.promises.readdir(absolutePathToEmailsDirectory, {
+    withFileTypes: true,
+  });
+
+  const isEmailPredicates = await Promise.all(
+    dirents.map((dirent) =>
+      isFileAnEmail(path.join(absolutePathToEmailsDirectory, dirent.name)),
+    ),
+  );
+  const emailFilenames = dirents
+    .filter((_, i) => isEmailPredicates[i])
+    .map((dirent) =>
+      keepFileExtensions
+        ? dirent.name
+        : dirent.name.replace(path.extname(dirent.name), ''),
+    );
+
+  const subDirectories = await Promise.all(
+    dirents
+      .filter(
+        (dirent) =>
+          dirent.isDirectory() &&
+          !dirent.name.startsWith('_') &&
+          dirent.name !== 'static',
+      )
+      .map((dirent) => {
+        const direntAbsolutePath = path.join(
+          absolutePathToEmailsDirectory,
+          dirent.name,
+        );
+
+        return getEmailsDirectoryMetadata(
+          direntAbsolutePath,
+          keepFileExtensions,
+          true,
+          baseDirectoryPath,
+        ) as Promise<EmailsDirectory>;
+      }),
+  );
+
+  const emailsMetadata = {
+    absolutePath: absolutePathToEmailsDirectory,
+    relativePath: path.relative(
+      baseDirectoryPath,
+      absolutePathToEmailsDirectory,
+    ),
+    directoryName: absolutePathToEmailsDirectory.split(path.sep).pop()!,
+    emailFilenames,
+    subDirectories,
+  } satisfies EmailsDirectory;
+
+  return isSubDirectory
+    ? mergeDirectoriesWithSubDirectories(emailsMetadata)
+    : emailsMetadata;
+};
diff --git a/packages/react-email/src/utils/get-line-and-column-from-offset.spec.ts b/packages/preview-server/src/utils/get-line-and-column-from-offset.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/get-line-and-column-from-offset.spec.ts
rename to packages/preview-server/src/utils/get-line-and-column-from-offset.spec.ts
diff --git a/packages/react-email/src/utils/get-line-and-column-from-offset.ts b/packages/preview-server/src/utils/get-line-and-column-from-offset.ts
similarity index 100%
rename from packages/react-email/src/utils/get-line-and-column-from-offset.ts
rename to packages/preview-server/src/utils/get-line-and-column-from-offset.ts
diff --git a/packages/react-email/src/utils/improve-error-with-sourcemap.ts b/packages/preview-server/src/utils/improve-error-with-sourcemap.ts
similarity index 100%
rename from packages/react-email/src/utils/improve-error-with-sourcemap.ts
rename to packages/preview-server/src/utils/improve-error-with-sourcemap.ts
diff --git a/packages/preview-server/src/utils/index.ts b/packages/preview-server/src/utils/index.ts
new file mode 100644
index 0000000000..7a3cd2e7b6
--- /dev/null
+++ b/packages/preview-server/src/utils/index.ts
@@ -0,0 +1,6 @@
+export * from './cn';
+export * from './copy-text-to-clipboard';
+export * from './language-map';
+export * from './sanitize';
+export * from './types/as';
+export * from './unreachable';
diff --git a/packages/react-email/src/utils/js-email-detection.spec.ts b/packages/preview-server/src/utils/js-email-detection.spec.ts
similarity index 100%
rename from packages/react-email/src/utils/js-email-detection.spec.ts
rename to packages/preview-server/src/utils/js-email-detection.spec.ts
diff --git a/packages/react-email/src/utils/language-map.ts b/packages/preview-server/src/utils/language-map.ts
similarity index 100%
rename from packages/react-email/src/utils/language-map.ts
rename to packages/preview-server/src/utils/language-map.ts
diff --git a/packages/react-email/src/utils/linting.ts b/packages/preview-server/src/utils/linting.ts
similarity index 100%
rename from packages/react-email/src/utils/linting.ts
rename to packages/preview-server/src/utils/linting.ts
diff --git a/packages/react-email/src/utils/load-stream.ts b/packages/preview-server/src/utils/load-stream.ts
similarity index 100%
rename from packages/react-email/src/utils/load-stream.ts
rename to packages/preview-server/src/utils/load-stream.ts
diff --git a/packages/preview-server/src/utils/register-spinner-autostopping.ts b/packages/preview-server/src/utils/register-spinner-autostopping.ts
new file mode 100644
index 0000000000..2a4a156b4d
--- /dev/null
+++ b/packages/preview-server/src/utils/register-spinner-autostopping.ts
@@ -0,0 +1,28 @@
+import logSymbols from 'log-symbols';
+import type { Ora } from 'ora';
+
+const spinners = new Set<Ora>();
+
+process.on('SIGINT', () => {
+  spinners.forEach((spinner) => {
+    if (spinner.isSpinning) {
+      spinner.stop();
+    }
+  });
+});
+
+process.on('exit', (code) => {
+  if (code !== 0) {
+    spinners.forEach((spinner) => {
+      if (spinner.isSpinning) {
+        spinner.stopAndPersist({
+          symbol: logSymbols.error,
+        });
+      }
+    });
+  }
+});
+
+export const registerSpinnerAutostopping = (spinner: Ora) => {
+  spinners.add(spinner);
+};
diff --git a/packages/react-email/src/utils/result.ts b/packages/preview-server/src/utils/result.ts
similarity index 100%
rename from packages/react-email/src/utils/result.ts
rename to packages/preview-server/src/utils/result.ts
diff --git a/packages/react-email/src/utils/run-bundled-code.ts b/packages/preview-server/src/utils/run-bundled-code.ts
similarity index 100%
rename from packages/react-email/src/utils/run-bundled-code.ts
rename to packages/preview-server/src/utils/run-bundled-code.ts
diff --git a/packages/react-email/src/utils/sanitize.ts b/packages/preview-server/src/utils/sanitize.ts
similarity index 100%
rename from packages/react-email/src/utils/sanitize.ts
rename to packages/preview-server/src/utils/sanitize.ts
diff --git a/packages/react-email/src/utils/static-node-modules-for-vm.ts b/packages/preview-server/src/utils/static-node-modules-for-vm.ts
similarity index 100%
rename from packages/react-email/src/utils/static-node-modules-for-vm.ts
rename to packages/preview-server/src/utils/static-node-modules-for-vm.ts
diff --git a/packages/react-email/src/utils/testing/js-email-export-default.js b/packages/preview-server/src/utils/testing/js-email-export-default.js
similarity index 100%
rename from packages/react-email/src/utils/testing/js-email-export-default.js
rename to packages/preview-server/src/utils/testing/js-email-export-default.js
diff --git a/packages/react-email/src/utils/testing/js-email-test.js b/packages/preview-server/src/utils/testing/js-email-test.js
similarity index 100%
rename from packages/react-email/src/utils/testing/js-email-test.js
rename to packages/preview-server/src/utils/testing/js-email-test.js
diff --git a/packages/react-email/src/utils/testing/mdx-email-test.js b/packages/preview-server/src/utils/testing/mdx-email-test.js
similarity index 100%
rename from packages/react-email/src/utils/testing/mdx-email-test.js
rename to packages/preview-server/src/utils/testing/mdx-email-test.js
diff --git a/packages/react-email/src/utils/testing/request-response-email.tsx b/packages/preview-server/src/utils/testing/request-response-email.tsx
similarity index 100%
rename from packages/react-email/src/utils/testing/request-response-email.tsx
rename to packages/preview-server/src/utils/testing/request-response-email.tsx
diff --git a/packages/react-email/src/utils/types/as.ts b/packages/preview-server/src/utils/types/as.ts
similarity index 100%
rename from packages/react-email/src/utils/types/as.ts
rename to packages/preview-server/src/utils/types/as.ts
diff --git a/packages/react-email/src/utils/types/email-template.ts b/packages/preview-server/src/utils/types/email-template.ts
similarity index 100%
rename from packages/react-email/src/utils/types/email-template.ts
rename to packages/preview-server/src/utils/types/email-template.ts
diff --git a/packages/react-email/src/utils/types/error-object.ts b/packages/preview-server/src/utils/types/error-object.ts
similarity index 100%
rename from packages/react-email/src/utils/types/error-object.ts
rename to packages/preview-server/src/utils/types/error-object.ts
diff --git a/packages/preview-server/src/utils/types/hot-reload-change.ts b/packages/preview-server/src/utils/types/hot-reload-change.ts
new file mode 100644
index 0000000000..15b6be7d89
--- /dev/null
+++ b/packages/preview-server/src/utils/types/hot-reload-change.ts
@@ -0,0 +1,13 @@
+export interface HotReloadChange {
+  filename: string;
+  event:
+    | 'all'
+    | 'ready'
+    | 'add'
+    | 'change'
+    | 'addDir'
+    | 'unlink'
+    | 'unlinkDir'
+    | 'raw'
+    | 'error';
+}
diff --git a/packages/react-email/src/utils/unreachable.ts b/packages/preview-server/src/utils/unreachable.ts
similarity index 100%
rename from packages/react-email/src/utils/unreachable.ts
rename to packages/preview-server/src/utils/unreachable.ts
diff --git a/packages/react-email/tailwind-internals.d.ts b/packages/preview-server/tailwind-internals.d.ts
similarity index 100%
rename from packages/react-email/tailwind-internals.d.ts
rename to packages/preview-server/tailwind-internals.d.ts
diff --git a/packages/react-email/tailwind.config.ts b/packages/preview-server/tailwind.config.ts
similarity index 100%
rename from packages/react-email/tailwind.config.ts
rename to packages/preview-server/tailwind.config.ts
diff --git a/packages/preview-server/tsconfig.json b/packages/preview-server/tsconfig.json
new file mode 100644
index 0000000000..7a12ec6b6a
--- /dev/null
+++ b/packages/preview-server/tsconfig.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Next.js",
+  "compilerOptions": {
+    "composite": false,
+    "downlevelIteration": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "inlineSources": false,
+    "isolatedModules": true,
+    "moduleResolution": "node",
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "preserveWatchOutput": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "allowJs": true,
+    "declaration": false,
+    "declarationMap": false,
+    "incremental": false,
+    "jsx": "preserve",
+    "lib": ["dom", "dom.iterable", "esnext", "ESNext.AsyncIterable"],
+    "noEmit": true,
+    "strict": false,
+    "target": "ESNext",
+    "module": "CommonJS",
+    "noUncheckedIndexedAccess": true,
+    "resolveJsonModule": true,
+    "types": ["vitest/globals"],
+    "outDir": "dist"
+  },
+  "include": [
+    "next-env.d.ts",
+    "tailwind-internals.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [".next", "dist", "node_modules"]
+}
diff --git a/packages/preview-server/vitest.config.ts b/packages/preview-server/vitest.config.ts
new file mode 100644
index 0000000000..bf6076a810
--- /dev/null
+++ b/packages/preview-server/vitest.config.ts
@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'happy-dom',
+  },
+  esbuild: {
+    tsconfigRaw: {
+      compilerOptions: {
+        jsx: 'react-jsx',
+      },
+    },
+  },
+});
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index e71af09715..280684e939 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -3,15 +3,13 @@
   "version": "4.1.0-canary.7",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
-    "email": "./dist/cli/index.mjs"
+    "email": "./dist/index.js"
   },
+  "type": "module",
   "scripts": {
-    "build": "tsup-node && node ./scripts/build-preview-server.mjs",
-    "postbuild": "pnpm install --frozen-lockfile",
-    "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
+    "build": "tsup-node",
     "clean": "rm -rf dist",
-    "dev": "tsup-node --watch",
-    "dev:preview": "cd ../../apps/demo && tsx ../../packages/react-email/src/cli/index.ts dev",
+    "dev": "tsup-node --watch src",
     "test": "vitest run",
     "test:watch": "vitest"
   },
@@ -37,60 +35,27 @@
     "debounce": "^2.0.0",
     "esbuild": "^0.25.0",
     "glob": "^11.0.0",
+    "jiti": "2.4.2",
     "log-symbols": "^7.0.0",
     "mime-types": "^3.0.0",
-    "next": "^15.3.1",
     "normalize-path": "^3.0.0",
+    "nypm": "0.6.0",
     "ora": "^8.0.0",
+    "prompts": "2.4.2",
     "socket.io": "^4.8.1",
     "tsconfig-paths": "4.2.0"
   },
   "devDependencies": {
-    "@babel/core": "7.26.10",
-    "@lottiefiles/dotlottie-react": "0.13.3",
-    "@radix-ui/colors": "3.0.0",
-    "@radix-ui/react-collapsible": "1.1.7",
-    "@radix-ui/react-dropdown-menu": "2.1.10",
-    "@radix-ui/react-popover": "1.1.10",
-    "@radix-ui/react-slot": "1.2.0",
-    "@radix-ui/react-tabs": "1.1.7",
-    "@radix-ui/react-toggle-group": "1.1.6",
-    "@radix-ui/react-tooltip": "1.2.3",
     "@react-email/components": "workspace:*",
-    "@swc/core": "1.11.21",
     "@types/babel__core": "7.20.5",
     "@types/babel__traverse": "7.20.7",
-    "@types/fs-extra": "11.0.1",
     "@types/mime-types": "2.1.4",
-    "@types/node": "22.14.1",
-    "@types/normalize-path": "3.0.2",
-    "@types/react": "19.0.10",
-    "@types/react-dom": "19.0.4",
-    "@types/webpack": "5.28.5",
-    "autoprefixer": "10.4.21",
-    "clsx": "2.1.1",
-    "framer-motion": "12.7.5",
-    "jiti": "2.4.2",
-    "json5": "2.2.3",
-    "module-punycode": "npm:punycode@2.3.1",
-    "node-html-parser": "7.0.1",
-    "postcss": "8.5.3",
-    "pretty-bytes": "6.1.1",
-    "prism-react-renderer": "2.4.1",
+    "@types/prompts": "2.4.9",
+    "next": "^15.3.1",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "sharp": "0.34.1",
-    "socket.io-client": "4.8.1",
-    "sonner": "2.0.3",
-    "source-map-js": "1.2.1",
-    "spamc": "0.0.5",
-    "stacktrace-parser": "0.1.11",
-    "tailwind-merge": "3.2.0",
-    "tailwindcss": "3.4.0",
     "tsup": "8.4.0",
     "tsx": "4.19.3",
-    "typescript": "5.8.3",
-    "use-debounce": "10.0.4",
-    "zod": "3.24.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/react-email/scripts/build-preview-server.mjs b/packages/react-email/scripts/build-preview-server.mjs
deleted file mode 100644
index 8c54a66083..0000000000
--- a/packages/react-email/scripts/build-preview-server.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-import { spawn } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const nextBuildProcess = spawn('pnpm', ['next', 'build'], {
-  detached: true,
-  shell: true,
-  stdio: 'inherit',
-  cwd: path.resolve(__dirname, '../'),
-});
-
-process.on('SIGINT', () => {
-  nextBuildProcess.kill('SIGINT');
-});
-
-nextBuildProcess.on('exit', (code) => {
-  if (code !== 0) {
-    console.error(`next build failed with exit code ${code}`);
-    process.exit(code);
-  }
-
-  const builtPreviewPath = path.resolve(__dirname, '../dist/preview');
-
-  if (fs.existsSync(builtPreviewPath)) {
-    fs.rmSync(builtPreviewPath, { recursive: true });
-  }
-  fs.mkdirSync(builtPreviewPath, { recursive: true });
-  fs.rmSync('.next/cache', { recursive: true });
-  fs.renameSync('.next', path.join(builtPreviewPath, '/.next'));
-});
diff --git a/packages/react-email/src/cli/commands/testing/export.spec.ts b/packages/react-email/src/cli/commands/testing/export.spec.ts
deleted file mode 100644
index f75662ab54..0000000000
--- a/packages/react-email/src/cli/commands/testing/export.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { exportTemplates } from '../export';
-
-test(
-  'email export',
-  async () => {
-    const pathToEmailsDirectory = path.resolve(
-      __dirname,
-      '../../../../../../apps/demo/emails',
-    );
-    const pathToDumpMarkup = path.resolve(__dirname, './out');
-    await exportTemplates(pathToDumpMarkup, pathToEmailsDirectory, {
-      silent: true,
-      pretty: true,
-    });
-
-    expect(fs.existsSync(pathToDumpMarkup)).toBe(true);
-    expect(
-      await fs.promises.readFile(
-        path.resolve(
-          pathToDumpMarkup,
-          './notifications/vercel-invite-user.html',
-        ),
-        'utf8',
-      ),
-    ).toMatchSnapshot();
-  },
-  { retry: 3 },
-);
diff --git a/packages/react-email/src/cli/utils/index.ts b/packages/react-email/src/cli/utils/index.ts
deleted file mode 100644
index 0aaa0b2ead..0000000000
--- a/packages/react-email/src/cli/utils/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './preview';
-export * from './tree';
diff --git a/packages/react-email/src/cli/utils/preview/index.ts b/packages/react-email/src/cli/utils/preview/index.ts
deleted file mode 100644
index 46a98521ab..0000000000
--- a/packages/react-email/src/cli/utils/preview/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './hot-reloading/setup-hot-reloading';
-export * from './start-dev-server';
diff --git a/packages/react-email/src/cli/utils/tree.spec.ts b/packages/react-email/src/cli/utils/tree.spec.ts
deleted file mode 100644
index 29278f9393..0000000000
--- a/packages/react-email/src/cli/utils/tree.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { tree } from './tree';
-
-test('tree(__dirname, 2)', async () => {
-  expect(await tree(__dirname, 2)).toMatchInlineSnapshot(`"utils
-├── preview
-│   ├── hot-reloading
-│   ├── get-env-variables-for-preview-app.ts
-│   ├── index.ts
-│   ├── serve-static-file.ts
-│   └── start-dev-server.ts
-├── index.ts
-├── tree.spec.ts
-└── tree.ts"`);
-});
diff --git a/packages/react-email/src/cli/commands/.npmignore b/packages/react-email/src/commands/.npmignore
similarity index 100%
rename from packages/react-email/src/cli/commands/.npmignore
rename to packages/react-email/src/commands/.npmignore
diff --git a/packages/react-email/src/cli/commands/build.ts b/packages/react-email/src/commands/build.ts
similarity index 95%
rename from packages/react-email/src/cli/commands/build.ts
rename to packages/react-email/src/commands/build.ts
index 04647740bf..a4394cc78e 100644
--- a/packages/react-email/src/cli/commands/build.ts
+++ b/packages/react-email/src/commands/build.ts
@@ -6,9 +6,9 @@ import ora from 'ora';
 import {
   type EmailsDirectory,
   getEmailsDirectoryMetadata,
-} from '../../utils/get-emails-directory-metadata';
-import { registerSpinnerAutostopping } from '../../utils/register-spinner-autostopping';
-import { cliPackageLocation } from '../utils';
+} from '../utils/get-emails-directory-metadata.js';
+import { getPreviewServerLocation } from '../utils/get-preview-server-location.js';
+import { registerSpinnerAutostopping } from '../utils/register-spinner-autostopping.js';
 
 interface Args {
   dir: string;
@@ -38,6 +38,39 @@ const buildPreviewApp = (absoluteDirectory: string) => {
   });
 };
 
+const npmInstall = async (
+  builtPreviewAppPath: string,
+  packageManager: string,
+) => {
+  return new Promise<void>((resolve, reject) => {
+    const childProc = spawn(
+      packageManager,
+      [
+        'install',
+        packageManager === 'deno' ? '' : '--include=dev',
+        packageManager === 'deno' ? '--quiet' : '--silent',
+      ],
+      {
+        cwd: builtPreviewAppPath,
+        shell: true,
+      },
+    );
+    childProc.stdout.pipe(process.stdout);
+    childProc.stderr.pipe(process.stderr);
+    childProc.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(
+          new Error(
+            `Unable to install the dependencies and it exited with code: ${code}`,
+          ),
+        );
+      }
+    });
+  });
+};
+
 const setNextEnvironmentVariablesForBuild = async (
   emailsDirRelativePath: string,
   builtPreviewAppPath: string,
@@ -45,7 +78,7 @@ const setNextEnvironmentVariablesForBuild = async (
   const nextConfigContents = `
 const path = require('path');
 const emailsDirRelativePath = path.normalize('${emailsDirRelativePath}');
-const userProjectLocation = path.resolve(process.cwd(), '../');
+const userProjectLocation = '${process.cwd()}';
 /** @type {import('next').NextConfig} */
 module.exports = {
   env: {
@@ -173,6 +206,7 @@ const updatePackageJson = async (builtPreviewAppPath: string) => {
   delete packageJson.scripts.postbuild;
 
   packageJson.name = 'preview-server';
+
   // We remove this one to avoid having resolve issues on our demo build process.
   // This is only used in the `export` command so it's irrelevant to have it here.
   //
@@ -181,6 +215,7 @@ const updatePackageJson = async (builtPreviewAppPath: string) => {
   delete packageJson.devDependencies['@react-email/render'];
   delete packageJson.devDependencies['@react-email/components'];
   delete packageJson.scripts.prepare;
+
   await fs.promises.writeFile(
     packageJsonPath,
     JSON.stringify(packageJson),
@@ -188,44 +223,13 @@ const updatePackageJson = async (builtPreviewAppPath: string) => {
   );
 };
 
-const npmInstall = async (
-  builtPreviewAppPath: string,
-  packageManager: string,
-) => {
-  return new Promise<void>((resolve, reject) => {
-    const childProc = spawn(
-      packageManager,
-      [
-        'install',
-        packageManager === 'deno' ? '' : '--include=dev',
-        packageManager === 'deno' ? '--quiet' : '--silent',
-      ],
-      {
-        cwd: builtPreviewAppPath,
-        shell: true,
-      },
-    );
-    childProc.stdout.pipe(process.stdout);
-    childProc.stderr.pipe(process.stderr);
-    childProc.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(
-          new Error(
-            `Unable to install the dependencies and it exited with code: ${code}`,
-          ),
-        );
-      }
-    });
-  });
-};
-
 export const build = async ({
   dir: emailsDirRelativePath,
   packageManager,
 }: Args) => {
   try {
+    const previewServerLocation = await getPreviewServerLocation();
+
     const spinner = ora({
       text: 'Starting build process...',
       prefixText: '  ',
@@ -248,7 +252,7 @@ export const build = async ({
     }
 
     spinner.text = 'Copying preview app from CLI to `.react-email`';
-    await fs.promises.cp(cliPackageLocation, builtPreviewAppPath, {
+    await fs.promises.cp(previewServerLocation, builtPreviewAppPath, {
       recursive: true,
       filter: (source: string) => {
         // do not copy the CLI files
diff --git a/packages/react-email/src/cli/commands/dev.ts b/packages/react-email/src/commands/dev.ts
similarity index 90%
rename from packages/react-email/src/cli/commands/dev.ts
rename to packages/react-email/src/commands/dev.ts
index 6f9ed6803d..f499041abd 100644
--- a/packages/react-email/src/cli/commands/dev.ts
+++ b/packages/react-email/src/commands/dev.ts
@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { setupHotreloading, startDevServer } from '../utils';
+import { setupHotreloading, startDevServer } from '../utils/index.js';
 
 interface Args {
   dir: string;
diff --git a/packages/react-email/src/cli/commands/export.ts b/packages/react-email/src/commands/export.ts
similarity index 95%
rename from packages/react-email/src/cli/commands/export.ts
rename to packages/react-email/src/commands/export.ts
index 442c4ee0e1..4bbdb5db47 100644
--- a/packages/react-email/src/cli/commands/export.ts
+++ b/packages/react-email/src/commands/export.ts
@@ -9,13 +9,13 @@ import logSymbols from 'log-symbols';
 import normalize from 'normalize-path';
 import ora, { type Ora } from 'ora';
 import type React from 'react';
-import { renderingUtilitiesExporter } from '../../utils/esbuild/renderring-utilities-exporter';
+import { renderingUtilitiesExporter } from '../utils/esbuild/renderring-utilities-exporter.js';
 import {
   type EmailsDirectory,
   getEmailsDirectoryMetadata,
-} from '../../utils/get-emails-directory-metadata';
-import { registerSpinnerAutostopping } from '../../utils/register-spinner-autostopping';
-import { tree } from '../utils';
+} from '../utils/get-emails-directory-metadata.js';
+import { tree } from '../utils/index.js';
+import { registerSpinnerAutostopping } from '../utils/register-spinner-autostopping.js';
 
 const getEmailTemplatesFromDirectory = (emailDirectory: EmailsDirectory) => {
   const templatePaths = [] as string[];
diff --git a/packages/react-email/src/cli/commands/start.ts b/packages/react-email/src/commands/start.ts
similarity index 73%
rename from packages/react-email/src/cli/commands/start.ts
rename to packages/react-email/src/commands/start.ts
index e5d1005d09..2a316c1f9b 100644
--- a/packages/react-email/src/cli/commands/start.ts
+++ b/packages/react-email/src/commands/start.ts
@@ -1,9 +1,12 @@
 import { spawn } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
+import { getPreviewServerLocation } from '../utils/get-preview-server-location.js';
 
 export const start = async () => {
   try {
+    const previewServerLocation = await getPreviewServerLocation();
+
     const usersProjectLocation = process.cwd();
     const builtPreviewPath = path.resolve(
       usersProjectLocation,
@@ -16,8 +19,8 @@ export const start = async () => {
       process.exit(1);
     }
 
-    const nextStart = spawn('npm', ['start'], {
-      cwd: builtPreviewPath,
+    const nextStart = spawn('npx', ['next', 'start', builtPreviewPath], {
+      cwd: previewServerLocation,
       stdio: 'inherit',
     });
 
diff --git a/packages/react-email/src/cli/commands/testing/.gitignore b/packages/react-email/src/commands/testing/.gitignore
similarity index 100%
rename from packages/react-email/src/cli/commands/testing/.gitignore
rename to packages/react-email/src/commands/testing/.gitignore
diff --git a/packages/react-email/src/cli/commands/testing/__snapshots__/export.spec.ts.snap b/packages/react-email/src/commands/testing/__snapshots__/export.spec.ts.snap
similarity index 100%
rename from packages/react-email/src/cli/commands/testing/__snapshots__/export.spec.ts.snap
rename to packages/react-email/src/commands/testing/__snapshots__/export.spec.ts.snap
diff --git a/packages/react-email/src/commands/testing/export.spec.ts b/packages/react-email/src/commands/testing/export.spec.ts
new file mode 100644
index 0000000000..98a2731696
--- /dev/null
+++ b/packages/react-email/src/commands/testing/export.spec.ts
@@ -0,0 +1,23 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { exportTemplates } from '../export.js';
+
+test('email export', { retry: 3 }, async () => {
+  const pathToEmailsDirectory = path.resolve(
+    __dirname,
+    '../../../../../apps/demo/emails',
+  );
+  const pathToDumpMarkup = path.resolve(__dirname, './out');
+  await exportTemplates(pathToDumpMarkup, pathToEmailsDirectory, {
+    silent: true,
+    pretty: true,
+  });
+
+  expect(fs.existsSync(pathToDumpMarkup)).toBe(true);
+  expect(
+    await fs.promises.readFile(
+      path.resolve(pathToDumpMarkup, './notifications/vercel-invite-user.html'),
+      'utf8',
+    ),
+  ).toMatchSnapshot();
+});
diff --git a/packages/react-email/src/cli/index.ts b/packages/react-email/src/index.ts
similarity index 86%
rename from packages/react-email/src/cli/index.ts
rename to packages/react-email/src/index.ts
index 3cb25317c7..43f4fba483 100644
--- a/packages/react-email/src/cli/index.ts
+++ b/packages/react-email/src/index.ts
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { program } from 'commander';
-import packageJson from '../../package.json';
-import { build } from './commands/build';
-import { dev } from './commands/dev';
-import { exportTemplates } from './commands/export';
-import { start } from './commands/start';
+import { build } from './commands/build.js';
+import { dev } from './commands/dev.js';
+import { exportTemplates } from './commands/export.js';
+import { start } from './commands/start.js';
+import { packageJson } from './utils/packageJson.js';
 
 const PACKAGE_NAME = 'react-email';
 
diff --git a/packages/react-email/src/utils/__snapshots__/tree.spec.ts.snap b/packages/react-email/src/utils/__snapshots__/tree.spec.ts.snap
new file mode 100644
index 0000000000..2b35dc16bc
--- /dev/null
+++ b/packages/react-email/src/utils/__snapshots__/tree.spec.ts.snap
@@ -0,0 +1,27 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`tree(__dirname, 2) 1`] = `
+"utils
+├── __snapshots__
+│   └── tree.spec.ts.snap
+├── esbuild
+│   ├── escape-string-for-regex.ts
+│   └── renderring-utilities-exporter.ts
+├── preview
+│   ├── hot-reloading
+│   ├── get-env-variables-for-preview-app.ts
+│   ├── index.ts
+│   ├── serve-static-file.ts
+│   └── start-dev-server.ts
+├── types
+│   ├── hot-reload-change.ts
+│   └── hot-reload-event.ts
+├── get-emails-directory-metadata.spec.ts
+├── get-emails-directory-metadata.ts
+├── get-preview-server-location.ts
+├── index.ts
+├── packageJson.ts
+├── register-spinner-autostopping.ts
+├── tree.spec.ts
+└── tree.ts"
+`;
diff --git a/packages/react-email/src/utils/esbuild/renderring-utilities-exporter.ts b/packages/react-email/src/utils/esbuild/renderring-utilities-exporter.ts
index 4856b15577..7f8fe62cc2 100644
--- a/packages/react-email/src/utils/esbuild/renderring-utilities-exporter.ts
+++ b/packages/react-email/src/utils/esbuild/renderring-utilities-exporter.ts
@@ -1,7 +1,7 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import type { Loader, PluginBuild, ResolveOptions } from 'esbuild';
-import { escapeStringForRegex } from './escape-string-for-regex';
+import { escapeStringForRegex } from './escape-string-for-regex.js';
 
 /**
  * Made to export the `render` function out of the user's email template
diff --git a/packages/react-email/src/utils/get-emails-directory-metadata.spec.ts b/packages/react-email/src/utils/get-emails-directory-metadata.spec.ts
index 1f7aaae36b..b91577a1b7 100644
--- a/packages/react-email/src/utils/get-emails-directory-metadata.spec.ts
+++ b/packages/react-email/src/utils/get-emails-directory-metadata.spec.ts
@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { getEmailsDirectoryMetadata } from './get-emails-directory-metadata';
+import { getEmailsDirectoryMetadata } from './get-emails-directory-metadata.js';
 
 test('getEmailsDirectoryMetadata on demo emails', async () => {
   const emailsDirectoryPath = path.resolve(
diff --git a/packages/react-email/src/utils/get-preview-server-location.ts b/packages/react-email/src/utils/get-preview-server-location.ts
new file mode 100644
index 0000000000..a438059beb
--- /dev/null
+++ b/packages/react-email/src/utils/get-preview-server-location.ts
@@ -0,0 +1,32 @@
+import path from 'node:path';
+import url from 'node:url';
+import { createJiti } from 'jiti';
+import { addDevDependency } from 'nypm';
+import prompts from 'prompts';
+
+export const getPreviewServerLocation = async () => {
+  const usersProject = createJiti(process.cwd());
+  let previewServerLocation!: string;
+  try {
+    previewServerLocation = path.dirname(
+      url.parse(usersProject.esmResolve('@react-email/preview-server'), true)
+        .path!,
+    );
+  } catch (exception) {
+    const response = await prompts({
+      type: 'confirm',
+      name: 'installPreviewServer',
+      message:
+        'To run the preview server, the pacakge "@react-email/preview-server" must be installed. Would you like to install it?',
+      initial: true,
+    });
+    if (response.installPreviewServer) {
+      console.log('Installing "@react-email/preview-server"');
+      await addDevDependency('@react-email/preview-server');
+      process.exit(0);
+    } else {
+      process.exit(0);
+    }
+  }
+  return previewServerLocation;
+};
diff --git a/packages/react-email/src/utils/index.ts b/packages/react-email/src/utils/index.ts
index 7a3cd2e7b6..a52444541b 100644
--- a/packages/react-email/src/utils/index.ts
+++ b/packages/react-email/src/utils/index.ts
@@ -1,6 +1,2 @@
-export * from './cn';
-export * from './copy-text-to-clipboard';
-export * from './language-map';
-export * from './sanitize';
-export * from './types/as';
-export * from './unreachable';
+export * from './preview/index.js';
+export * from './tree.js';
diff --git a/packages/react-email/src/utils/packageJson.ts b/packages/react-email/src/utils/packageJson.ts
new file mode 100644
index 0000000000..5c0b2d2a63
--- /dev/null
+++ b/packages/react-email/src/utils/packageJson.ts
@@ -0,0 +1,4 @@
+// @ts-expect-error Typescript doesn't want to allow this, but it's fine since we're using tsup
+import packageJson from '../../package.json';
+
+export { packageJson };
diff --git a/packages/react-email/src/cli/utils/preview/get-env-variables-for-preview-app.ts b/packages/react-email/src/utils/preview/get-env-variables-for-preview-app.ts
similarity index 89%
rename from packages/react-email/src/cli/utils/preview/get-env-variables-for-preview-app.ts
rename to packages/react-email/src/utils/preview/get-env-variables-for-preview-app.ts
index a293ca583f..ffb1634a62 100644
--- a/packages/react-email/src/cli/utils/preview/get-env-variables-for-preview-app.ts
+++ b/packages/react-email/src/utils/preview/get-env-variables-for-preview-app.ts
@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { isDev } from './start-dev-server';
+import { isDev } from './start-dev-server.js';
 
 export const getEnvVariablesForPreviewApp = (
   relativePathToEmailsDirectory: string,
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.spec.ts b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
similarity index 80%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.spec.ts
rename to packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
index 3dc9f1738c..ff1dbf8d3f 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.spec.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
 import {
   createDependencyGraph,
   type DependencyGraph,
-} from './create-dependency-graph';
+} from './create-dependency-graph.js';
 
 const pathToFileForTestingDependencyGraph = path.join(
   __dirname,
@@ -44,11 +44,11 @@ test('createDependencyGraph()', async () => {
   };
 
   const initialDependencyGraph = convertPathsToAbsolute({
-    '../../../../../package.json': {
+    '../../../../package.json': {
       dependencyPaths: [],
-      dependentPaths: ['../start-dev-server.ts'],
+      dependentPaths: ['../../packageJson.ts'],
       moduleDependencies: [],
-      path: '../../../../../package.json',
+      path: '../../../../package.json',
     },
     'create-dependency-graph.ts': {
       path: 'create-dependency-graph.ts',
@@ -61,7 +61,19 @@ test('createDependencyGraph()', async () => {
         'create-dependency-graph.spec.ts',
         'setup-hot-reloading.ts',
       ],
-      moduleDependencies: ['node:fs', 'node:path', 'chokidar/handler'],
+      moduleDependencies: ['node:fs', 'node:path', 'chokidar/handler.js'],
+    },
+    '../../get-preview-server-location.ts': {
+      dependencyPaths: [],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
+      moduleDependencies: ['node:path', 'node:url', 'jiti', 'nypm', 'prompts'],
+      path: '../../get-preview-server-location.ts',
+    },
+    '../../packageJson.ts': {
+      dependencyPaths: ['../../../../package.json'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
+      moduleDependencies: [],
+      path: '../../packageJson.ts',
     },
     'create-dependency-graph.spec.ts': {
       path: 'create-dependency-graph.spec.ts',
@@ -69,11 +81,11 @@ test('createDependencyGraph()', async () => {
       dependentPaths: [],
       moduleDependencies: ['node:fs', 'node:path'],
     },
-    '../../../utils/preview/get-env-variables-for-preview-app.ts': {
-      dependencyPaths: ['../../../utils/preview/start-dev-server.ts'],
-      dependentPaths: ['../../../utils/preview/start-dev-server.ts'],
+    '../get-env-variables-for-preview-app.ts': {
+      dependencyPaths: ['../../preview/start-dev-server.ts'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
       moduleDependencies: ['node:path'],
-      path: '../../../utils/preview/get-env-variables-for-preview-app.ts',
+      path: '../../preview/get-env-variables-for-preview-app.ts',
     },
     './test/some-file.ts': {
       dependencyPaths: [],
@@ -114,7 +126,7 @@ test('createDependencyGraph()', async () => {
     'setup-hot-reloading.ts': {
       path: 'setup-hot-reloading.ts',
       dependencyPaths: [
-        '../../../../utils/types/hot-reload-change.ts',
+        '../../types/hot-reload-change.ts',
         'create-dependency-graph.ts',
       ],
       dependentPaths: [],
@@ -128,14 +140,15 @@ test('createDependencyGraph()', async () => {
     },
     '../start-dev-server.ts': {
       dependencyPaths: [
-        '../../../../../package.json',
-        '../../../../utils/register-spinner-autostopping.ts',
-        '../../../utils/preview/get-env-variables-for-preview-app.ts',
-        '../../../utils/preview/serve-static-file.ts',
+        '../../register-spinner-autostopping.ts',
+        '../../get-preview-server-location.ts',
+        '../../packageJson.ts',
+        '../../preview/get-env-variables-for-preview-app.ts',
+        '../../preview/serve-static-file.ts',
       ],
       path: '../start-dev-server.ts',
       dependentPaths: [
-        '../../../utils/preview/get-env-variables-for-preview-app.ts',
+        '../../preview/get-env-variables-for-preview-app.ts',
         'create-dependency-graph.ts',
       ],
       moduleDependencies: [
@@ -143,14 +156,14 @@ test('createDependencyGraph()', async () => {
         'node:path',
         'node:url',
         'chalk',
+        'jiti',
         'log-symbols',
-        'next',
         'ora',
       ],
     },
-    '../../../utils/preview/serve-static-file.ts': {
+    '../../preview/serve-static-file.ts': {
       dependencyPaths: [],
-      dependentPaths: ['../../../utils/preview/start-dev-server.ts'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
       moduleDependencies: [
         'node:fs',
         'node:http',
@@ -158,23 +171,23 @@ test('createDependencyGraph()', async () => {
         'node:url',
         'mime-types',
       ],
-      path: '../../../utils/preview/serve-static-file.ts',
+      path: '../../preview/serve-static-file.ts',
     },
-    '../../../../utils/register-spinner-autostopping.ts': {
+    '../../register-spinner-autostopping.ts': {
       dependencyPaths: [],
-      dependentPaths: ['../../../utils/preview/start-dev-server.ts'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
       moduleDependencies: ['log-symbols', 'ora'],
-      path: '../../../../utils/register-spinner-autostopping.ts',
+      path: '../../register-spinner-autostopping.ts',
     },
-    '../../../../utils/types/hot-reload-event.ts': {
+    '../../types/hot-reload-event.ts': {
       dependencyPaths: [],
-      dependentPaths: ['../../../../utils/types/hot-reload-change.ts'],
-      moduleDependencies: ['chokidar/handler'],
-      path: '../../../../utils/types/hot-reload-event.ts',
+      dependentPaths: ['../../types/hot-reload-change.ts'],
+      moduleDependencies: ['chokidar/handler.js'],
+      path: '../../types/hot-reload-event.ts',
     },
-    '../../../../utils/types/hot-reload-change.ts': {
-      path: '../../../../utils/types/hot-reload-change.ts',
-      dependencyPaths: ['../../../../utils/types/hot-reload-event.ts'],
+    '../../types/hot-reload-change.ts': {
+      path: '../../types/hot-reload-change.ts',
+      dependencyPaths: ['../../types/hot-reload-event.ts'],
       dependentPaths: ['setup-hot-reloading.ts'],
       moduleDependencies: [],
     },
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.ts b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.ts
similarity index 97%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.ts
rename to packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.ts
index 0462779dbb..1c50fd908b 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/create-dependency-graph.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.ts
@@ -1,9 +1,9 @@
 import { existsSync, promises as fs, statSync } from 'node:fs';
 import path from 'node:path';
-import type { EventName } from 'chokidar/handler';
-import { isDev } from '../start-dev-server';
-import { getImportedModules } from './get-imported-modules';
-import { resolvePathAliases } from './resolve-path-aliases';
+import type { EventName } from 'chokidar/handler.js';
+import { isDev } from '../start-dev-server.js';
+import { getImportedModules } from './get-imported-modules.js';
+import { resolvePathAliases } from './resolve-path-aliases.js';
 
 interface Module {
   path: string;
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.spec.ts b/packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.spec.ts
similarity index 96%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.spec.ts
rename to packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.spec.ts
index 8e7d545271..f98bbb2808 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.spec.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.spec.ts
@@ -1,5 +1,5 @@
 import { promises as fs } from 'node:fs';
-import { getImportedModules } from './get-imported-modules';
+import { getImportedModules } from './get-imported-modules.js';
 
 vi.mock('@babel/traverse', async () => {
   const traverse = await vi.importActual('@babel/traverse');
@@ -12,7 +12,7 @@ describe('getImportedModules()', () => {
 
     expect(getImportedModules(contents)).toEqual([
       'node:fs',
-      './get-imported-modules',
+      './get-imported-modules.js',
     ]);
   });
 
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.ts b/packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.ts
similarity index 87%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.ts
rename to packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.ts
index 554abc3bf2..fa08eb4880 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/get-imported-modules.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/get-imported-modules.ts
@@ -7,9 +7,7 @@ const traverse =
   // script's use of tsx
   typeof traverseModule === 'function'
     ? traverseModule
-    : // @ts-expect-error This is fine since the default export is wrapped in a
-      // default function. The problem is that babel/traverse is not ESM.
-      traverseModule.default;
+    : traverseModule.default;
 
 export const getImportedModules = (contents: string) => {
   const importedPaths: string[] = [];
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/resolve-path-aliases.spec.ts b/packages/react-email/src/utils/preview/hot-reloading/resolve-path-aliases.spec.ts
similarity index 77%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/resolve-path-aliases.spec.ts
rename to packages/react-email/src/utils/preview/hot-reloading/resolve-path-aliases.spec.ts
index 8e50824db2..be7635ec86 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/resolve-path-aliases.spec.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/resolve-path-aliases.spec.ts
@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { resolvePathAliases } from './resolve-path-aliases';
+import { resolvePathAliases } from './resolve-path-aliases.js';
 
 test('resolveImports()', async () => {
   expect(
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/resolve-path-aliases.ts b/packages/react-email/src/utils/preview/hot-reloading/resolve-path-aliases.ts
similarity index 100%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/resolve-path-aliases.ts
rename to packages/react-email/src/utils/preview/hot-reloading/resolve-path-aliases.ts
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/setup-hot-reloading.ts b/packages/react-email/src/utils/preview/hot-reloading/setup-hot-reloading.ts
similarity index 97%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/setup-hot-reloading.ts
rename to packages/react-email/src/utils/preview/hot-reloading/setup-hot-reloading.ts
index d701cb339e..d6fb95e2bc 100644
--- a/packages/react-email/src/cli/utils/preview/hot-reloading/setup-hot-reloading.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/setup-hot-reloading.ts
@@ -3,8 +3,8 @@ import path from 'node:path';
 import { watch } from 'chokidar';
 import debounce from 'debounce';
 import { type Socket, Server as SocketServer } from 'socket.io';
-import type { HotReloadChange } from '../../../../utils/types/hot-reload-change';
-import { createDependencyGraph } from './create-dependency-graph';
+import type { HotReloadChange } from '../../types/hot-reload-change.js';
+import { createDependencyGraph } from './create-dependency-graph.js';
 
 export const setupHotreloading = async (
   devServer: http.Server,
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts b/packages/react-email/src/utils/preview/hot-reloading/test/some-file.ts
similarity index 100%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts
rename to packages/react-email/src/utils/preview/hot-reloading/test/some-file.ts
diff --git a/packages/react-email/src/cli/utils/preview/hot-reloading/test/tsconfig.json b/packages/react-email/src/utils/preview/hot-reloading/test/tsconfig.json
similarity index 100%
rename from packages/react-email/src/cli/utils/preview/hot-reloading/test/tsconfig.json
rename to packages/react-email/src/utils/preview/hot-reloading/test/tsconfig.json
diff --git a/packages/react-email/src/utils/preview/index.ts b/packages/react-email/src/utils/preview/index.ts
new file mode 100644
index 0000000000..508fedb6a9
--- /dev/null
+++ b/packages/react-email/src/utils/preview/index.ts
@@ -0,0 +1,2 @@
+export * from './hot-reloading/setup-hot-reloading.js';
+export * from './start-dev-server.js';
diff --git a/packages/react-email/src/cli/utils/preview/serve-static-file.ts b/packages/react-email/src/utils/preview/serve-static-file.ts
similarity index 100%
rename from packages/react-email/src/cli/utils/preview/serve-static-file.ts
rename to packages/react-email/src/utils/preview/serve-static-file.ts
diff --git a/packages/react-email/src/cli/utils/preview/start-dev-server.ts b/packages/react-email/src/utils/preview/start-dev-server.ts
similarity index 87%
rename from packages/react-email/src/cli/utils/preview/start-dev-server.ts
rename to packages/react-email/src/utils/preview/start-dev-server.ts
index 41e420aa04..192d4f7d01 100644
--- a/packages/react-email/src/cli/utils/preview/start-dev-server.ts
+++ b/packages/react-email/src/utils/preview/start-dev-server.ts
@@ -2,13 +2,14 @@ import http from 'node:http';
 import path from 'node:path';
 import url from 'node:url';
 import chalk from 'chalk';
+import { createJiti } from 'jiti';
 import logSymbols from 'log-symbols';
-import next from 'next';
 import ora from 'ora';
-import packageJson from '../../../../package.json';
-import { registerSpinnerAutostopping } from '../../../utils/register-spinner-autostopping';
-import { getEnvVariablesForPreviewApp } from './get-env-variables-for-preview-app';
-import { serveStaticFile } from './serve-static-file';
+import { registerSpinnerAutostopping } from '../../utils/register-spinner-autostopping.js';
+import { getPreviewServerLocation } from '../get-preview-server-location.js';
+import { packageJson } from '../packageJson.js';
+import { getEnvVariablesForPreviewApp } from './get-env-variables-for-preview-app.js';
+import { serveStaticFile } from './serve-static-file.js';
 
 let devServer: http.Server | undefined;
 
@@ -29,13 +30,7 @@ const safeAsyncServerListen = (server: http.Server, port: number) => {
 const filename = url.fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
 
-export const isDev = !filename.endsWith(path.join('cli', 'index.mjs'));
-export const cliPackageLocation = isDev
-  ? path.resolve(dirname, '../../../..')
-  : path.resolve(dirname, '../..');
-export const previewServerLocation = isDev
-  ? path.resolve(dirname, '../../../..')
-  : path.resolve(dirname, '../preview');
+export const isDev = !dirname.includes('dist');
 
 export const startDevServer = async (
   emailsDirRelativePath: string,
@@ -50,6 +45,12 @@ export const startDevServer = async (
     process.exit(1);
   }
 
+  const previewServerLocation = await getPreviewServerLocation();
+  const previewServer = createJiti(previewServerLocation);
+
+  const { default: next } =
+    await previewServer.import<typeof import('next')>('next');
+
   devServer = http.createServer((req, res) => {
     if (!req.url) {
       res.end(404);
@@ -191,13 +192,17 @@ const makeExitHandler =
       | { shouldKillProcess: false }
       | { shouldKillProcess: true; killWithErrorCode: boolean },
   ) =>
-  (_codeOrSignal: number | NodeJS.Signals) => {
+  (codeSignalOrError: number | NodeJS.Signals | Error) => {
     if (typeof devServer !== 'undefined') {
-      console.log('\n    shutting down dev server');
+      console.log('\nshutting down dev server');
       devServer.close();
       devServer = undefined;
     }
 
+    if (codeSignalOrError instanceof Error) {
+      console.error(codeSignalOrError);
+    }
+
     if (options?.shouldKillProcess) {
       process.exit(options.killWithErrorCode ? 1 : 0);
     }
diff --git a/packages/react-email/src/utils/tree.spec.ts b/packages/react-email/src/utils/tree.spec.ts
new file mode 100644
index 0000000000..a265e0a761
--- /dev/null
+++ b/packages/react-email/src/utils/tree.spec.ts
@@ -0,0 +1,5 @@
+import { tree } from './tree.js';
+
+test('tree(__dirname, 2)', async () => {
+  expect(await tree(__dirname, 2)).toMatchSnapshot();
+});
diff --git a/packages/react-email/src/cli/utils/tree.ts b/packages/react-email/src/utils/tree.ts
similarity index 100%
rename from packages/react-email/src/cli/utils/tree.ts
rename to packages/react-email/src/utils/tree.ts
diff --git a/packages/react-email/src/utils/types/hot-reload-change.ts b/packages/react-email/src/utils/types/hot-reload-change.ts
index cad7b9ebbf..8e4d308a91 100644
--- a/packages/react-email/src/utils/types/hot-reload-change.ts
+++ b/packages/react-email/src/utils/types/hot-reload-change.ts
@@ -1,4 +1,4 @@
-import type { HotReloadEvent } from './hot-reload-event';
+import type { HotReloadEvent } from './hot-reload-event.js';
 
 export interface HotReloadChange {
   filename: string;
diff --git a/packages/react-email/src/utils/types/hot-reload-event.ts b/packages/react-email/src/utils/types/hot-reload-event.ts
index 92ed7cb358..509a17e514 100644
--- a/packages/react-email/src/utils/types/hot-reload-event.ts
+++ b/packages/react-email/src/utils/types/hot-reload-event.ts
@@ -1,3 +1,3 @@
-import type { EventName } from 'chokidar/handler';
+import type { EventName } from 'chokidar/handler.js';
 
 export type HotReloadEvent = EventName;
diff --git a/packages/react-email/tsconfig.json b/packages/react-email/tsconfig.json
index 90c21e09c8..b10c1be9e0 100644
--- a/packages/react-email/tsconfig.json
+++ b/packages/react-email/tsconfig.json
@@ -8,7 +8,7 @@
     "forceConsistentCasingInFileNames": true,
     "inlineSources": false,
     "isolatedModules": true,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "noUnusedLocals": false,
     "noUnusedParameters": false,
     "preserveWatchOutput": true,
@@ -28,18 +28,12 @@
     "noEmit": true,
     "strict": false,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "noUncheckedIndexedAccess": true,
     "resolveJsonModule": true,
     "types": ["vitest/globals"],
     "outDir": "dist"
   },
-  "include": [
-    "next-env.d.ts",
-    "tailwind-internals.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts"
-  ],
-  "exclude": [".next", "dist", "node_modules"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["dist", "node_modules"]
 }
diff --git a/packages/react-email/tsup.config.ts b/packages/react-email/tsup.config.ts
index 44d6d43185..e1236ac842 100644
--- a/packages/react-email/tsup.config.ts
+++ b/packages/react-email/tsup.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from 'tsup';
 
 export default defineConfig({
   dts: false,
-  entry: ['./src/cli/index.ts'],
+  entry: ['./src/index.ts'],
   format: ['esm'],
-  outDir: 'dist/cli',
+  outDir: 'dist',
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea8d4a69fd..3aaf7085ab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -66,6 +66,9 @@ importers:
         specifier: workspace:*
         version: link:../../packages/react-email
     devDependencies:
+      '@react-email/preview-server':
+        specifier: workspace:*
+        version: link:../../packages/preview-server
       '@types/react':
         specifier: ^19.0.1
         version: 19.0.1
@@ -73,7 +76,7 @@ importers:
         specifier: ^19.0.1
         version: 19.0.1
       next:
-        specifier: 15.3.1
+        specifier: ^15.2.4
         version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       tsx:
         specifier: 4.19.3
@@ -612,57 +615,17 @@ importers:
         specifier: 5.8.3
         version: 5.8.3
 
-  packages/react-email:
+  packages/preview-server:
     dependencies:
+      '@babel/core':
+        specifier: 7.26.10
+        version: 7.26.10
       '@babel/parser':
         specifier: ^7.27.0
         version: 7.27.0
       '@babel/traverse':
         specifier: ^7.27.0
         version: 7.27.0
-      chalk:
-        specifier: ^5.0.0
-        version: 5.4.0
-      chokidar:
-        specifier: ^4.0.3
-        version: 4.0.3
-      commander:
-        specifier: ^13.0.0
-        version: 13.1.0
-      debounce:
-        specifier: ^2.0.0
-        version: 2.0.0
-      esbuild:
-        specifier: ^0.25.0
-        version: 0.25.0
-      glob:
-        specifier: ^11.0.0
-        version: 11.0.1
-      log-symbols:
-        specifier: ^7.0.0
-        version: 7.0.0
-      mime-types:
-        specifier: ^3.0.0
-        version: 3.0.1
-      next:
-        specifier: ^15.3.1
-        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
-      normalize-path:
-        specifier: ^3.0.0
-        version: 3.0.0
-      ora:
-        specifier: ^8.0.0
-        version: 8.2.0
-      socket.io:
-        specifier: ^4.8.1
-        version: 4.8.1
-      tsconfig-paths:
-        specifier: 4.2.0
-        version: 4.2.0
-    devDependencies:
-      '@babel/core':
-        specifier: 7.26.10
-        version: 7.26.10
       '@lottiefiles/dotlottie-react':
         specifier: 0.13.3
         version: 0.13.3(react@19.0.0)
@@ -690,24 +653,6 @@ importers:
       '@radix-ui/react-tooltip':
         specifier: 1.2.3
         version: 1.2.3(@types/react-dom@19.0.1)(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
-      '@react-email/components':
-        specifier: workspace:*
-        version: link:../components
-      '@swc/core':
-        specifier: 1.11.21
-        version: 1.11.21
-      '@types/babel__core':
-        specifier: 7.20.5
-        version: 7.20.5
-      '@types/babel__traverse':
-        specifier: 7.20.7
-        version: 7.20.7
-      '@types/fs-extra':
-        specifier: 11.0.1
-        version: 11.0.1
-      '@types/mime-types':
-        specifier: 2.1.4
-        version: 2.1.4
       '@types/node':
         specifier: 22.14.1
         version: 22.14.1
@@ -726,27 +671,36 @@ importers:
       autoprefixer:
         specifier: 10.4.21
         version: 10.4.21(postcss@8.5.3)
+      chalk:
+        specifier: ^4.1.2
+        version: 4.1.2
       clsx:
         specifier: 2.1.1
         version: 2.1.1
+      esbuild:
+        specifier: ^0.25.0
+        version: 0.25.0
       framer-motion:
         specifier: 12.7.5
         version: 12.7.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
-      jiti:
-        specifier: 2.4.2
-        version: 2.4.2
       json5:
         specifier: 2.2.3
         version: 2.2.3
+      log-symbols:
+        specifier: ^4.1.0
+        version: 4.1.0
       module-punycode:
         specifier: npm:punycode@2.3.1
         version: punycode@2.3.1
+      next:
+        specifier: ^15.2.4
+        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       node-html-parser:
         specifier: 7.0.1
         version: 7.0.1
-      postcss:
-        specifier: 8.5.3
-        version: 8.5.3
+      ora:
+        specifier: ^5.4.1
+        version: 5.4.1
       pretty-bytes:
         specifier: 6.1.1
         version: 6.1.1
@@ -783,6 +737,113 @@ importers:
       tailwindcss:
         specifier: 3.4.0
         version: 3.4.0
+      use-debounce:
+        specifier: 10.0.4
+        version: 10.0.4(react@19.0.0)
+      zod:
+        specifier: 3.24.3
+        version: 3.24.3
+    devDependencies:
+      '@react-email/components':
+        specifier: workspace:*
+        version: link:../components
+      '@types/babel__core':
+        specifier: 7.20.5
+        version: 7.20.5
+      '@types/babel__traverse':
+        specifier: 7.20.7
+        version: 7.20.7
+      '@types/fs-extra':
+        specifier: 11.0.1
+        version: 11.0.1
+      '@types/mime-types':
+        specifier: 2.1.4
+        version: 2.1.4
+      postcss:
+        specifier: 8.5.3
+        version: 8.5.3
+      typescript:
+        specifier: 5.8.3
+        version: 5.8.3
+
+  packages/react-email:
+    dependencies:
+      '@babel/parser':
+        specifier: ^7.27.0
+        version: 7.27.0
+      '@babel/traverse':
+        specifier: ^7.27.0
+        version: 7.27.0
+      chalk:
+        specifier: ^5.0.0
+        version: 5.4.0
+      chokidar:
+        specifier: ^4.0.3
+        version: 4.0.3
+      commander:
+        specifier: ^13.0.0
+        version: 13.1.0
+      debounce:
+        specifier: ^2.0.0
+        version: 2.0.0
+      esbuild:
+        specifier: ^0.25.0
+        version: 0.25.0
+      glob:
+        specifier: ^11.0.0
+        version: 11.0.1
+      jiti:
+        specifier: 2.4.2
+        version: 2.4.2
+      log-symbols:
+        specifier: ^7.0.0
+        version: 7.0.0
+      mime-types:
+        specifier: ^3.0.0
+        version: 3.0.1
+      normalize-path:
+        specifier: ^3.0.0
+        version: 3.0.0
+      nypm:
+        specifier: 0.6.0
+        version: 0.6.0
+      ora:
+        specifier: ^8.0.0
+        version: 8.2.0
+      prompts:
+        specifier: 2.4.2
+        version: 2.4.2
+      socket.io:
+        specifier: ^4.8.1
+        version: 4.8.1
+      tsconfig-paths:
+        specifier: 4.2.0
+        version: 4.2.0
+    devDependencies:
+      '@react-email/components':
+        specifier: workspace:*
+        version: link:../components
+      '@types/babel__core':
+        specifier: 7.20.5
+        version: 7.20.5
+      '@types/babel__traverse':
+        specifier: 7.20.7
+        version: 7.20.7
+      '@types/mime-types':
+        specifier: 2.1.4
+        version: 2.1.4
+      '@types/prompts':
+        specifier: 2.4.9
+        version: 2.4.9
+      next:
+        specifier: ^15.3.1
+        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      react:
+        specifier: ^19.0.0
+        version: 19.0.0
+      react-dom:
+        specifier: ^19.0.0
+        version: 19.0.0(react@19.0.0)
       tsup:
         specifier: 8.4.0
         version: 8.4.0(@microsoft/api-extractor@7.52.4(@types/node@22.14.1))(@swc/core@1.11.21)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.8.3)(yaml@2.6.1)
@@ -792,12 +853,6 @@ importers:
       typescript:
         specifier: 5.8.3
         version: 5.8.3
-      use-debounce:
-        specifier: 10.0.4
-        version: 10.0.4(react@19.0.0)
-      zod:
-        specifier: 3.24.3
-        version: 3.24.3
 
   packages/render:
     dependencies:
@@ -1008,10 +1063,6 @@ packages:
     resolution: {integrity: sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.26.10':
-    resolution: {integrity: sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/generator@7.26.3':
     resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
     engines: {node: '>=6.9.0'}
@@ -1070,10 +1121,6 @@ packages:
     resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.25.9':
-    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-string-parser@7.27.1':
     resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
     engines: {node: '>=6.9.0'}
@@ -1175,12 +1222,8 @@ packages:
     resolution: {integrity: sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.26.10':
-    resolution: {integrity: sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/types@7.26.3':
-    resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
+  '@babel/types@7.27.0':
+    resolution: {integrity: sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==}
     engines: {node: '>=6.9.0'}
 
   '@babel/types@7.27.1':
@@ -3714,6 +3757,9 @@ packages:
   '@types/prismjs@1.26.5':
     resolution: {integrity: sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==}
 
+  '@types/prompts@2.4.9':
+    resolution: {integrity: sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==}
+
   '@types/react-dom@19.0.1':
     resolution: {integrity: sha512-hljHij7MpWPKF6u5vojuyfV0YA4YURsQG7KT6SzV0Zs2BXAtgdTxG6A229Ub/xiWV4w/7JL8fi6aAyjshH4meA==}
 
@@ -4288,6 +4334,9 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
+  citty@0.1.6:
+    resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
+
   classnames@2.5.1:
     resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
 
@@ -5806,6 +5855,10 @@ packages:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
 
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
   kolorist@1.8.0:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
@@ -6387,6 +6440,11 @@ packages:
   nwsapi@2.2.20:
     resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==}
 
+  nypm@0.6.0:
+    resolution: {integrity: sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==}
+    engines: {node: ^14.16.0 || >=16.10.0}
+    hasBin: true
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -6756,6 +6814,10 @@ packages:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
 
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
   property-information@6.5.0:
     resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==}
 
@@ -7236,6 +7298,9 @@ packages:
   simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
 
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -8359,7 +8424,7 @@ snapshots:
       '@babel/parser': 7.27.0
       '@babel/template': 7.25.9
       '@babel/traverse': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
       convert-source-map: 2.0.0
       debug: 4.4.0
       gensync: 1.0.0-beta.2
@@ -8371,15 +8436,15 @@ snapshots:
   '@babel/core@7.26.10':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.26.2
-      '@babel/generator': 7.26.10
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.27.1
       '@babel/helper-compilation-targets': 7.26.5
       '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.10)
       '@babel/helpers': 7.26.10
       '@babel/parser': 7.27.0
-      '@babel/template': 7.26.9
+      '@babel/template': 7.27.1
       '@babel/traverse': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.1
       convert-source-map: 2.0.0
       debug: 4.4.0
       gensync: 1.0.0-beta.2
@@ -8388,18 +8453,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/generator@7.26.10':
-    dependencies:
-      '@babel/parser': 7.27.0
-      '@babel/types': 7.26.10
-      '@jridgewell/gen-mapping': 0.3.8
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 3.1.0
-
   '@babel/generator@7.26.3':
     dependencies:
       '@babel/parser': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
       '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 3.1.0
@@ -8455,7 +8512,7 @@ snapshots:
   '@babel/helper-module-imports@7.25.9':
     dependencies:
       '@babel/traverse': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
     transitivePeerDependencies:
       - supports-color
 
@@ -8499,8 +8556,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-string-parser@7.25.9': {}
-
   '@babel/helper-string-parser@7.27.1': {}
 
   '@babel/helper-validator-identifier@7.25.9': {}
@@ -8512,12 +8567,12 @@ snapshots:
   '@babel/helpers@7.26.0':
     dependencies:
       '@babel/template': 7.26.9
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@babel/helpers@7.26.10':
     dependencies:
-      '@babel/template': 7.26.9
-      '@babel/types': 7.26.10
+      '@babel/template': 7.27.1
+      '@babel/types': 7.27.1
 
   '@babel/parser@7.24.5':
     dependencies:
@@ -8589,13 +8644,13 @@ snapshots:
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/parser': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@babel/template@7.26.9':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/parser': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@babel/template@7.27.1':
     dependencies:
@@ -8615,15 +8670,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.26.10':
-    dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-
-  '@babel/types@7.26.3':
+  '@babel/types@7.27.0':
     dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.27.1
 
   '@babel/types@7.27.1':
     dependencies:
@@ -11072,6 +11122,7 @@ snapshots:
       '@swc/core-win32-arm64-msvc': 1.11.21
       '@swc/core-win32-ia32-msvc': 1.11.21
       '@swc/core-win32-x64-msvc': 1.11.21
+    optional: true
 
   '@swc/core@1.3.101(@swc/helpers@0.5.15)':
     dependencies:
@@ -11108,6 +11159,7 @@ snapshots:
   '@swc/types@0.1.21':
     dependencies:
       '@swc/counter': 0.1.3
+    optional: true
 
   '@szmarczak/http-timer@5.0.1':
     dependencies:
@@ -11124,23 +11176,23 @@ snapshots:
   '@types/babel__core@7.20.5':
     dependencies:
       '@babel/parser': 7.27.0
-      '@babel/types': 7.26.3
+      '@babel/types': 7.27.0
       '@types/babel__generator': 7.6.8
       '@types/babel__template': 7.4.4
       '@types/babel__traverse': 7.20.7
 
   '@types/babel__generator@7.6.8':
     dependencies:
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@types/babel__template@7.4.4':
     dependencies:
       '@babel/parser': 7.27.0
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@types/babel__traverse@7.20.7':
     dependencies:
-      '@babel/types': 7.26.10
+      '@babel/types': 7.27.0
 
   '@types/chai@5.2.2':
     dependencies:
@@ -11240,6 +11292,11 @@ snapshots:
 
   '@types/prismjs@1.26.5': {}
 
+  '@types/prompts@2.4.9':
+    dependencies:
+      '@types/node': 22.14.1
+      kleur: 3.0.3
+
   '@types/react-dom@19.0.1':
     dependencies:
       '@types/react': 19.0.1
@@ -11901,6 +11958,10 @@ snapshots:
 
   ci-info@3.9.0: {}
 
+  citty@0.1.6:
+    dependencies:
+      consola: 3.4.2
+
   classnames@2.5.1: {}
 
   clean-stack@4.2.0:
@@ -13688,6 +13749,8 @@ snapshots:
 
   kind-of@6.0.3: {}
 
+  kleur@3.0.3: {}
+
   kolorist@1.8.0: {}
 
   lcm@0.0.3:
@@ -14530,6 +14593,14 @@ snapshots:
 
   nwsapi@2.2.20: {}
 
+  nypm@0.6.0:
+    dependencies:
+      citty: 0.1.6
+      consola: 3.4.2
+      pathe: 2.0.3
+      pkg-types: 2.1.0
+      tinyexec: 0.3.2
+
   object-assign@4.1.1: {}
 
   object-hash@3.0.0: {}
@@ -14708,7 +14779,7 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.26.2
+      '@babel/code-frame': 7.27.1
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -14906,6 +14977,11 @@ snapshots:
 
   progress@2.0.3: {}
 
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
   property-information@6.5.0: {}
 
   property-information@7.0.0: {}
@@ -15681,6 +15757,8 @@ snapshots:
     dependencies:
       is-arrayish: 0.3.2
 
+  sisteransi@1.0.5: {}
+
   slash@3.0.0: {}
 
   smart-buffer@4.2.0: {}
@@ -16002,7 +16080,7 @@ snapshots:
       postcss-js: 4.0.1(postcss@8.5.3)
       postcss-load-config: 4.0.2(postcss@8.5.3)
       postcss-nested: 6.2.0(postcss@8.5.3)
-      postcss-selector-parser: 6.0.16
+      postcss-selector-parser: 6.1.2
       resolve: 1.22.9
       sucrase: 3.35.0
     transitivePeerDependencies:
diff --git a/turbo.json b/turbo.json
index a10d59c6fc..db6eb7ce76 100644
--- a/turbo.json
+++ b/turbo.json
@@ -26,6 +26,10 @@
       ],
       "outputs": [".next/**", "!.next/cache/**"]
     },
+    "@react-email/preview-server#build": {
+      "dependsOn": ["^build"],
+      "outputs": [".next/**", "!.next/cache/**"]
+    },
     "demo#build": {
       "dependsOn": ["^build", "^postbuild"],
       "outputs": [".react-email/**", "!.react-email/.next/cache/**"]

From a9b594cf572394a26f5d48ed92a59df5217d78b0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 12:42:36 -0300
Subject: [PATCH 30/51] chore(root): Version packages (canary) (#2255)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json               | 1 +
 packages/react-email/CHANGELOG.md | 6 ++++++
 packages/react-email/package.json | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 9cf05c313f..282cc93e35 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -36,6 +36,7 @@
     "crazy-seas-eat",
     "great-parrots-yell",
     "mighty-pigs-add",
+    "puny-chicken-argue",
     "stupid-ghosts-decide",
     "tasty-swans-taste",
     "tidy-geese-cross",
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 4f162bb236..8c63655d35 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.8
+
+### Minor Changes
+
+- ed2f46a: use a separate package for storing the preview server (@react-email/preview-server)
+
 ## 4.1.0-canary.7
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 280684e939..9770259496 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.7",
+  "version": "4.1.0-canary.8",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/index.js"

From e0c332d027bc7fda258752373fca32da31ae23c8 Mon Sep 17 00:00:00 2001
From: Pedro Almeida <pedroalmeidaprogrammer@gmail.com>
Date: Thu, 22 May 2025 06:07:09 -0300
Subject: [PATCH 31/51] FIX: fix(types): correct typo in SupportEntryCategory
 type (#2260)

---
 .../src/actions/email-validation/check-compatibility.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/preview-server/src/actions/email-validation/check-compatibility.ts b/packages/preview-server/src/actions/email-validation/check-compatibility.ts
index 8e045a211b..f55ee77ba2 100644
--- a/packages/preview-server/src/actions/email-validation/check-compatibility.ts
+++ b/packages/preview-server/src/actions/email-validation/check-compatibility.ts
@@ -68,14 +68,14 @@ export type Platform =
   | 'windows-mail'
   | 'outlook-com';
 
-export type SupportEntryCategroy = 'html' | 'css' | 'image' | 'others';
+export type SupportEntryCategory = 'html' | 'css' | 'image' | 'others';
 
 export interface SupportEntry {
   slug: string;
   title: string;
   description: string | null;
   url: string;
-  category: SupportEntryCategroy;
+  category: SupportEntryCategory;
   tags: string[];
   keywords: string | null;
   last_test_date: string;

From fa1a62fc445d842a1bb7be7aa6b20fd713de7d55 Mon Sep 17 00:00:00 2001
From: Pedro Almeida <pedroalmeidaprogrammer@gmail.com>
Date: Mon, 26 May 2025 10:13:28 -0300
Subject: [PATCH 32/51] docs(readme): split build and run instructions for
 clarity (#2261)

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a68467d544..6b52615bbd 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,13 @@ All components were tested using the most popular email clients.
 pnpm install
 ```
 
-#### Build and run packages
+#### Build
+
+```sh
+pnpm build
+```
+
+#### Run packages
 
 ```sh
 pnpm dev

From ac44641a07c3debca7f67ac79915c194716e0632 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Mon, 26 May 2025 16:38:02 -0300
Subject: [PATCH 33/51] chore(root): Update biome to beta.5 (#2264)

---
 apps/web/src/components/template.tsx          |  2 +-
 .../parse-pointing-table-rows.ts              |  2 +-
 biome.json                                    |  5 +-
 package.json                                  |  2 +-
 .../actions/email-validation/check-images.ts  |  6 +-
 .../actions/email-validation/check-links.ts   |  6 +-
 .../actions/email-validation/quick-fetch.ts   |  2 +-
 .../src/app/preview/[...slug]/page.tsx        |  7 +-
 .../preview-server/src/components/send.tsx    |  2 +-
 .../toolbar/code-preview-line-link.tsx        |  1 -
 .../src/components/toolbar/results.tsx        |  1 +
 .../components/toolbar/use-cached-state.ts    |  4 +-
 .../caniemail/ast/get-object-variables.ts     |  2 +-
 .../tailwind/generate-tailwind-rules.ts       |  2 +-
 .../caniemail/tailwind/get-tailwind-config.ts | 11 +--
 packages/preview-server/src/utils/result.ts   |  4 +-
 .../src/utils/testing/js-email-test.js        |  2 +-
 .../utils/testing/request-response-email.tsx  |  4 +-
 .../src/utils/get-preview-server-location.ts  |  2 +-
 packages/render/src/shared/options.ts         |  1 -
 pnpm-lock.yaml                                | 76 +++++++++----------
 21 files changed, 67 insertions(+), 77 deletions(-)

diff --git a/apps/web/src/components/template.tsx b/apps/web/src/components/template.tsx
index 3a5194cc08..bf85fd3736 100644
--- a/apps/web/src/components/template.tsx
+++ b/apps/web/src/components/template.tsx
@@ -1,8 +1,8 @@
 'use client';
 
 import classNames from 'classnames';
-import Image from 'next/image';
 import type { ImageLoader } from 'next/image';
+import Image from 'next/image';
 import Link from 'next/link';
 import * as React from 'react';
 import { Heading } from './heading';
diff --git a/apps/web/src/utils/spam-assassin/parse-pointing-table-rows.ts b/apps/web/src/utils/spam-assassin/parse-pointing-table-rows.ts
index 3afa39b89e..0ccfdfa717 100644
--- a/apps/web/src/utils/spam-assassin/parse-pointing-table-rows.ts
+++ b/apps/web/src/utils/spam-assassin/parse-pointing-table-rows.ts
@@ -27,7 +27,7 @@ export const parsePointingTableRows = (response: string) => {
   const responseFromTableStart = response.slice(
     tableStartMatch.index + tableStartMatch[0].length,
   );
-  let currentRow: Row | undefined = undefined;
+  let currentRow: Row | undefined;
   for (const line of responseFromTableStart.split(/\r\n|\n|\r/)) {
     if (line.trim().length === 0) break;
 
diff --git a/biome.json b/biome.json
index 8f3beaf4e1..5c35171042 100644
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.0.0-beta.1/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.0-beta.5/schema.json",
   "assist": {
     "actions": {
       "source": {
@@ -31,7 +31,6 @@
         "noCommaOperator": "error",
         "useNodejsImportProtocol": "error",
         "useAsConstAssertion": "error",
-        "useNumericLiterals": "error",
         "useEnumInitializers": "error",
         "useSelfClosingElements": "error",
         "useConst": "error",
@@ -54,6 +53,7 @@
         "noDelete": "off"
       },
       "a11y": {
+        "noStaticElementInteractions": "off",
         "noSvgWithoutTitle": "off",
         "noAutofocus": "off"
       },
@@ -67,6 +67,7 @@
         "useSortedClasses": "off"
       },
       "complexity": {
+        "useNumericLiterals": "error",
         "noUselessFragments": "off",
         "noForEach": "off"
       },
diff --git a/package.json b/package.json
index 72f6cc8f16..d00baa351b 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test:watch": "turbo run test:watch"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.0.0-beta.1",
+    "@biomejs/biome": "2.0.0-beta.5",
     "@changesets/cli": "2.29.4",
     "@types/node": "22.14.1",
     "@types/react": "19.0.1",
diff --git a/packages/preview-server/src/actions/email-validation/check-images.ts b/packages/preview-server/src/actions/email-validation/check-images.ts
index 7f4929d3b3..b6d2842df0 100644
--- a/packages/preview-server/src/actions/email-validation/check-images.ts
+++ b/packages/preview-server/src/actions/email-validation/check-images.ts
@@ -103,7 +103,7 @@ export const checkImages = async (code: string, base: string) => {
             });
           }
 
-          let res: IncomingMessage | undefined = undefined;
+          let res: IncomingMessage | undefined;
           try {
             res = await quickFetch(url);
             const hasSucceeded =
@@ -132,7 +132,7 @@ export const checkImages = async (code: string, base: string) => {
             if (responseSizeBytes > 1_048_576 && result.status !== 'error') {
               result.status = 'warning';
             }
-          } catch (exception) {
+          } catch (_exception) {
             result.checks.push({
               type: 'fetch_attempt',
               passed: false,
@@ -142,7 +142,7 @@ export const checkImages = async (code: string, base: string) => {
             });
             result.status = 'error';
           }
-        } catch (exception) {
+        } catch (_exception) {
           result.checks.push({
             passed: false,
             type: 'syntax',
diff --git a/packages/preview-server/src/actions/email-validation/check-links.ts b/packages/preview-server/src/actions/email-validation/check-links.ts
index 83df39072f..9a79306048 100644
--- a/packages/preview-server/src/actions/email-validation/check-links.ts
+++ b/packages/preview-server/src/actions/email-validation/check-links.ts
@@ -68,7 +68,7 @@ export const checkLinks = async (code: string) => {
             });
           }
 
-          let res: IncomingMessage | undefined = undefined;
+          let res: IncomingMessage | undefined;
           try {
             res = await quickFetch(url);
             const hasSucceeded =
@@ -85,7 +85,7 @@ export const checkLinks = async (code: string) => {
                 ? 'warning'
                 : 'error';
             }
-          } catch (exception) {
+          } catch (_exception) {
             result.checks.push({
               type: 'fetch_attempt',
               passed: false,
@@ -95,7 +95,7 @@ export const checkLinks = async (code: string) => {
             });
             result.status = 'error';
           }
-        } catch (exception) {
+        } catch (_exception) {
           result.checks.push({
             passed: false,
             type: 'syntax',
diff --git a/packages/preview-server/src/actions/email-validation/quick-fetch.ts b/packages/preview-server/src/actions/email-validation/quick-fetch.ts
index 3f5b1dcf22..d2ab9447e8 100644
--- a/packages/preview-server/src/actions/email-validation/quick-fetch.ts
+++ b/packages/preview-server/src/actions/email-validation/quick-fetch.ts
@@ -1,5 +1,5 @@
-import http from 'node:http';
 import type { IncomingMessage } from 'node:http';
+import http from 'node:http';
 import https from 'node:https';
 
 export const quickFetch = (url: URL) => {
diff --git a/packages/preview-server/src/app/preview/[...slug]/page.tsx b/packages/preview-server/src/app/preview/[...slug]/page.tsx
index e9511d5f59..6f305c903c 100644
--- a/packages/preview-server/src/app/preview/[...slug]/page.tsx
+++ b/packages/preview-server/src/app/preview/[...slug]/page.tsx
@@ -60,10 +60,9 @@ This is most likely not an issue with the preview server. Maybe there was a typo
 
   const serverEmailRenderingResult = await renderEmailByPath(emailPath);
 
-  let spamCheckingResult: SpamCheckingResult | undefined = undefined;
-  let lintingRows: LintingRow[] | undefined = undefined;
-  let compatibilityCheckingResults: CompatibilityCheckingResult[] | undefined =
-    undefined;
+  let spamCheckingResult: SpamCheckingResult | undefined;
+  let lintingRows: LintingRow[] | undefined;
+  let compatibilityCheckingResults: CompatibilityCheckingResult[] | undefined;
 
   if (isBuilding) {
     if ('error' in serverEmailRenderingResult) {
diff --git a/packages/preview-server/src/components/send.tsx b/packages/preview-server/src/components/send.tsx
index 012e3ecb4e..a7a008f754 100644
--- a/packages/preview-server/src/components/send.tsx
+++ b/packages/preview-server/src/components/send.tsx
@@ -31,7 +31,7 @@ export const Send = ({ markup }: { markup: string }) => {
       }
 
       toast.success('Email sent! Check your inbox.');
-    } catch (exception) {
+    } catch (_exception) {
       toast.error('Something went wrong. Please try again.');
     } finally {
       setIsSending(false);
diff --git a/packages/preview-server/src/components/toolbar/code-preview-line-link.tsx b/packages/preview-server/src/components/toolbar/code-preview-line-link.tsx
index 1c59416c0b..dd62fe7763 100644
--- a/packages/preview-server/src/components/toolbar/code-preview-line-link.tsx
+++ b/packages/preview-server/src/components/toolbar/code-preview-line-link.tsx
@@ -10,7 +10,6 @@ interface CodePreviewLineLinkProps {
 
 export const CodePreviewLineLink = ({
   line,
-  column,
   type,
 }: CodePreviewLineLinkProps) => {
   const searchParams = useSearchParams();
diff --git a/packages/preview-server/src/components/toolbar/results.tsx b/packages/preview-server/src/components/toolbar/results.tsx
index 25644f1ed8..7e576509a0 100644
--- a/packages/preview-server/src/components/toolbar/results.tsx
+++ b/packages/preview-server/src/components/toolbar/results.tsx
@@ -7,6 +7,7 @@ export const Results = ({
 }: React.ComponentProps<'table'>) => {
   return (
     <table
+      {...props}
       className={cn(
         'group relative w-full border-collapse text-left text-slate-10 text-sm',
         className,
diff --git a/packages/preview-server/src/components/toolbar/use-cached-state.ts b/packages/preview-server/src/components/toolbar/use-cached-state.ts
index aeb2df5489..8c062faab6 100644
--- a/packages/preview-server/src/components/toolbar/use-cached-state.ts
+++ b/packages/preview-server/src/components/toolbar/use-cached-state.ts
@@ -1,13 +1,13 @@
 import { useSyncExternalStore } from 'react';
 
 export const useCachedState = <T>(key: string) => {
-  let value: T | undefined = undefined;
+  let value: T | undefined;
   if ('localStorage' in global) {
     const storedValue = global.localStorage.getItem(key);
     if (storedValue !== null && storedValue !== 'undefined') {
       try {
         value = JSON.parse(storedValue) as T;
-      } catch (exception) {
+      } catch (_exception) {
         console.warn(
           'Failed to load stored value for',
           key,
diff --git a/packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts b/packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts
index 5c0355793c..733fb23bf0 100644
--- a/packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts
+++ b/packages/preview-server/src/utils/caniemail/ast/get-object-variables.ts
@@ -1,5 +1,5 @@
-import traverse from '@babel/traverse';
 import type { Node } from '@babel/traverse';
+import traverse from '@babel/traverse';
 import type { AST } from '../../../actions/email-validation/check-compatibility';
 
 export interface Position {
diff --git a/packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts b/packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
index 59dfa145da..85ce82de58 100644
--- a/packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
+++ b/packages/preview-server/src/utils/caniemail/tailwind/generate-tailwind-rules.ts
@@ -1,5 +1,5 @@
-import postcss from 'postcss';
 import type { Root, Rule } from 'postcss';
+import postcss from 'postcss';
 import evaluateTailwindFunctions from 'tailwindcss/lib/lib/evaluateTailwindFunctions';
 import { generateRules as rawGenerateRules } from 'tailwindcss/lib/lib/generateRules';
 import type { JitContext } from 'tailwindcss/lib/lib/setupContextUtils';
diff --git a/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts b/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts
index 3b0137aa10..8e65f72602 100644
--- a/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts
+++ b/packages/preview-server/src/utils/caniemail/tailwind/get-tailwind-config.ts
@@ -1,7 +1,6 @@
-import fs from 'node:fs';
 import path from 'node:path';
-import traverse from '@babel/traverse';
 import type { Node } from '@babel/traverse';
+import traverse from '@babel/traverse';
 import * as esbuild from 'esbuild';
 import type { Config as TailwindOriginalConfig } from 'tailwindcss';
 import type { AST } from '../../../actions/email-validation/check-compatibility';
@@ -24,14 +23,6 @@ export type TailwindConfig = Pick<
   | 'plugins'
 >;
 
-const getFirstExistingFilepath = (filePaths: string[]) => {
-  for (const filePath of filePaths) {
-    if (fs.existsSync(filePath)) {
-      return filePath;
-    }
-  }
-};
-
 type ImportDeclaration = Node & { type: 'ImportDeclaration' };
 
 export const getTailwindConfig = async (
diff --git a/packages/preview-server/src/utils/result.ts b/packages/preview-server/src/utils/result.ts
index 19125a920e..e6c519fbea 100644
--- a/packages/preview-server/src/utils/result.ts
+++ b/packages/preview-server/src/utils/result.ts
@@ -32,7 +32,7 @@ export function mapResult<T, E, B>(
 
 export function ok<T, E>(value: NoInfer<T>): Ok<T, E>;
 // biome-ignore lint/suspicious/noConfusingVoidType: This is required for void return types on functions that can still error
-export function ok<T extends void = void, E = never>(value: void): Ok<void, E>;
+export function ok<_T extends void = void, E = never>(value: void): Ok<void, E>;
 export function ok<T, E>(value: NoInfer<T>): Ok<T, E> {
   return {
     value,
@@ -41,7 +41,7 @@ export function ok<T, E>(value: NoInfer<T>): Ok<T, E> {
 
 export function err<T, E>(error: NoInfer<E>): Error<T, E>;
 // biome-ignore lint/suspicious/noConfusingVoidType: This is required for void return types on functions that can still error
-export function err<T, E extends void = void>(error: void): Error<T, void>;
+export function err<T, _E extends void = void>(error: void): Error<T, void>;
 export function err<T, E>(error: NoInfer<E>): Error<T, E> {
   return {
     error,
diff --git a/packages/preview-server/src/utils/testing/js-email-test.js b/packages/preview-server/src/utils/testing/js-email-test.js
index 10bb11a668..4239310c92 100644
--- a/packages/preview-server/src/utils/testing/js-email-test.js
+++ b/packages/preview-server/src/utils/testing/js-email-test.js
@@ -1,5 +1,5 @@
 // A simple JavaScript email component
-const React = require('react');
+const _React = require('react');
 const { Html, Button } = require('@react-email/components');
 
 function Email() {
diff --git a/packages/preview-server/src/utils/testing/request-response-email.tsx b/packages/preview-server/src/utils/testing/request-response-email.tsx
index 0272314717..0156c1d3f1 100644
--- a/packages/preview-server/src/utils/testing/request-response-email.tsx
+++ b/packages/preview-server/src/utils/testing/request-response-email.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const req = new Request('https://react.email');
-const res = new Response('{}');
+const _req = new Request('https://react.email');
+const _res = new Response('{}');
 
 const Email = () => {
   return <div />;
diff --git a/packages/react-email/src/utils/get-preview-server-location.ts b/packages/react-email/src/utils/get-preview-server-location.ts
index a438059beb..677e58978b 100644
--- a/packages/react-email/src/utils/get-preview-server-location.ts
+++ b/packages/react-email/src/utils/get-preview-server-location.ts
@@ -12,7 +12,7 @@ export const getPreviewServerLocation = async () => {
       url.parse(usersProject.esmResolve('@react-email/preview-server'), true)
         .path!,
     );
-  } catch (exception) {
+  } catch (_exception) {
     const response = await prompts({
       type: 'confirm',
       name: 'installPreviewServer',
diff --git a/packages/render/src/shared/options.ts b/packages/render/src/shared/options.ts
index a2c9ad0526..ddc36b352f 100644
--- a/packages/render/src/shared/options.ts
+++ b/packages/render/src/shared/options.ts
@@ -1,5 +1,4 @@
 import type { HtmlToTextOptions } from 'html-to-text';
-// biome-ignore lint/correctness/noUnusedImports: this is used in the deprecated doc
 import type { pretty } from './utils/pretty';
 
 export type Options = {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3aaf7085ab..7aec9836c6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,8 +15,8 @@ importers:
   .:
     devDependencies:
       '@biomejs/biome':
-        specifier: 2.0.0-beta.1
-        version: 2.0.0-beta.1
+        specifier: 2.0.0-beta.5
+        version: 2.0.0-beta.5
       '@changesets/cli':
         specifier: 2.29.4
         version: 2.29.4
@@ -1230,55 +1230,55 @@ packages:
     resolution: {integrity: sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==}
     engines: {node: '>=6.9.0'}
 
-  '@biomejs/biome@2.0.0-beta.1':
-    resolution: {integrity: sha512-MqRoy9CbTkrS45zW+S4u8p4kQUIFx0mGUWi789W1R3b1kXYIudEqsTKgXKtTGsI0kWOlvnjuKqwTrabjaGchhQ==}
+  '@biomejs/biome@2.0.0-beta.5':
+    resolution: {integrity: sha512-1ldO4AepieVvg4aLi1ubZkA7NsefQT2UTNssbJbDiQTGem8kCHx/PZCwLxIR6UzFpGIjh0xsDzivyVvhnmqmuA==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.0.0-beta.1':
-    resolution: {integrity: sha512-RaGmpNLl5NFooXaoCwvgvcuU6Am/rMZ3R48pQeCVxjrCcz1BIlKLTai5UosiedazW7JbXAvgXdSNizYG7ITlAQ==}
+  '@biomejs/cli-darwin-arm64@2.0.0-beta.5':
+    resolution: {integrity: sha512-pnJiaoDpwGo+ctGkMu4POcO8jgOgCErBdYbhutr+K9rxxJS+TlHLr0LR91GCEWbGV2O1oyZRFQcW21rYFoak4w==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.0.0-beta.1':
-    resolution: {integrity: sha512-sTzSshkne7HKZFNfiIhmAji7gjtCBXvkTujZELCZWIZC7oj1Tjw/gvAzbdFj2UyHd5/i90pND4ybFOLQZm9gpg==}
+  '@biomejs/cli-darwin-x64@2.0.0-beta.5':
+    resolution: {integrity: sha512-WwEZpqcmsNoFpZkUFNQcbZo52WK4hLGQ0vZk3PQ8JlZ55gJsHiyhtv6aem6fVlyVCvZgpsC0sYPLE3VvFVKNAQ==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.1':
-    resolution: {integrity: sha512-0MPUKzz9uBBxAYSJ+OlFi4+yGwiRcZeFqq39H0MxXCQ9MMpKJFH2Ek72fw8sXwG7Prn7EsW/3u1b7najyn1XGQ==}
+  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.5':
+    resolution: {integrity: sha512-4vxNkYx1uEt211W8hLdXddc7icRHQgYENb72g6uTd/tLVPSBvIwqUAxAOkU+9Ai1E/8R4sWy7HIxREgpuFgbNA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-arm64@2.0.0-beta.1':
-    resolution: {integrity: sha512-bxce2O4nooBmp20Ey0+IFIZyy/b0RVnciIQk9euCfAi9evq7SvFtMBYo3YUZej0KIvrau5H7tJk5OqmRJk2l+g==}
+  '@biomejs/cli-linux-arm64@2.0.0-beta.5':
+    resolution: {integrity: sha512-lAF1de+Ki0vnq14NwDXouKkAR/iviyMNrUngSHjTGFC4z8XGVEfIw0ZMSm7fAdJZ5fAWodt9HiYmEAVs5EtHQg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64-musl@2.0.0-beta.1':
-    resolution: {integrity: sha512-dFvisnP1hFpVILNw0PZfs8piBwe8+aykO04Tb/4AJDVVzKkGgJfwSefwo4jqzO/Wk/Zruvhcp1nKbjgRXM+vDg==}
+  '@biomejs/cli-linux-x64-musl@2.0.0-beta.5':
+    resolution: {integrity: sha512-nUeKGO517GtRCxziVD9les1HiCs2s2/WIVITMN9+9RRuLOko8r+T77E8ZXEmlfLOfOIOeE6z62WITqei3oNccA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64@2.0.0-beta.1':
-    resolution: {integrity: sha512-6P/AtJv4hOH8mu8ez0c4UInUpiet9NEoF25+O7OPyb4w6ZHJMp2qzvayJS7TKrTQzE5KUvSiNsACGRz34DzUkg==}
+  '@biomejs/cli-linux-x64@2.0.0-beta.5':
+    resolution: {integrity: sha512-I0Pt1VHeL1mN8G7ZwV2u9AfzBd5ZKfbvHUI4x2wETUZbwcQlAu/nEzEa2LUe5HqSmnctTR36ig7RkkM9qbmIrA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-win32-arm64@2.0.0-beta.1':
-    resolution: {integrity: sha512-0C9YSqWHf2cJGnjKDbLi49xv6H9IfqbDsFav7X557PqwY64O6IKWqcmZzi/PkDFHjQM9opU6uhKapeGKGDxziQ==}
+  '@biomejs/cli-win32-arm64@2.0.0-beta.5':
+    resolution: {integrity: sha512-YXW6hgbrgBcWQ1SLO69ypWlluPchgQV5C1lTG4xOcBUWdCsfYuQirM64S6Dov7SFPqsMIoFC6LlQRW+n8qAyiA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.0.0-beta.1':
-    resolution: {integrity: sha512-o8W6+DX0YRjt1kS8Y3ismq6EkjwiVDv7X0TEpfnFywoVG8HoJ7G7/m9r8LM1yE46WI3maPH2A0MoVpQ1ZNG++A==}
+  '@biomejs/cli-win32-x64@2.0.0-beta.5':
+    resolution: {integrity: sha512-N7Yby52BJmvEdst1iMbclE5hxxefboaXKRJLm1tLfBYr4FeuoCe6j8HdiQSwhCRdIUGFFqBLaDXh//LLF6EReA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -8680,39 +8680,39 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
 
-  '@biomejs/biome@2.0.0-beta.1':
+  '@biomejs/biome@2.0.0-beta.5':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.0.0-beta.1
-      '@biomejs/cli-darwin-x64': 2.0.0-beta.1
-      '@biomejs/cli-linux-arm64': 2.0.0-beta.1
-      '@biomejs/cli-linux-arm64-musl': 2.0.0-beta.1
-      '@biomejs/cli-linux-x64': 2.0.0-beta.1
-      '@biomejs/cli-linux-x64-musl': 2.0.0-beta.1
-      '@biomejs/cli-win32-arm64': 2.0.0-beta.1
-      '@biomejs/cli-win32-x64': 2.0.0-beta.1
-
-  '@biomejs/cli-darwin-arm64@2.0.0-beta.1':
+      '@biomejs/cli-darwin-arm64': 2.0.0-beta.5
+      '@biomejs/cli-darwin-x64': 2.0.0-beta.5
+      '@biomejs/cli-linux-arm64': 2.0.0-beta.5
+      '@biomejs/cli-linux-arm64-musl': 2.0.0-beta.5
+      '@biomejs/cli-linux-x64': 2.0.0-beta.5
+      '@biomejs/cli-linux-x64-musl': 2.0.0-beta.5
+      '@biomejs/cli-win32-arm64': 2.0.0-beta.5
+      '@biomejs/cli-win32-x64': 2.0.0-beta.5
+
+  '@biomejs/cli-darwin-arm64@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.0.0-beta.1':
+  '@biomejs/cli-darwin-x64@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.1':
+  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.0.0-beta.1':
+  '@biomejs/cli-linux-arm64@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.0.0-beta.1':
+  '@biomejs/cli-linux-x64-musl@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.0.0-beta.1':
+  '@biomejs/cli-linux-x64@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.0.0-beta.1':
+  '@biomejs/cli-win32-arm64@2.0.0-beta.5':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.0.0-beta.1':
+  '@biomejs/cli-win32-x64@2.0.0-beta.5':
     optional: true
 
   '@changesets/apply-release-plan@7.0.12':

From 5db6b0f78acf9ec5f58dbdca04137e834b1ba2dd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 15:32:15 -0300
Subject: [PATCH 34/51] chore(root): Version packages (canary) (#2266)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                  | 1 +
 packages/preview-server/CHANGELOG.md | 7 +++++++
 packages/preview-server/package.json | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 packages/preview-server/CHANGELOG.md

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 282cc93e35..9399715cbe 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -33,6 +33,7 @@
     "web": "0.0.0"
   },
   "changesets": [
+    "afraid-sides-agree",
     "crazy-seas-eat",
     "great-parrots-yell",
     "mighty-pigs-add",
diff --git a/packages/preview-server/CHANGELOG.md b/packages/preview-server/CHANGELOG.md
new file mode 100644
index 0000000000..ab28d2e9d7
--- /dev/null
+++ b/packages/preview-server/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @react-email/preview-server
+
+## 1.0.0-canary.1
+
+### Patch Changes
+
+- efb4db2: fix `<svg>` not being flagged as incompatible
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index e57564649b..c8e3d76c83 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-email/preview-server",
-  "version": "1.0.0-canary.0",
+  "version": "1.0.0-canary.1",
   "description": "A live preview of your emails right in your browser.",
   "scripts": {
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",

From c86b44da0e45595098dd84c3b320d5368e635d30 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 08:04:57 -0300
Subject: [PATCH 35/51] chore(root): Version packages (canary) (#2269)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json              |  1 +
 packages/components/CHANGELOG.md | 26 ++++++++++++++++++++++++++
 packages/render/CHANGELOG.md     |  6 ++++++
 3 files changed, 33 insertions(+)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 9399715cbe..cfafa64037 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -35,6 +35,7 @@
   "changesets": [
     "afraid-sides-agree",
     "crazy-seas-eat",
+    "deep-clowns-bet",
     "great-parrots-yell",
     "mighty-pigs-add",
     "puny-chicken-argue",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index af66ee2451..b9b0bc2738 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -41,6 +41,32 @@
   - @react-email/button@0.1.0
   - @react-email/tailwind@1.0.5
 
+## 0.1.0-canary.4
+
+### Patch Changes
+
+- Updated dependencies [e22cc83]
+  - @react-email/render@1.1.3-canary.0
+  - @react-email/body@0.0.11
+  - @react-email/button@0.1.0-canary.0
+  - @react-email/code-block@0.0.13
+  - @react-email/code-inline@0.0.5
+  - @react-email/column@0.0.13
+  - @react-email/container@0.0.15
+  - @react-email/font@0.0.9
+  - @react-email/head@0.0.12
+  - @react-email/heading@0.0.15
+  - @react-email/hr@0.0.11
+  - @react-email/html@0.0.11
+  - @react-email/img@0.0.11
+  - @react-email/link@0.0.12
+  - @react-email/markdown@0.0.15
+  - @react-email/preview@0.0.13
+  - @react-email/row@0.0.12
+  - @react-email/section@0.0.16
+  - @react-email/tailwind@1.1.0-canary.0
+  - @react-email/text@0.1.4
+
 ## 0.1.0-canary.3
 
 ### Minor Changes
diff --git a/packages/render/CHANGELOG.md b/packages/render/CHANGELOG.md
index 511f96d1c3..a52e16d1ae 100644
--- a/packages/render/CHANGELOG.md
+++ b/packages/render/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - 19cc59c: fix browser version including errors in the output instead of throwing them
 
+## 1.1.3-canary.0
+
+### Patch Changes
+
+- e22cc83: fix browser version including errors in the output instead of throwing them
+
 ## 1.1.2
 
 ### Patch Changes

From 8945e497973a532b5bd2f275ec00d2f28b037b15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 11:55:49 -0300
Subject: [PATCH 36/51] chore(deps): bump next from 14.2.3 to 15.3.1 (#2244)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/demo/package.json               |   2 +-
 apps/web/package.json                |   2 +-
 packages/preview-server/package.json |   2 +-
 packages/react-email/package.json    |   2 +-
 pnpm-lock.yaml                       | 144 +++++++++++++++------------
 5 files changed, 85 insertions(+), 67 deletions(-)

diff --git a/apps/demo/package.json b/apps/demo/package.json
index b886a9659b..478adbb091 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@react-email/preview-server": "workspace:*",
-    "next": "^15.2.4",
+    "next": "^15.3.2",
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "tsx": "4.19.3"
diff --git a/apps/web/package.json b/apps/web/package.json
index ce813bfc25..59c37b3604 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -21,7 +21,7 @@
     "@vercel/analytics": "1.5.0",
     "framer-motion": "12.7.4",
     "lucide-react": "^0.492.0",
-    "next": "15.3.1",
+    "next": "15.3.2",
     "prism-react-renderer": "2.4.1",
     "react": "^19",
     "react-dom": "^19",
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index c8e3d76c83..09894e0455 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -36,7 +36,7 @@
     "json5": "2.2.3",
     "log-symbols": "^4.1.0",
     "module-punycode": "npm:punycode@2.3.1",
-    "next": "^15.2.4",
+    "next": "^15.3.2",
     "node-html-parser": "7.0.1",
     "ora": "^5.4.1",
     "pretty-bytes": "6.1.1",
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 9770259496..cd8ddd47db 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -51,7 +51,7 @@
     "@types/babel__traverse": "7.20.7",
     "@types/mime-types": "2.1.4",
     "@types/prompts": "2.4.9",
-    "next": "^15.3.1",
+    "next": "^15.3.2",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "tsup": "8.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7aec9836c6..2dda5d60ed 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -76,8 +76,8 @@ importers:
         specifier: ^19.0.1
         version: 19.0.1
       next:
-        specifier: ^15.2.4
-        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        specifier: ^15.3.2
+        version: 15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       tsx:
         specifier: 4.19.3
         version: 4.19.3
@@ -113,7 +113,7 @@ importers:
         version: 2.49.4
       '@vercel/analytics':
         specifier: 1.5.0
-        version: 1.5.0(next@15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)
+        version: 1.5.0(next@15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)
       framer-motion:
         specifier: 12.7.4
         version: 12.7.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
@@ -121,8 +121,8 @@ importers:
         specifier: ^0.492.0
         version: 0.492.0(react@19.0.0)
       next:
-        specifier: 15.3.1
-        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        specifier: 15.3.2
+        version: 15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       prism-react-renderer:
         specifier: 2.4.1
         version: 2.4.1(react@19.0.0)
@@ -693,8 +693,8 @@ importers:
         specifier: npm:punycode@2.3.1
         version: punycode@2.3.1
       next:
-        specifier: ^15.2.4
-        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        specifier: ^15.3.2
+        version: 15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       node-html-parser:
         specifier: 7.0.1
         version: 7.0.1
@@ -836,8 +836,8 @@ importers:
         specifier: 2.4.9
         version: 2.4.9
       next:
-        specifier: ^15.3.1
-        version: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        specifier: ^15.3.2
+        version: 15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react:
         specifier: ^19.0.0
         version: 19.0.0
@@ -1665,8 +1665,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@eslint-community/eslint-utils@4.6.1':
-    resolution: {integrity: sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==}
+  '@eslint-community/eslint-utils@4.7.0':
+    resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
@@ -2180,14 +2180,17 @@ packages:
   '@next/env@15.3.1':
     resolution: {integrity: sha512-cwK27QdzrMblHSn9DZRV+DQscHXRuJv6MydlJRpFSqJWZrTYMLzKDeyueJNN9MGd8NNiUKzDQADAf+dMLXX7YQ==}
 
+  '@next/env@15.3.2':
+    resolution: {integrity: sha512-xURk++7P7qR9JG1jJtLzPzf0qEvqCN0A/T3DXf8IPMKo9/6FfjxtEffRJIIew/bIL4T3C2jLLqBor8B/zVlx6g==}
+
   '@next/swc-darwin-arm64@14.2.3':
     resolution: {integrity: sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-arm64@15.3.1':
-    resolution: {integrity: sha512-hjDw4f4/nla+6wysBL07z52Gs55Gttp5Bsk5/8AncQLJoisvTBP0pRIBK/B16/KqQyH+uN4Ww8KkcAqJODYH3w==}
+  '@next/swc-darwin-arm64@15.3.2':
+    resolution: {integrity: sha512-2DR6kY/OGcokbnCsjHpNeQblqCZ85/1j6njYSkzRdpLn5At7OkSdmk7WyAmB9G0k25+VgqVZ/u356OSoQZ3z0g==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
@@ -2198,8 +2201,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@15.3.1':
-    resolution: {integrity: sha512-q+aw+cJ2ooVYdCEqZVk+T4Ni10jF6Fo5DfpEV51OupMaV5XL6pf3GCzrk6kSSZBsMKZtVC1Zm/xaNBFpA6bJ2g==}
+  '@next/swc-darwin-x64@15.3.2':
+    resolution: {integrity: sha512-ro/fdqaZWL6k1S/5CLv1I0DaZfDVJkWNaUU3un8Lg6m0YENWlDulmIWzV96Iou2wEYyEsZq51mwV8+XQXqMp3w==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
@@ -2210,8 +2213,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-gnu@15.3.1':
-    resolution: {integrity: sha512-wBQ+jGUI3N0QZyWmmvRHjXjTWFy8o+zPFLSOyAyGFI94oJi+kK/LIZFJXeykvgXUk1NLDAEFDZw/NVINhdk9FQ==}
+  '@next/swc-linux-arm64-gnu@15.3.2':
+    resolution: {integrity: sha512-covwwtZYhlbRWK2HlYX9835qXum4xYZ3E2Mra1mdQ+0ICGoMiw1+nVAn4d9Bo7R3JqSmK1grMq/va+0cdh7bJA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -2222,8 +2225,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-musl@15.3.1':
-    resolution: {integrity: sha512-IIxXEXRti/AulO9lWRHiCpUUR8AR/ZYLPALgiIg/9ENzMzLn3l0NSxVdva7R/VDcuSEBo0eGVCe3evSIHNz0Hg==}
+  '@next/swc-linux-arm64-musl@15.3.2':
+    resolution: {integrity: sha512-KQkMEillvlW5Qk5mtGA/3Yz0/tzpNlSw6/3/ttsV1lNtMuOHcGii3zVeXZyi4EJmmLDKYcTcByV2wVsOhDt/zg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -2234,8 +2237,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-gnu@15.3.1':
-    resolution: {integrity: sha512-bfI4AMhySJbyXQIKH5rmLJ5/BP7bPwuxauTvVEiJ/ADoddaA9fgyNNCcsbu9SlqfHDoZmfI6g2EjzLwbsVTr5A==}
+  '@next/swc-linux-x64-gnu@15.3.2':
+    resolution: {integrity: sha512-uRBo6THWei0chz+Y5j37qzx+BtoDRFIkDzZjlpCItBRXyMPIg079eIkOCl3aqr2tkxL4HFyJ4GHDes7W8HuAUg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -2246,8 +2249,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-musl@15.3.1':
-    resolution: {integrity: sha512-FeAbR7FYMWR+Z+M5iSGytVryKHiAsc0x3Nc3J+FD5NVbD5Mqz7fTSy8CYliXinn7T26nDMbpExRUI/4ekTvoiA==}
+  '@next/swc-linux-x64-musl@15.3.2':
+    resolution: {integrity: sha512-+uxFlPuCNx/T9PdMClOqeE8USKzj8tVz37KflT3Kdbx/LOlZBRI2yxuIcmx1mPNK8DwSOMNCr4ureSet7eyC0w==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -2258,8 +2261,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-arm64-msvc@15.3.1':
-    resolution: {integrity: sha512-yP7FueWjphQEPpJQ2oKmshk/ppOt+0/bB8JC8svPUZNy0Pi3KbPx2Llkzv1p8CoQa+D2wknINlJpHf3vtChVBw==}
+  '@next/swc-win32-arm64-msvc@15.3.2':
+    resolution: {integrity: sha512-LLTKmaI5cfD8dVzh5Vt7+OMo+AIOClEdIU/TSKbXXT2iScUTSxOGoBhfuv+FU8R9MLmrkIL1e2fBMkEEjYAtPQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
@@ -2276,8 +2279,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@15.3.1':
-    resolution: {integrity: sha512-3PMvF2zRJAifcRNni9uMk/gulWfWS+qVI/pagd+4yLF5bcXPZPPH2xlYRYOsUjmCJOXSTAC2PjRzbhsRzR2fDQ==}
+  '@next/swc-win32-x64-msvc@15.3.2':
+    resolution: {integrity: sha512-aW5B8wOPioJ4mBdMDXkt5f3j8pUr9W8AnlX0Df35uRWNT1Y6RIybxjnSUe+PhM+M1bwgyY8PHLmXZC6zT1o5tA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -4265,12 +4268,12 @@ packages:
     resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
     engines: {node: '>= 6'}
 
-  caniuse-lite@1.0.30001690:
-    resolution: {integrity: sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==}
-
   caniuse-lite@1.0.30001716:
     resolution: {integrity: sha512-49/c1+x3Kwz7ZIWt+4DvK3aMJy9oYXXG6/97JKsnjdCk/6n9vVyWL8NAwVt95Lwt9eigI10Hl782kDfZUUlRXw==}
 
+  caniuse-lite@1.0.30001718:
+    resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==}
+
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
@@ -4663,6 +4666,10 @@ packages:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
 
+  detect-libc@2.0.4:
+    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
+    engines: {node: '>=8'}
+
   detect-node-es@1.1.0:
     resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
@@ -6352,8 +6359,8 @@ packages:
       sass:
         optional: true
 
-  next@15.3.1:
-    resolution: {integrity: sha512-8+dDV0xNLOgHlyBxP1GwHGVaNXsmp+2NhZEYrXr24GWLHtt27YrBPbPuHvzlhi7kZNYjeJNR93IF5zfFu5UL0g==}
+  next@15.3.2:
+    resolution: {integrity: sha512-CA3BatMyHkxZ48sgOCLdVHjFU36N7TF1HhqAHLFOkV6buwZnvMI84Cug8xD56B9mCuKrqXnLn94417GrZ/jjCQ==}
     engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
     hasBin: true
     peerDependencies:
@@ -7206,6 +7213,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.7.2:
+    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.19.0:
     resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
     engines: {node: '>= 0.8.0'}
@@ -9032,7 +9044,7 @@ snapshots:
   '@esbuild/win32-x64@0.25.0':
     optional: true
 
-  '@eslint-community/eslint-utils@4.6.1(eslint@8.50.0)':
+  '@eslint-community/eslint-utils@4.7.0(eslint@8.50.0)':
     dependencies:
       eslint: 8.50.0
       eslint-visitor-keys: 3.4.3
@@ -9734,46 +9746,48 @@ snapshots:
 
   '@next/env@15.3.1': {}
 
+  '@next/env@15.3.2': {}
+
   '@next/swc-darwin-arm64@14.2.3':
     optional: true
 
-  '@next/swc-darwin-arm64@15.3.1':
+  '@next/swc-darwin-arm64@15.3.2':
     optional: true
 
   '@next/swc-darwin-x64@14.2.3':
     optional: true
 
-  '@next/swc-darwin-x64@15.3.1':
+  '@next/swc-darwin-x64@15.3.2':
     optional: true
 
   '@next/swc-linux-arm64-gnu@14.2.3':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@15.3.1':
+  '@next/swc-linux-arm64-gnu@15.3.2':
     optional: true
 
   '@next/swc-linux-arm64-musl@14.2.3':
     optional: true
 
-  '@next/swc-linux-arm64-musl@15.3.1':
+  '@next/swc-linux-arm64-musl@15.3.2':
     optional: true
 
   '@next/swc-linux-x64-gnu@14.2.3':
     optional: true
 
-  '@next/swc-linux-x64-gnu@15.3.1':
+  '@next/swc-linux-x64-gnu@15.3.2':
     optional: true
 
   '@next/swc-linux-x64-musl@14.2.3':
     optional: true
 
-  '@next/swc-linux-x64-musl@15.3.1':
+  '@next/swc-linux-x64-musl@15.3.2':
     optional: true
 
   '@next/swc-win32-arm64-msvc@14.2.3':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@15.3.1':
+  '@next/swc-win32-arm64-msvc@15.3.2':
     optional: true
 
   '@next/swc-win32-ia32-msvc@14.2.3':
@@ -9782,7 +9796,7 @@ snapshots:
   '@next/swc-win32-x64-msvc@14.2.3':
     optional: true
 
-  '@next/swc-win32-x64-msvc@15.3.1':
+  '@next/swc-win32-x64-msvc@15.3.2':
     optional: true
 
   '@nodelib/fs.scandir@2.1.5':
@@ -9882,7 +9896,7 @@ snapshots:
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
-      semver: 7.7.1
+      semver: 7.7.2
       tar-fs: 3.0.8
       unbzip2-stream: 1.4.3
       yargs: 17.7.2
@@ -11349,9 +11363,9 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vercel/analytics@1.5.0(next@15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)':
+  '@vercel/analytics@1.5.0(next@15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)':
     optionalDependencies:
-      next: 15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      next: 15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react: 19.0.0
 
   '@vitejs/plugin-react@4.4.1(vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1))':
@@ -11689,7 +11703,7 @@ snapshots:
   autoprefixer@10.4.14(postcss@8.4.39):
     dependencies:
       browserslist: 4.24.4
-      caniuse-lite: 1.0.30001690
+      caniuse-lite: 1.0.30001718
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.1
@@ -11817,7 +11831,7 @@ snapshots:
 
   browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001716
+      caniuse-lite: 1.0.30001718
       electron-to-chromium: 1.5.74
       node-releases: 2.0.19
       update-browserslist-db: 1.1.1(browserslist@4.24.4)
@@ -11884,10 +11898,10 @@ snapshots:
 
   camelcase-css@2.0.1: {}
 
-  caniuse-lite@1.0.30001690: {}
-
   caniuse-lite@1.0.30001716: {}
 
+  caniuse-lite@1.0.30001718: {}
+
   ccount@2.0.1: {}
 
   chai@5.2.0:
@@ -12227,6 +12241,8 @@ snapshots:
 
   detect-libc@2.0.3: {}
 
+  detect-libc@2.0.4: {}
+
   detect-node-es@1.1.0: {}
 
   detect-port@1.6.1:
@@ -12590,7 +12606,7 @@ snapshots:
 
   eslint@8.50.0:
     dependencies:
-      '@eslint-community/eslint-utils': 4.6.1(eslint@8.50.0)
+      '@eslint-community/eslint-utils': 4.7.0(eslint@8.50.0)
       '@eslint-community/regexpp': 4.12.1
       '@eslint/eslintrc': 2.1.4
       '@eslint/js': 8.50.0
@@ -14488,7 +14504,7 @@ snapshots:
       '@next/env': 14.2.3
       '@swc/helpers': 0.5.5
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001690
+      caniuse-lite: 1.0.30001718
       graceful-fs: 4.2.11
       postcss: 8.4.31
       react: 19.0.0
@@ -14508,26 +14524,26 @@ snapshots:
       - '@babel/core'
       - babel-plugin-macros
 
-  next@15.3.1(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
+  next@15.3.2(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
     dependencies:
-      '@next/env': 15.3.1
+      '@next/env': 15.3.2
       '@swc/counter': 0.1.3
       '@swc/helpers': 0.5.15
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001716
+      caniuse-lite: 1.0.30001718
       postcss: 8.4.31
       react: 19.0.0
       react-dom: 19.0.0(react@19.0.0)
       styled-jsx: 5.1.6(@babel/core@7.26.10)(react@19.0.0)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 15.3.1
-      '@next/swc-darwin-x64': 15.3.1
-      '@next/swc-linux-arm64-gnu': 15.3.1
-      '@next/swc-linux-arm64-musl': 15.3.1
-      '@next/swc-linux-x64-gnu': 15.3.1
-      '@next/swc-linux-x64-musl': 15.3.1
-      '@next/swc-win32-arm64-msvc': 15.3.1
-      '@next/swc-win32-x64-msvc': 15.3.1
+      '@next/swc-darwin-arm64': 15.3.2
+      '@next/swc-darwin-x64': 15.3.2
+      '@next/swc-linux-arm64-gnu': 15.3.2
+      '@next/swc-linux-arm64-musl': 15.3.2
+      '@next/swc-linux-x64-gnu': 15.3.2
+      '@next/swc-linux-x64-musl': 15.3.2
+      '@next/swc-win32-arm64-msvc': 15.3.2
+      '@next/swc-win32-x64-msvc': 15.3.2
       sharp: 0.34.1
     transitivePeerDependencies:
       - '@babel/core'
@@ -15584,6 +15600,8 @@ snapshots:
 
   semver@7.7.1: {}
 
+  semver@7.7.2: {}
+
   send@0.19.0:
     dependencies:
       debug: 2.6.9
@@ -15646,8 +15664,8 @@ snapshots:
   sharp@0.33.5:
     dependencies:
       color: 4.2.3
-      detect-libc: 2.0.3
-      semver: 7.7.1
+      detect-libc: 2.0.4
+      semver: 7.7.2
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.5
       '@img/sharp-darwin-x64': 0.33.5

From 221b686f1dad447957e1869c3da017a039aff7b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 12:36:06 -0300
Subject: [PATCH 37/51] chore(deps): bump next from 14.2.3 to 15.3.2 (#2273)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 160 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 159 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2dda5d60ed..2e19220ecd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1723,6 +1723,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@img/sharp-darwin-arm64@0.34.2':
+    resolution: {integrity: sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
   '@img/sharp-darwin-x64@0.33.5':
     resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1735,6 +1741,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@img/sharp-darwin-x64@0.34.2':
+    resolution: {integrity: sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
   '@img/sharp-libvips-darwin-arm64@1.0.4':
     resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
     cpu: [arm64]
@@ -1832,6 +1844,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@img/sharp-linux-arm64@0.34.2':
+    resolution: {integrity: sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@img/sharp-linux-arm@0.33.5':
     resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1844,6 +1862,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@img/sharp-linux-arm@0.34.2':
+    resolution: {integrity: sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
   '@img/sharp-linux-s390x@0.33.5':
     resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1856,6 +1880,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@img/sharp-linux-s390x@0.34.2':
+    resolution: {integrity: sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
   '@img/sharp-linux-x64@0.33.5':
     resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1868,6 +1898,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@img/sharp-linux-x64@0.34.2':
+    resolution: {integrity: sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
   '@img/sharp-linuxmusl-arm64@0.33.5':
     resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1880,6 +1916,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@img/sharp-linuxmusl-arm64@0.34.2':
+    resolution: {integrity: sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@img/sharp-linuxmusl-x64@0.33.5':
     resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1892,6 +1934,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@img/sharp-linuxmusl-x64@0.34.2':
+    resolution: {integrity: sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
   '@img/sharp-wasm32@0.33.5':
     resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1902,6 +1950,17 @@ packages:
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
+  '@img/sharp-wasm32@0.34.2':
+    resolution: {integrity: sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-arm64@0.34.2':
+    resolution: {integrity: sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [win32]
+
   '@img/sharp-win32-ia32@0.33.5':
     resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1914,6 +1973,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@img/sharp-win32-ia32@0.34.2':
+    resolution: {integrity: sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
   '@img/sharp-win32-x64@0.33.5':
     resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1926,6 +1991,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@img/sharp-win32-x64@0.34.2':
+    resolution: {integrity: sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
   '@inquirer/checkbox@4.1.2':
     resolution: {integrity: sha512-PL9ixC5YsPXzXhAZFUPmkXGxfgjkdfZdPEPPmt4kFwQ4LBMDG9n/nHXYRGGZSKZJs+d1sGKWgS2GiPzVRKUdtQ==}
     engines: {node: '>=18'}
@@ -7256,6 +7327,10 @@ packages:
     resolution: {integrity: sha512-1j0w61+eVxu7DawFJtnfYcvSv6qPFvfTaqzTQ2BLknVhHTwGS8sc63ZBF4rzkWMBVKybo4S5OBtDdZahh2A1xg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
+  sharp@0.34.2:
+    resolution: {integrity: sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
   shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -9106,6 +9181,11 @@ snapshots:
       '@img/sharp-libvips-darwin-arm64': 1.1.0
     optional: true
 
+  '@img/sharp-darwin-arm64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.1.0
+    optional: true
+
   '@img/sharp-darwin-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.0.4
@@ -9116,6 +9196,11 @@ snapshots:
       '@img/sharp-libvips-darwin-x64': 1.1.0
     optional: true
 
+  '@img/sharp-darwin-x64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.1.0
+    optional: true
+
   '@img/sharp-libvips-darwin-arm64@1.0.4':
     optional: true
 
@@ -9177,6 +9262,11 @@ snapshots:
       '@img/sharp-libvips-linux-arm64': 1.1.0
     optional: true
 
+  '@img/sharp-linux-arm64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.1.0
+    optional: true
+
   '@img/sharp-linux-arm@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.0.5
@@ -9187,6 +9277,11 @@ snapshots:
       '@img/sharp-libvips-linux-arm': 1.1.0
     optional: true
 
+  '@img/sharp-linux-arm@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.1.0
+    optional: true
+
   '@img/sharp-linux-s390x@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.0.4
@@ -9197,6 +9292,11 @@ snapshots:
       '@img/sharp-libvips-linux-s390x': 1.1.0
     optional: true
 
+  '@img/sharp-linux-s390x@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.1.0
+    optional: true
+
   '@img/sharp-linux-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.0.4
@@ -9207,6 +9307,11 @@ snapshots:
       '@img/sharp-libvips-linux-x64': 1.1.0
     optional: true
 
+  '@img/sharp-linux-x64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.1.0
+    optional: true
+
   '@img/sharp-linuxmusl-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
@@ -9217,6 +9322,11 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-arm64': 1.1.0
     optional: true
 
+  '@img/sharp-linuxmusl-arm64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.1.0
+    optional: true
+
   '@img/sharp-linuxmusl-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.4
@@ -9227,6 +9337,11 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-x64': 1.1.0
     optional: true
 
+  '@img/sharp-linuxmusl-x64@0.34.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.1.0
+    optional: true
+
   '@img/sharp-wasm32@0.33.5':
     dependencies:
       '@emnapi/runtime': 1.4.3
@@ -9237,18 +9352,32 @@ snapshots:
       '@emnapi/runtime': 1.4.3
     optional: true
 
+  '@img/sharp-wasm32@0.34.2':
+    dependencies:
+      '@emnapi/runtime': 1.4.3
+    optional: true
+
+  '@img/sharp-win32-arm64@0.34.2':
+    optional: true
+
   '@img/sharp-win32-ia32@0.33.5':
     optional: true
 
   '@img/sharp-win32-ia32@0.34.1':
     optional: true
 
+  '@img/sharp-win32-ia32@0.34.2':
+    optional: true
+
   '@img/sharp-win32-x64@0.33.5':
     optional: true
 
   '@img/sharp-win32-x64@0.34.1':
     optional: true
 
+  '@img/sharp-win32-x64@0.34.2':
+    optional: true
+
   '@inquirer/checkbox@4.1.2(@types/node@22.14.1)':
     dependencies:
       '@inquirer/core': 10.1.7(@types/node@22.14.1)
@@ -14544,7 +14673,7 @@ snapshots:
       '@next/swc-linux-x64-musl': 15.3.2
       '@next/swc-win32-arm64-msvc': 15.3.2
       '@next/swc-win32-x64-msvc': 15.3.2
-      sharp: 0.34.1
+      sharp: 0.34.2
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
@@ -15714,6 +15843,35 @@ snapshots:
       '@img/sharp-win32-ia32': 0.34.1
       '@img/sharp-win32-x64': 0.34.1
 
+  sharp@0.34.2:
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.4
+      semver: 7.7.2
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.34.2
+      '@img/sharp-darwin-x64': 0.34.2
+      '@img/sharp-libvips-darwin-arm64': 1.1.0
+      '@img/sharp-libvips-darwin-x64': 1.1.0
+      '@img/sharp-libvips-linux-arm': 1.1.0
+      '@img/sharp-libvips-linux-arm64': 1.1.0
+      '@img/sharp-libvips-linux-ppc64': 1.1.0
+      '@img/sharp-libvips-linux-s390x': 1.1.0
+      '@img/sharp-libvips-linux-x64': 1.1.0
+      '@img/sharp-libvips-linuxmusl-arm64': 1.1.0
+      '@img/sharp-libvips-linuxmusl-x64': 1.1.0
+      '@img/sharp-linux-arm': 0.34.2
+      '@img/sharp-linux-arm64': 0.34.2
+      '@img/sharp-linux-s390x': 0.34.2
+      '@img/sharp-linux-x64': 0.34.2
+      '@img/sharp-linuxmusl-arm64': 0.34.2
+      '@img/sharp-linuxmusl-x64': 0.34.2
+      '@img/sharp-wasm32': 0.34.2
+      '@img/sharp-win32-arm64': 0.34.2
+      '@img/sharp-win32-ia32': 0.34.2
+      '@img/sharp-win32-x64': 0.34.2
+    optional: true
+
   shebang-command@1.2.0:
     dependencies:
       shebang-regex: 1.0.0

From bb19a083c6835e0ff8679347f3ba0e316029ebf1 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Tue, 3 Jun 2025 10:47:25 -0300
Subject: [PATCH 38/51] feat(react-email, preview-server): fixed equal versions
 for both (#2277)

---
 .changeset/common-goats-find.md               |  6 +++
 .changeset/config.json                        |  2 +-
 packages/preview-server/_index.js             |  4 --
 packages/preview-server/index.mjs             | 17 +++++++
 packages/preview-server/package.json          |  2 +-
 .../src/utils/get-preview-server-location.ts  | 47 +++++++++++++------
 6 files changed, 58 insertions(+), 20 deletions(-)
 create mode 100644 .changeset/common-goats-find.md
 delete mode 100644 packages/preview-server/_index.js
 create mode 100644 packages/preview-server/index.mjs

diff --git a/.changeset/common-goats-find.md b/.changeset/common-goats-find.md
new file mode 100644
index 0000000000..6c7912dc17
--- /dev/null
+++ b/.changeset/common-goats-find.md
@@ -0,0 +1,6 @@
+---
+"@react-email/preview-server": patch
+"react-email": patch
+---
+
+Use the same version for the preview-server and react-email
diff --git a/.changeset/config.json b/.changeset/config.json
index d896c865df..379ce9b054 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -2,7 +2,7 @@
   "$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "linked": [],
+  "fixed": [["react-email", "@react-email/preview-server"]],
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
diff --git a/packages/preview-server/_index.js b/packages/preview-server/_index.js
deleted file mode 100644
index e3eb1b23d6..0000000000
--- a/packages/preview-server/_index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * this file is just a placeholder file so that import.meta.resolve and require.resolve can properly
- * find out the path to this module. This file does not do anything nor does it need to export anything of value.
- */
diff --git a/packages/preview-server/index.mjs b/packages/preview-server/index.mjs
new file mode 100644
index 0000000000..e2b8b0ed94
--- /dev/null
+++ b/packages/preview-server/index.mjs
@@ -0,0 +1,17 @@
+/**
+ * this file is required so that import.meta.resolve and require.resolve can properly can find the module for this package
+ */
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import url from 'node:url';
+
+const filename = url.fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const packageJson = JSON.parse(
+  await fs.readFile(path.join(dirname, 'package.json'), 'utf-8'),
+);
+
+/**
+ * @type {string}
+ */
+export const version = packageJson.version;
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index 09894e0455..1877ed9cb3 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -9,7 +9,7 @@
     "test": "vitest run",
     "test:watch": "vitest"
   },
-  "main": "./_index.js",
+  "main": "./index.mjs",
   "dependencies": {
     "@babel/core": "7.26.10",
     "@babel/parser": "^7.27.0",
diff --git a/packages/react-email/src/utils/get-preview-server-location.ts b/packages/react-email/src/utils/get-preview-server-location.ts
index 677e58978b..5829bd1ef9 100644
--- a/packages/react-email/src/utils/get-preview-server-location.ts
+++ b/packages/react-email/src/utils/get-preview-server-location.ts
@@ -3,6 +3,27 @@ import url from 'node:url';
 import { createJiti } from 'jiti';
 import { addDevDependency } from 'nypm';
 import prompts from 'prompts';
+import { packageJson } from './packageJson.js';
+
+const ensurePreviewServerInstalled = async (
+  message: string,
+): Promise<never> => {
+  const response = await prompts({
+    type: 'confirm',
+    name: 'installPreviewServer',
+    message,
+    initial: true,
+  });
+  if (response.installPreviewServer) {
+    console.log('Installing "@react-email/preview-server"');
+    await addDevDependency(
+      `@react-email/preview-server@${packageJson.version}`,
+    );
+    process.exit(0);
+  } else {
+    process.exit(0);
+  }
+};
 
 export const getPreviewServerLocation = async () => {
   const usersProject = createJiti(process.cwd());
@@ -13,20 +34,18 @@ export const getPreviewServerLocation = async () => {
         .path!,
     );
   } catch (_exception) {
-    const response = await prompts({
-      type: 'confirm',
-      name: 'installPreviewServer',
-      message:
-        'To run the preview server, the pacakge "@react-email/preview-server" must be installed. Would you like to install it?',
-      initial: true,
-    });
-    if (response.installPreviewServer) {
-      console.log('Installing "@react-email/preview-server"');
-      await addDevDependency('@react-email/preview-server');
-      process.exit(0);
-    } else {
-      process.exit(0);
-    }
+    await ensurePreviewServerInstalled(
+      'To run the preview server, the package "@react-email/preview-server" must be installed. Would you like to install it?',
+    );
+  }
+  const { version } = await usersProject.import<{
+    version: string;
+  }>('@react-email/preview-server');
+  if (version !== packageJson.version) {
+    await ensurePreviewServerInstalled(
+      `To run the preview server, the version of "@react-email/preview-server" must match the version of "react-email" (${packageJson.version}). Would you like to install it?`,
+    );
   }
+
   return previewServerLocation;
 };

From 0b6f3d7e0b99a7fa9cb6b26c6c85974bc721b7ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 3 Jun 2025 10:52:07 -0300
Subject: [PATCH 39/51] chore(root): Version packages (canary) (#2278)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                  | 1 +
 packages/preview-server/CHANGELOG.md | 6 ++++++
 packages/preview-server/package.json | 2 +-
 packages/react-email/CHANGELOG.md    | 6 ++++++
 packages/react-email/package.json    | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index cfafa64037..4a5e409b7a 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -34,6 +34,7 @@
   },
   "changesets": [
     "afraid-sides-agree",
+    "common-goats-find",
     "crazy-seas-eat",
     "deep-clowns-bet",
     "great-parrots-yell",
diff --git a/packages/preview-server/CHANGELOG.md b/packages/preview-server/CHANGELOG.md
index ab28d2e9d7..d8f152c9ca 100644
--- a/packages/preview-server/CHANGELOG.md
+++ b/packages/preview-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @react-email/preview-server
 
+## 4.1.0-canary.9
+
+### Patch Changes
+
+- 40fb596: Use the same version for the preview-server and react-email
+
 ## 1.0.0-canary.1
 
 ### Patch Changes
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index 1877ed9cb3..0ef5650554 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-email/preview-server",
-  "version": "1.0.0-canary.1",
+  "version": "4.1.0-canary.9",
   "description": "A live preview of your emails right in your browser.",
   "scripts": {
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 8c63655d35..b8ad6a0068 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.9
+
+### Patch Changes
+
+- 40fb596: Use the same version for the preview-server and react-email
+
 ## 4.1.0-canary.8
 
 ### Minor Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index cd8ddd47db..e53f158aa7 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.8",
+  "version": "4.1.0-canary.9",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/index.js"

From 29a1514d5f74825d87400ec29629d54b87b7dd5d Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Tue, 3 Jun 2025 10:58:45 -0300
Subject: [PATCH 40/51] fix(react-email): testing data

---
 .../create-dependency-graph.spec.ts           | 253 +++++++++---------
 1 file changed, 129 insertions(+), 124 deletions(-)

diff --git a/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
index ff1dbf8d3f..989ff930b2 100644
--- a/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
@@ -1,21 +1,21 @@
-import { existsSync, promises as fs } from 'node:fs';
-import path from 'node:path';
+import { existsSync, promises as fs } from "node:fs";
+import path from "node:path";
 import {
   createDependencyGraph,
   type DependencyGraph,
-} from './create-dependency-graph.js';
+} from "./create-dependency-graph.js";
 
 const pathToFileForTestingDependencyGraph = path.join(
   __dirname,
-  '.for-dependency-graph.ts',
+  ".for-dependency-graph.ts",
 );
 
-vi.mock('@babel/traverse', async () => {
-  const traverse = await vi.importActual('@babel/traverse');
+vi.mock("@babel/traverse", async () => {
+  const traverse = await vi.importActual("@babel/traverse");
   return { default: traverse };
 });
 
-test('createDependencyGraph()', async () => {
+test("createDependencyGraph()", async () => {
   if (existsSync(pathToFileForTestingDependencyGraph)) {
     await fs.rm(pathToFileForTestingDependencyGraph);
   }
@@ -44,158 +44,163 @@ test('createDependencyGraph()', async () => {
   };
 
   const initialDependencyGraph = convertPathsToAbsolute({
-    '../../../../package.json': {
+    "../../../../package.json": {
       dependencyPaths: [],
-      dependentPaths: ['../../packageJson.ts'],
+      dependentPaths: ["../../packageJson.ts"],
       moduleDependencies: [],
-      path: '../../../../package.json',
+      path: "../../../../package.json",
     },
-    'create-dependency-graph.ts': {
-      path: 'create-dependency-graph.ts',
+    "create-dependency-graph.ts": {
+      path: "create-dependency-graph.ts",
       dependencyPaths: [
-        '../start-dev-server.ts',
-        'get-imported-modules.ts',
-        'resolve-path-aliases.ts',
+        "../start-dev-server.ts",
+        "get-imported-modules.ts",
+        "resolve-path-aliases.ts",
       ],
       dependentPaths: [
-        'create-dependency-graph.spec.ts',
-        'setup-hot-reloading.ts',
+        "create-dependency-graph.spec.ts",
+        "setup-hot-reloading.ts",
       ],
-      moduleDependencies: ['node:fs', 'node:path', 'chokidar/handler.js'],
+      moduleDependencies: ["node:fs", "node:path", "chokidar/handler.js"],
     },
-    '../../get-preview-server-location.ts': {
-      dependencyPaths: [],
-      dependentPaths: ['../../preview/start-dev-server.ts'],
-      moduleDependencies: ['node:path', 'node:url', 'jiti', 'nypm', 'prompts'],
-      path: '../../get-preview-server-location.ts',
+    "../../get-preview-server-location.ts": {
+      dependencyPaths: [
+        "../../packageJson.ts",
+      ],
+      dependentPaths: ["../../preview/start-dev-server.ts"],
+      moduleDependencies: ["node:path", "node:url", "jiti", "nypm", "prompts"],
+      path: "../../get-preview-server-location.ts",
     },
-    '../../packageJson.ts': {
-      dependencyPaths: ['../../../../package.json'],
-      dependentPaths: ['../../preview/start-dev-server.ts'],
+    "../../packageJson.ts": {
+      dependencyPaths: ["../../../../package.json"],
+      dependentPaths: [
+        "../../get-preview-server-location.ts",
+        "../../preview/start-dev-server.ts",
+      ],
       moduleDependencies: [],
-      path: '../../packageJson.ts',
+      path: "../../packageJson.ts",
     },
-    'create-dependency-graph.spec.ts': {
-      path: 'create-dependency-graph.spec.ts',
-      dependencyPaths: ['create-dependency-graph.ts'],
+    "create-dependency-graph.spec.ts": {
+      path: "create-dependency-graph.spec.ts",
+      dependencyPaths: ["create-dependency-graph.ts"],
       dependentPaths: [],
-      moduleDependencies: ['node:fs', 'node:path'],
+      moduleDependencies: ["node:fs", "node:path"],
     },
-    '../get-env-variables-for-preview-app.ts': {
-      dependencyPaths: ['../../preview/start-dev-server.ts'],
-      dependentPaths: ['../../preview/start-dev-server.ts'],
-      moduleDependencies: ['node:path'],
-      path: '../../preview/get-env-variables-for-preview-app.ts',
+    "../get-env-variables-for-preview-app.ts": {
+      dependencyPaths: ["../../preview/start-dev-server.ts"],
+      dependentPaths: ["../../preview/start-dev-server.ts"],
+      moduleDependencies: ["node:path"],
+      path: "../../preview/get-env-variables-for-preview-app.ts",
     },
-    './test/some-file.ts': {
+    "./test/some-file.ts": {
       dependencyPaths: [],
       dependentPaths: [],
       moduleDependencies: [],
-      path: '/home/gabriel/Projects/Resend/react-email/packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts',
+      path: "/home/gabriel/Projects/Resend/react-email/packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts",
     },
-    'resolve-path-aliases.ts': {
-      path: 'resolve-path-aliases.ts',
+    "resolve-path-aliases.ts": {
+      path: "resolve-path-aliases.ts",
       dependentPaths: [
-        'create-dependency-graph.ts',
-        'resolve-path-aliases.spec.ts',
+        "create-dependency-graph.ts",
+        "resolve-path-aliases.spec.ts",
       ],
       dependencyPaths: [],
-      moduleDependencies: ['node:path', 'tsconfig-paths'],
+      moduleDependencies: ["node:path", "tsconfig-paths"],
     },
-    'resolve-path-aliases.spec.ts': {
-      path: 'resolve-path-aliases.spec.ts',
-      dependencyPaths: ['resolve-path-aliases.ts'],
+    "resolve-path-aliases.spec.ts": {
+      path: "resolve-path-aliases.spec.ts",
+      dependencyPaths: ["resolve-path-aliases.ts"],
       dependentPaths: [],
-      moduleDependencies: ['node:path'],
+      moduleDependencies: ["node:path"],
     },
-    'get-imported-modules.ts': {
-      path: 'get-imported-modules',
+    "get-imported-modules.ts": {
+      path: "get-imported-modules",
       dependentPaths: [
-        'create-dependency-graph.ts',
-        'get-imported-modules.spec.ts',
+        "create-dependency-graph.ts",
+        "get-imported-modules.spec.ts",
       ],
       dependencyPaths: [],
-      moduleDependencies: ['@babel/parser', '@babel/traverse'],
+      moduleDependencies: ["@babel/parser", "@babel/traverse"],
     },
-    'get-imported-modules.spec.ts': {
-      path: 'get-imported-modules.spec.ts',
-      dependencyPaths: ['get-imported-modules.ts'],
+    "get-imported-modules.spec.ts": {
+      path: "get-imported-modules.spec.ts",
+      dependencyPaths: ["get-imported-modules.ts"],
       dependentPaths: [],
-      moduleDependencies: ['node:fs'],
+      moduleDependencies: ["node:fs"],
     },
-    'setup-hot-reloading.ts': {
-      path: 'setup-hot-reloading.ts',
+    "setup-hot-reloading.ts": {
+      path: "setup-hot-reloading.ts",
       dependencyPaths: [
-        '../../types/hot-reload-change.ts',
-        'create-dependency-graph.ts',
+        "../../types/hot-reload-change.ts",
+        "create-dependency-graph.ts",
       ],
       dependentPaths: [],
       moduleDependencies: [
-        'node:http',
-        'node:path',
-        'chokidar',
-        'debounce',
-        'socket.io',
+        "node:http",
+        "node:path",
+        "chokidar",
+        "debounce",
+        "socket.io",
       ],
     },
-    '../start-dev-server.ts': {
+    "../start-dev-server.ts": {
       dependencyPaths: [
-        '../../register-spinner-autostopping.ts',
-        '../../get-preview-server-location.ts',
-        '../../packageJson.ts',
-        '../../preview/get-env-variables-for-preview-app.ts',
-        '../../preview/serve-static-file.ts',
+        "../../register-spinner-autostopping.ts",
+        "../../get-preview-server-location.ts",
+        "../../packageJson.ts",
+        "../../preview/get-env-variables-for-preview-app.ts",
+        "../../preview/serve-static-file.ts",
       ],
-      path: '../start-dev-server.ts',
+      path: "../start-dev-server.ts",
       dependentPaths: [
-        '../../preview/get-env-variables-for-preview-app.ts',
-        'create-dependency-graph.ts',
+        "../../preview/get-env-variables-for-preview-app.ts",
+        "create-dependency-graph.ts",
       ],
       moduleDependencies: [
-        'node:http',
-        'node:path',
-        'node:url',
-        'chalk',
-        'jiti',
-        'log-symbols',
-        'ora',
+        "node:http",
+        "node:path",
+        "node:url",
+        "chalk",
+        "jiti",
+        "log-symbols",
+        "ora",
       ],
     },
-    '../../preview/serve-static-file.ts': {
+    "../../preview/serve-static-file.ts": {
       dependencyPaths: [],
-      dependentPaths: ['../../preview/start-dev-server.ts'],
+      dependentPaths: ["../../preview/start-dev-server.ts"],
       moduleDependencies: [
-        'node:fs',
-        'node:http',
-        'node:path',
-        'node:url',
-        'mime-types',
+        "node:fs",
+        "node:http",
+        "node:path",
+        "node:url",
+        "mime-types",
       ],
-      path: '../../preview/serve-static-file.ts',
+      path: "../../preview/serve-static-file.ts",
     },
-    '../../register-spinner-autostopping.ts': {
+    "../../register-spinner-autostopping.ts": {
       dependencyPaths: [],
-      dependentPaths: ['../../preview/start-dev-server.ts'],
-      moduleDependencies: ['log-symbols', 'ora'],
-      path: '../../register-spinner-autostopping.ts',
+      dependentPaths: ["../../preview/start-dev-server.ts"],
+      moduleDependencies: ["log-symbols", "ora"],
+      path: "../../register-spinner-autostopping.ts",
     },
-    '../../types/hot-reload-event.ts': {
+    "../../types/hot-reload-event.ts": {
       dependencyPaths: [],
-      dependentPaths: ['../../types/hot-reload-change.ts'],
-      moduleDependencies: ['chokidar/handler.js'],
-      path: '../../types/hot-reload-event.ts',
+      dependentPaths: ["../../types/hot-reload-change.ts"],
+      moduleDependencies: ["chokidar/handler.js"],
+      path: "../../types/hot-reload-event.ts",
     },
-    '../../types/hot-reload-change.ts': {
-      path: '../../types/hot-reload-change.ts',
-      dependencyPaths: ['../../types/hot-reload-event.ts'],
-      dependentPaths: ['setup-hot-reloading.ts'],
+    "../../types/hot-reload-change.ts": {
+      path: "../../types/hot-reload-change.ts",
+      dependencyPaths: ["../../types/hot-reload-event.ts"],
+      dependentPaths: ["setup-hot-reloading.ts"],
       moduleDependencies: [],
     },
   } satisfies DependencyGraph);
 
   expect(
     dependencyGraph,
-    'the initial value for the dependency graph should work with the directory of this testing file',
+    "the initial value for the dependency graph should work with the directory of this testing file",
   ).toEqual(initialDependencyGraph);
 
   await fs.writeFile(
@@ -205,30 +210,30 @@ import {} from './setup-hot-reloading';
 import {} from './get-imported-modules';
 import {} from './create-dependency-graph.ts';
 `,
-    'utf8',
+    "utf8",
   );
-  await updateDependencyGraph('add', pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph("add", pathToFileForTestingDependencyGraph);
   expect(
     dependencyGraph[pathToFileForTestingDependencyGraph],
-    'added file to have proper dependency paths',
+    "added file to have proper dependency paths",
   ).toEqual({
     path: pathToFileForTestingDependencyGraph,
     dependentPaths: [],
     dependencyPaths: [
-      toAbsolute('setup-hot-reloading.ts'),
-      toAbsolute('get-imported-modules.ts'),
-      toAbsolute('create-dependency-graph.ts'),
+      toAbsolute("setup-hot-reloading.ts"),
+      toAbsolute("get-imported-modules.ts"),
+      toAbsolute("create-dependency-graph.ts"),
     ],
     moduleDependencies: [],
   } satisfies DependencyGraph[number]);
   expect(
-    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
 
   await fs.writeFile(
@@ -237,45 +242,45 @@ import {} from './create-dependency-graph.ts';
 import {} from './setup-hot-reloading';
 import {} from './create-dependency-graph.ts';
 `,
-    'utf8',
+    "utf8",
   );
-  await updateDependencyGraph('change', pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph("change", pathToFileForTestingDependencyGraph);
   expect(
     dependencyGraph[pathToFileForTestingDependencyGraph],
-    'changed file to have updated dependencyPaths',
+    "changed file to have updated dependencyPaths",
   ).toEqual({
     path: pathToFileForTestingDependencyGraph,
     dependentPaths: [],
     dependencyPaths: [
-      toAbsolute('setup-hot-reloading.ts'),
-      toAbsolute('create-dependency-graph.ts'),
+      toAbsolute("setup-hot-reloading.ts"),
+      toAbsolute("create-dependency-graph.ts"),
     ],
     moduleDependencies: [],
   } satisfies DependencyGraph[number]);
   expect(
-    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
-    'when removing dependency on a file, the dependency should have its dependents updated to not have the testing file again',
+    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
+    "when removing dependency on a file, the dependency should have its dependents updated to not have the testing file again",
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
 
   await fs.rm(pathToFileForTestingDependencyGraph);
-  await updateDependencyGraph('unlink', pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph("unlink", pathToFileForTestingDependencyGraph);
   expect(dependencyGraph[pathToFileForTestingDependencyGraph]).toBeUndefined();
   expect(
-    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
+    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
 });

From a62f0395dfaa584243f30b692fc27e9428cd562a Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Tue, 3 Jun 2025 12:24:42 -0300
Subject: [PATCH 41/51] chore(root): lint

---
 .../create-dependency-graph.spec.ts           | 252 +++++++++---------
 1 file changed, 125 insertions(+), 127 deletions(-)

diff --git a/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
index 989ff930b2..a99e6798ee 100644
--- a/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
+++ b/packages/react-email/src/utils/preview/hot-reloading/create-dependency-graph.spec.ts
@@ -1,21 +1,21 @@
-import { existsSync, promises as fs } from "node:fs";
-import path from "node:path";
+import { existsSync, promises as fs } from 'node:fs';
+import path from 'node:path';
 import {
   createDependencyGraph,
   type DependencyGraph,
-} from "./create-dependency-graph.js";
+} from './create-dependency-graph.js';
 
 const pathToFileForTestingDependencyGraph = path.join(
   __dirname,
-  ".for-dependency-graph.ts",
+  '.for-dependency-graph.ts',
 );
 
-vi.mock("@babel/traverse", async () => {
-  const traverse = await vi.importActual("@babel/traverse");
+vi.mock('@babel/traverse', async () => {
+  const traverse = await vi.importActual('@babel/traverse');
   return { default: traverse };
 });
 
-test("createDependencyGraph()", async () => {
+test('createDependencyGraph()', async () => {
   if (existsSync(pathToFileForTestingDependencyGraph)) {
     await fs.rm(pathToFileForTestingDependencyGraph);
   }
@@ -44,163 +44,161 @@ test("createDependencyGraph()", async () => {
   };
 
   const initialDependencyGraph = convertPathsToAbsolute({
-    "../../../../package.json": {
+    '../../../../package.json': {
       dependencyPaths: [],
-      dependentPaths: ["../../packageJson.ts"],
+      dependentPaths: ['../../packageJson.ts'],
       moduleDependencies: [],
-      path: "../../../../package.json",
+      path: '../../../../package.json',
     },
-    "create-dependency-graph.ts": {
-      path: "create-dependency-graph.ts",
+    'create-dependency-graph.ts': {
+      path: 'create-dependency-graph.ts',
       dependencyPaths: [
-        "../start-dev-server.ts",
-        "get-imported-modules.ts",
-        "resolve-path-aliases.ts",
+        '../start-dev-server.ts',
+        'get-imported-modules.ts',
+        'resolve-path-aliases.ts',
       ],
       dependentPaths: [
-        "create-dependency-graph.spec.ts",
-        "setup-hot-reloading.ts",
+        'create-dependency-graph.spec.ts',
+        'setup-hot-reloading.ts',
       ],
-      moduleDependencies: ["node:fs", "node:path", "chokidar/handler.js"],
+      moduleDependencies: ['node:fs', 'node:path', 'chokidar/handler.js'],
     },
-    "../../get-preview-server-location.ts": {
-      dependencyPaths: [
-        "../../packageJson.ts",
-      ],
-      dependentPaths: ["../../preview/start-dev-server.ts"],
-      moduleDependencies: ["node:path", "node:url", "jiti", "nypm", "prompts"],
-      path: "../../get-preview-server-location.ts",
+    '../../get-preview-server-location.ts': {
+      dependencyPaths: ['../../packageJson.ts'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
+      moduleDependencies: ['node:path', 'node:url', 'jiti', 'nypm', 'prompts'],
+      path: '../../get-preview-server-location.ts',
     },
-    "../../packageJson.ts": {
-      dependencyPaths: ["../../../../package.json"],
+    '../../packageJson.ts': {
+      dependencyPaths: ['../../../../package.json'],
       dependentPaths: [
-        "../../get-preview-server-location.ts",
-        "../../preview/start-dev-server.ts",
+        '../../get-preview-server-location.ts',
+        '../../preview/start-dev-server.ts',
       ],
       moduleDependencies: [],
-      path: "../../packageJson.ts",
+      path: '../../packageJson.ts',
     },
-    "create-dependency-graph.spec.ts": {
-      path: "create-dependency-graph.spec.ts",
-      dependencyPaths: ["create-dependency-graph.ts"],
+    'create-dependency-graph.spec.ts': {
+      path: 'create-dependency-graph.spec.ts',
+      dependencyPaths: ['create-dependency-graph.ts'],
       dependentPaths: [],
-      moduleDependencies: ["node:fs", "node:path"],
+      moduleDependencies: ['node:fs', 'node:path'],
     },
-    "../get-env-variables-for-preview-app.ts": {
-      dependencyPaths: ["../../preview/start-dev-server.ts"],
-      dependentPaths: ["../../preview/start-dev-server.ts"],
-      moduleDependencies: ["node:path"],
-      path: "../../preview/get-env-variables-for-preview-app.ts",
+    '../get-env-variables-for-preview-app.ts': {
+      dependencyPaths: ['../../preview/start-dev-server.ts'],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
+      moduleDependencies: ['node:path'],
+      path: '../../preview/get-env-variables-for-preview-app.ts',
     },
-    "./test/some-file.ts": {
+    './test/some-file.ts': {
       dependencyPaths: [],
       dependentPaths: [],
       moduleDependencies: [],
-      path: "/home/gabriel/Projects/Resend/react-email/packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts",
+      path: '/home/gabriel/Projects/Resend/react-email/packages/react-email/src/cli/utils/preview/hot-reloading/test/some-file.ts',
     },
-    "resolve-path-aliases.ts": {
-      path: "resolve-path-aliases.ts",
+    'resolve-path-aliases.ts': {
+      path: 'resolve-path-aliases.ts',
       dependentPaths: [
-        "create-dependency-graph.ts",
-        "resolve-path-aliases.spec.ts",
+        'create-dependency-graph.ts',
+        'resolve-path-aliases.spec.ts',
       ],
       dependencyPaths: [],
-      moduleDependencies: ["node:path", "tsconfig-paths"],
+      moduleDependencies: ['node:path', 'tsconfig-paths'],
     },
-    "resolve-path-aliases.spec.ts": {
-      path: "resolve-path-aliases.spec.ts",
-      dependencyPaths: ["resolve-path-aliases.ts"],
+    'resolve-path-aliases.spec.ts': {
+      path: 'resolve-path-aliases.spec.ts',
+      dependencyPaths: ['resolve-path-aliases.ts'],
       dependentPaths: [],
-      moduleDependencies: ["node:path"],
+      moduleDependencies: ['node:path'],
     },
-    "get-imported-modules.ts": {
-      path: "get-imported-modules",
+    'get-imported-modules.ts': {
+      path: 'get-imported-modules',
       dependentPaths: [
-        "create-dependency-graph.ts",
-        "get-imported-modules.spec.ts",
+        'create-dependency-graph.ts',
+        'get-imported-modules.spec.ts',
       ],
       dependencyPaths: [],
-      moduleDependencies: ["@babel/parser", "@babel/traverse"],
+      moduleDependencies: ['@babel/parser', '@babel/traverse'],
     },
-    "get-imported-modules.spec.ts": {
-      path: "get-imported-modules.spec.ts",
-      dependencyPaths: ["get-imported-modules.ts"],
+    'get-imported-modules.spec.ts': {
+      path: 'get-imported-modules.spec.ts',
+      dependencyPaths: ['get-imported-modules.ts'],
       dependentPaths: [],
-      moduleDependencies: ["node:fs"],
+      moduleDependencies: ['node:fs'],
     },
-    "setup-hot-reloading.ts": {
-      path: "setup-hot-reloading.ts",
+    'setup-hot-reloading.ts': {
+      path: 'setup-hot-reloading.ts',
       dependencyPaths: [
-        "../../types/hot-reload-change.ts",
-        "create-dependency-graph.ts",
+        '../../types/hot-reload-change.ts',
+        'create-dependency-graph.ts',
       ],
       dependentPaths: [],
       moduleDependencies: [
-        "node:http",
-        "node:path",
-        "chokidar",
-        "debounce",
-        "socket.io",
+        'node:http',
+        'node:path',
+        'chokidar',
+        'debounce',
+        'socket.io',
       ],
     },
-    "../start-dev-server.ts": {
+    '../start-dev-server.ts': {
       dependencyPaths: [
-        "../../register-spinner-autostopping.ts",
-        "../../get-preview-server-location.ts",
-        "../../packageJson.ts",
-        "../../preview/get-env-variables-for-preview-app.ts",
-        "../../preview/serve-static-file.ts",
+        '../../register-spinner-autostopping.ts',
+        '../../get-preview-server-location.ts',
+        '../../packageJson.ts',
+        '../../preview/get-env-variables-for-preview-app.ts',
+        '../../preview/serve-static-file.ts',
       ],
-      path: "../start-dev-server.ts",
+      path: '../start-dev-server.ts',
       dependentPaths: [
-        "../../preview/get-env-variables-for-preview-app.ts",
-        "create-dependency-graph.ts",
+        '../../preview/get-env-variables-for-preview-app.ts',
+        'create-dependency-graph.ts',
       ],
       moduleDependencies: [
-        "node:http",
-        "node:path",
-        "node:url",
-        "chalk",
-        "jiti",
-        "log-symbols",
-        "ora",
+        'node:http',
+        'node:path',
+        'node:url',
+        'chalk',
+        'jiti',
+        'log-symbols',
+        'ora',
       ],
     },
-    "../../preview/serve-static-file.ts": {
+    '../../preview/serve-static-file.ts': {
       dependencyPaths: [],
-      dependentPaths: ["../../preview/start-dev-server.ts"],
+      dependentPaths: ['../../preview/start-dev-server.ts'],
       moduleDependencies: [
-        "node:fs",
-        "node:http",
-        "node:path",
-        "node:url",
-        "mime-types",
+        'node:fs',
+        'node:http',
+        'node:path',
+        'node:url',
+        'mime-types',
       ],
-      path: "../../preview/serve-static-file.ts",
+      path: '../../preview/serve-static-file.ts',
     },
-    "../../register-spinner-autostopping.ts": {
+    '../../register-spinner-autostopping.ts': {
       dependencyPaths: [],
-      dependentPaths: ["../../preview/start-dev-server.ts"],
-      moduleDependencies: ["log-symbols", "ora"],
-      path: "../../register-spinner-autostopping.ts",
+      dependentPaths: ['../../preview/start-dev-server.ts'],
+      moduleDependencies: ['log-symbols', 'ora'],
+      path: '../../register-spinner-autostopping.ts',
     },
-    "../../types/hot-reload-event.ts": {
+    '../../types/hot-reload-event.ts': {
       dependencyPaths: [],
-      dependentPaths: ["../../types/hot-reload-change.ts"],
-      moduleDependencies: ["chokidar/handler.js"],
-      path: "../../types/hot-reload-event.ts",
+      dependentPaths: ['../../types/hot-reload-change.ts'],
+      moduleDependencies: ['chokidar/handler.js'],
+      path: '../../types/hot-reload-event.ts',
     },
-    "../../types/hot-reload-change.ts": {
-      path: "../../types/hot-reload-change.ts",
-      dependencyPaths: ["../../types/hot-reload-event.ts"],
-      dependentPaths: ["setup-hot-reloading.ts"],
+    '../../types/hot-reload-change.ts': {
+      path: '../../types/hot-reload-change.ts',
+      dependencyPaths: ['../../types/hot-reload-event.ts'],
+      dependentPaths: ['setup-hot-reloading.ts'],
       moduleDependencies: [],
     },
   } satisfies DependencyGraph);
 
   expect(
     dependencyGraph,
-    "the initial value for the dependency graph should work with the directory of this testing file",
+    'the initial value for the dependency graph should work with the directory of this testing file',
   ).toEqual(initialDependencyGraph);
 
   await fs.writeFile(
@@ -210,30 +208,30 @@ import {} from './setup-hot-reloading';
 import {} from './get-imported-modules';
 import {} from './create-dependency-graph.ts';
 `,
-    "utf8",
+    'utf8',
   );
-  await updateDependencyGraph("add", pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph('add', pathToFileForTestingDependencyGraph);
   expect(
     dependencyGraph[pathToFileForTestingDependencyGraph],
-    "added file to have proper dependency paths",
+    'added file to have proper dependency paths',
   ).toEqual({
     path: pathToFileForTestingDependencyGraph,
     dependentPaths: [],
     dependencyPaths: [
-      toAbsolute("setup-hot-reloading.ts"),
-      toAbsolute("get-imported-modules.ts"),
-      toAbsolute("create-dependency-graph.ts"),
+      toAbsolute('setup-hot-reloading.ts'),
+      toAbsolute('get-imported-modules.ts'),
+      toAbsolute('create-dependency-graph.ts'),
     ],
     moduleDependencies: [],
   } satisfies DependencyGraph[number]);
   expect(
-    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
 
   await fs.writeFile(
@@ -242,45 +240,45 @@ import {} from './create-dependency-graph.ts';
 import {} from './setup-hot-reloading';
 import {} from './create-dependency-graph.ts';
 `,
-    "utf8",
+    'utf8',
   );
-  await updateDependencyGraph("change", pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph('change', pathToFileForTestingDependencyGraph);
   expect(
     dependencyGraph[pathToFileForTestingDependencyGraph],
-    "changed file to have updated dependencyPaths",
+    'changed file to have updated dependencyPaths',
   ).toEqual({
     path: pathToFileForTestingDependencyGraph,
     dependentPaths: [],
     dependencyPaths: [
-      toAbsolute("setup-hot-reloading.ts"),
-      toAbsolute("create-dependency-graph.ts"),
+      toAbsolute('setup-hot-reloading.ts'),
+      toAbsolute('create-dependency-graph.ts'),
     ],
     moduleDependencies: [],
   } satisfies DependencyGraph[number]);
   expect(
-    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
-    "when removing dependency on a file, the dependency should have its dependents updated to not have the testing file again",
+    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
+    'when removing dependency on a file, the dependency should have its dependents updated to not have the testing file again',
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
   ).toContain(pathToFileForTestingDependencyGraph);
 
   await fs.rm(pathToFileForTestingDependencyGraph);
-  await updateDependencyGraph("unlink", pathToFileForTestingDependencyGraph);
+  await updateDependencyGraph('unlink', pathToFileForTestingDependencyGraph);
   expect(dependencyGraph[pathToFileForTestingDependencyGraph]).toBeUndefined();
   expect(
-    dependencyGraph[toAbsolute("setup-hot-reloading.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('setup-hot-reloading.ts')]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("get-imported-modules.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('get-imported-modules.ts')]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
   expect(
-    dependencyGraph[toAbsolute("create-dependency-graph.ts")]?.dependentPaths,
+    dependencyGraph[toAbsolute('create-dependency-graph.ts')]?.dependentPaths,
     "should remove itself from dependents once it's unlinked",
   ).not.toContain(pathToFileForTestingDependencyGraph);
 });

From 726fa969e1ce5bcab9f48d2bd0d51221ddd816bd Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Fri, 6 Jun 2025 13:08:47 -0300
Subject: [PATCH 42/51] feat(react-email): email-dev package for linking
 globally (#2258)

Co-authored-by: Bu Kinoshita <6929565+bukinoshita@users.noreply.github.com>
---
 packages/react-email/dev/index.js     | 40 ++++++++++++++++++++++
 packages/react-email/dev/package.json | 13 +++++++
 packages/react-email/readme.md        | 16 +++++++++
 pnpm-lock.yaml                        | 49 ++++-----------------------
 pnpm-workspace.yaml                   |  1 +
 5 files changed, 77 insertions(+), 42 deletions(-)
 create mode 100755 packages/react-email/dev/index.js
 create mode 100644 packages/react-email/dev/package.json

diff --git a/packages/react-email/dev/index.js b/packages/react-email/dev/index.js
new file mode 100755
index 0000000000..11820ca0c0
--- /dev/null
+++ b/packages/react-email/dev/index.js
@@ -0,0 +1,40 @@
+import child_process from 'node:child_process';
+import path from 'node:path';
+import url from 'node:url';
+
+const filename = url.fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+
+const root = path.resolve(dirname, '../src/index.ts');
+
+const tsxPath = path.resolve(dirname, './node_modules/.bin/tsx');
+
+const tsx = child_process.spawn(tsxPath, [root, ...process.argv.slice(2)], {
+  shell: true,
+  cwd: process.cwd(),
+  stdio: 'inherit',
+});
+
+process.on('uncaughtExceptionMonitor', () => {
+  tsx.kill();
+});
+
+process.on('exit', (code) => {
+  tsx.kill(code);
+});
+
+process.on('SIGINT', () => {
+  tsx.kill('SIGINT');
+});
+
+process.on('SIGTERM', () => {
+  tsx.kill('SIGTERM');
+});
+
+process.on('SIGUSR1', () => {
+  tsx.kill('SIGUSR1');
+});
+
+process.on('SIGUSR2', () => {
+  tsx.kill('SIGUSR2');
+});
diff --git a/packages/react-email/dev/package.json b/packages/react-email/dev/package.json
new file mode 100644
index 0000000000..7ba9a4b8ad
--- /dev/null
+++ b/packages/react-email/dev/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "email-dev",
+  "version": "0.0.0",
+  "bin": "index.js",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "node ."
+  },
+  "dependencies": {
+    "tsx": "4.19.3"
+  }
+}
diff --git a/packages/react-email/readme.md b/packages/react-email/readme.md
index dba7837160..4073ac1b03 100644
--- a/packages/react-email/readme.md
+++ b/packages/react-email/readme.md
@@ -39,6 +39,22 @@ Generates the plain HTML files of your emails into a `out` directory.
 npx react-email export
 ```
 
+## Setting Up the Environment
+
+When working in the CLI, a lot of friction can get introduced with installing it and rebuilding for every change. To avoid that, we have a script that can be linked globally to directly run the source code of the CLI. You can use it the same as you would the standard CLI.
+
+### 1. Link `react-email` globally
+
+```sh
+pnpm link ./dev -g
+```
+
+### 2. Run the CLI
+
+```sh
+email-dev [command] [flags]
+```
+
 ## License
 
 MIT License
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2e19220ecd..e28d8ada24 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -198,7 +198,7 @@ importers:
         version: 5.8.3
       webpack:
         specifier: 5.99.6
-        version: 5.99.6(@swc/core@1.11.21)
+        version: 5.99.6(@swc/core@1.11.21)(esbuild@0.25.0)
       zod:
         specifier: 3.24.3
         version: 3.24.3
@@ -854,6 +854,12 @@ importers:
         specifier: 5.8.3
         version: 5.8.3
 
+  packages/react-email/dev:
+    dependencies:
+      tsx:
+        specifier: 4.19.3
+        version: 4.19.3
+
   packages/render:
     dependencies:
       html-to-text:
@@ -16357,17 +16363,6 @@ snapshots:
       '@swc/core': 1.11.21
       esbuild: 0.25.0
 
-  terser-webpack-plugin@5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21)):
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      jest-worker: 27.5.1
-      schema-utils: 4.3.0
-      serialize-javascript: 6.0.2
-      terser: 5.37.0
-      webpack: 5.99.6(@swc/core@1.11.21)
-    optionalDependencies:
-      '@swc/core': 1.11.21
-
   terser-webpack-plugin@5.3.11(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)(webpack@5.99.6(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
@@ -16950,36 +16945,6 @@ snapshots:
 
   webpack-sources@3.2.3: {}
 
-  webpack@5.99.6(@swc/core@1.11.21):
-    dependencies:
-      '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.7
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/wasm-edit': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-      acorn: 8.14.1
-      browserslist: 4.24.4
-      chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.17.1
-      es-module-lexer: 1.6.0
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 4.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21))
-      watchpack: 2.4.2
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-
   webpack@5.99.6(@swc/core@1.11.21)(esbuild@0.25.0):
     dependencies:
       '@types/eslint-scope': 3.7.7
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index de3a5f9a1c..9716354f0d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,5 @@
 packages:
   - "apps/*"
   - "packages/*"
+  - "packages/react-email/dev"
   - "benchmarks/*"

From d335312543ff43c5f437c83aba5a723b456a9775 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Mon, 9 Jun 2025 11:50:27 -0300
Subject: [PATCH 43/51] chore(root): Ignore the `email-dev` private package

---
 .changeset/config.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.changeset/config.json b/.changeset/config.json
index 379ce9b054..9f4df12f06 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -1,15 +1,16 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
+  "access": "public",
+  "baseBranch": "main",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
   "fixed": [["react-email", "@react-email/preview-server"]],
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
   "ignore": [
     "@benchmarks/preview-server",
     "@benchmarks/tailwind-component",
     "demo",
+    "email-dev",
     "web"
-  ]
+  ],
+  "updateInternalDependencies": "patch"
 }

From 324c296a36469426af52b201b7780074b942558d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 11:54:29 -0300
Subject: [PATCH 44/51] chore(root): Version packages (canary) (#2286)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                  | 1 +
 packages/preview-server/CHANGELOG.md | 6 ++++++
 packages/preview-server/package.json | 2 +-
 packages/react-email/CHANGELOG.md    | 2 ++
 packages/react-email/package.json    | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 4a5e409b7a..138ab0c060 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -39,6 +39,7 @@
     "deep-clowns-bet",
     "great-parrots-yell",
     "mighty-pigs-add",
+    "petite-boxes-find",
     "puny-chicken-argue",
     "stupid-ghosts-decide",
     "tasty-swans-taste",
diff --git a/packages/preview-server/CHANGELOG.md b/packages/preview-server/CHANGELOG.md
index d8f152c9ca..cf22b74a61 100644
--- a/packages/preview-server/CHANGELOG.md
+++ b/packages/preview-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @react-email/preview-server
 
+## 4.1.0-canary.10
+
+### Patch Changes
+
+- caa4a31: fix hot reloading with collapsed directories
+
 ## 4.1.0-canary.9
 
 ### Patch Changes
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index 0ef5650554..e0f81deb90 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-email/preview-server",
-  "version": "4.1.0-canary.9",
+  "version": "4.1.0-canary.10",
   "description": "A live preview of your emails right in your browser.",
   "scripts": {
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index b8ad6a0068..7728be8325 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,7 @@
 # react-email
 
+## 4.1.0-canary.10
+
 ## 4.1.0-canary.9
 
 ### Patch Changes
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index e53f158aa7..6718ddc072 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.9",
+  "version": "4.1.0-canary.10",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/index.js"

From dee06c4af851638756352ca2e73c8df0e787c1e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 13:36:58 -0300
Subject: [PATCH 45/51] chore(deps): bump next from 14.2.3 to 15.3.2 (#2290)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e28d8ada24..091cf4ccc7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3715,8 +3715,8 @@ packages:
   '@swc/types@0.1.17':
     resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==}
 
-  '@swc/types@0.1.21':
-    resolution: {integrity: sha512-2YEtj5HJVbKivud9N4bpPBAyZhj4S2Ipe5LkUG94alTpr7in/GU/EARgPAd3BwU+YOmFVJC2+kjqhGRi3r0ZpQ==}
+  '@swc/types@0.1.22':
+    resolution: {integrity: sha512-D13mY/ZA4PPEFSy6acki9eBT/3WgjMoRqNcdpIvjaYLQ44Xk5BdaL7UkDxAh6Z9UOe7tCCp67BVmZCojYp9owg==}
 
   '@szmarczak/http-timer@5.0.1':
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
@@ -4029,6 +4029,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   address@1.2.2:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
@@ -4348,8 +4353,8 @@ packages:
   caniuse-lite@1.0.30001716:
     resolution: {integrity: sha512-49/c1+x3Kwz7ZIWt+4DvK3aMJy9oYXXG6/97JKsnjdCk/6n9vVyWL8NAwVt95Lwt9eigI10Hl782kDfZUUlRXw==}
 
-  caniuse-lite@1.0.30001718:
-    resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==}
+  caniuse-lite@1.0.30001721:
+    resolution: {integrity: sha512-cOuvmUVtKrtEaoKiO0rSc29jcjwMwX5tOHDy4MgVFEWiUXj4uBMJkwI8MDySkgXidpMiHUcviogAvFi4pA2hDQ==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -11259,7 +11264,7 @@ snapshots:
   '@swc/core@1.11.21':
     dependencies:
       '@swc/counter': 0.1.3
-      '@swc/types': 0.1.21
+      '@swc/types': 0.1.22
     optionalDependencies:
       '@swc/core-darwin-arm64': 1.11.21
       '@swc/core-darwin-x64': 1.11.21
@@ -11305,7 +11310,7 @@ snapshots:
     dependencies:
       '@swc/counter': 0.1.3
 
-  '@swc/types@0.1.21':
+  '@swc/types@0.1.22':
     dependencies:
       '@swc/counter': 0.1.3
     optional: true
@@ -11694,8 +11699,14 @@ snapshots:
     dependencies:
       acorn: 8.14.1
 
+  acorn-jsx@5.3.2(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
   acorn@8.14.1: {}
 
+  acorn@8.15.0: {}
+
   address@1.2.2: {}
 
   agent-base@7.1.3: {}
@@ -11838,7 +11849,7 @@ snapshots:
   autoprefixer@10.4.14(postcss@8.4.39):
     dependencies:
       browserslist: 4.24.4
-      caniuse-lite: 1.0.30001718
+      caniuse-lite: 1.0.30001721
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.1
@@ -11966,7 +11977,7 @@ snapshots:
 
   browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001718
+      caniuse-lite: 1.0.30001716
       electron-to-chromium: 1.5.74
       node-releases: 2.0.19
       update-browserslist-db: 1.1.1(browserslist@4.24.4)
@@ -12035,7 +12046,7 @@ snapshots:
 
   caniuse-lite@1.0.30001716: {}
 
-  caniuse-lite@1.0.30001718: {}
+  caniuse-lite@1.0.30001721: {}
 
   ccount@2.0.1: {}
 
@@ -12783,8 +12794,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.14.1
-      acorn-jsx: 5.3.2(acorn@8.14.1)
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
@@ -14639,7 +14650,7 @@ snapshots:
       '@next/env': 14.2.3
       '@swc/helpers': 0.5.5
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001718
+      caniuse-lite: 1.0.30001721
       graceful-fs: 4.2.11
       postcss: 8.4.31
       react: 19.0.0
@@ -14665,7 +14676,7 @@ snapshots:
       '@swc/counter': 0.1.3
       '@swc/helpers': 0.5.15
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001718
+      caniuse-lite: 1.0.30001721
       postcss: 8.4.31
       react: 19.0.0
       react-dom: 19.0.0(react@19.0.0)

From 4ad30e8c933395fc5f1cc877522ed15f04a34ad7 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Tue, 10 Jun 2025 14:31:47 -0300
Subject: [PATCH 46/51] chore(demo): use `email-dev` instead of `react-email`
 in commands (#2293)

---
 apps/demo/package.json | 10 +++++-----
 pnpm-lock.yaml         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/demo/package.json b/apps/demo/package.json
index 478adbb091..8529dd4a20 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -3,16 +3,16 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "pnpm install --frozen-lockfile && email build",
-    "dev": "email dev",
-    "start": "email start",
-    "export": "email export"
+    "build": "email-dev build",
+    "dev": "email-dev dev",
+    "start": "email-dev start",
+    "export": "email-dev export"
   },
   "dependencies": {
     "@react-email/components": "workspace:*",
     "react": "^19",
     "react-dom": "^19",
-    "react-email": "workspace:*"
+    "email-dev": "workspace:*"
   },
   "devDependencies": {
     "@react-email/preview-server": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 091cf4ccc7..ac941ca092 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,15 +56,15 @@ importers:
       '@react-email/components':
         specifier: workspace:*
         version: link:../../packages/components
+      email-dev:
+        specifier: workspace:*
+        version: link:../../packages/react-email/dev
       react:
         specifier: ^19.0.0
         version: 19.0.0
       react-dom:
         specifier: ^19.0.0
         version: 19.0.0(react@19.0.0)
-      react-email:
-        specifier: workspace:*
-        version: link:../../packages/react-email
     devDependencies:
       '@react-email/preview-server':
         specifier: workspace:*

From 07e1e0742581a03c409d935c44eeaaef2beec226 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 14:34:42 -0300
Subject: [PATCH 47/51] chore(root): Version packages (canary) (#2291)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                  | 6 +++++-
 packages/preview-server/CHANGELOG.md | 6 ++++++
 packages/preview-server/package.json | 2 +-
 packages/react-email/CHANGELOG.md    | 6 ++++++
 packages/react-email/package.json    | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 138ab0c060..ec8463e067 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -30,14 +30,18 @@
     "docs": "0.0.0",
     "react-email": "4.0.17",
     "tsconfig": "0.0.0",
-    "web": "0.0.0"
+    "web": "0.0.0",
+    "@react-email/preview-server": "4.1.0-canary.10",
+    "email-dev": "0.0.0"
   },
   "changesets": [
     "afraid-sides-agree",
+    "better-insects-like",
     "common-goats-find",
     "crazy-seas-eat",
     "deep-clowns-bet",
     "great-parrots-yell",
+    "kind-showers-exist",
     "mighty-pigs-add",
     "petite-boxes-find",
     "puny-chicken-argue",
diff --git a/packages/preview-server/CHANGELOG.md b/packages/preview-server/CHANGELOG.md
index cf22b74a61..ce51919396 100644
--- a/packages/preview-server/CHANGELOG.md
+++ b/packages/preview-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @react-email/preview-server
 
+## 4.1.0-canary.11
+
+### Patch Changes
+
+- 272b21e: fix the forced `color-scheme: dark` for the preview
+
 ## 4.1.0-canary.10
 
 ### Patch Changes
diff --git a/packages/preview-server/package.json b/packages/preview-server/package.json
index e0f81deb90..9b311de403 100644
--- a/packages/preview-server/package.json
+++ b/packages/preview-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-email/preview-server",
-  "version": "4.1.0-canary.10",
+  "version": "4.1.0-canary.11",
   "description": "A live preview of your emails right in your browser.",
   "scripts": {
     "caniemail:fetch": "node ./scripts/fill-caniemail-data.mjs",
diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md
index 7728be8325..c95e902bf4 100644
--- a/packages/react-email/CHANGELOG.md
+++ b/packages/react-email/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-email
 
+## 4.1.0-canary.11
+
+### Patch Changes
+
+- 19d4b45: fix static file serving security issue with logging
+
 ## 4.1.0-canary.10
 
 ## 4.1.0-canary.9
diff --git a/packages/react-email/package.json b/packages/react-email/package.json
index 6718ddc072..4bff5c0287 100644
--- a/packages/react-email/package.json
+++ b/packages/react-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "4.1.0-canary.10",
+  "version": "4.1.0-canary.11",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/index.js"

From abfc3f730cb4419b578d0a58125b056bad5218d3 Mon Sep 17 00:00:00 2001
From: gabriel miranda <gabrielmfern@outlook.com>
Date: Tue, 24 Jun 2025 13:36:25 -0300
Subject: [PATCH 48/51] chore(root): Remove hanging changesets in pre.json

---
 .changeset/pre.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index ec8463e067..3ae62f112a 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -35,19 +35,11 @@
     "email-dev": "0.0.0"
   },
   "changesets": [
-    "afraid-sides-agree",
-    "better-insects-like",
     "common-goats-find",
     "crazy-seas-eat",
-    "deep-clowns-bet",
     "great-parrots-yell",
-    "kind-showers-exist",
-    "mighty-pigs-add",
-    "petite-boxes-find",
     "puny-chicken-argue",
-    "stupid-ghosts-decide",
     "tasty-swans-taste",
-    "tidy-geese-cross",
     "tiny-rice-give"
   ]
 }

From 0ff40685024ee32f4bf55b62d4fff885d9bf5dab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 14:19:46 -0300
Subject: [PATCH 49/51] chore(deps): update dependency vite to v6.3.4
 [security] (#2294)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json   |   2 +-
 pnpm-lock.yaml | 103 +++++++++++++++++++++----------------------------
 2 files changed, 45 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index d00baa351b..5021bd00be 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "tsconfig": "workspace:*",
     "tsup": "8.4.0",
     "turbo": "2.5.4",
-    "vite": "6.3.2",
+    "vite": "6.3.4",
     "vitest": "3.2.3"
   },
   "pnpm": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac941ca092..950f0cec75 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: 2.5.4
         version: 2.5.4
       vite:
-        specifier: 6.3.2
-        version: 6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
+        specifier: 6.3.4
+        version: 6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
       vitest:
         specifier: 3.2.3
         version: 3.2.3(@edge-runtime/vm@5.0.0)(@types/debug@4.1.12)(@types/node@22.14.1)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@26.1.0)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1)
@@ -198,7 +198,7 @@ importers:
         version: 5.8.3
       webpack:
         specifier: 5.99.6
-        version: 5.99.6(@swc/core@1.11.21)(esbuild@0.25.0)
+        version: 5.99.6(@swc/core@1.11.21)
       zod:
         specifier: 3.24.3
         version: 3.24.3
@@ -8115,46 +8115,6 @@ packages:
       vite:
         optional: true
 
-  vite@6.3.2:
-    resolution: {integrity: sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      jiti: '>=1.21.0'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
   vite@6.3.4:
     resolution: {integrity: sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -16374,6 +16334,17 @@ snapshots:
       '@swc/core': 1.11.21
       esbuild: 0.25.0
 
+  terser-webpack-plugin@5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21)):
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      jest-worker: 27.5.1
+      schema-utils: 4.3.0
+      serialize-javascript: 6.0.2
+      terser: 5.37.0
+      webpack: 5.99.6(@swc/core@1.11.21)
+    optionalDependencies:
+      '@swc/core': 1.11.21
+
   terser-webpack-plugin@5.3.11(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)(webpack@5.99.6(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
@@ -16854,22 +16825,6 @@ snapshots:
       - rollup
       - supports-color
 
-  vite@6.3.2(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1):
-    dependencies:
-      esbuild: 0.25.0
-      fdir: 6.4.4(picomatch@4.0.2)
-      picomatch: 4.0.2
-      postcss: 8.5.3
-      rollup: 4.39.0
-      tinyglobby: 0.2.14
-    optionalDependencies:
-      '@types/node': 22.14.1
-      fsevents: 2.3.3
-      jiti: 2.4.2
-      terser: 5.37.0
-      tsx: 4.19.3
-      yaml: 2.6.1
-
   vite@6.3.4(@types/node@22.14.1)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
       esbuild: 0.25.0
@@ -16956,6 +16911,36 @@ snapshots:
 
   webpack-sources@3.2.3: {}
 
+  webpack@5.99.6(@swc/core@1.11.21):
+    dependencies:
+      '@types/eslint-scope': 3.7.7
+      '@types/estree': 1.0.7
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/wasm-edit': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      acorn: 8.14.1
+      browserslist: 4.24.4
+      chrome-trace-event: 1.0.4
+      enhanced-resolve: 5.17.1
+      es-module-lexer: 1.6.0
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 4.3.0
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21))
+      watchpack: 2.4.2
+      webpack-sources: 3.2.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
+
   webpack@5.99.6(@swc/core@1.11.21)(esbuild@0.25.0):
     dependencies:
       '@types/eslint-scope': 3.7.7

From 3ff8597954553e9d83ce181f4b066fb709657a77 Mon Sep 17 00:00:00 2001
From: Gabriel Miranda <gabrielmfern@outlook.com>
Date: Wed, 25 Jun 2025 10:05:47 -0300
Subject: [PATCH 50/51] chore(root): update biome to v2 (#2311)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Mendy Landa <54242706+MendyLanda@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kaylee <65376239+KayleeWilliams@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bu Kinoshita <6929565+bukinoshita@users.noreply.github.com>
Co-authored-by: Pedro Almeida <pedroalmeidaprogrammer@gmail.com>
---
 apps/web/src/components/logo.tsx              |   7 +-
 apps/web/src/components/menu.tsx              |   7 +-
 benchmarks/tailwind-component/package.json    |   1 +
 biome.json                                    |   8 +-
 package.json                                  |   2 +-
 packages/preview-server/_index.js             |   4 +
 .../src/components/code-container.tsx         |   4 +-
 .../preview-server/src/components/logo.tsx    | 131 +++++------
 .../preview-server/src/components/send.tsx    |  13 +-
 .../sidebar/file-tree-directory-children.tsx  |   5 +-
 .../preview-server/src/components/toolbar.tsx |  16 +-
 .../ast/get-used-style-properties.ts          |   1 +
 pnpm-lock.yaml                                | 210 +++++++++++-------
 13 files changed, 241 insertions(+), 168 deletions(-)
 create mode 100644 packages/preview-server/_index.js

diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/components/logo.tsx
index 8d309ad796..721a83f466 100644
--- a/apps/web/src/components/logo.tsx
+++ b/apps/web/src/components/logo.tsx
@@ -1,4 +1,7 @@
+import * as React from 'react';
+
 export const Logo = () => {
+  const id = React.useId();
   return (
     <svg
       className="pointer-events-none"
@@ -8,7 +11,7 @@ export const Logo = () => {
       width="119"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <g clipPath="url(#clip0_27_291)">
+      <g clipPath={`url(#${id})`}>
         <path
           clipRule="evenodd"
           d="M24.4558 24.4853C25.2339 23.7073 25.3805 22.6549 25.2947 21.746C25.2078 20.8254 24.8697 19.8258 24.3896 18.8287C23.957 17.9302 23.3802 16.9745 22.6821 16C23.3802 15.0255 23.957 14.0698 24.3896 13.1713C24.8697 12.1742 25.2078 11.1746 25.2947 10.254C25.3805 9.34508 25.2339 8.29273 24.4558 7.51472C23.6778 6.73671 22.6255 6.59004 21.7165 6.67584C20.796 6.76273 19.7964 7.10086 18.7993 7.58094C17.9007 8.01357 16.945 8.59036 15.9706 9.28842C14.9961 8.59036 14.0404 8.01357 13.1418 7.58094C12.1447 7.10086 11.1451 6.76273 10.2246 6.67584C9.31564 6.59004 8.26329 6.73671 7.48528 7.51472C6.70727 8.29273 6.5606 9.34508 6.6464 10.254C6.7333 11.1746 7.07142 12.1742 7.5515 13.1713C7.98414 14.0698 8.56092 15.0255 9.25898 16C8.56092 16.9745 7.98414 17.9302 7.5515 18.8287C7.07142 19.8258 6.7333 20.8254 6.6464 21.746C6.5606 22.6549 6.70727 23.7073 7.48528 24.4853C8.26329 25.2633 9.31564 25.41 10.2246 25.3242C11.1451 25.2373 12.1447 24.8991 13.1418 24.4191C14.0404 23.9864 14.9961 23.4096 15.9706 22.7116C16.945 23.4096 17.9007 23.9864 18.7993 24.4191C19.7964 24.8991 20.796 25.2373 21.7165 25.3242C22.6255 25.41 23.6778 25.2633 24.4558 24.4853ZM15.9706 20.948C16.8399 20.2684 17.724 19.4874 18.591 18.6205C19.458 17.7535 20.239 16.8693 20.9186 16C20.239 15.1307 19.458 14.2465 18.591 13.3795C17.724 12.5126 16.8399 11.7316 15.9706 11.052C15.1012 11.7316 14.2171 12.5126 13.3501 13.3795C12.4831 14.2465 11.7021 15.1307 11.0225 16C11.7021 16.8693 12.4831 17.7535 13.3501 18.6205C14.2171 19.4874 15.1012 20.2684 15.9706 20.948ZM17.1498 21.8145C17.968 21.1558 18.7885 20.4195 19.5893 19.6187C20.39 18.818 21.1264 17.9974 21.7851 17.1792C23.7187 19.9919 24.4627 22.4819 23.4576 23.487C22.4524 24.4922 19.9625 23.7482 17.1498 21.8145ZM10.156 17.1792C10.8148 17.9974 11.5511 18.818 12.3518 19.6187C13.1526 20.4195 13.9731 21.1558 14.7914 21.8145C11.9786 23.7482 9.48871 24.4922 8.48355 23.487C7.47839 22.4819 8.22238 19.9919 10.156 17.1792ZM10.156 14.8208C10.8148 14.0026 11.5511 13.182 12.3518 12.3813C13.1526 11.5805 13.9731 10.8442 14.7914 10.1855C11.9786 8.25182 9.48871 7.50783 8.48355 8.51299C7.47839 9.51815 8.22238 12.0081 10.156 14.8208ZM17.1498 10.1855C17.968 10.8442 18.7885 11.5805 19.5893 12.3813C20.39 13.182 21.1264 14.0026 21.7851 14.8208C23.7187 12.0081 24.4627 9.51815 23.4576 8.51299C22.4524 7.50783 19.9625 8.25182 17.1498 10.1855Z"
@@ -56,7 +59,7 @@ export const Logo = () => {
       />
       <path d="M116.675 22.176V10.336H118.659V22.176H116.675Z" fill="white" />
       <defs>
-        <clipPath id="clip0_27_291">
+        <clipPath id={id}>
           <rect fill="white" height="32" rx="8" width="32" />
         </clipPath>
       </defs>
diff --git a/apps/web/src/components/menu.tsx b/apps/web/src/components/menu.tsx
index 43db432c14..535b6ebc29 100644
--- a/apps/web/src/components/menu.tsx
+++ b/apps/web/src/components/menu.tsx
@@ -94,11 +94,8 @@ const SocialIcons = ({ onItemClick }: { onItemClick: () => void }) => (
         xmlns="http://www.w3.org/2000/svg"
       >
         <g>
-          <g data-name="Discord Logos" id="Discord_Logos">
-            <g
-              data-name="Discord Logo - Large - White"
-              id="Discord_Logo_-_Large_-_White"
-            >
+          <g data-name="Discord Logos">
+            <g data-name="Discord Logo - Large - White">
               <path
                 d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z"
                 fill="currentColor"
diff --git a/benchmarks/tailwind-component/package.json b/benchmarks/tailwind-component/package.json
index 17f9ed6053..7210b6488f 100644
--- a/benchmarks/tailwind-component/package.json
+++ b/benchmarks/tailwind-component/package.json
@@ -29,6 +29,7 @@
     "tinybench": "3.1.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "flamebearer": "1.1.3",
     "tsconfig": "workspace:*",
     "tsx": "4.19.3",
diff --git a/biome.json b/biome.json
index 5c35171042..0f25e9bf7d 100644
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.0.0-beta.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
   "assist": {
     "actions": {
       "source": {
@@ -28,7 +28,6 @@
       "style": {
         "noNonNullAssertion": "off",
         "useLiteralEnumMembers": "error",
-        "noCommaOperator": "error",
         "useNodejsImportProtocol": "error",
         "useAsConstAssertion": "error",
         "useEnumInitializers": "error",
@@ -42,7 +41,6 @@
         "useTemplate": "error",
         "noParameterAssign": "error",
         "useDefaultParameterLast": "error",
-        "noArguments": "error",
         "useImportType": "error",
         "useExportType": "error",
         "noUselessElse": "error",
@@ -69,7 +67,9 @@
       "complexity": {
         "useNumericLiterals": "error",
         "noUselessFragments": "off",
-        "noForEach": "off"
+        "noForEach": "off",
+        "noCommaOperator": "error",
+        "noArguments": "error"
       },
       "suspicious": {
         "noArrayIndexKey": "off",
diff --git a/package.json b/package.json
index 5021bd00be..223b821524 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test:watch": "turbo run test:watch"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.0.0-beta.5",
+    "@biomejs/biome": "2.0.5",
     "@changesets/cli": "2.29.4",
     "@types/node": "22.14.1",
     "@types/react": "19.0.1",
diff --git a/packages/preview-server/_index.js b/packages/preview-server/_index.js
new file mode 100644
index 0000000000..e3eb1b23d6
--- /dev/null
+++ b/packages/preview-server/_index.js
@@ -0,0 +1,4 @@
+/**
+ * this file is just a placeholder file so that import.meta.resolve and require.resolve can properly
+ * find out the path to this module. This file does not do anything nor does it need to export anything of value.
+ */
diff --git a/packages/preview-server/src/components/code-container.tsx b/packages/preview-server/src/components/code-container.tsx
index 9f987e0dee..e32b3d8921 100644
--- a/packages/preview-server/src/components/code-container.tsx
+++ b/packages/preview-server/src/components/code-container.tsx
@@ -37,6 +37,8 @@ export const CodeContainer: React.FC<Readonly<CodeContainerProps>> = ({
     });
   }
 
+  const codeId = React.useId();
+
   return (
     <div
       className="relative max-h-[650px] w-full h-full whitespace-pre rounded-md border border-slate-6 text-sm"
@@ -49,7 +51,7 @@ export const CodeContainer: React.FC<Readonly<CodeContainerProps>> = ({
     >
       <div className="h-9 border-b border-slate-6">
         <div className="flex">
-          <LayoutGroup id="code">
+          <LayoutGroup id={codeId}>
             {markups.map(({ language }) => {
               const isCurrentLang = activeLang === language;
               return (
diff --git a/packages/preview-server/src/components/logo.tsx b/packages/preview-server/src/components/logo.tsx
index 41849a64a2..6713d43946 100644
--- a/packages/preview-server/src/components/logo.tsx
+++ b/packages/preview-server/src/components/logo.tsx
@@ -1,63 +1,68 @@
-export const Logo = () => (
-  <svg
-    fill="none"
-    height="30"
-    viewBox="0 0 119 32"
-    width="113"
-    xmlns="http://www.w3.org/2000/svg"
-    style={{ opacity: 0.9 }}
-  >
-    <g clipPath="url(#clip0_27_291)">
-      <path
-        clipRule="evenodd"
-        d="M24.4558 24.4853C25.2339 23.7073 25.3805 22.6549 25.2947 21.746C25.2078 20.8254 24.8697 19.8258 24.3896 18.8287C23.957 17.9302 23.3802 16.9745 22.6821 16C23.3802 15.0255 23.957 14.0698 24.3896 13.1713C24.8697 12.1742 25.2078 11.1746 25.2947 10.254C25.3805 9.34508 25.2339 8.29273 24.4558 7.51472C23.6778 6.73671 22.6255 6.59004 21.7165 6.67584C20.796 6.76273 19.7964 7.10086 18.7993 7.58094C17.9007 8.01357 16.945 8.59036 15.9706 9.28842C14.9961 8.59036 14.0404 8.01357 13.1418 7.58094C12.1447 7.10086 11.1451 6.76273 10.2246 6.67584C9.31564 6.59004 8.26329 6.73671 7.48528 7.51472C6.70727 8.29273 6.5606 9.34508 6.6464 10.254C6.7333 11.1746 7.07142 12.1742 7.5515 13.1713C7.98414 14.0698 8.56092 15.0255 9.25898 16C8.56092 16.9745 7.98414 17.9302 7.5515 18.8287C7.07142 19.8258 6.7333 20.8254 6.6464 21.746C6.5606 22.6549 6.70727 23.7073 7.48528 24.4853C8.26329 25.2633 9.31564 25.41 10.2246 25.3242C11.1451 25.2373 12.1447 24.8991 13.1418 24.4191C14.0404 23.9864 14.9961 23.4096 15.9706 22.7116C16.945 23.4096 17.9007 23.9864 18.7993 24.4191C19.7964 24.8991 20.796 25.2373 21.7165 25.3242C22.6255 25.41 23.6778 25.2633 24.4558 24.4853ZM15.9706 20.948C16.8399 20.2684 17.724 19.4874 18.591 18.6205C19.458 17.7535 20.239 16.8693 20.9186 16C20.239 15.1307 19.458 14.2465 18.591 13.3795C17.724 12.5126 16.8399 11.7316 15.9706 11.052C15.1012 11.7316 14.2171 12.5126 13.3501 13.3795C12.4831 14.2465 11.7021 15.1307 11.0225 16C11.7021 16.8693 12.4831 17.7535 13.3501 18.6205C14.2171 19.4874 15.1012 20.2684 15.9706 20.948ZM17.1498 21.8145C17.968 21.1558 18.7885 20.4195 19.5893 19.6187C20.39 18.818 21.1264 17.9974 21.7851 17.1792C23.7187 19.9919 24.4627 22.4819 23.4576 23.487C22.4524 24.4922 19.9625 23.7482 17.1498 21.8145ZM10.156 17.1792C10.8148 17.9974 11.5511 18.818 12.3518 19.6187C13.1526 20.4195 13.9731 21.1558 14.7914 21.8145C11.9786 23.7482 9.48871 24.4922 8.48355 23.487C7.47839 22.4819 8.22238 19.9919 10.156 17.1792ZM10.156 14.8208C10.8148 14.0026 11.5511 13.182 12.3518 12.3813C13.1526 11.5805 13.9731 10.8442 14.7914 10.1855C11.9786 8.25182 9.48871 7.50783 8.48355 8.51299C7.47839 9.51815 8.22238 12.0081 10.156 14.8208ZM17.1498 10.1855C17.968 10.8442 18.7885 11.5805 19.5893 12.3813C20.39 13.182 21.1264 14.0026 21.7851 14.8208C23.7187 12.0081 24.4627 9.51815 23.4576 8.51299C22.4524 7.50783 19.9625 8.25182 17.1498 10.1855Z"
-        fill="white"
-        fillRule="evenodd"
-        stroke="white"
-        strokeWidth="0.5"
-      />
-    </g>
-    <path
-      d="M36 22.176V13.744H37.936L37.968 16.432L37.696 15.824C37.8133 15.3973 38.016 15.0133 38.304 14.672C38.592 14.3307 38.9227 14.064 39.296 13.872C39.68 13.6693 40.08 13.568 40.496 13.568C40.6773 13.568 40.848 13.584 41.008 13.616C41.1787 13.648 41.3173 13.6853 41.424 13.728L40.896 15.888C40.7787 15.824 40.6347 15.7707 40.464 15.728C40.2933 15.6853 40.1227 15.664 39.952 15.664C39.6853 15.664 39.4293 15.7173 39.184 15.824C38.9493 15.92 38.7413 16.0587 38.56 16.24C38.3787 16.4213 38.2347 16.6347 38.128 16.88C38.032 17.1147 37.984 17.3813 37.984 17.68V22.176H36Z"
-      fill="white"
-    />
-    <path
-      d="M45.907 22.336C45.0217 22.336 44.2377 22.1493 43.555 21.776C42.883 21.4027 42.355 20.896 41.971 20.256C41.5977 19.6053 41.411 18.864 41.411 18.032C41.411 17.3707 41.5177 16.768 41.731 16.224C41.9443 15.68 42.2377 15.2107 42.611 14.816C42.995 14.4107 43.4483 14.1013 43.971 13.888C44.5043 13.664 45.0857 13.552 45.715 13.552C46.2697 13.552 46.787 13.6587 47.267 13.872C47.747 14.0853 48.163 14.3787 48.515 14.752C48.867 15.1147 49.1337 15.552 49.315 16.064C49.507 16.5653 49.5977 17.1147 49.587 17.712L49.571 18.4H42.739L42.371 17.056H47.923L47.667 17.328V16.976C47.635 16.6453 47.5283 16.3573 47.347 16.112C47.1657 15.856 46.931 15.6587 46.643 15.52C46.3657 15.3707 46.0563 15.296 45.715 15.296C45.1923 15.296 44.7497 15.3973 44.387 15.6C44.035 15.8027 43.7683 16.096 43.587 16.48C43.4057 16.8533 43.315 17.3227 43.315 17.888C43.315 18.432 43.427 18.9067 43.651 19.312C43.8857 19.7173 44.211 20.032 44.627 20.256C45.0537 20.4693 45.5497 20.576 46.115 20.576C46.5097 20.576 46.8723 20.512 47.203 20.384C47.5337 20.256 47.891 20.0267 48.275 19.696L49.251 21.056C48.963 21.3227 48.6323 21.552 48.259 21.744C47.8963 21.9253 47.5123 22.0693 47.107 22.176C46.7017 22.2827 46.3017 22.336 45.907 22.336Z"
-      fill="white"
-    />
-    <path
-      d="M54.094 22.336C53.4007 22.336 52.7713 22.144 52.206 21.76C51.6407 21.376 51.1873 20.8533 50.846 20.192C50.5047 19.5307 50.334 18.7787 50.334 17.936C50.334 17.0933 50.5047 16.3413 50.846 15.68C51.1873 15.0187 51.6513 14.5013 52.238 14.128C52.8247 13.7547 53.486 13.568 54.222 13.568C54.6487 13.568 55.038 13.632 55.39 13.76C55.742 13.8773 56.0513 14.048 56.318 14.272C56.5847 14.496 56.8033 14.752 56.974 15.04C57.1553 15.328 57.278 15.6373 57.342 15.968L56.91 15.856V13.744H58.894V22.176H56.894V20.16L57.358 20.08C57.2833 20.368 57.1447 20.6507 56.942 20.928C56.75 21.1947 56.5047 21.4347 56.206 21.648C55.918 21.8507 55.5927 22.016 55.23 22.144C54.878 22.272 54.4993 22.336 54.094 22.336ZM54.638 20.592C55.0967 20.592 55.502 20.48 55.854 20.256C56.206 20.032 56.478 19.7227 56.67 19.328C56.8727 18.9227 56.974 18.4587 56.974 17.936C56.974 17.424 56.8727 16.9707 56.67 16.576C56.478 16.1813 56.206 15.872 55.854 15.648C55.502 15.424 55.0967 15.312 54.638 15.312C54.1793 15.312 53.774 15.424 53.422 15.648C53.0807 15.872 52.814 16.1813 52.622 16.576C52.43 16.9707 52.334 17.424 52.334 17.936C52.334 18.4587 52.43 18.9227 52.622 19.328C52.814 19.7227 53.0807 20.032 53.422 20.256C53.774 20.48 54.1793 20.592 54.638 20.592Z"
-      fill="white"
-    />
-    <path
-      d="M64.3716 22.336C63.5823 22.336 62.873 22.144 62.2436 21.76C61.6143 21.376 61.1183 20.8533 60.7556 20.192C60.393 19.5307 60.2116 18.784 60.2116 17.952C60.2116 17.12 60.393 16.3733 60.7556 15.712C61.1183 15.0507 61.6143 14.528 62.2436 14.144C62.873 13.76 63.5823 13.568 64.3716 13.568C65.129 13.568 65.817 13.712 66.4356 14C67.0543 14.288 67.5343 14.688 67.8756 15.2L66.7876 16.512C66.6276 16.288 66.425 16.0853 66.1796 15.904C65.9343 15.7227 65.673 15.5787 65.3956 15.472C65.1183 15.3653 64.841 15.312 64.5636 15.312C64.0943 15.312 63.673 15.4293 63.2996 15.664C62.937 15.888 62.649 16.2027 62.4356 16.608C62.2223 17.0027 62.1156 17.4507 62.1156 17.952C62.1156 18.4533 62.2223 18.9013 62.4356 19.296C62.6596 19.6907 62.9583 20.0053 63.3316 20.24C63.705 20.4747 64.121 20.592 64.5796 20.592C64.857 20.592 65.1236 20.5493 65.3796 20.464C65.6463 20.368 65.897 20.2347 66.1316 20.064C66.3663 19.8933 66.585 19.68 66.7876 19.424L67.8756 20.752C67.513 21.2213 67.0116 21.6053 66.3716 21.904C65.7423 22.192 65.0756 22.336 64.3716 22.336Z"
-      fill="white"
-    />
-    <path
-      d="M69.8726 22.176V11.6H71.8406V22.176H69.8726ZM68.2086 15.568V13.744H73.6806V15.568H68.2086Z"
-      fill="white"
-    />
-    <path
-      d="M82.9945 22.336C82.1092 22.336 81.3252 22.1493 80.6425 21.776C79.9705 21.4027 79.4425 20.896 79.0585 20.256C78.6852 19.6053 78.4985 18.864 78.4985 18.032C78.4985 17.3707 78.6052 16.768 78.8185 16.224C79.0318 15.68 79.3252 15.2107 79.6985 14.816C80.0825 14.4107 80.5358 14.1013 81.0585 13.888C81.5918 13.664 82.1732 13.552 82.8025 13.552C83.3572 13.552 83.8745 13.6587 84.3545 13.872C84.8345 14.0853 85.2505 14.3787 85.6025 14.752C85.9545 15.1147 86.2212 15.552 86.4025 16.064C86.5945 16.5653 86.6852 17.1147 86.6745 17.712L86.6585 18.4H79.8265L79.4585 17.056H85.0105L84.7545 17.328V16.976C84.7225 16.6453 84.6158 16.3573 84.4345 16.112C84.2532 15.856 84.0185 15.6587 83.7305 15.52C83.4532 15.3707 83.1438 15.296 82.8025 15.296C82.2798 15.296 81.8372 15.3973 81.4745 15.6C81.1225 15.8027 80.8558 16.096 80.6745 16.48C80.4932 16.8533 80.4025 17.3227 80.4025 17.888C80.4025 18.432 80.5145 18.9067 80.7385 19.312C80.9732 19.7173 81.2985 20.032 81.7145 20.256C82.1412 20.4693 82.6372 20.576 83.2025 20.576C83.5972 20.576 83.9598 20.512 84.2905 20.384C84.6212 20.256 84.9785 20.0267 85.3625 19.696L86.3385 21.056C86.0505 21.3227 85.7198 21.552 85.3465 21.744C84.9838 21.9253 84.5998 22.0693 84.1945 22.176C83.7892 22.2827 83.3892 22.336 82.9945 22.336Z"
-      fill="white"
-    />
-    <path
-      d="M87.9655 22.176V13.744H89.9015L89.9335 15.44L89.6135 15.568C89.7095 15.2907 89.8535 15.0347 90.0455 14.8C90.2375 14.5547 90.4668 14.3467 90.7335 14.176C91.0002 13.9947 91.2828 13.856 91.5815 13.76C91.8802 13.6533 92.1842 13.6 92.4935 13.6C92.9522 13.6 93.3575 13.6747 93.7095 13.824C94.0722 13.9627 94.3708 14.1867 94.6055 14.496C94.8508 14.8053 95.0322 15.2 95.1495 15.68L94.8455 15.616L94.9735 15.36C95.0908 15.104 95.2562 14.8747 95.4695 14.672C95.6828 14.4587 95.9228 14.272 96.1895 14.112C96.4562 13.9413 96.7335 13.8133 97.0215 13.728C97.3202 13.6427 97.6135 13.6 97.9015 13.6C98.5415 13.6 99.0748 13.728 99.5015 13.984C99.9282 14.24 100.248 14.6293 100.462 15.152C100.675 15.6747 100.782 16.32 100.782 17.088V22.176H98.7975V17.216C98.7975 16.7893 98.7388 16.4373 98.6215 16.16C98.5148 15.8827 98.3442 15.68 98.1095 15.552C97.8855 15.4133 97.6028 15.344 97.2615 15.344C96.9948 15.344 96.7388 15.392 96.4935 15.488C96.2588 15.5733 96.0562 15.7013 95.8855 15.872C95.7148 16.032 95.5815 16.2187 95.4855 16.432C95.3895 16.6453 95.3415 16.88 95.3415 17.136V22.176H93.3575V17.2C93.3575 16.7947 93.2988 16.4587 93.1815 16.192C93.0642 15.9147 92.8935 15.7067 92.6695 15.568C92.4455 15.4187 92.1735 15.344 91.8535 15.344C91.5868 15.344 91.3362 15.392 91.1015 15.488C90.8668 15.5733 90.6642 15.696 90.4935 15.856C90.3228 16.016 90.1895 16.2027 90.0935 16.416C89.9975 16.6293 89.9495 16.864 89.9495 17.12V22.176H87.9655Z"
-      fill="white"
-    />
-    <path
-      d="M105.73 22.336C105.037 22.336 104.408 22.144 103.842 21.76C103.277 21.376 102.824 20.8533 102.482 20.192C102.141 19.5307 101.97 18.7787 101.97 17.936C101.97 17.0933 102.141 16.3413 102.482 15.68C102.824 15.0187 103.288 14.5013 103.874 14.128C104.461 13.7547 105.122 13.568 105.858 13.568C106.285 13.568 106.674 13.632 107.026 13.76C107.378 13.8773 107.688 14.048 107.954 14.272C108.221 14.496 108.44 14.752 108.61 15.04C108.792 15.328 108.914 15.6373 108.978 15.968L108.546 15.856V13.744H110.53V22.176H108.53V20.16L108.994 20.08C108.92 20.368 108.781 20.6507 108.578 20.928C108.386 21.1947 108.141 21.4347 107.842 21.648C107.554 21.8507 107.229 22.016 106.866 22.144C106.514 22.272 106.136 22.336 105.73 22.336ZM106.274 20.592C106.733 20.592 107.138 20.48 107.49 20.256C107.842 20.032 108.114 19.7227 108.306 19.328C108.509 18.9227 108.61 18.4587 108.61 17.936C108.61 17.424 108.509 16.9707 108.306 16.576C108.114 16.1813 107.842 15.872 107.49 15.648C107.138 15.424 106.733 15.312 106.274 15.312C105.816 15.312 105.41 15.424 105.058 15.648C104.717 15.872 104.45 16.1813 104.258 16.576C104.066 16.9707 103.97 17.424 103.97 17.936C103.97 18.4587 104.066 18.9227 104.258 19.328C104.45 19.7227 104.717 20.032 105.058 20.256C105.41 20.48 105.816 20.592 106.274 20.592Z"
-      fill="white"
-    />
-    <path
-      d="M112.616 22.176V13.744H114.584V22.176H112.616ZM113.576 11.952C113.181 11.952 112.872 11.856 112.648 11.664C112.435 11.4613 112.328 11.1787 112.328 10.816C112.328 10.4747 112.44 10.1973 112.664 9.984C112.888 9.77067 113.192 9.664 113.576 9.664C113.981 9.664 114.291 9.76534 114.504 9.968C114.728 10.16 114.84 10.4427 114.84 10.816C114.84 11.1467 114.728 11.4187 114.504 11.632C114.28 11.8453 113.971 11.952 113.576 11.952Z"
-      fill="white"
-    />
-    <path d="M116.675 22.176V10.336H118.659V22.176H116.675Z" fill="white" />
-    <defs>
-      <clipPath id="clip0_27_291">
-        <rect fill="white" height="32" rx="8" width="32" />
-      </clipPath>
-    </defs>
-  </svg>
-);
+import * as React from 'react';
+
+export const Logo = () => {
+  const id = React.useId();
+  return (
+    <svg
+      fill="none"
+      height="30"
+      viewBox="0 0 119 32"
+      width="113"
+      xmlns="http://www.w3.org/2000/svg"
+      style={{ opacity: 0.9 }}
+    >
+      <g clipPath={`url(#${id})`}>
+        <path
+          clipRule="evenodd"
+          d="M24.4558 24.4853C25.2339 23.7073 25.3805 22.6549 25.2947 21.746C25.2078 20.8254 24.8697 19.8258 24.3896 18.8287C23.957 17.9302 23.3802 16.9745 22.6821 16C23.3802 15.0255 23.957 14.0698 24.3896 13.1713C24.8697 12.1742 25.2078 11.1746 25.2947 10.254C25.3805 9.34508 25.2339 8.29273 24.4558 7.51472C23.6778 6.73671 22.6255 6.59004 21.7165 6.67584C20.796 6.76273 19.7964 7.10086 18.7993 7.58094C17.9007 8.01357 16.945 8.59036 15.9706 9.28842C14.9961 8.59036 14.0404 8.01357 13.1418 7.58094C12.1447 7.10086 11.1451 6.76273 10.2246 6.67584C9.31564 6.59004 8.26329 6.73671 7.48528 7.51472C6.70727 8.29273 6.5606 9.34508 6.6464 10.254C6.7333 11.1746 7.07142 12.1742 7.5515 13.1713C7.98414 14.0698 8.56092 15.0255 9.25898 16C8.56092 16.9745 7.98414 17.9302 7.5515 18.8287C7.07142 19.8258 6.7333 20.8254 6.6464 21.746C6.5606 22.6549 6.70727 23.7073 7.48528 24.4853C8.26329 25.2633 9.31564 25.41 10.2246 25.3242C11.1451 25.2373 12.1447 24.8991 13.1418 24.4191C14.0404 23.9864 14.9961 23.4096 15.9706 22.7116C16.945 23.4096 17.9007 23.9864 18.7993 24.4191C19.7964 24.8991 20.796 25.2373 21.7165 25.3242C22.6255 25.41 23.6778 25.2633 24.4558 24.4853ZM15.9706 20.948C16.8399 20.2684 17.724 19.4874 18.591 18.6205C19.458 17.7535 20.239 16.8693 20.9186 16C20.239 15.1307 19.458 14.2465 18.591 13.3795C17.724 12.5126 16.8399 11.7316 15.9706 11.052C15.1012 11.7316 14.2171 12.5126 13.3501 13.3795C12.4831 14.2465 11.7021 15.1307 11.0225 16C11.7021 16.8693 12.4831 17.7535 13.3501 18.6205C14.2171 19.4874 15.1012 20.2684 15.9706 20.948ZM17.1498 21.8145C17.968 21.1558 18.7885 20.4195 19.5893 19.6187C20.39 18.818 21.1264 17.9974 21.7851 17.1792C23.7187 19.9919 24.4627 22.4819 23.4576 23.487C22.4524 24.4922 19.9625 23.7482 17.1498 21.8145ZM10.156 17.1792C10.8148 17.9974 11.5511 18.818 12.3518 19.6187C13.1526 20.4195 13.9731 21.1558 14.7914 21.8145C11.9786 23.7482 9.48871 24.4922 8.48355 23.487C7.47839 22.4819 8.22238 19.9919 10.156 17.1792ZM10.156 14.8208C10.8148 14.0026 11.5511 13.182 12.3518 12.3813C13.1526 11.5805 13.9731 10.8442 14.7914 10.1855C11.9786 8.25182 9.48871 7.50783 8.48355 8.51299C7.47839 9.51815 8.22238 12.0081 10.156 14.8208ZM17.1498 10.1855C17.968 10.8442 18.7885 11.5805 19.5893 12.3813C20.39 13.182 21.1264 14.0026 21.7851 14.8208C23.7187 12.0081 24.4627 9.51815 23.4576 8.51299C22.4524 7.50783 19.9625 8.25182 17.1498 10.1855Z"
+          fill="white"
+          fillRule="evenodd"
+          stroke="white"
+          strokeWidth="0.5"
+        />
+      </g>
+      <path
+        d="M36 22.176V13.744H37.936L37.968 16.432L37.696 15.824C37.8133 15.3973 38.016 15.0133 38.304 14.672C38.592 14.3307 38.9227 14.064 39.296 13.872C39.68 13.6693 40.08 13.568 40.496 13.568C40.6773 13.568 40.848 13.584 41.008 13.616C41.1787 13.648 41.3173 13.6853 41.424 13.728L40.896 15.888C40.7787 15.824 40.6347 15.7707 40.464 15.728C40.2933 15.6853 40.1227 15.664 39.952 15.664C39.6853 15.664 39.4293 15.7173 39.184 15.824C38.9493 15.92 38.7413 16.0587 38.56 16.24C38.3787 16.4213 38.2347 16.6347 38.128 16.88C38.032 17.1147 37.984 17.3813 37.984 17.68V22.176H36Z"
+        fill="white"
+      />
+      <path
+        d="M45.907 22.336C45.0217 22.336 44.2377 22.1493 43.555 21.776C42.883 21.4027 42.355 20.896 41.971 20.256C41.5977 19.6053 41.411 18.864 41.411 18.032C41.411 17.3707 41.5177 16.768 41.731 16.224C41.9443 15.68 42.2377 15.2107 42.611 14.816C42.995 14.4107 43.4483 14.1013 43.971 13.888C44.5043 13.664 45.0857 13.552 45.715 13.552C46.2697 13.552 46.787 13.6587 47.267 13.872C47.747 14.0853 48.163 14.3787 48.515 14.752C48.867 15.1147 49.1337 15.552 49.315 16.064C49.507 16.5653 49.5977 17.1147 49.587 17.712L49.571 18.4H42.739L42.371 17.056H47.923L47.667 17.328V16.976C47.635 16.6453 47.5283 16.3573 47.347 16.112C47.1657 15.856 46.931 15.6587 46.643 15.52C46.3657 15.3707 46.0563 15.296 45.715 15.296C45.1923 15.296 44.7497 15.3973 44.387 15.6C44.035 15.8027 43.7683 16.096 43.587 16.48C43.4057 16.8533 43.315 17.3227 43.315 17.888C43.315 18.432 43.427 18.9067 43.651 19.312C43.8857 19.7173 44.211 20.032 44.627 20.256C45.0537 20.4693 45.5497 20.576 46.115 20.576C46.5097 20.576 46.8723 20.512 47.203 20.384C47.5337 20.256 47.891 20.0267 48.275 19.696L49.251 21.056C48.963 21.3227 48.6323 21.552 48.259 21.744C47.8963 21.9253 47.5123 22.0693 47.107 22.176C46.7017 22.2827 46.3017 22.336 45.907 22.336Z"
+        fill="white"
+      />
+      <path
+        d="M54.094 22.336C53.4007 22.336 52.7713 22.144 52.206 21.76C51.6407 21.376 51.1873 20.8533 50.846 20.192C50.5047 19.5307 50.334 18.7787 50.334 17.936C50.334 17.0933 50.5047 16.3413 50.846 15.68C51.1873 15.0187 51.6513 14.5013 52.238 14.128C52.8247 13.7547 53.486 13.568 54.222 13.568C54.6487 13.568 55.038 13.632 55.39 13.76C55.742 13.8773 56.0513 14.048 56.318 14.272C56.5847 14.496 56.8033 14.752 56.974 15.04C57.1553 15.328 57.278 15.6373 57.342 15.968L56.91 15.856V13.744H58.894V22.176H56.894V20.16L57.358 20.08C57.2833 20.368 57.1447 20.6507 56.942 20.928C56.75 21.1947 56.5047 21.4347 56.206 21.648C55.918 21.8507 55.5927 22.016 55.23 22.144C54.878 22.272 54.4993 22.336 54.094 22.336ZM54.638 20.592C55.0967 20.592 55.502 20.48 55.854 20.256C56.206 20.032 56.478 19.7227 56.67 19.328C56.8727 18.9227 56.974 18.4587 56.974 17.936C56.974 17.424 56.8727 16.9707 56.67 16.576C56.478 16.1813 56.206 15.872 55.854 15.648C55.502 15.424 55.0967 15.312 54.638 15.312C54.1793 15.312 53.774 15.424 53.422 15.648C53.0807 15.872 52.814 16.1813 52.622 16.576C52.43 16.9707 52.334 17.424 52.334 17.936C52.334 18.4587 52.43 18.9227 52.622 19.328C52.814 19.7227 53.0807 20.032 53.422 20.256C53.774 20.48 54.1793 20.592 54.638 20.592Z"
+        fill="white"
+      />
+      <path
+        d="M64.3716 22.336C63.5823 22.336 62.873 22.144 62.2436 21.76C61.6143 21.376 61.1183 20.8533 60.7556 20.192C60.393 19.5307 60.2116 18.784 60.2116 17.952C60.2116 17.12 60.393 16.3733 60.7556 15.712C61.1183 15.0507 61.6143 14.528 62.2436 14.144C62.873 13.76 63.5823 13.568 64.3716 13.568C65.129 13.568 65.817 13.712 66.4356 14C67.0543 14.288 67.5343 14.688 67.8756 15.2L66.7876 16.512C66.6276 16.288 66.425 16.0853 66.1796 15.904C65.9343 15.7227 65.673 15.5787 65.3956 15.472C65.1183 15.3653 64.841 15.312 64.5636 15.312C64.0943 15.312 63.673 15.4293 63.2996 15.664C62.937 15.888 62.649 16.2027 62.4356 16.608C62.2223 17.0027 62.1156 17.4507 62.1156 17.952C62.1156 18.4533 62.2223 18.9013 62.4356 19.296C62.6596 19.6907 62.9583 20.0053 63.3316 20.24C63.705 20.4747 64.121 20.592 64.5796 20.592C64.857 20.592 65.1236 20.5493 65.3796 20.464C65.6463 20.368 65.897 20.2347 66.1316 20.064C66.3663 19.8933 66.585 19.68 66.7876 19.424L67.8756 20.752C67.513 21.2213 67.0116 21.6053 66.3716 21.904C65.7423 22.192 65.0756 22.336 64.3716 22.336Z"
+        fill="white"
+      />
+      <path
+        d="M69.8726 22.176V11.6H71.8406V22.176H69.8726ZM68.2086 15.568V13.744H73.6806V15.568H68.2086Z"
+        fill="white"
+      />
+      <path
+        d="M82.9945 22.336C82.1092 22.336 81.3252 22.1493 80.6425 21.776C79.9705 21.4027 79.4425 20.896 79.0585 20.256C78.6852 19.6053 78.4985 18.864 78.4985 18.032C78.4985 17.3707 78.6052 16.768 78.8185 16.224C79.0318 15.68 79.3252 15.2107 79.6985 14.816C80.0825 14.4107 80.5358 14.1013 81.0585 13.888C81.5918 13.664 82.1732 13.552 82.8025 13.552C83.3572 13.552 83.8745 13.6587 84.3545 13.872C84.8345 14.0853 85.2505 14.3787 85.6025 14.752C85.9545 15.1147 86.2212 15.552 86.4025 16.064C86.5945 16.5653 86.6852 17.1147 86.6745 17.712L86.6585 18.4H79.8265L79.4585 17.056H85.0105L84.7545 17.328V16.976C84.7225 16.6453 84.6158 16.3573 84.4345 16.112C84.2532 15.856 84.0185 15.6587 83.7305 15.52C83.4532 15.3707 83.1438 15.296 82.8025 15.296C82.2798 15.296 81.8372 15.3973 81.4745 15.6C81.1225 15.8027 80.8558 16.096 80.6745 16.48C80.4932 16.8533 80.4025 17.3227 80.4025 17.888C80.4025 18.432 80.5145 18.9067 80.7385 19.312C80.9732 19.7173 81.2985 20.032 81.7145 20.256C82.1412 20.4693 82.6372 20.576 83.2025 20.576C83.5972 20.576 83.9598 20.512 84.2905 20.384C84.6212 20.256 84.9785 20.0267 85.3625 19.696L86.3385 21.056C86.0505 21.3227 85.7198 21.552 85.3465 21.744C84.9838 21.9253 84.5998 22.0693 84.1945 22.176C83.7892 22.2827 83.3892 22.336 82.9945 22.336Z"
+        fill="white"
+      />
+      <path
+        d="M87.9655 22.176V13.744H89.9015L89.9335 15.44L89.6135 15.568C89.7095 15.2907 89.8535 15.0347 90.0455 14.8C90.2375 14.5547 90.4668 14.3467 90.7335 14.176C91.0002 13.9947 91.2828 13.856 91.5815 13.76C91.8802 13.6533 92.1842 13.6 92.4935 13.6C92.9522 13.6 93.3575 13.6747 93.7095 13.824C94.0722 13.9627 94.3708 14.1867 94.6055 14.496C94.8508 14.8053 95.0322 15.2 95.1495 15.68L94.8455 15.616L94.9735 15.36C95.0908 15.104 95.2562 14.8747 95.4695 14.672C95.6828 14.4587 95.9228 14.272 96.1895 14.112C96.4562 13.9413 96.7335 13.8133 97.0215 13.728C97.3202 13.6427 97.6135 13.6 97.9015 13.6C98.5415 13.6 99.0748 13.728 99.5015 13.984C99.9282 14.24 100.248 14.6293 100.462 15.152C100.675 15.6747 100.782 16.32 100.782 17.088V22.176H98.7975V17.216C98.7975 16.7893 98.7388 16.4373 98.6215 16.16C98.5148 15.8827 98.3442 15.68 98.1095 15.552C97.8855 15.4133 97.6028 15.344 97.2615 15.344C96.9948 15.344 96.7388 15.392 96.4935 15.488C96.2588 15.5733 96.0562 15.7013 95.8855 15.872C95.7148 16.032 95.5815 16.2187 95.4855 16.432C95.3895 16.6453 95.3415 16.88 95.3415 17.136V22.176H93.3575V17.2C93.3575 16.7947 93.2988 16.4587 93.1815 16.192C93.0642 15.9147 92.8935 15.7067 92.6695 15.568C92.4455 15.4187 92.1735 15.344 91.8535 15.344C91.5868 15.344 91.3362 15.392 91.1015 15.488C90.8668 15.5733 90.6642 15.696 90.4935 15.856C90.3228 16.016 90.1895 16.2027 90.0935 16.416C89.9975 16.6293 89.9495 16.864 89.9495 17.12V22.176H87.9655Z"
+        fill="white"
+      />
+      <path
+        d="M105.73 22.336C105.037 22.336 104.408 22.144 103.842 21.76C103.277 21.376 102.824 20.8533 102.482 20.192C102.141 19.5307 101.97 18.7787 101.97 17.936C101.97 17.0933 102.141 16.3413 102.482 15.68C102.824 15.0187 103.288 14.5013 103.874 14.128C104.461 13.7547 105.122 13.568 105.858 13.568C106.285 13.568 106.674 13.632 107.026 13.76C107.378 13.8773 107.688 14.048 107.954 14.272C108.221 14.496 108.44 14.752 108.61 15.04C108.792 15.328 108.914 15.6373 108.978 15.968L108.546 15.856V13.744H110.53V22.176H108.53V20.16L108.994 20.08C108.92 20.368 108.781 20.6507 108.578 20.928C108.386 21.1947 108.141 21.4347 107.842 21.648C107.554 21.8507 107.229 22.016 106.866 22.144C106.514 22.272 106.136 22.336 105.73 22.336ZM106.274 20.592C106.733 20.592 107.138 20.48 107.49 20.256C107.842 20.032 108.114 19.7227 108.306 19.328C108.509 18.9227 108.61 18.4587 108.61 17.936C108.61 17.424 108.509 16.9707 108.306 16.576C108.114 16.1813 107.842 15.872 107.49 15.648C107.138 15.424 106.733 15.312 106.274 15.312C105.816 15.312 105.41 15.424 105.058 15.648C104.717 15.872 104.45 16.1813 104.258 16.576C104.066 16.9707 103.97 17.424 103.97 17.936C103.97 18.4587 104.066 18.9227 104.258 19.328C104.45 19.7227 104.717 20.032 105.058 20.256C105.41 20.48 105.816 20.592 106.274 20.592Z"
+        fill="white"
+      />
+      <path
+        d="M112.616 22.176V13.744H114.584V22.176H112.616ZM113.576 11.952C113.181 11.952 112.872 11.856 112.648 11.664C112.435 11.4613 112.328 11.1787 112.328 10.816C112.328 10.4747 112.44 10.1973 112.664 9.984C112.888 9.77067 113.192 9.664 113.576 9.664C113.981 9.664 114.291 9.76534 114.504 9.968C114.728 10.16 114.84 10.4427 114.84 10.816C114.84 11.1467 114.728 11.4187 114.504 11.632C114.28 11.8453 113.971 11.952 113.576 11.952Z"
+        fill="white"
+      />
+      <path d="M116.675 22.176V10.336H118.659V22.176H116.675Z" fill="white" />
+      <defs>
+        <clipPath id={id}>
+          <rect fill="white" height="32" rx="8" width="32" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
diff --git a/packages/preview-server/src/components/send.tsx b/packages/preview-server/src/components/send.tsx
index a7a008f754..4b5aa3249d 100644
--- a/packages/preview-server/src/components/send.tsx
+++ b/packages/preview-server/src/components/send.tsx
@@ -38,6 +38,9 @@ export const Send = ({ markup }: { markup: string }) => {
     }
   };
 
+  const toId = React.useId();
+  const subjectId = React.useId();
+
   return (
     <Popover.Root
       onOpenChange={() => {
@@ -63,13 +66,13 @@ export const Send = ({ markup }: { markup: string }) => {
       <Popover.Portal>
         <Popover.Content
           align="end"
-          className="-mt-10 w-80 rounded-lg border border-slate-6 bg-black/70 p-3 font-sans text-slate-11 shadow-md backdrop-blur-lg font-sans"
+          className="-mt-10 w-80 rounded-lg border border-slate-6 bg-black/70 p-3 text-slate-11 shadow-md backdrop-blur-lg font-sans"
           sideOffset={48}
         >
           <form className="mt-1" onSubmit={(e) => void onFormSubmit(e)}>
             <label
               className="mb-2 block text-xs uppercase text-slate-10"
-              htmlFor="to"
+              htmlFor={toId}
             >
               Recipient
             </label>
@@ -77,7 +80,7 @@ export const Send = ({ markup }: { markup: string }) => {
               autoFocus
               className="mb-3 w-full appearance-none rounded-lg border border-slate-6 bg-slate-3 px-2 py-1 text-sm text-slate-12 placeholder-slate-10 outline-none transition duration-300 ease-in-out focus:ring-1 focus:ring-slate-10"
               defaultValue={to}
-              id="to"
+              id={toId}
               onChange={(e) => {
                 setTo(e.target.value);
               }}
@@ -87,14 +90,14 @@ export const Send = ({ markup }: { markup: string }) => {
             />
             <label
               className="mb-2 mt-1 block text-xs uppercase text-slate-10"
-              htmlFor="subject"
+              htmlFor={subjectId}
             >
               Subject
             </label>
             <input
               className="mb-3 w-full appearance-none rounded-lg border border-slate-6 bg-slate-3 px-2 py-1 text-sm text-slate-12 placeholder-slate-10 outline-none transition duration-300 ease-in-out focus:ring-1 focus:ring-slate-10"
               defaultValue={subject}
-              id="subject"
+              id={subjectId}
               onChange={(e) => {
                 setSubject(e.target.value);
               }}
diff --git a/packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx b/packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx
index 2e65bf0cdd..399f237611 100644
--- a/packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx
+++ b/packages/preview-server/src/components/sidebar/file-tree-directory-children.tsx
@@ -2,6 +2,7 @@ import * as Collapsible from '@radix-ui/react-collapsible';
 import { AnimatePresence, LayoutGroup, motion } from 'framer-motion';
 import Link from 'next/link';
 import { useRouter, useSearchParams } from 'next/navigation';
+import * as React from 'react';
 import { cn } from '../../utils';
 import type { EmailsDirectory } from '../../utils/get-emails-directory-metadata';
 import { IconFile } from '../icons/icon-file';
@@ -16,6 +17,8 @@ export const FileTreeDirectoryChildren = (props: {
   const searchParams = useSearchParams();
   const router = useRouter();
 
+  const id = React.useId();
+
   return (
     <AnimatePresence initial={false}>
       {props.open ? (
@@ -33,7 +36,7 @@ export const FileTreeDirectoryChildren = (props: {
               <div className="line absolute left-2.5 h-full w-px bg-slate-6" />
             )}
             <div className="flex flex-col truncate">
-              <LayoutGroup id="sidebar">
+              <LayoutGroup id={`sidebar-${id}`}>
                 {props.emailsDirectoryMetadata.subDirectories.map(
                   (subDirectory) => (
                     <FileTreeDirectory
diff --git a/packages/preview-server/src/components/toolbar.tsx b/packages/preview-server/src/components/toolbar.tsx
index fd5c324fec..c0218d734b 100644
--- a/packages/preview-server/src/components/toolbar.tsx
+++ b/packages/preview-server/src/components/toolbar.tsx
@@ -2,7 +2,7 @@
 import * as Tabs from '@radix-ui/react-tabs';
 import { LayoutGroup } from 'framer-motion';
 import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-import { use, useEffect } from 'react';
+import * as React from 'react';
 import type { CompatibilityCheckingResult } from '../actions/email-validation/check-compatibility';
 import { isBuilding } from '../app/env';
 import { PreviewContext } from '../contexts/preview';
@@ -105,7 +105,8 @@ const ToolbarInner = ({
 
   if (!isBuilding) {
     // biome-ignore lint/correctness/useHookAtTopLevel: This is fine since isBuilding does not change at runtime
-    useEffect(() => {
+    // biome-ignore lint/correctness/useExhaustiveDependencies: Setters don't need dependencies
+    React.useEffect(() => {
       (async () => {
         const lintingRows = await loadLinting();
         setCachedLintingRows(lintingRows);
@@ -116,9 +117,11 @@ const ToolbarInner = ({
         const compatibilityCheckingResults = await loadCompatibility();
         setCachedCompatibilityResults(compatibilityCheckingResults);
       })();
-    }, []);
+    }, [loadCompatibility, loadSpamChecking, loadLinting]);
   }
 
+  const id = React.useId();
+
   return (
     <div
       data-toggled={toggled}
@@ -137,7 +140,7 @@ const ToolbarInner = ({
       >
         <div className="flex flex-col h-full">
           <Tabs.List className="flex gap-4 px-4 border-b border-solid border-slate-6 h-10 w-full flex-shrink-0">
-            <LayoutGroup id="toolbar">
+            <LayoutGroup id={`toolbar-${id}`}>
               <Tabs.Trigger asChild value="linter">
                 <ToolbarButton active={activeTab === 'linter'}>
                   Linter
@@ -189,7 +192,7 @@ const ToolbarInner = ({
                   <IconReload
                     size={24}
                     className={cn({
-                      'animate-spin opacity-60 animate-spin-fast':
+                      'opacity-60 animate-spin-fast':
                         lintLoading || spamLoading,
                     })}
                   />
@@ -329,7 +332,8 @@ export const Toolbar = ({
   serverSpamCheckingResult,
   serverCompatibilityResults,
 }: ToolbarProps) => {
-  const { emailPath, emailSlug, renderedEmailMetadata } = use(PreviewContext)!;
+  const { emailPath, emailSlug, renderedEmailMetadata } =
+    React.use(PreviewContext)!;
 
   if (renderedEmailMetadata === undefined) return null;
   const { markup, plainText, reactMarkup } = renderedEmailMetadata;
diff --git a/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts b/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts
index 8fc22d6c75..ad85e03a9a 100644
--- a/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts
+++ b/packages/preview-server/src/utils/caniemail/ast/get-used-style-properties.ts
@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/nursery/noNestedComponentDefinitions: There are no components here, just visitor functions */
 import traverse from '@babel/traverse';
 import type { AST } from '../../../actions/email-validation/check-compatibility';
 import { generateTailwindCssRules } from '../tailwind/generate-tailwind-rules';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 950f0cec75..f376ef3bef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,8 +15,8 @@ importers:
   .:
     devDependencies:
       '@biomejs/biome':
-        specifier: 2.0.0-beta.5
-        version: 2.0.0-beta.5
+        specifier: 2.0.5
+        version: 2.0.5
       '@changesets/cli':
         specifier: 2.29.4
         version: 2.29.4
@@ -198,7 +198,7 @@ importers:
         version: 5.8.3
       webpack:
         specifier: 5.99.6
-        version: 5.99.6(@swc/core@1.11.21)
+        version: 5.99.6(@swc/core@1.11.21)(esbuild@0.25.0)
       zod:
         specifier: 3.24.3
         version: 3.24.3
@@ -252,6 +252,9 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
     devDependencies:
+      '@biomejs/biome':
+        specifier: 2.0.0
+        version: 2.0.0
       flamebearer:
         specifier: 1.1.3
         version: 1.1.3
@@ -1236,55 +1239,108 @@ packages:
     resolution: {integrity: sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==}
     engines: {node: '>=6.9.0'}
 
-  '@biomejs/biome@2.0.0-beta.5':
-    resolution: {integrity: sha512-1ldO4AepieVvg4aLi1ubZkA7NsefQT2UTNssbJbDiQTGem8kCHx/PZCwLxIR6UzFpGIjh0xsDzivyVvhnmqmuA==}
+  '@biomejs/biome@2.0.0':
+    resolution: {integrity: sha512-BlUoXEOI/UQTDEj/pVfnkMo8SrZw3oOWBDrXYFT43V7HTkIUDkBRY53IC5Jx1QkZbaB+0ai1wJIfYwp9+qaJTQ==}
+    engines: {node: '>=14.21.3'}
+    hasBin: true
+
+  '@biomejs/biome@2.0.5':
+    resolution: {integrity: sha512-MztFGhE6cVjf3QmomWu83GpTFyWY8KIcskgRf2AqVEMSH4qI4rNdBLdpAQ11TNK9pUfLGz3IIOC1ZYwgBePtig==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.0.0-beta.5':
-    resolution: {integrity: sha512-pnJiaoDpwGo+ctGkMu4POcO8jgOgCErBdYbhutr+K9rxxJS+TlHLr0LR91GCEWbGV2O1oyZRFQcW21rYFoak4w==}
+  '@biomejs/cli-darwin-arm64@2.0.0':
+    resolution: {integrity: sha512-QvqWYtFFhhxdf8jMAdJzXW+Frc7X8XsnHQLY+TBM1fnT1TfeV/v9vsFI5L2J7GH6qN1+QEEJ19jHibCY2Ypplw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@biomejs/cli-darwin-arm64@2.0.5':
+    resolution: {integrity: sha512-VIIWQv9Rcj9XresjCf3isBFfWjFStsdGZvm8SmwJzKs/22YQj167ge7DkxuaaZbNf2kmYif0AcjAKvtNedEoEw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.0.0-beta.5':
-    resolution: {integrity: sha512-WwEZpqcmsNoFpZkUFNQcbZo52WK4hLGQ0vZk3PQ8JlZ55gJsHiyhtv6aem6fVlyVCvZgpsC0sYPLE3VvFVKNAQ==}
+  '@biomejs/cli-darwin-x64@2.0.0':
+    resolution: {integrity: sha512-5JFhls1EfmuIH4QGFPlNpxJQFC6ic3X1ltcoLN+eSRRIPr6H/lUS1ttuD0Fj7rPgPhZqopK/jfH8UVj/1hIsQw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.5':
-    resolution: {integrity: sha512-4vxNkYx1uEt211W8hLdXddc7icRHQgYENb72g6uTd/tLVPSBvIwqUAxAOkU+9Ai1E/8R4sWy7HIxREgpuFgbNA==}
+  '@biomejs/cli-darwin-x64@2.0.5':
+    resolution: {integrity: sha512-DRpGxBgf5Z7HUFcNUB6n66UiD4VlBlMpngNf32wPraxX8vYU6N9cb3xQWOXIQVBBQ64QfsSLJnjNu79i/LNmSg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@biomejs/cli-linux-arm64-musl@2.0.0':
+    resolution: {integrity: sha512-Bxsz8ki8+b3PytMnS5SgrGV+mbAWwIxI3ydChb/d1rURlJTMdxTTq5LTebUnlsUWAX6OvJuFeiVq9Gjn1YbCyA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-arm64-musl@2.0.5':
+    resolution: {integrity: sha512-OpflTCOw/ElEs7QZqN/HFaSViPHjAsAPxFJ22LhWUWvuJgcy/Z8+hRV0/3mk/ZRWy5A6fCDKHZqAxU+xB6W4mA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-arm64@2.0.0-beta.5':
-    resolution: {integrity: sha512-lAF1de+Ki0vnq14NwDXouKkAR/iviyMNrUngSHjTGFC4z8XGVEfIw0ZMSm7fAdJZ5fAWodt9HiYmEAVs5EtHQg==}
+  '@biomejs/cli-linux-arm64@2.0.0':
+    resolution: {integrity: sha512-BAH4QVi06TzAbVchXdJPsL0Z/P87jOfes15rI+p3EX9/EGTfIjaQ9lBVlHunxcmoptaA5y1Hdb9UYojIhmnjIw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64-musl@2.0.0-beta.5':
-    resolution: {integrity: sha512-nUeKGO517GtRCxziVD9les1HiCs2s2/WIVITMN9+9RRuLOko8r+T77E8ZXEmlfLOfOIOeE6z62WITqei3oNccA==}
+  '@biomejs/cli-linux-arm64@2.0.5':
+    resolution: {integrity: sha512-FQTfDNMXOknf8+g9Eede2daaduRjTC2SNbfWPNFMadN9K3UKjeZ62jwiYxztPaz9zQQsZU8VbddQIaeQY5CmIA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64-musl@2.0.0':
+    resolution: {integrity: sha512-tiQ0ABxMJb9I6GlfNp0ulrTiQSFacJRJO8245FFwE3ty3bfsfxlU/miblzDIi+qNrgGsLq5wIZcVYGp4c+HXZA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64-musl@2.0.5':
+    resolution: {integrity: sha512-9lmjCnajAzpZXbav2P6D87ugkhnaDpJtDvOH5uQbY2RXeW6Rq18uOUltxgacGBP+d8GusTr+s3IFOu7SN0Ok8g==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64@2.0.0':
+    resolution: {integrity: sha512-09PcOGYTtkopWRm6mZ/B6Mr6UHdkniUgIG/jLBv+2J8Z61ezRE+xQmpi3yNgUrFIAU4lPA9atg7mhvE/5Bo7Wg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64@2.0.0-beta.5':
-    resolution: {integrity: sha512-I0Pt1VHeL1mN8G7ZwV2u9AfzBd5ZKfbvHUI4x2wETUZbwcQlAu/nEzEa2LUe5HqSmnctTR36ig7RkkM9qbmIrA==}
+  '@biomejs/cli-linux-x64@2.0.5':
+    resolution: {integrity: sha512-znpfydUDPuDkyBTulnODrQVK2FaG/4hIOPcQSsF2GeauQOYrBAOplj0etGB0NUrr0dFsvaQ15nzDXYb60ACoiw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-win32-arm64@2.0.0-beta.5':
-    resolution: {integrity: sha512-YXW6hgbrgBcWQ1SLO69ypWlluPchgQV5C1lTG4xOcBUWdCsfYuQirM64S6Dov7SFPqsMIoFC6LlQRW+n8qAyiA==}
+  '@biomejs/cli-win32-arm64@2.0.0':
+    resolution: {integrity: sha512-vrTtuGu91xNTEQ5ZcMJBZuDlqr32DWU1r14UfePIGndF//s2WUAmer4FmgoPgruo76rprk37e8S2A2c0psXdxw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.0.0-beta.5':
-    resolution: {integrity: sha512-N7Yby52BJmvEdst1iMbclE5hxxefboaXKRJLm1tLfBYr4FeuoCe6j8HdiQSwhCRdIUGFFqBLaDXh//LLF6EReA==}
+  '@biomejs/cli-win32-arm64@2.0.5':
+    resolution: {integrity: sha512-CP2wKQB+gh8HdJTFKYRFETqReAjxlcN9AlYDEoye8v2eQp+L9v+PUeDql/wsbaUhSsLR0sjj3PtbBtt+02AN3A==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@2.0.0':
+    resolution: {integrity: sha512-2USVQ0hklNsph/KIR72ZdeptyXNnQ3JdzPn3NbjI4Sna34CnxeiYAaZcZzXPDl5PYNFBivV4xmvT3Z3rTmyDBg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@2.0.5':
+    resolution: {integrity: sha512-Sw3rz2m6bBADeQpr3+MD7Ch4E1l15DTt/+dfqKnwkm3cn4BrYwnArmvKeZdVsFRDjMyjlKIP88bw1r7o+9aqzw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -8738,39 +8794,74 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
 
-  '@biomejs/biome@2.0.0-beta.5':
+  '@biomejs/biome@2.0.0':
+    optionalDependencies:
+      '@biomejs/cli-darwin-arm64': 2.0.0
+      '@biomejs/cli-darwin-x64': 2.0.0
+      '@biomejs/cli-linux-arm64': 2.0.0
+      '@biomejs/cli-linux-arm64-musl': 2.0.0
+      '@biomejs/cli-linux-x64': 2.0.0
+      '@biomejs/cli-linux-x64-musl': 2.0.0
+      '@biomejs/cli-win32-arm64': 2.0.0
+      '@biomejs/cli-win32-x64': 2.0.0
+
+  '@biomejs/biome@2.0.5':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.0.0-beta.5
-      '@biomejs/cli-darwin-x64': 2.0.0-beta.5
-      '@biomejs/cli-linux-arm64': 2.0.0-beta.5
-      '@biomejs/cli-linux-arm64-musl': 2.0.0-beta.5
-      '@biomejs/cli-linux-x64': 2.0.0-beta.5
-      '@biomejs/cli-linux-x64-musl': 2.0.0-beta.5
-      '@biomejs/cli-win32-arm64': 2.0.0-beta.5
-      '@biomejs/cli-win32-x64': 2.0.0-beta.5
-
-  '@biomejs/cli-darwin-arm64@2.0.0-beta.5':
+      '@biomejs/cli-darwin-arm64': 2.0.5
+      '@biomejs/cli-darwin-x64': 2.0.5
+      '@biomejs/cli-linux-arm64': 2.0.5
+      '@biomejs/cli-linux-arm64-musl': 2.0.5
+      '@biomejs/cli-linux-x64': 2.0.5
+      '@biomejs/cli-linux-x64-musl': 2.0.5
+      '@biomejs/cli-win32-arm64': 2.0.5
+      '@biomejs/cli-win32-x64': 2.0.5
+
+  '@biomejs/cli-darwin-arm64@2.0.0':
+    optional: true
+
+  '@biomejs/cli-darwin-arm64@2.0.5':
+    optional: true
+
+  '@biomejs/cli-darwin-x64@2.0.0':
+    optional: true
+
+  '@biomejs/cli-darwin-x64@2.0.5':
+    optional: true
+
+  '@biomejs/cli-linux-arm64-musl@2.0.0':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.0.0-beta.5':
+  '@biomejs/cli-linux-arm64-musl@2.0.5':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.0.0-beta.5':
+  '@biomejs/cli-linux-arm64@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.0.0-beta.5':
+  '@biomejs/cli-linux-arm64@2.0.5':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.0.0-beta.5':
+  '@biomejs/cli-linux-x64-musl@2.0.0':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.0.0-beta.5':
+  '@biomejs/cli-linux-x64-musl@2.0.5':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.0.0-beta.5':
+  '@biomejs/cli-linux-x64@2.0.0':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.0.0-beta.5':
+  '@biomejs/cli-linux-x64@2.0.5':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.0.0':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.0.5':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.0.0':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.0.5':
     optional: true
 
   '@changesets/apply-release-plan@7.0.12':
@@ -16334,17 +16425,6 @@ snapshots:
       '@swc/core': 1.11.21
       esbuild: 0.25.0
 
-  terser-webpack-plugin@5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21)):
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      jest-worker: 27.5.1
-      schema-utils: 4.3.0
-      serialize-javascript: 6.0.2
-      terser: 5.37.0
-      webpack: 5.99.6(@swc/core@1.11.21)
-    optionalDependencies:
-      '@swc/core': 1.11.21
-
   terser-webpack-plugin@5.3.11(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)(webpack@5.99.6(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
@@ -16911,36 +16991,6 @@ snapshots:
 
   webpack-sources@3.2.3: {}
 
-  webpack@5.99.6(@swc/core@1.11.21):
-    dependencies:
-      '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.7
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/wasm-edit': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-      acorn: 8.14.1
-      browserslist: 4.24.4
-      chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.17.1
-      es-module-lexer: 1.6.0
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 4.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.11(@swc/core@1.11.21)(webpack@5.99.6(@swc/core@1.11.21))
-      watchpack: 2.4.2
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-
   webpack@5.99.6(@swc/core@1.11.21)(esbuild@0.25.0):
     dependencies:
       '@types/eslint-scope': 3.7.7

From 536dbc0e087d22bbefe65ea72dd920f04fda99d4 Mon Sep 17 00:00:00 2001
From: tstassin <Tstassin@users.noreply.github.com>
Date: Thu, 26 Jun 2025 10:35:15 +0200
Subject: [PATCH 51/51] fix(render): in node environments react-dom/server is
 not always CJS

---
 packages/render/src/node/render.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/render/src/node/render.tsx b/packages/render/src/node/render.tsx
index b743d56131..e17c58b608 100644
--- a/packages/render/src/node/render.tsx
+++ b/packages/render/src/node/render.tsx
@@ -8,8 +8,13 @@ import { readStream } from './read-stream';
 export const render = async (node: React.ReactNode, options?: Options) => {
   const suspendedElement = <Suspense>{node}</Suspense>;
   const reactDOMServer = await import('react-dom/server').then(
-    // This is beacuse react-dom/server is CJS
-    (m) => m.default,
+    m => {
+      if (Object.hasOwn(m, 'default')) {
+        //react-dom/server export is CJS
+        return m.default
+      } 
+      return m
+    }
   );
 
   let html!: string;
