react-email 6.0.3 → 6.0.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # react-email
 
+## 6.0.4
+
+### Patch Changes
+
+- 96af3a7: Replace ora with picospinner for CLI and preview spinner output.
+- 5cf57ae: unpin esbuild
+- Updated dependencies [e0e896f]
+  - @react-email/render@2.0.8
+
 ## 6.0.3
 
 ### Patch Changes

package/dist/cli/index.mjs

@@ -17,9 +17,9 @@ import { fileURLToPath as fileURLToPath$1 } from "url";
 import { createRequire as createRequire$1 } from "module";
 import logSymbols from "log-symbols";
 import { addDevDependency, installDependencies, runScript } from "nypm";
-import ora from "ora";
 import { createJiti } from "jiti";
 import prompts from "prompts";
+import { Spinner } from "picospinner";
 import { watch } from "chokidar";
 import debounce from "debounce";
 import { Server } from "socket.io";
@@ -6522,7 +6522,7 @@ const getEmailsDirectoryMetadata = async (absolutePathToEmailsDirectory, keepFil
 //#region package.json
 var package_default = {
 	name: "react-email",
-	version: "6.0.3",
+	version: "6.0.4",
 	description: "A live preview of your emails right in your browser.",
 	bin: { "email": "./dist/cli/index.mjs" },
 	type: "module",
@@ -6561,13 +6561,13 @@ var package_default = {
 	dependencies: {
 		"@babel/parser": "catalog:",
 		"@babel/traverse": "catalog:",
-		"@react-email/render": "workspace:>=2.0.7",
+		"@react-email/render": "workspace:>=2.0.8",
 		"chokidar": "^4.0.3",
 		"commander": "catalog:",
 		"conf": "^15.0.2",
 		"css-tree": "3.2.1",
 		"debounce": "^2.0.0",
-		"esbuild": "catalog:",
+		"esbuild": "^0.28.0",
 		"glob": "^13.0.6",
 		"jiti": "2.4.2",
 		"log-symbols": "catalog:",
@@ -6575,7 +6575,7 @@ var package_default = {
 		"mime-types": "^3.0.0",
 		"normalize-path": "^3.0.0",
 		"nypm": "catalog:",
-		"ora": "catalog:",
+		"picospinner": "catalog:",
 		"prismjs": "^1.30.0",
 		"prompts": "2.4.2",
 		"socket.io": "^4.8.1",
@@ -6632,18 +6632,36 @@ const getUiLocation = async () => {
 const spinners = /* @__PURE__ */ new Set();
 process.on("SIGINT", () => {
 	spinners.forEach((spinner) => {
-		if (spinner.isSpinning) spinner.stop();
+		if (spinner.running) spinner.stop();
 	});
 });
 process.on("exit", (code) => {
 	if (code !== 0) spinners.forEach((spinner) => {
-		if (spinner.isSpinning) spinner.stopAndPersist({ symbol: logSymbols.error });
+		if (spinner.running) spinner.fail();
 	});
 });
 const registerSpinnerAutostopping = (spinner) => {
 	spinners.add(spinner);
 };
 //#endregion
+//#region src/cli/utils/spinner.ts
+const withPrefixText = (prefixText, symbolFormatter) => {
+	if (typeof prefixText === "undefined") return symbolFormatter;
+	return (symbol) => `${prefixText}${symbolFormatter?.(symbol) ?? symbol}`;
+};
+const normalizeDisplay = (display) => {
+	if (typeof display === "string") return display;
+	const { prefixText, stream, symbolFormatter, ...spinnerDisplay } = display;
+	return {
+		...spinnerDisplay,
+		symbolFormatter: withPrefixText(prefixText, symbolFormatter)
+	};
+};
+const createSpinner = (display, options) => new Spinner(normalizeDisplay(display), options);
+const stopSpinnerAndPersist = (spinner, display) => {
+	spinner?.setDisplay(display);
+};
+//#endregion
 //#region src/cli/commands/build.ts
 const isInReactEmailMonorepo = !path.dirname(fileURLToPath(import.meta.url)).includes("node_modules");
 const setNextEnvironmentVariablesForBuild = async (emailsDirRelativePath, builtPreviewAppPath, usersProjectLocation) => {
@@ -6715,21 +6733,22 @@ const build$1 = async ({ dir: emailsDirRelativePath, packageManager }) => {
 	try {
 		const usersProjectLocation = process.cwd();
 		const previewServerLocation = await getUiLocation();
-		const spinner = ora({
+		const spinner = createSpinner({
 			text: "Starting build process...",
 			prefixText: "  "
-		}).start();
+		});
+		spinner.start();
 		registerSpinnerAutostopping(spinner);
-		spinner.text = `Checking if ${emailsDirRelativePath} folder exists`;
+		spinner.setText(`Checking if ${emailsDirRelativePath} folder exists`);
 		if (!fs.existsSync(emailsDirRelativePath)) process.exit(1);
 		const emailsDirPath = path.join(usersProjectLocation, emailsDirRelativePath);
 		const staticPath = path.join(emailsDirPath, "static");
 		const builtPreviewAppPath = path.join(usersProjectLocation, ".react-email");
 		if (fs.existsSync(builtPreviewAppPath)) {
-			spinner.text = "Deleting pre-existing `.react-email` folder";
+			spinner.setText("Deleting pre-existing `.react-email` folder");
 			await fs.promises.rm(builtPreviewAppPath, { recursive: true });
 		}
-		spinner.text = "Copying preview app from CLI to `.react-email`";
+		spinner.setText("Copying preview app from CLI to `.react-email`");
 		await fs.promises.cp(previewServerLocation, builtPreviewAppPath, {
 			recursive: true,
 			filter: (source) => {
@@ -6738,25 +6757,25 @@ const build$1 = async ({ dir: emailsDirRelativePath, packageManager }) => {
 			}
 		});
 		if (fs.existsSync(staticPath)) {
-			spinner.text = "Copying `static` folder into `.react-email/public/static`";
+			spinner.setText("Copying `static` folder into `.react-email/public/static`");
 			const builtStaticDirectory = path.resolve(builtPreviewAppPath, "./public/static");
 			await fs.promises.cp(staticPath, builtStaticDirectory, { recursive: true });
 		}
-		spinner.text = "Setting Next environment variables for preview app to work properly";
+		spinner.setText("Setting Next environment variables for preview app to work properly");
 		await setNextEnvironmentVariablesForBuild(emailsDirRelativePath, builtPreviewAppPath, usersProjectLocation);
-		spinner.text = "Setting server side generation for the email preview pages";
+		spinner.setText("Setting server side generation for the email preview pages");
 		await forceSSGForEmailPreviews(emailsDirPath, builtPreviewAppPath);
-		spinner.text = "Updating package.json's build and start scripts";
+		spinner.setText("Updating package.json's build and start scripts");
 		await updatePackageJson(builtPreviewAppPath);
 		if (!isInReactEmailMonorepo) {
-			spinner.text = "Installing dependencies on `.react-email`";
+			spinner.setText("Installing dependencies on `.react-email`");
 			await installDependencies({
 				cwd: builtPreviewAppPath,
 				silent: true,
 				packageManager
 			});
 		}
-		spinner.stopAndPersist({
+		stopSpinnerAndPersist(spinner, {
 			text: "Successfully prepared `.react-email` for `next build`",
 			symbol: logSymbols.success
 		});
@@ -7133,16 +7152,17 @@ const startDevServer = async (emailsDirRelativePath, staticBaseDirRelativePath,
 		await app.close();
 	});
 	devServer.on("error", (e) => {
-		spinner.stopAndPersist({
+		stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
 			text: `Preview Server had an error: ${e}`
 		});
 		process.exit(1);
 	});
-	const spinner = ora({
+	const spinner = createSpinner({
 		text: "Getting react-email preview server ready...\n",
 		prefixText: " "
-	}).start();
+	});
+	spinner.start();
 	registerSpinnerAutostopping(spinner);
 	const timeBeforeNextReady = performance.now();
 	process.env = {
@@ -7168,7 +7188,7 @@ const startDevServer = async (emailsDirRelativePath, staticBaseDirRelativePath,
 	try {
 		await nextReadyPromise;
 	} catch (exception) {
-		spinner.stopAndPersist({
+		stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
 			text: ` Preview Server had an error: ${exception}`
 		});
@@ -7176,9 +7196,8 @@ const startDevServer = async (emailsDirRelativePath, staticBaseDirRelativePath,
 	}
 	isNextReady = true;
 	const nextHandleRequest = app.getRequestHandler();
-	const secondsToNextReady = ((performance.now() - timeBeforeNextReady) / 1e3).toFixed(1);
-	spinner.stopAndPersist({
-		text: `Ready in ${secondsToNextReady}s\n`,
+	stopSpinnerAndPersist(spinner, {
+		text: `Ready in ${((performance.now() - timeBeforeNextReady) / 1e3).toFixed(1)}s\n`,
 		symbol: logSymbols.success
 	});
 	return devServer;
@@ -7317,12 +7336,13 @@ const require$1 = createRequire(url.fileURLToPath(import.meta.url));
 const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirectoryPath, options) => {
 	let spinner;
 	if (!options.silent) {
-		spinner = ora("Preparing files...\n").start();
+		spinner = createSpinner("Preparing files...\n");
+		spinner.start();
 		registerSpinnerAutostopping(spinner);
 	}
 	const emailsDirectoryMetadata = await getEmailsDirectoryMetadata(path.resolve(process.cwd(), emailsDirectoryPath), true);
 	if (typeof emailsDirectoryMetadata === "undefined") {
-		if (spinner) spinner.stopAndPersist({
+		if (spinner) stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
 			text: `Could not find the directory at ${emailsDirectoryPath}`
 		});
@@ -7347,7 +7367,7 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 			write: true
 		});
 	} catch (exception) {
-		if (spinner) spinner.stopAndPersist({
+		if (spinner) stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
 			text: "Failed to build emails"
 		});
@@ -7356,18 +7376,19 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 	}
 	if (spinner) spinner.succeed();
 	const allBuiltTemplates = glob.sync(normalize$1(`${pathToWhereEmailMarkupShouldBeDumped}/**/*.cjs`), { absolute: true });
+	if (spinner && allBuiltTemplates.length > 0) {
+		spinner.setText(`rendering ${allBuiltTemplates[0]?.split("/").pop()}`);
+		spinner.start();
+	}
 	for await (const template of allBuiltTemplates) try {
-		if (spinner) {
-			spinner.text = `rendering ${template.split("/").pop()}`;
-			spinner.render();
-		}
+		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) spinner.stopAndPersist({
+		if (spinner) stopSpinnerAndPersist(spinner, {
 			symbol: logSymbols.error,
 			text: `failed when rendering ${template.split("/").pop()}`
 		});
@@ -7376,8 +7397,8 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 	}
 	if (spinner) {
 		spinner.succeed("Rendered all files");
-		spinner.text = "Copying static files";
-		spinner.render();
+		spinner.setText("Copying static files");
+		spinner.start();
 	}
 	const staticDirectoryPath = path.join(emailsDirectoryPath, "static");
 	if (fs.existsSync(staticDirectoryPath)) {
@@ -7387,7 +7408,7 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 			await fs.promises.cp(staticDirectoryPath, pathToDumpStaticFilesInto, { recursive: true });
 		} catch (exception) {
 			console.error(exception);
-			if (spinner) spinner.stopAndPersist({
+			if (spinner) stopSpinnerAndPersist(spinner, {
 				symbol: logSymbols.error,
 				text: "Failed to copy static files"
 			});
@@ -7399,10 +7420,7 @@ const exportTemplates = async (pathToWhereEmailMarkupShouldBeDumped, emailsDirec
 		spinner.succeed();
 		const fileTree = await tree(pathToWhereEmailMarkupShouldBeDumped, 4);
 		console.log(fileTree);
-		spinner.stopAndPersist({
-			symbol: logSymbols.success,
-			text: "Successfully exported emails"
-		});
+		console.log(`${logSymbols.success} Successfully exported emails`);
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-email",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "A live preview of your emails right in your browser.",
   "bin": {
     "email": "./dist/cli/index.mjs"
@@ -37,13 +37,13 @@
   "dependencies": {
     "@babel/parser": "7.27.0",
     "@babel/traverse": "7.27.0",
-    "@react-email/render": ">=2.0.7",
+    "@react-email/render": ">=2.0.8",
     "chokidar": "^4.0.3",
     "commander": "^13.0.0",
     "conf": "^15.0.2",
     "css-tree": "3.2.1",
     "debounce": "^2.0.0",
-    "esbuild": "0.28.0",
+    "esbuild": "^0.28.0",
     "glob": "^13.0.6",
     "jiti": "2.4.2",
     "log-symbols": "^7.0.0",
@@ -51,7 +51,7 @@
     "mime-types": "^3.0.0",
     "normalize-path": "^3.0.0",
     "nypm": "0.6.6",
-    "ora": "^8.0.0",
+    "picospinner": "^3.0.0",
     "prismjs": "^1.30.0",
     "prompts": "2.4.2",
     "socket.io": "^4.8.1",
@@ -74,7 +74,7 @@
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "yalc": "1.0.0-pre.53",
-    "@react-email/render": "2.0.7"
+    "@react-email/render": "2.0.8"
   },
   "scripts": {
     "build": "tsdown",