react-email 6.1.3 → 6.1.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # react-email
 
+## 6.1.5
+
+### Patch Changes
+
+- 1a61cb0: Avoid OOM when running `email export` on projects with many templates. esbuild builds now run in batches of 10 entry points, and the render phase runs each batch of 25 templates inside a `worker_threads` worker so V8 isolate memory is reclaimed between batches.
+
+## 6.1.4
+
+### Patch Changes
+
+- 1c386ce: Avoid spamming each spinner frame as a new line on non-TTY streams (CI logs, pipes, dumb terminals). The spinner now logs each status text once instead of redrawing animated frames when the output is not a TTY.
+- ad6a9de: - deprecate packageManager CLI option for `email build`, only supporting npm
+  - ensure `email build` dependency installation includes dev dependencies
+
 ## 6.1.3
 
 ## 6.1.2

package/dist/cli/index.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
 import { spawn } from "node:child_process";
-import { program } from "commander";
+import { Option, program } from "commander";
 import * as fs$1 from "node:fs";
-import fs, { existsSync, promises, statSync, unlinkSync, writeFileSync } from "node:fs";
+import fs, { existsSync, promises, statSync } from "node:fs";
 import * as path$2 from "node:path";
 import path from "node:path";
 import url, { fileURLToPath } from "node:url";
@@ -31,7 +31,8 @@ import os from "node:os";
 import Conf from "conf";
 import * as nodeUtil from "node:util";
 import { lookup } from "mime-types";
-import { build } from "esbuild";
+import { Worker } from "node:worker_threads";
+import { build, stop } from "esbuild";
 import { glob } from "glob";
 import normalize$1 from "normalize-path";
 //#region \0rolldown/runtime.js
