react-email 2.1.4 → 2.1.5

package/cli/index.js

@@ -340,7 +340,7 @@ var import_commander = require("commander");
 // package.json
 var package_default = {
     name: "react-email",
-    version: "2.1.4",
+    version: "2.1.5",
     description: "A live preview of your emails right in your browser.",
     bin: {
         email: "./cli/index.js"
@@ -370,13 +370,13 @@ var package_default = {
         "@babel/core": "7.24.5",
         "@babel/parser": "7.24.5",
         "@radix-ui/colors": "1.0.1",
-        "@radix-ui/react-collapsible": "1.0.3",
-        "@radix-ui/react-popover": "1.0.7",
-        "@radix-ui/react-slot": "1.0.2",
-        "@radix-ui/react-toggle-group": "1.0.4",
-        "@radix-ui/react-tooltip": "1.0.7",
+        "@radix-ui/react-collapsible": "1.1.0",
+        "@radix-ui/react-popover": "1.1.1",
+        "@radix-ui/react-slot": "1.1.0",
+        "@radix-ui/react-toggle-group": "1.1.0",
+        "@radix-ui/react-tooltip": "1.1.1",
         "@swc/core": "1.3.101",
-        "@types/react": "^18.2.0",
+        "@types/react": "18.2.47",
         "@types/react-dom": "^18.2.0",
         "@types/webpack": "5.28.5",
         autoprefixer: "10.4.14",
@@ -399,7 +399,6 @@ var package_default = {
         "prism-react-renderer": "2.1.0",
         react: "^18.2.0",
         "react-dom": "^18.2.0",
-        shelljs: "0.8.5",
         "socket.io": "4.7.3",
         "socket.io-client": "4.7.3",
         sonner: "1.3.1",
@@ -417,7 +416,6 @@ var package_default = {
         "@types/mime-types": "2.1.4",
         "@types/node": "18.0.0",
         "@types/normalize-path": "3.0.2",
-        "@types/shelljs": "0.8.15",
         "@vercel/style-guide": "5.1.0",
         eslint: "8.50.0",
         tsup: "7.2.0",
@@ -1786,7 +1784,6 @@ var import_esbuild = require("esbuild");
 var import_ora2 = __toESM(require("ora"));
 var import_log_symbols2 = __toESM(require("log-symbols"));
 var import_normalize_path = __toESM(require("normalize-path"));
-var import_shelljs = require("shelljs");
 // src/actions/get-emails-directory-metadata.ts
 var import_node_fs5 = __toESM(require("fs"));
 var import_node_path6 = __toESM(require("path"));
@@ -1972,7 +1969,7 @@ var getEmailTemplatesFromDirectory = function(emailDirectory) {
 };
 var exportTemplates = function() {
     var _ref = _async_to_generator(function(pathToWhereEmailMarkupShouldBeDumped, emailsDirectoryPath, options) {
-        var spinner, emailsDirectoryMetadata, allTemplates, exception, buildFailure, allBuiltTemplates, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, template, emailModule, rendered, htmlPath, exception1, err, staticDirectoryPath, pathToDumpStaticFilesInto, result, fileTree;
+        var spinner, emailsDirectoryMetadata, allTemplates, exception, buildFailure, allBuiltTemplates, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, template, emailModule, rendered, htmlPath, exception1, err, staticDirectoryPath, pathToDumpStaticFilesInto, exception2, fileTree;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -2154,7 +2151,7 @@ var exportTemplates = function() {
                     staticDirectoryPath = import_node_path8.default.join(emailsDirectoryPath, "static");
                     if (!import_node_fs7.default.existsSync(staticDirectoryPath)) return [
                         3,
-                        18
+                        20
                     ];
                     pathToDumpStaticFilesInto = import_node_path8.default.join(pathToWhereEmailMarkupShouldBeDumped, "static");
                     if (!import_node_fs7.default.existsSync(pathToDumpStaticFilesInto)) return [
@@ -2171,36 +2168,53 @@ var exportTemplates = function() {
                     _state.sent();
                     _state.label = 17;
                 case 17:
-                    result = (0, import_shelljs.cp)("-r", staticDirectoryPath, import_node_path8.default.join(pathToWhereEmailMarkupShouldBeDumped, "static"));
-                    if (result.code > 0) {
-                        if (spinner) {
-                            spinner.stopAndPersist({
-                                symbol: import_log_symbols2.default.error,
-                                text: "Failed to copy static files"
-                            });
-                        }
-                        throw new Error("Something went wrong while copying the file to ".concat(pathToWhereEmailMarkupShouldBeDumped, "/static, ").concat(result.stderr));
-                    }
-                    _state.label = 18;
+                    _state.trys.push([
+                        17,
+                        19,
+                        ,
+                        20
+                    ]);
+                    return [
+                        4,
+                        import_node_fs7.default.promises.cp(staticDirectoryPath, pathToDumpStaticFilesInto, {
+                            recursive: true
+                        })
+                    ];
                 case 18:
-                    if (!(spinner && !options.silent)) return [
+                    _state.sent();
+                    return [
                         3,
                         20
                     ];
+                case 19:
+                    exception2 = _state.sent();
+                    console.error(exception2);
+                    if (spinner) {
+                        spinner.stopAndPersist({
+                            symbol: import_log_symbols2.default.error,
+                            text: "Failed to copy static files"
+                        });
+                    }
+                    throw new Error("Something went wrong while copying the file to ".concat(pathToWhereEmailMarkupShouldBeDumped, "/static, ").concat(exception2));
+                case 20:
+                    if (!(spinner && !options.silent)) return [
+                        3,
+                        22
+                    ];
                     spinner.succeed();
                     return [
                         4,
                         tree(pathToWhereEmailMarkupShouldBeDumped, 4)
                     ];
-                case 19:
+                case 21:
                     fileTree = _state.sent();
                     console.log(fileTree);
                     spinner.stopAndPersist({
                         symbol: import_log_symbols2.default.success,
                         text: "Successfully exported emails"
                     });
-                    _state.label = 20;
-                case 20:
+                    _state.label = 22;
+                case 22:
                     return [
                         2
                     ];
@@ -2215,7 +2229,6 @@ var exportTemplates = function() {
 var import_node_fs8 = __toESM(require("fs"));
 var import_node_path9 = __toESM(require("path"));
 var import_ora3 = __toESM(require("ora"));
-var import_shelljs2 = __toESM(require("shelljs"));
 var import_node_child_process = require("child_process");
 var import_log_symbols3 = __toESM(require("log-symbols"));
 var buildPreviewApp = function(absoluteDirectory) {
@@ -2224,14 +2237,11 @@ var buildPreviewApp = function(absoluteDirectory) {
             "run",
             "build"
         ], {
-            cwd: absoluteDirectory
-        });
-        nextBuild.stdout.on("data", function(msg) {
-            process.stdout.write(msg);
-        });
-        nextBuild.stderr.on("data", function(msg) {
-            process.stderr.write(msg);
+            cwd: absoluteDirectory,
+            shell: true
         });
+        nextBuild.stdout.pipe(process.stdout);
+        nextBuild.stderr.pipe(process.stderr);
         nextBuild.on("close", function(code) {
             if (code === 0) {
                 resolve();
@@ -2359,17 +2369,35 @@ var npmInstall = function() {
         return _ts_generator(this, function(_state) {
             return [
                 2,
-                new Promise(function(resolve, reject) {
-                    import_shelljs2.default.exec("".concat(packageManager, " install --silent"), {
-                        cwd: builtPreviewAppPath
-                    }, function(code) {
-                        if (code === 0) {
-                            resolve();
-                        } else {
-                            reject(new Error("Unable to install the dependencies and it exited with code: ".concat(code)));
-                        }
+                new Promise(function() {
+                    var _ref = _async_to_generator(function(resolve, reject) {
+                        var childProc;
+                        return _ts_generator(this, function(_state) {
+                            childProc = (0, import_node_child_process.spawn)(packageManager, [
+                                "install",
+                                "--silent"
+                            ], {
+                                cwd: builtPreviewAppPath,
+                                shell: true
+                            });
+                            childProc.stdout.pipe(process.stdout);
+                            childProc.stderr.pipe(process.stderr);
+                            childProc.on("close", function(code) {
+                                if (code === 0) {
+                                    resolve();
+                                } else {
+                                    reject(new Error("Unable to install the dependencies and it exited with code: ".concat(code)));
+                                }
+                            });
+                            return [
+                                2
+                            ];
+                        });
                     });
-                })
+                    return function(resolve, reject) {
+                        return _ref.apply(this, arguments);
+                    };
+                }())
             ];
         });
     });
@@ -2425,7 +2453,7 @@ var build2 = function() {
                         import_node_fs8.default.promises.cp(cliPacakgeLocation, builtPreviewAppPath, {
                             recursive: true,
                             filter: function(source) {
-                                return !source.includes("/cli/") && !source.includes("/.next/") && !/\/node_modules\/?$/.test(source);
+                                return !/(\/|\\)cli(\/|\\)?/.test(source) && !/(\/|\\)\.next(\/|\\)?/.test(source) && !/(\/|\\)\.turbo(\/|\\)?/.test(source) && !/(\/|\\)node_modules(\/|\\)?$/.test(source);
                             }
                         })
                     ];
@@ -2525,14 +2553,11 @@ var start = function() {
                 nextStart = (0, import_node_child_process2.spawn)("npm", [
                     "start"
                 ], {
-                    cwd: builtPreviewPath
-                });
-                nextStart.stdout.on("data", function(msg) {
-                    process.stdout.write(msg);
-                });
-                nextStart.stderr.on("data", function(msg) {
-                    process.stderr.write(msg);
+                    cwd: builtPreviewPath,
+                    shell: true
                 });
+                nextStart.stdout.pipe(process.stdout);
+                nextStart.stderr.pipe(process.stderr);
             } catch (error) {
                 console.log(error);
                 process.exit(1);

package/cli/index.mjs

@@ -13,7 +13,7 @@ import { program } from "commander";
 // package.json
 var package_default = {
   name: "react-email",
-  version: "2.1.4",
+  version: "2.1.5",
   description: "A live preview of your emails right in your browser.",
   bin: {
     email: "./cli/index.js"
@@ -43,13 +43,13 @@ var package_default = {
     "@babel/core": "7.24.5",
     "@babel/parser": "7.24.5",
     "@radix-ui/colors": "1.0.1",
-    "@radix-ui/react-collapsible": "1.0.3",
-    "@radix-ui/react-popover": "1.0.7",
-    "@radix-ui/react-slot": "1.0.2",
-    "@radix-ui/react-toggle-group": "1.0.4",
-    "@radix-ui/react-tooltip": "1.0.7",
+    "@radix-ui/react-collapsible": "1.1.0",
+    "@radix-ui/react-popover": "1.1.1",
+    "@radix-ui/react-slot": "1.1.0",
+    "@radix-ui/react-toggle-group": "1.1.0",
+    "@radix-ui/react-tooltip": "1.1.1",
     "@swc/core": "1.3.101",
-    "@types/react": "^18.2.0",
+    "@types/react": "18.2.47",
     "@types/react-dom": "^18.2.0",
     "@types/webpack": "5.28.5",
     autoprefixer: "10.4.14",
@@ -72,7 +72,6 @@ var package_default = {
     "prism-react-renderer": "2.1.0",
     react: "^18.2.0",
     "react-dom": "^18.2.0",
-    shelljs: "0.8.5",
     "socket.io": "4.7.3",
     "socket.io-client": "4.7.3",
     sonner: "1.3.1",
@@ -90,7 +89,6 @@ var package_default = {
     "@types/mime-types": "2.1.4",
     "@types/node": "18.0.0",
     "@types/normalize-path": "3.0.2",
-    "@types/shelljs": "0.8.15",
     "@vercel/style-guide": "5.1.0",
     eslint: "8.50.0",
     tsup: "7.2.0",
@@ -699,7 +697,6 @@ import { build } from "esbuild";
 import ora2 from "ora";
 import logSymbols2 from "log-symbols";
 import normalize from "normalize-path";
-import { cp } from "shelljs";
 
 // src/actions/get-emails-directory-metadata.ts
 import fs5 from "fs";
@@ -919,12 +916,12 @@ ${allTemplates.map((p) => `- ${p}`).join("\n")}`
     );
     if (fs7.existsSync(pathToDumpStaticFilesInto))
       await fs7.promises.rm(pathToDumpStaticFilesInto, { recursive: true });
-    const result = cp(
-      "-r",
-      staticDirectoryPath,
-      path9.join(pathToWhereEmailMarkupShouldBeDumped, "static")
-    );
-    if (result.code > 0) {
+    try {
+      await fs7.promises.cp(staticDirectoryPath, pathToDumpStaticFilesInto, {
+        recursive: true
+      });
+    } catch (exception) {
+      console.error(exception);
       if (spinner) {
         spinner.stopAndPersist({
           symbol: logSymbols2.error,
@@ -932,7 +929,7 @@ ${allTemplates.map((p) => `- ${p}`).join("\n")}`
         });
       }
       throw new Error(
-        `Something went wrong while copying the file to ${pathToWhereEmailMarkupShouldBeDumped}/static, ${result.stderr}`
+        `Something went wrong while copying the file to ${pathToWhereEmailMarkupShouldBeDumped}/static, ${exception}`
       );
     }
   }
@@ -951,20 +948,16 @@ ${allTemplates.map((p) => `- ${p}`).join("\n")}`
 import fs8 from "fs";
 import path10 from "path";
 import ora3 from "ora";
-import shell from "shelljs";
 import { spawn } from "child_process";
 import logSymbols3 from "log-symbols";
 var buildPreviewApp = (absoluteDirectory) => {
   return new Promise((resolve, reject) => {
     const nextBuild = spawn("npm", ["run", "build"], {
-      cwd: absoluteDirectory
-    });
-    nextBuild.stdout.on("data", (msg) => {
-      process.stdout.write(msg);
-    });
-    nextBuild.stderr.on("data", (msg) => {
-      process.stderr.write(msg);
+      cwd: absoluteDirectory,
+      shell: true
     });
+    nextBuild.stdout.pipe(process.stdout);
+    nextBuild.stderr.pipe(process.stderr);
     nextBuild.on("close", (code) => {
       if (code === 0) {
         resolve();
@@ -1082,22 +1075,24 @@ var updatePackageJson = async (builtPreviewAppPath) => {
   );
 };
 var npmInstall = async (builtPreviewAppPath, packageManager) => {
-  return new Promise((resolve, reject) => {
-    shell.exec(
-      `${packageManager} install --silent`,
-      { cwd: builtPreviewAppPath },
-      (code) => {
-        if (code === 0) {
-          resolve();
-        } else {
-          reject(
-            new Error(
-              `Unable to install the dependencies and it exited with code: ${code}`
-            )
-          );
-        }
+  return new Promise(async (resolve, reject) => {
+    const childProc = spawn(packageManager, ["install", "--silent"], {
+      cwd: builtPreviewAppPath,
+      shell: true
+    });
+    childProc.stdout.pipe(process.stdout);
+    childProc.stderr.pipe(process.stderr);
+    childProc.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(
+          new Error(
+            `Unable to install the dependencies and it exited with code: ${code}`
+          )
+        );
       }
-    );
+    });
   });
 };
 var build2 = async ({
@@ -1125,7 +1120,7 @@ var build2 = async ({
     await fs8.promises.cp(cliPacakgeLocation, builtPreviewAppPath, {
       recursive: true,
       filter: (source) => {
-        return !source.includes("/cli/") && !source.includes("/.next/") && !/\/node_modules\/?$/.test(source);
+        return !/(\/|\\)cli(\/|\\)?/.test(source) && !/(\/|\\)\.next(\/|\\)?/.test(source) && !/(\/|\\)\.turbo(\/|\\)?/.test(source) && !/(\/|\\)node_modules(\/|\\)?$/.test(source);
       }
     });
     if (fs8.existsSync(staticPath)) {
@@ -1177,14 +1172,11 @@ var start = async () => {
       );
     }
     const nextStart = spawn2("npm", ["start"], {
-      cwd: builtPreviewPath
-    });
-    nextStart.stdout.on("data", (msg) => {
-      process.stdout.write(msg);
-    });
-    nextStart.stderr.on("data", (msg) => {
-      process.stderr.write(msg);
+      cwd: builtPreviewPath,
+      shell: true
     });
+    nextStart.stdout.pipe(process.stdout);
+    nextStart.stderr.pipe(process.stderr);
   } catch (error) {
     console.log(error);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./cli/index.js"
@@ -22,13 +22,13 @@
     "@babel/core": "7.24.5",
     "@babel/parser": "7.24.5",
     "@radix-ui/colors": "1.0.1",
-    "@radix-ui/react-collapsible": "1.0.3",
-    "@radix-ui/react-popover": "1.0.7",
-    "@radix-ui/react-slot": "1.0.2",
-    "@radix-ui/react-toggle-group": "1.0.4",
-    "@radix-ui/react-tooltip": "1.0.7",
+    "@radix-ui/react-collapsible": "1.1.0",
+    "@radix-ui/react-popover": "1.1.1",
+    "@radix-ui/react-slot": "1.1.0",
+    "@radix-ui/react-toggle-group": "1.1.0",
+    "@radix-ui/react-tooltip": "1.1.1",
     "@swc/core": "1.3.101",
-    "@types/react": "^18.2.0",
+    "@types/react": "18.2.47",
     "@types/react-dom": "^18.2.0",
     "@types/webpack": "5.28.5",
     "autoprefixer": "10.4.14",
@@ -51,7 +51,6 @@
     "prism-react-renderer": "2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "shelljs": "0.8.5",
     "socket.io": "4.7.3",
     "socket.io-client": "4.7.3",
     "sonner": "1.3.1",
@@ -69,7 +68,6 @@
     "@types/mime-types": "2.1.4",
     "@types/node": "18.0.0",
     "@types/normalize-path": "3.0.2",
-    "@types/shelljs": "0.8.15",
     "@vercel/style-guide": "5.1.0",
     "eslint": "8.50.0",
     "tsup": "7.2.0",

package/src/utils/static-node-modules-for-vm.ts

@@ -26,6 +26,7 @@ import cluster from 'node:cluster';
 import childProcess from 'node:child_process';
 import buffer from 'node:buffer';
 import assert from 'node:assert';
+import asyncHooks from 'node:async_hooks';
 
 /**
  * A map of the name of the modules (including `node:` prefixed ones)
@@ -71,6 +72,8 @@ export const staticNodeModulesForVM = {
   'node:http': http,
   fs,
   'node:fs': fs,
+  'fs/promises': fs.promises,
+  'node:fs/promises': fs.promises,
   events,
   'node:events': events,
   domain,
@@ -89,4 +92,6 @@ export const staticNodeModulesForVM = {
   'node:buffer': buffer,
   assert,
   'node:assert': assert,
+  'async_hooks': asyncHooks,
+  'node:async_hooks': asyncHooks,
 };