react-email 1.7.9 → 1.7.11

package/dist/package.json

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

package/dist/source/commands/dev.js

@@ -23,13 +23,9 @@ const dev = async ({ dir, port }) => {
     const watcherInstance = (0, utils_1.createWatcherInstance)(emailDir);
     try {
         const hasReactEmailDirectory = (0, utils_1.checkDirectoryExist)(utils_1.REACT_EMAIL_ROOT);
-        let packageManager;
-        try {
-            packageManager = await (0, detect_package_manager_1.detect)({ cwd: utils_1.CURRENT_PATH });
-        }
-        catch (_) {
-            packageManager = 'yarn';
-        }
+        const packageManager = await (0, detect_package_manager_1.detect)({
+            cwd: utils_1.CURRENT_PATH,
+        }).catch(() => 'npm');
         if (hasReactEmailDirectory) {
             const isUpToDate = await (0, utils_1.checkPackageIsUpToDate)();
             if (isUpToDate) {
@@ -56,7 +52,7 @@ const dev = async ({ dir, port }) => {
 };
 exports.dev = dev;
 const startDevServer = (packageManager, port) => {
-    shelljs_1.default.exec(`${packageManager} run dev -p ${port}`, { async: true });
+    shelljs_1.default.exec(`${packageManager} run dev -- -p ${port}`, { async: true });
 };
 const convertToAbsolutePath = (dir) => path_1.default.isAbsolute(dir) ? dir : path_1.default.join(process.cwd(), dir);
 const createBasicStructure = async () => {
@@ -122,7 +118,6 @@ const generateEmailsPreview = async (emailDir) => {
         const spinner = (0, ora_1.default)('Generating emails preview').start();
         await createEmailPreviews(emailDir);
         await createStaticFiles(emailDir);
-        await createComponents(emailDir);
         spinner.stopAndPersist({
             symbol: log_symbols_1.default.success,
             text: 'Emails preview generated',
@@ -134,41 +129,34 @@ const generateEmailsPreview = async (emailDir) => {
 };
 const createEmailPreviews = async (emailDir) => {
     const hasEmailsDirectory = (0, utils_1.checkDirectoryExist)(emailDir);
-    const isEmailsDirectoryEmpty = hasEmailsDirectory
-        ? await (0, utils_1.checkEmptyDirectory)(emailDir)
-        : true;
-    if (isEmailsDirectoryEmpty) {
+    if (hasEmailsDirectory) {
+        await (0, utils_1.checkEmptyDirectory)(emailDir);
     }
     const hasPackageEmailsDirectory = (0, utils_1.checkDirectoryExist)(utils_1.PACKAGE_EMAILS_PATH);
     if (hasPackageEmailsDirectory) {
         await fs_1.default.promises.rm(utils_1.PACKAGE_EMAILS_PATH, { recursive: true });
     }
-    await (0, cpy_1.default)(path_1.default.join(emailDir, '*{.tsx,.jsx}'), utils_1.PACKAGE_EMAILS_PATH);
+    await (0, cpy_1.default)(path_1.default.join(emailDir, '**'), utils_1.PACKAGE_EMAILS_PATH);
 };
 const createStaticFiles = async (emailDir) => {
     const hasPackageStaticDirectory = (0, utils_1.checkDirectoryExist)(`${utils_1.REACT_EMAIL_ROOT}/public/static`);
-    const staticDir = path_1.default.join(emailDir, 'static');
-    const hasStaticDirectory = (0, utils_1.checkDirectoryExist)(staticDir);
     if (hasPackageStaticDirectory) {
         await fs_1.default.promises.rm(`${utils_1.REACT_EMAIL_ROOT}/public/static`, {
             recursive: true,
         });
     }
-    if (hasStaticDirectory) {
-        await (0, cpy_1.default)(staticDir, `${utils_1.REACT_EMAIL_ROOT}/public/static`);
-    }
-};
-const createComponents = async (emailDir) => {
-    const hasPackageComponentsDirectory = (0, utils_1.checkDirectoryExist)(`${utils_1.PACKAGE_EMAILS_PATH}/components`);
-    const componentDir = path_1.default.join(emailDir, 'components');
-    const hasComponentsDirectory = (0, utils_1.checkDirectoryExist)(componentDir);
-    if (hasPackageComponentsDirectory) {
-        await fs_1.default.promises.rm(`${utils_1.PACKAGE_EMAILS_PATH}/components`, {
+    // Make sure that the "static" folder does not exists in .react-email/emails
+    // since it should only exists in .react-email/public, but the "createEmailPreviews"-function will blindly copy the complete emails folder
+    const hasPackageStaticDirectoryInEmails = (0, utils_1.checkDirectoryExist)(`${utils_1.REACT_EMAIL_ROOT}/emails/static`);
+    if (hasPackageStaticDirectoryInEmails) {
+        await fs_1.default.promises.rm(`${utils_1.REACT_EMAIL_ROOT}/emails/static`, {
             recursive: true,
         });
     }
-    if (hasComponentsDirectory) {
-        await (0, cpy_1.default)(componentDir, `${utils_1.PACKAGE_EMAILS_PATH}/components`);
+    const staticDir = path_1.default.join(emailDir, 'static');
+    const hasStaticDirectory = (0, utils_1.checkDirectoryExist)(staticDir);
+    if (hasStaticDirectory) {
+        await (0, cpy_1.default)(staticDir, `${utils_1.REACT_EMAIL_ROOT}/public/static`);
     }
 };
 const syncPkg = async () => {

package/package.json

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

package/source/commands/dev.ts

@@ -36,12 +36,9 @@ export const dev = async ({ dir, port }: Args) => {
   const watcherInstance = createWatcherInstance(emailDir);
   try {
     const hasReactEmailDirectory = checkDirectoryExist(REACT_EMAIL_ROOT);
-    let packageManager: PackageManager;
-    try {
-      packageManager = await detectPackageManager({ cwd: CURRENT_PATH });
-    } catch (_) {
-      packageManager = 'yarn';
-    }
+    const packageManager: PackageManager = await detectPackageManager({
+      cwd: CURRENT_PATH,
+    }).catch(() => 'npm');
 
     if (hasReactEmailDirectory) {
       const isUpToDate = await checkPackageIsUpToDate();
@@ -71,8 +68,8 @@ export const dev = async ({ dir, port }: Args) => {
 };
 
 const startDevServer = (packageManager: string, port: string) => {
-  shell.exec(`${packageManager} run dev -p ${port}`, { async: true });
-}
+  shell.exec(`${packageManager} run dev -- -p ${port}`, { async: true });
+};
 
 const convertToAbsolutePath = (dir: string): string =>
   path.isAbsolute(dir) ? dir : path.join(process.cwd(), dir);
@@ -148,7 +145,6 @@ const generateEmailsPreview = async (emailDir: string) => {
 
     await createEmailPreviews(emailDir);
     await createStaticFiles(emailDir);
-    await createComponents(emailDir);
 
     spinner.stopAndPersist({
       symbol: logSymbols.success,
@@ -161,12 +157,8 @@ const generateEmailsPreview = async (emailDir: string) => {
 
 const createEmailPreviews = async (emailDir: string) => {
   const hasEmailsDirectory = checkDirectoryExist(emailDir);
-
-  const isEmailsDirectoryEmpty = hasEmailsDirectory
-    ? await checkEmptyDirectory(emailDir)
-    : true;
-
-  if (isEmailsDirectoryEmpty) {
+  if (hasEmailsDirectory) {
+    await checkEmptyDirectory(emailDir);
   }
 
   const hasPackageEmailsDirectory = checkDirectoryExist(PACKAGE_EMAILS_PATH);
@@ -175,42 +167,35 @@ const createEmailPreviews = async (emailDir: string) => {
     await fs.promises.rm(PACKAGE_EMAILS_PATH, { recursive: true });
   }
 
-  await copy(path.join(emailDir, '*{.tsx,.jsx}'), PACKAGE_EMAILS_PATH);
+  await copy(path.join(emailDir, '**'), PACKAGE_EMAILS_PATH);
 };
 
 const createStaticFiles = async (emailDir: string) => {
   const hasPackageStaticDirectory = checkDirectoryExist(
     `${REACT_EMAIL_ROOT}/public/static`,
   );
-  const staticDir = path.join(emailDir, 'static');
-  const hasStaticDirectory = checkDirectoryExist(staticDir);
-
   if (hasPackageStaticDirectory) {
     await fs.promises.rm(`${REACT_EMAIL_ROOT}/public/static`, {
       recursive: true,
     });
   }
 
-  if (hasStaticDirectory) {
-    await copy(staticDir, `${REACT_EMAIL_ROOT}/public/static`);
-  }
-};
-
-const createComponents = async (emailDir: string) => {
-  const hasPackageComponentsDirectory = checkDirectoryExist(
-    `${PACKAGE_EMAILS_PATH}/components`,
+  // Make sure that the "static" folder does not exists in .react-email/emails
+  // since it should only exists in .react-email/public, but the "createEmailPreviews"-function will blindly copy the complete emails folder
+  const hasPackageStaticDirectoryInEmails = checkDirectoryExist(
+    `${REACT_EMAIL_ROOT}/emails/static`,
   );
-  const componentDir = path.join(emailDir, 'components');
-  const hasComponentsDirectory = checkDirectoryExist(componentDir);
-
-  if (hasPackageComponentsDirectory) {
-    await fs.promises.rm(`${PACKAGE_EMAILS_PATH}/components`, {
+  if (hasPackageStaticDirectoryInEmails) {
+    await fs.promises.rm(`${REACT_EMAIL_ROOT}/emails/static`, {
       recursive: true,
     });
   }
 
-  if (hasComponentsDirectory) {
-    await copy(componentDir, `${PACKAGE_EMAILS_PATH}/components`);
+  const staticDir = path.join(emailDir, 'static');
+  const hasStaticDirectory = checkDirectoryExist(staticDir);
+
+  if (hasStaticDirectory) {
+    await copy(staticDir, `${REACT_EMAIL_ROOT}/public/static`);
   }
 };