react-email 3.0.5 → 3.0.6

package/dist/preview/.next/types/app/layout.ts

@@ -1,4 +1,4 @@
-// File: /home/gabriel/Projects/resend/react-email/packages/react-email/src/app/layout.tsx
+// File: /home/gabriel/Projects/Resend/react-email.git/tertiary/packages/react-email/src/app/layout.tsx
 import * as entry from '../../../src/app/layout.js'
 import type { ResolvingMetadata, ResolvingViewport } from 'next/dist/lib/metadata/types/metadata-interface.js'
 

package/dist/preview/.next/types/app/preview/[...slug]/page.ts

@@ -1,4 +1,4 @@
-// File: /home/gabriel/Projects/resend/react-email/packages/react-email/src/app/preview/[...slug]/page.tsx
+// File: /home/gabriel/Projects/Resend/react-email.git/tertiary/packages/react-email/src/app/preview/[...slug]/page.tsx
 import * as entry from '../../../../../src/app/preview/[...slug]/page.js'
 import type { ResolvingMetadata, ResolvingViewport } from 'next/dist/lib/metadata/types/metadata-interface.js'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.js"

package/src/actions/get-emails-directory-metadata-action.ts

@@ -0,0 +1,19 @@
+'use server';
+
+import type { EmailsDirectory } from '../utils/get-emails-directory-metadata';
+import { getEmailsDirectoryMetadata } from '../utils/get-emails-directory-metadata';
+
+export const getEmailsDirectoryMetadataAction = async (
+  absolutePathToEmailsDirectory: string,
+  keepFileExtensions = false,
+  isSubDirectory = false,
+
+  baseDirectoryPath = absolutePathToEmailsDirectory,
+): Promise<EmailsDirectory | undefined> => {
+  return getEmailsDirectoryMetadata(
+    absolutePathToEmailsDirectory,
+    keepFileExtensions,
+    isSubDirectory,
+    baseDirectoryPath,
+  );
+};

package/src/app/layout.tsx

@@ -1,8 +1,8 @@
 import type { Metadata } from 'next';
 import './globals.css';
-import { getEmailsDirectoryMetadata } from '../actions/get-emails-directory-metadata';
 import { emailsDirectoryAbsolutePath } from '../utils/emails-directory-absolute-path';
 import { EmailsProvider } from '../contexts/emails';
