react-email 1.5.1 → 1.6.0

package/dist/commands/dev.js

@@ -12,6 +12,7 @@ const utils_2 = require("../_preview/utils");
 const root_1 = require("../_preview/root");
 const pages_1 = require("../_preview/pages");
 const cpy_1 = __importDefault(require("cpy"));
+const detect_package_manager_1 = require("detect-package-manager");
 const log_symbols_1 = __importDefault(require("log-symbols"));
 const ora_1 = __importDefault(require("ora"));
 const read_pkg_1 = __importDefault(require("read-pkg"));
@@ -20,12 +21,19 @@ const styles_1 = require("../_preview/styles");
 const dev = async () => {
     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';
+        }
         if (hasReactEmailDirectory) {
             const isUpToDate = await (0, utils_1.checkPackageIsUpToDate)();
             if (isUpToDate) {
                 await Promise.all([generateEmailsPreview(), syncPkg()]);
-                await installDependencies();
-                shelljs_1.default.exec('yarn dev', { async: true });
+                await installDependencies(packageManager);
+                shelljs_1.default.exec(`${packageManager} run dev`, { async: true });
                 (0, utils_1.watcher)();
                 return;
             }
@@ -35,8 +43,8 @@ const dev = async () => {
         await createAppDirectories();
         await createAppFiles();
         await Promise.all([generateEmailsPreview(), syncPkg()]);
-        await installDependencies();
-        shelljs_1.default.exec('yarn dev', { async: true });
+        await installDependencies(packageManager);
+        shelljs_1.default.exec(`${packageManager} run dev`, { async: true });
         (0, utils_1.watcher)();
     }
     catch (error) {
@@ -167,10 +175,10 @@ const syncPkg = async () => {
     };
     await fs_1.default.promises.writeFile(path_1.default.join(utils_1.REACT_EMAIL_ROOT, 'package.json'), JSON.stringify(pkg));
 };
-const installDependencies = async () => {
+const installDependencies = async (packageManager) => {
     const spinner = (0, ora_1.default)('Installing dependencies...\n').start();
     shelljs_1.default.cd(path_1.default.join(utils_1.REACT_EMAIL_ROOT));
-    shelljs_1.default.exec('yarn');
+    shelljs_1.default.exec(`${packageManager} install`);
     spinner.stopAndPersist({
         symbol: log_symbols_1.default.success,
         text: 'Dependencies installed',

package/dist/commands/exportTemplates.js

@@ -35,6 +35,7 @@ const log_symbols_1 = __importDefault(require("log-symbols"));
 const render_1 = require("@react-email/render");
 const fs_1 = require("fs");
 const cpy_1 = __importDefault(require("cpy"));
+const normalize_path_1 = __importDefault(require("normalize-path"));
 const utils_1 = require("../utils");
 /*
   This first builds all the templates using esbuild and then puts the output in the `.js`
@@ -43,7 +44,7 @@ const utils_1 = require("../utils");
  */
 const exportTemplates = async (outDir, pretty) => {
     const spinner = (0, ora_1.default)('Preparing files...\n').start();
-    const allTemplates = glob_1.glob.sync(`${utils_1.CLIENT_EMAILS_PATH}/*.{tsx,jsx}`);
+    const allTemplates = glob_1.glob.sync((0, normalize_path_1.default)(`${utils_1.CLIENT_EMAILS_PATH}/*.{tsx,jsx}`));
     esbuild_1.default.buildSync({
         bundle: true,
         entryPoints: allTemplates,
@@ -51,7 +52,7 @@ const exportTemplates = async (outDir, pretty) => {
         write: true,
         outdir: outDir,
     });
-    const allBuiltTemplates = glob_1.glob.sync(`${outDir}/*.js`, {
+    const allBuiltTemplates = glob_1.glob.sync((0, normalize_path_1.default)(`${outDir}/*.js`), {
         absolute: true,
     });
     for (const template of allBuiltTemplates) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/index.js"
@@ -30,13 +30,15 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "9.4.1",
-    "@react-email/render": "*",
+    "@react-email/render": "0.0.3",
     "chokidar": "3.5.3",
     "commander": "9.4.1",
     "cpy": "8.1.2",
+    "detect-package-manager": "2.0.1",
     "esbuild": "0.16.4",
     "glob": "8.0.3",
     "log-symbols": "4.1.0",
+    "normalize-path": "3.0.0",
     "ora": "5.4.1",
     "read-pkg": "5.2.0",
     "shelljs": "0.8.5",
@@ -44,6 +46,7 @@
   },
   "devDependencies": {
     "@types/node": "18.11.9",
+    "@types/normalize-path": "3.0.0",
     "@types/shelljs": "0.8.11",
     "prettier": "2.7.1",
     "ts-node": "10.9.1"

package/source/commands/dev.ts

@@ -4,6 +4,7 @@ import {
   checkPackageIsUpToDate,
   CLIENT_EMAILS_PATH,
   createDirectory,
+  CURRENT_PATH,
   PACKAGE_EMAILS_PATH,
   REACT_EMAIL_ROOT,
   SRC_PATH,
@@ -19,6 +20,7 @@ import { utils } from '../_preview/utils';
 import { root } from '../_preview/root';
 import { pages } from '../_preview/pages';
 import copy from 'cpy';
+import { detect as detectPackageManager } from 'detect-package-manager';
 import logSymbols from 'log-symbols';
 import ora from 'ora';
 import readPackage from 'read-pkg';
@@ -28,14 +30,20 @@ import { styles } from '../_preview/styles';
 export const dev = async () => {
   try {
     const hasReactEmailDirectory = checkDirectoryExist(REACT_EMAIL_ROOT);
+    let packageManager: PackageManager;
+    try {
+      packageManager = await detectPackageManager({ cwd: CURRENT_PATH });
+    } catch (_) {
+      packageManager = 'yarn';
+    }
 
     if (hasReactEmailDirectory) {
       const isUpToDate = await checkPackageIsUpToDate();
 
       if (isUpToDate) {
         await Promise.all([generateEmailsPreview(), syncPkg()]);
-        await installDependencies();
-        shell.exec('yarn dev', { async: true });
+        await installDependencies(packageManager);
+        shell.exec(`${packageManager} run dev`, { async: true });
         watcher();
         return;
       }
@@ -47,8 +55,8 @@ export const dev = async () => {
     await createAppDirectories();
     await createAppFiles();
     await Promise.all([generateEmailsPreview(), syncPkg()]);
-    await installDependencies();
-    shell.exec('yarn dev', { async: true });
+    await installDependencies(packageManager);
+    shell.exec(`${packageManager} run dev`, { async: true });
     watcher();
   } catch (error) {
     await watcherInstance.close();
@@ -218,11 +226,13 @@ const syncPkg = async () => {
   );
 };
 
-const installDependencies = async () => {
+type PackageManager = 'yarn' | 'npm' | 'pnpm';
+
+const installDependencies = async (packageManager: PackageManager) => {
   const spinner = ora('Installing dependencies...\n').start();
 
   shell.cd(path.join(REACT_EMAIL_ROOT));
-  shell.exec('yarn');
+  shell.exec(`${packageManager} install`);
   spinner.stopAndPersist({
     symbol: logSymbols.success,
     text: 'Dependencies installed',

package/source/commands/exportTemplates.ts

@@ -6,6 +6,7 @@ import logSymbols from 'log-symbols';
 import { render } from '@react-email/render';
 import { unlinkSync, writeFileSync } from 'fs';
 import copy from 'cpy';
+import normalize from 'normalize-path';
 import { checkDirectoryExist, CLIENT_EMAILS_PATH } from '../utils';
 
 /*
@@ -15,7 +16,7 @@ import { checkDirectoryExist, CLIENT_EMAILS_PATH } from '../utils';
  */
 export const exportTemplates = async (outDir: string, pretty: boolean) => {
   const spinner = ora('Preparing files...\n').start();
-  const allTemplates = glob.sync(`${CLIENT_EMAILS_PATH}/*.{tsx,jsx}`);
+  const allTemplates = glob.sync(normalize(`${CLIENT_EMAILS_PATH}/*.{tsx,jsx}`));
 
   esbuild.buildSync({
     bundle: true,
@@ -25,7 +26,7 @@ export const exportTemplates = async (outDir: string, pretty: boolean) => {
     outdir: outDir,
   });
 
-  const allBuiltTemplates = glob.sync(`${outDir}/*.js`, {
+  const allBuiltTemplates = glob.sync(normalize(`${outDir}/*.js`), {
     absolute: true,
   });