react-email 2.1.7-canary.2 → 2.2.0-alpha-7f567f6f-20240814

package/build-preview-server.mjs

@@ -0,0 +1,24 @@
+import { spawn } from 'node:child_process';
+import { existsSync, promises as fs } from 'node:fs';
+
+const nextBuildProcess = spawn('next', ['build'], {
+  detached: true,
+  stdio: "inherit"
+});
+
+process.on('SIGINT', () => {
+  nextBuildProcess.kill('SIGINT');
+});
+
+nextBuildProcess.on('exit', async (code) => {
+  if (code !== 0) {
+    process.exit(code);
+  }
+
+  if (existsSync('dist/preview')) {
+    await fs.rm('dist/preview', { recursive: true });
+  }
+  await fs.mkdir('dist/preview', { recursive: true });
+  await fs.rename('.next', 'dist/preview/.next');
+});
+

package/cli/index.js

@@ -340,7 +340,7 @@ var import_commander = require("commander");
 // package.json
 var package_default = {
     name: "react-email",
-    version: "2.1.7-canary.2",
+    version: "2.1.6",
     description: "A live preview of your emails right in your browser.",
     bin: {
         email: "./cli/index.js"
@@ -376,7 +376,7 @@ var package_default = {
         "@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",
@@ -388,19 +388,19 @@ var package_default = {
         esbuild: "0.19.11",
         "eslint-config-prettier": "9.0.0",
         "eslint-config-turbo": "1.10.12",
-        "framer-motion": "12.0.0-alpha.0",
+        "framer-motion": "10.17.4",
         glob: "10.3.4",
         "log-symbols": "4.1.0",
         "mime-types": "2.1.35",
-        next: "14.2.3",
+        next: "14.1.4",
         "normalize-path": "3.0.0",
         ora: "5.4.1",
-        postcss: "8.4.39",
+        postcss: "8.4.38",
         "prism-react-renderer": "2.1.0",
-        react: "18.3.1",
-        "react-dom": "18.3.1",
-        "socket.io": "4.7.5",
-        "socket.io-client": "4.7.5",
+        react: "^18.2.0",
+        "react-dom": "^18.2.0",
+        "socket.io": "4.7.3",
+        "socket.io-client": "4.7.3",
         sonner: "1.3.1",
         "source-map-js": "1.0.2",
         "stacktrace-parser": "0.1.10",
@@ -587,8 +587,7 @@ var getImportedModules = function(contents) {
         errorRecovery: true,
         plugins: [
             "jsx",
-            "typescript",
-            "decorators"
+            "typescript"
         ]
     });
     (0, import_core.traverse)(parsedContents, {
@@ -1908,12 +1907,12 @@ var mergeDirectoriesWithSubDirectories = function(emailsDirectoryMetadata) {
 };
 var getEmailsDirectoryMetadata = function() {
     var _ref = _async_to_generator(function(absolutePathToEmailsDirectory) {
-        var keepFileExtensions, isSubDirectory, dirents, emailFilenames, subDirectories, emailsMetadata;
+        var keepFileExtensions, dirents, emailFilenames, subDirectories;
         var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    keepFileExtensions = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : false, isSubDirectory = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : false;
+                    keepFileExtensions = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : false;
                     if (!import_node_fs5.default.existsSync(absolutePathToEmailsDirectory)) return [
                         2
                     ];
@@ -1935,20 +1934,19 @@ var getEmailsDirectoryMetadata = function() {
                         Promise.all(dirents.filter(function(dirent) {
                             return dirent.isDirectory() && !dirent.name.startsWith("_") && dirent.name !== "static";
                         }).map(function(dirent) {
-                            return getEmailsDirectoryMetadata(import_node_path6.default.join(absolutePathToEmailsDirectory, dirent.name), keepFileExtensions, true);
+                            return getEmailsDirectoryMetadata(import_node_path6.default.join(absolutePathToEmailsDirectory, dirent.name));
                         }))
                     ];
                 case 2:
                     subDirectories = _state.sent();
-                    emailsMetadata = {
-                        absolutePath: absolutePathToEmailsDirectory,
-                        directoryName: absolutePathToEmailsDirectory.split(import_node_path6.default.sep).pop(),
-                        emailFilenames: emailFilenames,
-                        subDirectories: subDirectories
-                    };
                     return [
                         2,
-                        isSubDirectory ? mergeDirectoriesWithSubDirectories(emailsMetadata) : emailsMetadata
+                        mergeDirectoriesWithSubDirectories({
+                            absolutePath: absolutePathToEmailsDirectory,
+                            directoryName: absolutePathToEmailsDirectory.split(import_node_path6.default.sep).pop(),
+                            emailFilenames: emailFilenames,
+                            subDirectories: subDirectories
+                        })
                     ];
             }
         });
@@ -1957,17 +1955,15 @@ var getEmailsDirectoryMetadata = function() {
         return _ref.apply(this, arguments);
     };
 }();
-// src/utils/esbuild/renderring-utilities-exporter.ts
+// src/utils/render-resolver-esbuild-plugin.ts
 var import_node_path7 = __toESM(require("path"));
 var import_node_fs6 = require("fs");
-// src/utils/esbuild/escape-string-for-regex.ts
 function escapeStringForRegex(string) {
     return string.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
 }
-// src/utils/esbuild/renderring-utilities-exporter.ts
-var renderingUtilitiesExporter = function(emailTemplates) {
+var renderResolver = function(emailTemplates) {
     return {
-        name: "rendering-utilities-exporter",
+        name: "render-resolver",
         setup: function(b) {
             b.onLoad({
                 filter: new RegExp(emailTemplates.map(function(emailPath) {
@@ -1991,7 +1987,7 @@ var renderingUtilitiesExporter = function(emailTemplates) {
                                     2,
                                     (_tmp.contents = _1.apply(_, [
                                         _state.sent(),
-                                        ";\n          export { renderAsync } from 'react-email-module-that-will-export-render'\n          export { createElement as reactEmailCreateReactElement } from 'react';\n        "
+                                        ";\n          export { renderAsync } from 'react-email-module-that-will-export-render'\n        "
                                     ]), _tmp.loader = import_node_path7.default.extname(pathToFile).slice(1), _tmp)
                                 ];
                         }
@@ -2051,6 +2047,7 @@ var renderingUtilitiesExporter = function(emailTemplates) {
     };
 };
 // src/cli/commands/export.ts
+var import_react = require("react");
 var getEmailTemplatesFromDirectory = function(emailDirectory) {
     var templatePaths = [];
     emailDirectory.emailFilenames.forEach(function(filename) {
@@ -2109,7 +2106,7 @@ var exportTemplates = function() {
                             bundle: true,
                             entryPoints: allTemplates,
                             plugins: [
-                                renderingUtilitiesExporter(allTemplates)
+                                renderResolver(allTemplates)
                             ],
                             platform: "node",
                             format: "cjs",
@@ -2184,7 +2181,7 @@ var exportTemplates = function() {
                     emailModule = require(template);
                     return [
                         4,
-                        emailModule.renderAsync(emailModule.reactEmailCreateReactElement(emailModule.default, {}), options)
+                        emailModule.renderAsync((0, import_react.createElement)(emailModule.default, {}), options)
                     ];
                 case 9:
                     rendered = _state.sent();
@@ -2470,8 +2467,7 @@ var npmInstall = function() {
                         return _ts_generator(this, function(_state) {
                             childProc = (0, import_node_child_process.spawn)(packageManager, [
                                 "install",
-                                "--silent",
-                                "--force"
+                                "--silent"
                             ], {
                                 cwd: builtPreviewAppPath,
                                 shell: true

package/cli/index.mjs

@@ -13,7 +13,7 @@ import { program } from "commander";
 // package.json
 var package_default = {
   name: "react-email",
-  version: "2.1.7-canary.2",
+  version: "2.1.6",
   description: "A live preview of your emails right in your browser.",
   bin: {
     email: "./cli/index.js"
@@ -49,7 +49,7 @@ var package_default = {
     "@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",
@@ -61,19 +61,19 @@ var package_default = {
     esbuild: "0.19.11",
     "eslint-config-prettier": "9.0.0",
     "eslint-config-turbo": "1.10.12",
-    "framer-motion": "12.0.0-alpha.0",
+    "framer-motion": "10.17.4",
     glob: "10.3.4",
     "log-symbols": "4.1.0",
     "mime-types": "2.1.35",
-    next: "14.2.3",
+    next: "14.1.4",
     "normalize-path": "3.0.0",
     ora: "5.4.1",
-    postcss: "8.4.39",
+    postcss: "8.4.38",
     "prism-react-renderer": "2.1.0",
-    react: "18.3.1",
-    "react-dom": "18.3.1",
-    "socket.io": "4.7.5",
-    "socket.io-client": "4.7.5",
+    react: "^18.2.0",
+    "react-dom": "^18.2.0",
+    "socket.io": "4.7.3",
+    "socket.io-client": "4.7.3",
     sonner: "1.3.1",
     "source-map-js": "1.0.2",
     "stacktrace-parser": "0.1.10",
@@ -175,7 +175,7 @@ var getImportedModules = (contents) => {
     sourceType: "unambiguous",
     strictMode: false,
     errorRecovery: true,
-    plugins: ["jsx", "typescript", "decorators"]
+    plugins: ["jsx", "typescript"]
   });
   traverse(parsedContents, {
     ImportDeclaration({ node }) {
@@ -747,7 +747,7 @@ var mergeDirectoriesWithSubDirectories = (emailsDirectoryMetadata) => {
   }
   return currentResultingMergedDirectory;
 };
-var getEmailsDirectoryMetadata = async (absolutePathToEmailsDirectory, keepFileExtensions = false, isSubDirectory = false) => {
+var getEmailsDirectoryMetadata = async (absolutePathToEmailsDirectory, keepFileExtensions = false) => {
   if (!fs5.existsSync(absolutePathToEmailsDirectory))
     return;
   const dirents = await fs5.promises.readdir(absolutePathToEmailsDirectory, {
@@ -763,33 +763,26 @@ var getEmailsDirectoryMetadata = async (absolutePathToEmailsDirectory, keepFileE
       (dirent) => dirent.isDirectory() && !dirent.name.startsWith("_") && dirent.name !== "static"
     ).map(
       (dirent) => getEmailsDirectoryMetadata(
-        path7.join(absolutePathToEmailsDirectory, dirent.name),
-        keepFileExtensions,
-        true
+        path7.join(absolutePathToEmailsDirectory, dirent.name)
       )
     )
   );
-  const emailsMetadata = {
+  return mergeDirectoriesWithSubDirectories({
     absolutePath: absolutePathToEmailsDirectory,
     directoryName: absolutePathToEmailsDirectory.split(path7.sep).pop(),
     emailFilenames,
     subDirectories
-  };
-  return isSubDirectory ? mergeDirectoriesWithSubDirectories(emailsMetadata) : emailsMetadata;
+  });
 };
 
-// src/utils/esbuild/renderring-utilities-exporter.ts
+// src/utils/render-resolver-esbuild-plugin.ts
 import path8 from "path";
 import { promises as fs6 } from "fs";
-
-// src/utils/esbuild/escape-string-for-regex.ts
 function escapeStringForRegex(string) {
   return string.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
 }
-
-// src/utils/esbuild/renderring-utilities-exporter.ts
-var renderingUtilitiesExporter = (emailTemplates) => ({
-  name: "rendering-utilities-exporter",
+var renderResolver = (emailTemplates) => ({
+  name: "render-resolver",
   setup: (b) => {
     b.onLoad(
       {
@@ -801,7 +794,6 @@ var renderingUtilitiesExporter = (emailTemplates) => ({
         return {
           contents: `${await fs6.readFile(pathToFile, "utf8")};
           export { renderAsync } from 'react-email-module-that-will-export-render'
-          export { createElement as reactEmailCreateReactElement } from 'react';
         `,
           loader: path8.extname(pathToFile).slice(1)
         };
@@ -831,6 +823,7 @@ var renderingUtilitiesExporter = (emailTemplates) => ({
 });
 
 // src/cli/commands/export.ts
+import { createElement } from "react";
 var getEmailTemplatesFromDirectory = (emailDirectory) => {
   const templatePaths = [];
   emailDirectory.emailFilenames.forEach(
@@ -868,7 +861,7 @@ var exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirecto
     await build({
       bundle: true,
       entryPoints: allTemplates,
-      plugins: [renderingUtilitiesExporter(allTemplates)],
+      plugins: [renderResolver(allTemplates)],
       platform: "node",
       format: "cjs",
       loader: { ".js": "jsx" },
@@ -910,7 +903,7 @@ ${allTemplates.map((p) => `- ${p}`).join("\n")}`
       delete __require.cache[template];
       const emailModule = __require(template);
       const rendered = await emailModule.renderAsync(
-        emailModule.reactEmailCreateReactElement(emailModule.default, {}),
+        createElement(emailModule.default, {}),
         options
       );
       const htmlPath = template.replace(
@@ -1103,14 +1096,10 @@ var updatePackageJson = async (builtPreviewAppPath) => {
 };
 var npmInstall = async (builtPreviewAppPath, packageManager) => {
   return new Promise(async (resolve2, reject) => {
-    const childProc = spawn(
-      packageManager,
-      ["install", "--silent", "--force"],
-      {
-        cwd: builtPreviewAppPath,
-        shell: true
-      }
-    );
+    const childProc = spawn(packageManager, ["install", "--silent"], {
+      cwd: builtPreviewAppPath,
+      shell: true
+    });
     childProc.stdout.pipe(process.stdout);
     childProc.stderr.pipe(process.stderr);
     childProc.on("close", (code) => {

package/dist/cli/index.d.mts

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

package/dist/cli/index.d.ts

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