+import { getEmailsDirectoryMetadata } from '../utils/get-emails-directory-metadata';
 import { inter } from './inter';
 
 export const metadata: Metadata = {

package/src/app/preview/[...slug]/page.tsx

@@ -2,10 +2,10 @@ import path from 'node:path';
 import { Suspense } from 'react';
 import { redirect } from 'next/navigation';
 import { getEmailPathFromSlug } from '../../../actions/get-email-path-from-slug';
-import { getEmailsDirectoryMetadata } from '../../../actions/get-emails-directory-metadata';
 import { renderEmailByPath } from '../../../actions/render-email-by-path';
 import { emailsDirectoryAbsolutePath } from '../../../utils/emails-directory-absolute-path';
 import Home from '../../page';
+import { getEmailsDirectoryMetadata } from '../../../utils/get-emails-directory-metadata';
 import Preview from './preview';
 
 export const dynamicParams = true;

package/src/components/sidebar/sidebar-directory-children.tsx

@@ -2,7 +2,7 @@ import { AnimatePresence, LayoutGroup, motion } from 'framer-motion';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
-import type { EmailsDirectory } from '../../actions/get-emails-directory-metadata';
+import type { EmailsDirectory } from '../../utils/get-emails-directory-metadata';
 import { emailsDirectoryAbsolutePath } from '../../utils/emails-directory-absolute-path';
 import { cn } from '../../utils';
 import { IconFile } from '../icons/icon-file';

package/src/components/sidebar/sidebar-directory.tsx

@@ -2,7 +2,7 @@
 import * as Collapsible from '@radix-ui/react-collapsible';
 import * as React from 'react';
 import { cn } from '../../utils';
-import { type EmailsDirectory } from '../../actions/get-emails-directory-metadata';
+import { type EmailsDirectory } from '../../utils/get-emails-directory-metadata';
 import { Heading } from '../heading';
 import { IconFolder } from '../icons/icon-folder';
 import { IconFolderOpen } from '../icons/icon-folder-open';

package/src/contexts/emails.tsx

@@ -1,10 +1,8 @@
 'use client';
 import { createContext, useContext, useState } from 'react';
-import {
-  getEmailsDirectoryMetadata,
-  type EmailsDirectory,
-} from '../actions/get-emails-directory-metadata';
+import { getEmailsDirectoryMetadataAction } from '../actions/get-emails-directory-metadata-action';
 import { useHotreload } from '../hooks/use-hot-reload';
+import type { EmailsDirectory } from '../utils/get-emails-directory-metadata';
 
 const EmailsContext = createContext<
   | {
@@ -37,7 +35,7 @@ export const EmailsProvider = (props: {
     // the rules of hooks
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useHotreload(async () => {
-      const metadata = await getEmailsDirectoryMetadata(
+      const metadata = await getEmailsDirectoryMetadataAction(
         props.initialEmailsDirectoryMetadata.absolutePath,
       );
       if (metadata) {

package/src/{actions → utils}/get-emails-directory-metadata.spec.ts

@@ -4,7 +4,7 @@ import { getEmailsDirectoryMetadata } from './get-emails-directory-metadata';
 test('getEmailsDirectoryMetadata on demo emails', async () => {
   const emailsDirectoryPath = path.resolve(
     __dirname,
-    '../../../../apps/demo/emails/',
+    '../../../../apps/demo/emails',
   );
   expect(await getEmailsDirectoryMetadata(emailsDirectoryPath)).toEqual({
     absolutePath: emailsDirectoryPath,

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

@@ -0,0 +1,119 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import fs from 'node:fs';
+import path from 'node:path';
+
+const isFileAnEmail = (fullPath: string): boolean => {
+  const stat = fs.statSync(fullPath);
+
+  if (stat.isDirectory()) 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)) {
+    return false;
+  }
+
+  // check with a heuristic to see if the file has at least
+  // a default export
+  const fileContents = fs.readFileSync(fullPath, 'utf8');
+
+  return /\bexport\s+default\b/gm.test(fileContents);
+};
+
+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 emailFilenames = dirents
+    .filter((dirent) =>
+      isFileAnEmail(path.join(absolutePathToEmailsDirectory, dirent.name)),
+    )
+    .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;
+};

package/dist/index.d.mts

@@ -1,20 +0,0 @@
-export * from '@react-email/body';
-export * from '@react-email/button';
-export * from '@react-email/code-block';
-export * from '@react-email/code-inline';
-export * from '@react-email/column';
-export * from '@react-email/container';
-export * from '@react-email/font';
-export * from '@react-email/head';
-export * from '@react-email/heading';
-export * from '@react-email/hr';
-export * from '@react-email/html';
-export * from '@react-email/img';
-export * from '@react-email/link';
-export * from '@react-email/markdown';
-export * from '@react-email/preview';
-export * from '@react-email/render';
-export * from '@react-email/row';
-export * from '@react-email/section';
-export * from '@react-email/tailwind';
-export * from '@react-email/text';

package/dist/index.d.ts

@@ -1,20 +0,0 @@
-export * from '@react-email/body';
-export * from '@react-email/button';
-export * from '@react-email/code-block';
-export * from '@react-email/code-inline';
-export * from '@react-email/column';
-export * from '@react-email/container';
-export * from '@react-email/font';
-export * from '@react-email/head';
-export * from '@react-email/heading';
-export * from '@react-email/hr';
-export * from '@react-email/html';
-export * from '@react-email/img';
-export * from '@react-email/link';
-export * from '@react-email/markdown';
-export * from '@react-email/preview';
-export * from '@react-email/render';
-export * from '@react-email/row';
-export * from '@react-email/section';
-export * from '@react-email/tailwind';
-export * from '@react-email/text';

package/dist/index.js

@@ -1,96 +0,0 @@
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
-}
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = function(to, from, except, desc) {
-    if (from && typeof from === "object" || typeof from === "function") {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            var _loop = function() {
-                var key = _step.value;
-                if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-                    get: function() {
-                        return from[key];
-                    },
-                    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-                });
-            };
-            for(var _iterator = __getOwnPropNames(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
-            }
-        }
-    }
-    return to;
-};
-var __reExport = function(target, mod, secondTarget) {
-    return __copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default");
-};
-var __toCommonJS = function(mod) {
-    return __copyProps(__defProp({}, "__esModule", {
-        value: true
-    }), mod);
-};
-// src/package/index.ts
-var package_exports = {};
-module.exports = __toCommonJS(package_exports);
-__reExport(package_exports, require("@react-email/body"), module.exports);
-__reExport(package_exports, require("@react-email/button"), module.exports);
-__reExport(package_exports, require("@react-email/code-block"), module.exports);
-__reExport(package_exports, require("@react-email/code-inline"), module.exports);
-__reExport(package_exports, require("@react-email/column"), module.exports);
-__reExport(package_exports, require("@react-email/container"), module.exports);
-__reExport(package_exports, require("@react-email/font"), module.exports);
-__reExport(package_exports, require("@react-email/head"), module.exports);
-__reExport(package_exports, require("@react-email/heading"), module.exports);
-__reExport(package_exports, require("@react-email/hr"), module.exports);
-__reExport(package_exports, require("@react-email/html"), module.exports);
-__reExport(package_exports, require("@react-email/img"), module.exports);
-__reExport(package_exports, require("@react-email/link"), module.exports);
-__reExport(package_exports, require("@react-email/markdown"), module.exports);
-__reExport(package_exports, require("@react-email/preview"), module.exports);
-__reExport(package_exports, require("@react-email/render"), module.exports);
-__reExport(package_exports, require("@react-email/row"), module.exports);
-__reExport(package_exports, require("@react-email/section"), module.exports);
-__reExport(package_exports, require("@react-email/tailwind"), module.exports);
-__reExport(package_exports, require("@react-email/text"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = _object_spread({}, require("@react-email/body"), require("@react-email/button"), require("@react-email/code-block"), require("@react-email/code-inline"), require("@react-email/column"), require("@react-email/container"), require("@react-email/font"), require("@react-email/head"), require("@react-email/heading"), require("@react-email/hr"), require("@react-email/html"), require("@react-email/img"), require("@react-email/link"), require("@react-email/markdown"), require("@react-email/preview"), require("@react-email/render"), require("@react-email/row"), require("@react-email/section"), require("@react-email/tailwind"), require("@react-email/text")));

package/dist/index.mjs

@@ -1,21 +0,0 @@
-// src/package/index.ts
-export * from "@react-email/body";
-export * from "@react-email/button";
-export * from "@react-email/code-block";
-export * from "@react-email/code-inline";
-export * from "@react-email/column";
-export * from "@react-email/container";
-export * from "@react-email/font";
-export * from "@react-email/head";
-export * from "@react-email/heading";
-export * from "@react-email/hr";
-export * from "@react-email/html";
-export * from "@react-email/img";
-export * from "@react-email/link";
-export * from "@react-email/markdown";
-export * from "@react-email/preview";
-export * from "@react-email/render";
-export * from "@react-email/row";
-export * from "@react-email/section";
-export * from "@react-email/tailwind";
-export * from "@react-email/text";

package/dist/package/index.d.mts

@@ -1,33 +0,0 @@
-type Control<ValueType> = {
-    type: 'number';
-    defaultValue: ValueType;
-} | {
-    type: 'email' | 'text';
-    defaultValue: string;
-} | {
-    type: 'checkbox';
-    defaultValue: boolean;
-} | {
-    type: 'select';
-    options: {
-        name: string;
-        value: ValueType;
-    }[];
-    defaultValue: ValueType;
-};
-type SafeControl<ValueType> = ValueType extends string ? Control<ValueType> & {
-    type: 'email' | 'text' | 'select';
-} : ValueType extends number ? Control<ValueType> & {
-    type: 'number';
-} : ValueType extends boolean ? Control<ValueType> & {
-    type: 'checkbox';
-} : Control<ValueType>;
-type Controls<Props extends object = Record<string, unknown>> = {
-    [K in keyof Props]?: SafeControl<Props[K]>;
-};
-declare const setupForPreview: <Props extends object>(component: {
-    (props: Props): React.ReactNode;
-    controls?: Controls<Props> | undefined;
-}, controls: Controls<Props>) => void;
-
-export { Control, Controls, setupForPreview };

package/dist/package/index.d.ts

@@ -1,33 +0,0 @@
-type Control<ValueType> = {
-    type: 'number';
-    defaultValue: ValueType;
-} | {
-    type: 'email' | 'text';
-    defaultValue: string;
-} | {
-    type: 'checkbox';
-    defaultValue: boolean;
-} | {
-    type: 'select';
-    options: {
-        name: string;
-        value: ValueType;
-    }[];
-    defaultValue: ValueType;
-};
-type SafeControl<ValueType> = ValueType extends string ? Control<ValueType> & {
-    type: 'email' | 'text' | 'select';
-} : ValueType extends number ? Control<ValueType> & {
-    type: 'number';
-} : ValueType extends boolean ? Control<ValueType> & {
-    type: 'checkbox';
-} : Control<ValueType>;
-type Controls<Props extends object = Record<string, unknown>> = {
-    [K in keyof Props]?: SafeControl<Props[K]>;
-};
-declare const setupForPreview: <Props extends object>(component: {
-    (props: Props): React.ReactNode;
-    controls?: Controls<Props> | undefined;
-}, controls: Controls<Props>) => void;
-
-export { Control, Controls, setupForPreview };

package/dist/package/index.js

@@ -1,62 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = function(target, all) {
-    for(var name in all)__defProp(target, name, {
-        get: all[name],
-        enumerable: true
-    });
-};
-var __copyProps = function(to, from, except, desc) {
-    if (from && typeof from === "object" || typeof from === "function") {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            var _loop = function() {
-                var key = _step.value;
-                if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-                    get: function() {
-                        return from[key];
-                    },
-                    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-                });
-            };
-            for(var _iterator = __getOwnPropNames(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
-            }
-        }
-    }
-    return to;
-};
-var __toCommonJS = function(mod) {
-    return __copyProps(__defProp({}, "__esModule", {
-        value: true
-    }), mod);
-};
-// src/package/index.ts
-var package_exports = {};
-__export(package_exports, {
-    setupForPreview: function() {
-        return setupForPreview;
-    }
-});
-module.exports = __toCommonJS(package_exports);
-// src/package/setup-for-preview.ts
-var setupForPreview = function(component, controls) {
-    component.controls = controls;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-    setupForPreview: setupForPreview
-});

package/dist/package/index.mjs

@@ -1,7 +0,0 @@
-// src/package/setup-for-preview.ts
-var setupForPreview = (component, controls) => {
-  component.controls = controls;
-};
-export {
-  setupForPreview
-};