move the fileContents to be cached with the getEmailComponent

resend · Jan 6, 2025 · bb572c4 · bb572c4
1 parent e22c0c3
commit bb572c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/packages/react-email/src/actions/render-email-by-path.tsx b/packages/react-email/src/actions/render-email-by-path.tsx
@@ -52,19 +52,17 @@ export const renderEmailByPath = async (
   const timeBeforeEmailRendered = performance.now();
 
   const emailFilename = path.basename(emailPath);
-  let spinner: ora.Ora | undefined;
-  if (process.env.NEXT_PUBLIC_IS_BUILDING !== 'true') {
-    spinner = ora({
-      text: `Rendering email template ${emailFilename}\n`,
-      prefixText: ' ',
-    }).start();
-    registerSpinnerAutostopping(spinner);
-  }
+
+  const spinner = ora({
+    text: `Rendering email template ${emailFilename}\n`,
+    prefixText: ' ',
+  }).start();
+  registerSpinnerAutostopping(spinner);
 
   const componentResult = await cachedGetEmailComponent(emailPath, invalidatingComponentCache);
 
   if ('error' in componentResult) {
-    spinner?.stopAndPersist({
+    spinner.stopAndPersist({
       symbol: logSymbols.error,
       text: `Failed while rendering ${emailFilename}`,
     });
@@ -75,6 +73,7 @@ export const renderEmailByPath = async (
     emailComponent: Email,
     createElement,
     render,
+    fileContents: reactMarkup,
     sourceMapToOriginalFile,
   } = componentResult;
 
@@ -87,8 +86,6 @@ export const renderEmailByPath = async (
       plainText: true,
     });
 
-    const reactMarkup = await fs.promises.readFile(emailPath, 'utf-8');
-
     const milisecondsToRendered = performance.now() - timeBeforeEmailRendered;
     let timeForConsole = `${milisecondsToRendered.toFixed(0)}ms`;
     if (milisecondsToRendered <= 450) {
@@ -98,7 +95,7 @@ export const renderEmailByPath = async (
     } else {
       timeForConsole = chalk.red(timeForConsole);
     }
-    spinner?.stopAndPersist({
+    spinner.stopAndPersist({
       symbol: logSymbols.success,
       text: `Successfully rendered ${emailFilename} in ${timeForConsole}`,
     });
@@ -118,7 +115,7 @@ export const renderEmailByPath = async (
   } catch (exception) {
     const error = exception as Error;
 
-    spinner?.stopAndPersist({
+    spinner.stopAndPersist({
       symbol: logSymbols.error,
       text: `Failed while rendering ${emailFilename}`,
     });

diff --git a/packages/react-email/src/utils/get-email-component.ts b/packages/react-email/src/utils/get-email-component.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import path from 'node:path';
 import vm from 'node:vm';
+import fs from 'node:fs'
 import type React from 'react';
 import { type RawSourceMap } from 'source-map-js';
 import { type OutputFile, build, type BuildFailure } from 'esbuild';
@@ -13,12 +14,10 @@ import { renderingUtilitiesExporter } from './esbuild/renderring-utilities-expor
 
 export type GetEmailComponentResult =
   | {
+    fileContents: string;
     emailComponent: EmailComponent;
-
     createElement: typeof React.createElement;
-
     render: typeof render;
-
     sourceMapToOriginalFile: RawSourceMap;
   }
   | { error: ErrorObject };
@@ -142,7 +141,11 @@ export const getEmailComponent = async (
     };
   }
 
+  const fileContents = await fs.promises.readFile(emailPath, 'utf-8');
+
   return {
+    fileContents,
+
     emailComponent: fakeContext.module.exports.default as EmailComponent,
     render: fakeContext.module.exports.render as typeof render,
     createElement: fakeContext.module.exports