@@ -6522,7 +6523,7 @@ const getEmailsDirectoryMetadata = async (absolutePathToEmailsDirectory, keepFil
 //#region package.json
 var package_default = {
 	name: "react-email",
-	version: "6.1.3",
+	version: "6.1.5",
 	description: "A live preview of your emails right in your browser.",
 	bin: { "email": "./dist/cli/index.mjs" },
 	type: "module",
@@ -6657,7 +6658,70 @@ const normalizeDisplay = (display) => {
 		symbolFormatter: withPrefixText(prefixText, symbolFormatter)
 	};
 };
-const createSpinner = (display, options) => new Spinner(normalizeDisplay(display), options);
+const isInteractiveStream = (stream) => {
+	if (!stream.isTTY) return false;
+	if (process.env.TERM === "dumb") return false;
+	if (process.env.CI) return false;
+	return true;
+};
+var NonInteractiveSpinner = class {
+	running = false;
+	text = "";
+	prefixText = "";
+	stream;
+	lastLoggedLine;
+	constructor(display) {
+		if (typeof display === "string") {
+			this.text = display;
+			this.stream = process.stdout;
+		} else {
+			this.text = display.text ?? "";
+			this.prefixText = display.prefixText ?? "";
+			this.stream = display.stream ?? process.stdout;
+		}
+	}
+	start() {
+		this.running = true;
+		this.log();
+	}
+	stop() {
+		this.running = false;
+	}
+	setText(text) {
+		this.text = text;
+		if (this.running) this.log();
+	}
+	setDisplay(display) {
+		if (typeof display.text === "string") this.text = display.text;
+		const { symbol } = display;
+		this.log(symbol);
+		if (typeof symbol === "string") this.running = false;
+	}
+	succeed(display) {
+		this.finish("✔", display);
+	}
+	fail(display) {
+		this.finish("✖", display);
+	}
+	finish(symbol, display) {
+		if (typeof display === "string") this.text = display;
+		else if (typeof display?.text === "string") this.text = display.text;
+		this.log(symbol);
+		this.running = false;
+	}
+	log(symbol) {
+		const symbolPrefix = typeof symbol === "string" && symbol.length > 0 ? `${symbol} ` : "";
+		const trimmedText = this.text.replace(/\n+$/, "");
+		const line = `${this.prefixText}${symbolPrefix}${trimmedText}`;
+		if (line === this.lastLoggedLine) return;
+		this.lastLoggedLine = line;
+		this.stream.write(`${line}\n`);
+	}
+};
+const createSpinner = (display, options) => {
+	if (!isInteractiveStream(typeof display !== "string" && display.stream || process.stdout)) return new NonInteractiveSpinner(display);
+	return new Spinner(normalizeDisplay(display), options);
+};
 const stopSpinnerAndPersist = (spinner, display) => {
 	spinner?.setDisplay(display);
 };
@@ -6730,6 +6794,7 @@ const updatePackageJson = async (builtUiPath) => {
 	await fs.promises.writeFile(packageJsonPath, JSON.stringify(packageJson), "utf8");
 };
 const build$1 = async ({ dir: emailsDirRelativePath, packageManager }) => {
+	if (packageManager) console.warn("The --packageManager option is deprecated and ignored. The build command now just uses npm.");
 	try {
 		const usersProjectLocation = process.cwd();
 		const previewServerLocation = await getUiLocation();
@@ -6769,18 +6834,25 @@ const build$1 = async ({ dir: emailsDirRelativePath, packageManager }) => {
 		await updatePackageJson(builtPreviewAppPath);
 		if (!isInReactEmailMonorepo) {
 			spinner.setText("Installing dependencies on `.react-email`");
-			await installDependencies({
-				cwd: builtPreviewAppPath,
-				silent: true,
-				packageManager
-			});
+			const previousInclude = process.env.NPM_CONFIG_INCLUDE;
+			process.env.NPM_CONFIG_INCLUDE = "dev";
+			try {
+				await installDependencies({
+					cwd: builtPreviewAppPath,
+					silent: true,
+					packageManager: "npm"
+				});
+			} finally {
+				if (previousInclude === void 0) delete process.env.NPM_CONFIG_INCLUDE;
+				else process.env.NPM_CONFIG_INCLUDE = previousInclude;
+			}
 		}
 		stopSpinnerAndPersist(spinner, {
 			text: "Successfully prepared `.react-email` for `next build`",
 			symbol: logSymbols.success
 		});
 		await runScript("build", {
-			packageManager,
+			packageManager: "npm",
 			cwd: builtPreviewAppPath
 		});
 	} catch (error) {
@@ -7332,7 +7404,40 @@ const getEmailTemplatesFromDirectory = (emailDirectory) => {
 	for (const directory of emailDirectory.subDirectories) templatePaths.push(...getEmailTemplatesFromDirectory(directory));
 	return templatePaths;
 };
-const require$1 = createRequire(url.fileURLToPath(import.meta.url));
+const BUILD_BATCH_SIZE = 10;
+const RENDER_BATCH_SIZE = 25;
+const renderWorkerSource = `
+const { unlinkSync, writeFileSync } = require('node:fs');
+const { parentPort, workerData } = require('node:worker_threads');
+
+const { templates, options } = workerData;
+
+(async () => {
+  for (const template of templates) {
+    try {
+      const emailModule = require(template);
+      const rendered = await emailModule.render(
+        emailModule.reactEmailCreateReactElement(emailModule.default, {}),
+        options,
+      );
+      const htmlPath = template.replace(
+        '.cjs',
+        options.plainText ? '.txt' : '.html',
+      );
+      writeFileSync(htmlPath, rendered);
+      unlinkSync(template);
+      parentPort.postMessage({ type: 'progress', template });
+    } catch (exception) {
+      parentPort.postMessage({
+        type: 'error',
+        template,
+        message: exception && exception.stack ? exception.stack : String(exception),
+      });
+      process.exit(1);
+    }
+  }
+})();
+`;
 const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirectoryPath, options) => {
 	let spinner;
 	if (!options.silent) {
@@ -7352,20 +7457,24 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 	if (fs.existsSync(pathToWhereEmailMarkupShouldBeDumped)) fs.rmSync(pathToWhereEmailMarkupShouldBeDumped, { recursive: true });
 	const allTemplates = getEmailTemplatesFromDirectory(emailsDirectoryMetadata);
 	try {
-		await build({
-			bundle: true,
-			entryPoints: allTemplates,
-			external: ["css-tree"],
-			format: "cjs",
-			jsx: "automatic",
-			loader: { ".js": "jsx" },
-			logLevel: "silent",
-			outExtension: { ".js": ".cjs" },
-			outdir: pathToWhereEmailMarkupShouldBeDumped,
-			platform: "node",
-			plugins: [renderingUtilitiesExporter(allTemplates)],
-			write: true
-		});
+		for (let i = 0; i < allTemplates.length; i += BUILD_BATCH_SIZE) {
+			const batch = allTemplates.slice(i, i + BUILD_BATCH_SIZE);
+			await build({
+				bundle: true,
+				entryPoints: batch,
+				external: ["css-tree"],
+				format: "cjs",
+				jsx: "automatic",
+				loader: { ".js": "jsx" },
+				logLevel: "silent",
+				outExtension: { ".js": ".cjs" },
+				outdir: pathToWhereEmailMarkupShouldBeDumped,
+				platform: "node",
+				plugins: [renderingUtilitiesExporter(batch)],
+				write: true
+			});
+			await stop();
+		}
 	} catch (exception) {
 		if (spinner) stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
@@ -7380,20 +7489,41 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 		spinner.setText(`rendering ${allBuiltTemplates[0]?.split("/").pop()}`);
 		spinner.start();
 	}
-	for await (const template of allBuiltTemplates) try {
-		if (spinner) spinner.setText(`rendering ${template.split("/").pop()}`);
-		delete require$1.cache[template];
-		const emailModule = require$1(template);
-		const rendered = await emailModule.render(emailModule.reactEmailCreateReactElement(emailModule.default, {}), options);
-		writeFileSync(template.replace(".cjs", options.plainText ? ".txt" : ".html"), rendered);
-		unlinkSync(template);
-	} catch (exception) {
-		if (spinner) stopSpinnerAndPersist(spinner, {
-			symbol: logSymbols.error,
-			text: `failed when rendering ${template.split("/").pop()}`
-		});
-		console.error(exception);
-		process.exit(1);
+	for (let i = 0; i < allBuiltTemplates.length; i += RENDER_BATCH_SIZE) {
+		const batch = allBuiltTemplates.slice(i, i + RENDER_BATCH_SIZE);
+		let failedTemplate;
+		let failureMessage;
+		try {
+			await new Promise((resolve, reject) => {
+				const worker = new Worker(renderWorkerSource, {
+					eval: true,
+					workerData: {
+						templates: batch,
+						options
+					}
+				});
+				worker.on("message", (msg) => {
+					if (msg.type === "progress") {
+						if (spinner) spinner.setText(`rendering ${msg.template.split("/").pop()}`);
+					} else if (msg.type === "error") {
+						failedTemplate = msg.template;
+						failureMessage = msg.message;
+					}
+				});
+				worker.on("error", reject);
+				worker.on("exit", (code) => {
+					if (code !== 0) reject(new Error(failureMessage ?? `Render worker exited with code ${code}`));
+					else resolve();
+				});
+			});
+		} catch (exception) {
+			if (spinner) stopSpinnerAndPersist(spinner, {
+				symbol: logSymbols.error,
+				text: failedTemplate ? `failed when rendering ${failedTemplate.split("/").pop()}` : "failed when rendering"
+			});
+			console.error(exception);
+			process.exit(1);
+		}
 	}
 	if (spinner) {
 		spinner.succeed("Rendered all files");
@@ -7489,7 +7619,7 @@ if (!requiredFlags.every((flag) => process.execArgv.includes(flag))) spawn(proce
 else {
 	program.name("react-email").description("A live preview of your emails right in your browser").version(package_default.version);
 	program.command("dev").description("Starts the preview email development app").option("-d, --dir <path>", "Directory with your email templates", "./emails").option("-p --port <port>", "Port to run dev server on", "3000").action(dev);
-	program.command("build").description("Copies the preview app for onto .react-email and builds it").option("-d, --dir <path>", "Directory with your email templates", "./emails").option("-p --packageManager <name>", "Package name to use on installation on `.react-email`", "npm").action(build$1);
+	program.command("build").description("Copies the preview app for onto .react-email and builds it").option("-d, --dir <path>", "Directory with your email templates", "./emails").addOption(new Option("-p, --packageManager <name>").hideHelp()).action(build$1);
 	program.command("start").description("Runs the built preview app that is inside of \".react-email\"").action(start);
 	program.command("export").description("Build the templates to the `out` directory").option("--outDir <path>", "Output directory", "out").option("-p, --pretty", "Pretty print the output", false).option("-t, --plainText", "Set output format as plain text", false).option("-d, --dir <path>", "Directory with your email templates", "./emails").option("-s, --silent", "To, or not to show a spinner with process information", false).action(({ outDir, pretty, plainText, silent, dir: srcDir }) => exportTemplates(outDir, srcDir, {
 		silent,

package/package.json

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