@yimingliao/cms 0.0.48 → 0.0.50

package/dist/server/index.d.ts

@@ -213,8 +213,9 @@ declare function createSendEmail({ transporter, config, }: {
     };
 }): (options: SendEmailOptions) => Promise<any>;
 
-declare function createRenderEmailTemplate({ logoUrl, logger, }: {
+declare function createRenderEmailTemplate({ logoUrl, siteName, logger, }: {
     logoUrl: string;
+    siteName: string;
     logger: Logger;
 }): (templateKey: string, replacements?: Record<string, string>) => Promise<string>;
 

package/dist/server/index.js

@@ -658,10 +658,11 @@ async function readTemplate(filePath) {
   }
 }
 function applyReplacements(html, replacements, logger) {
-  return html.replace(/\{\{\{(.*?)\}\}\}/g, (_, key) => {
+  return html.replace(/\{\{\{(.*?)\}\}\}/g, (_, raw) => {
+    const key = raw.trim();
     const value = replacements[key];
     if (value == null) {
-      logger?.warn({ msg: "Email template variable missing", variable: key });
+      logger.warn({ msg: "Email template variable missing", variable: key });
       return "";
     }
     return value;
@@ -669,19 +670,21 @@ function applyReplacements(html, replacements, logger) {
 }
 function createRenderEmailTemplate({
   logoUrl,
+  siteName,
   logger
 }) {
   return async function renderEmailTemplate(templateKey, replacements = {}) {
     try {
       const contentPath = path.join(TEMPLATE_DIR, `${templateKey}.html`);
+      const vars = {
+        LOGO_URL: logoUrl,
+        SITE_NAME: siteName,
+        ...replacements
+      };
       const layoutHtml = await readTemplate(LAYOUT_PATH);
       let contentHtml = await readTemplate(contentPath);
-      contentHtml = applyReplacements(
-        contentHtml,
-        { LOGO_URL: logoUrl, ...replacements },
-        logger
-      );
-      return layoutHtml.replaceAll("{{{content}}}", contentHtml);
+      const merged = layoutHtml.replaceAll("{{{content}}}", contentHtml);
+      return applyReplacements(merged, vars, logger);
     } catch (error) {
       logger.error({
         msg: "Email template render failed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",