react-email 4.0.7 → 4.0.9

package/src/utils/contains-email-template.ts

@@ -0,0 +1,33 @@
+import type { EmailsDirectory } from './get-emails-directory-metadata';
+
+export const removeFilenameExtension = (filename: string): string => {
+  const parts = filename.split('.');
+
+  if (parts.length > 1) {
+    return parts.slice(0, -1).join('.');
+  }
+
+  return filename;
+};
+
+export const containsEmailTemplate = (
+  relativeEmailPath: string,
+  directory: EmailsDirectory,
+) => {
+  const remainingSegments = relativeEmailPath
+    .replace(directory.relativePath, '')
+    .split('/')
+    .filter(Boolean);
+  if (remainingSegments.length === 1) {
+    const emailFilename = removeFilenameExtension(remainingSegments[0]!);
+    return directory.emailFilenames.includes(emailFilename);
+  }
+  const subDirectory = directory.subDirectories.find(
+    (sub) => sub.relativePath === remainingSegments[0],
+  );
+  if (subDirectory === undefined) {
+    return false;
+  }
+
+  return containsEmailTemplate(relativeEmailPath, subDirectory);
+};

package/src/utils/get-email-component.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import type { render } from '@react-email/components';
-import { type BuildFailure, type OutputFile, build } from 'esbuild';
+import { type BuildFailure, build, type OutputFile } from 'esbuild';
 import type React from 'react';
 import type { RawSourceMap } from 'source-map-js';
 import { z } from 'zod';
@@ -106,6 +106,21 @@ export const getEmailComponent = async (
     };
   }
 
+  if (typeof parseResult.data.default !== 'function') {
+    return {
+      error: improveErrorWithSourceMap(
+        new Error(
+          `The email component at ${emailPath} does not contain a default exported function`,
+          {
+            cause: parseResult.error,
+          },
+        ),
+        emailPath,
+        sourceMapToEmail,
+      ),
+    };
+  }
+
   const { data: componentModule } = parseResult;
 
   return {

package/src/utils/get-emails-directory-metadata.ts

@@ -2,25 +2,33 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-const isFileAnEmail = (fullPath: string): boolean => {
-  const stat = fs.statSync(fullPath);
+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()) return false;
+  if (stat.isDirectory()) {
+    await fileHandle.close();
+    return false;
+  }
 
   const { ext } = path.parse(fullPath);
 
-  if (!['.js', '.tsx', '.jsx'].includes(ext)) return false;
-
-  // This is to avoid a possible race condition where the file doesn't exist anymore
-  // once we are checking if it is an actual email, this couuld cause issues that
-  // would be very hard to debug and find out the why of it happening.
-  if (!fs.existsSync(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 = fs.readFileSync(fullPath, 'utf8');
+  const fileContents = await fileHandle.readFile('utf8');
+
+  await fileHandle.close();
 
   // Check for ES6 export default syntax
   const hasES6DefaultExport = /\bexport\s+default\b/gm.test(fileContents);
@@ -80,10 +88,13 @@ export const getEmailsDirectoryMetadata = async (
     withFileTypes: true,
   });
 
-  const emailFilenames = dirents
-    .filter((dirent) =>
+  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

package/src/utils/index.ts

@@ -1,6 +1,6 @@
-export * from './types/as';
 export * from './cn';
 export * from './copy-text-to-clipboard';
 export * from './language-map';
-export * from './unreachable';
 export * from './sanitize';
+export * from './types/as';
+export * from './unreachable';

package/src/utils/run-bundled-code.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import vm from 'node:vm';
-import { type Result, err, ok } from './result';
+import { err, ok, type Result } from './result';
 import { staticNodeModulesForVM } from './static-node-modules-for-vm';
 
 export const runBundledCode = (

package/tailwind.config.ts

@@ -1,5 +1,6 @@
+import * as colors from '@radix-ui/colors';
 import type { Config } from 'tailwindcss';
-import colors = require('@radix-ui/colors');
+
 import { fontFamily } from 'tailwindcss/defaultTheme';
 import plugin from 'tailwindcss/plugin';
 

package/tsconfig.json

@@ -28,7 +28,7 @@
     "noEmit": true,
     "strict": false,
     "target": "ESNext",
-    "module": "CommonJS",
+    "module": "ESNext",
     "noUncheckedIndexedAccess": true,
     "resolveJsonModule": true,
     "types": ["vitest/globals"],

package/dist/cli/index.d.mts

@@ -1 +0,0 @@
-#!/usr/bin/env node

package/dist/cli/index.d.ts

@@ -1 +0,0 @@
-#!/usr/bin/env node