payload-plugin-newsletter 0.14.2 → 0.15.0

package/dist/index.js

@@ -1623,6 +1623,8 @@ var BroadcastProvider = class {
         body: JSON.stringify({
           to: recipients[0],
           // Broadcast API expects a single recipient for transactional emails
+          from: `${from.name} <${from.email}>`,
+          // Include from name and email
           subject: params.subject,
           body: params.html || params.text || "",
           reply_to: params.replyTo || this.replyTo || from.email
@@ -2721,9 +2723,10 @@ var createSigninEndpoint = (config) => {
             siteName: settings?.brandSettings?.siteName || "Newsletter",
             expiresIn: config.auth?.tokenExpiration || "7d"
           }, config);
+          const subject = settings?.emailTemplates?.magicLink?.subjectLine || (settings?.brandSettings?.siteName ? `Sign in to ${settings.brandSettings.siteName}` : "Sign in to your account");
           await emailService.send({
             to: subscriber.email,
-            subject: settings?.brandSettings?.siteName ? `Sign in to ${settings.brandSettings.siteName}` : "Sign in to your account",
+            subject,
             html
           });
         } else {
@@ -3758,143 +3761,152 @@ import {
   InlineToolbarFeature,
   lexicalEditor
 } from "@payloadcms/richtext-lexical";
-var emailSafeFeatures = [
-  // Toolbars
-  FixedToolbarFeature(),
-  // Fixed toolbar at the top
-  InlineToolbarFeature(),
-  // Floating toolbar when text is selected
-  // Basic text formatting
-  BoldFeature(),
-  ItalicFeature(),
-  UnderlineFeature(),
-  StrikethroughFeature(),
-  // Links with enhanced configuration
-  LinkFeature({
-    fields: [
-      {
-        name: "url",
-        type: "text",
-        required: true,
-        admin: {
-          description: "Enter the full URL (including https://)"
+var createEmailSafeFeatures = (additionalBlocks) => {
+  const baseBlocks = [
+    {
+      slug: "button",
+      fields: [
+        {
+          name: "text",
+          type: "text",
+          label: "Button Text",
+          required: true
+        },
+        {
+          name: "url",
+          type: "text",
+          label: "Button URL",
+          required: true,
+          admin: {
+            description: "Enter the full URL (including https://)"
+          }
+        },
+        {
+          name: "style",
+          type: "select",
+          label: "Button Style",
+          defaultValue: "primary",
+          options: [
+            { label: "Primary", value: "primary" },
+            { label: "Secondary", value: "secondary" },
+            { label: "Outline", value: "outline" }
+          ]
         }
-      },
-      {
-        name: "newTab",
-        type: "checkbox",
-        label: "Open in new tab",
-        defaultValue: false
+      ],
+      interfaceName: "EmailButton",
+      labels: {
+        singular: "Button",
+        plural: "Buttons"
       }
-    ]
-  }),
-  // Lists
-  OrderedListFeature(),
-  UnorderedListFeature(),
-  // Headings - limited to h1, h2, h3 for email compatibility
-  HeadingFeature({
-    enabledHeadingSizes: ["h1", "h2", "h3"]
-  }),
-  // Basic paragraph and alignment
-  ParagraphFeature(),
-  AlignFeature(),
-  // Blockquotes
-  BlockquoteFeature(),
-  // Upload feature for images
-  UploadFeature({
-    collections: {
-      media: {
-        fields: [
-          {
-            name: "caption",
-            type: "text",
-            admin: {
-              description: "Optional caption for the image"
-            }
-          },
-          {
-            name: "altText",
-            type: "text",
-            label: "Alt Text",
-            required: true,
-            admin: {
-              description: "Alternative text for accessibility and when image cannot be displayed"
-            }
-          }
-        ]
+    },
+    {
+      slug: "divider",
+      fields: [
+        {
+          name: "style",
+          type: "select",
+          label: "Divider Style",
+          defaultValue: "solid",
+          options: [
+            { label: "Solid", value: "solid" },
+            { label: "Dashed", value: "dashed" },
+            { label: "Dotted", value: "dotted" }
+          ]
+        }
+      ],
+      interfaceName: "EmailDivider",
+      labels: {
+        singular: "Divider",
+        plural: "Dividers"
       }
     }
-  }),
-  // Custom blocks for email-specific content
-  BlocksFeature({
-    blocks: [
-      {
-        slug: "button",
-        fields: [
-          {
-            name: "text",
-            type: "text",
-            label: "Button Text",
-            required: true
-          },
-          {
-            name: "url",
-            type: "text",
-            label: "Button URL",
-            required: true,
-            admin: {
-              description: "Enter the full URL (including https://)"
-            }
-          },
-          {
-            name: "style",
-            type: "select",
-            label: "Button Style",
-            defaultValue: "primary",
-            options: [
-              { label: "Primary", value: "primary" },
-              { label: "Secondary", value: "secondary" },
-              { label: "Outline", value: "outline" }
-            ]
+  ];
+  const allBlocks = [
+    ...baseBlocks,
+    ...additionalBlocks || []
+  ];
+  return [
+    // Toolbars
+    FixedToolbarFeature(),
+    // Fixed toolbar at the top
+    InlineToolbarFeature(),
+    // Floating toolbar when text is selected
+    // Basic text formatting
+    BoldFeature(),
+    ItalicFeature(),
+    UnderlineFeature(),
+    StrikethroughFeature(),
+    // Links with enhanced configuration
+    LinkFeature({
+      fields: [
+        {
+          name: "url",
+          type: "text",
+          required: true,
+          admin: {
+            description: "Enter the full URL (including https://)"
           }
-        ],
-        interfaceName: "EmailButton",
-        labels: {
-          singular: "Button",
-          plural: "Buttons"
+        },
+        {
+          name: "newTab",
+          type: "checkbox",
+          label: "Open in new tab",
+          defaultValue: false
         }
-      },
-      {
-        slug: "divider",
-        fields: [
-          {
-            name: "style",
-            type: "select",
-            label: "Divider Style",
-            defaultValue: "solid",
-            options: [
-              { label: "Solid", value: "solid" },
-              { label: "Dashed", value: "dashed" },
-              { label: "Dotted", value: "dotted" }
-            ]
-          }
-        ],
-        interfaceName: "EmailDivider",
-        labels: {
-          singular: "Divider",
-          plural: "Dividers"
+      ]
+    }),
+    // Lists
+    OrderedListFeature(),
+    UnorderedListFeature(),
+    // Headings - limited to h1, h2, h3 for email compatibility
+    HeadingFeature({
+      enabledHeadingSizes: ["h1", "h2", "h3"]
+    }),
+    // Basic paragraph and alignment
+    ParagraphFeature(),
+    AlignFeature(),
+    // Blockquotes
+    BlockquoteFeature(),
+    // Upload feature for images
+    UploadFeature({
+      collections: {
+        media: {
+          fields: [
+            {
+              name: "caption",
+              type: "text",
+              admin: {
+                description: "Optional caption for the image"
+              }
+            },
+            {
+              name: "altText",
+              type: "text",
+              label: "Alt Text",
+              required: true,
+              admin: {
+                description: "Alternative text for accessibility and when image cannot be displayed"
+              }
+            }
+          ]
         }
       }
-    ]
-  })
-];
+    }),
+    // Custom blocks for email-specific content
+    BlocksFeature({
+      blocks: allBlocks
+    })
+  ];
+};
+var emailSafeFeatures = createEmailSafeFeatures();
 var createEmailContentField = (overrides) => {
+  const features = createEmailSafeFeatures(overrides?.additionalBlocks);
   return {
     name: "content",
     type: "richText",
     required: true,
     editor: lexicalEditor({
-      features: emailSafeFeatures
+      features
     }),
     admin: {
       description: "Email content with limited formatting for compatibility",
@@ -3920,6 +3932,7 @@ var createBroadcastInlinePreviewField = () => {
 // src/collections/Broadcasts.ts
 var createBroadcastsCollection = (pluginConfig) => {
   const hasProviders = !!(pluginConfig.providers?.broadcast || pluginConfig.providers?.resend);
+  const customizations = pluginConfig.customizations?.broadcasts;
   return {
     slug: "broadcasts",
     labels: {
@@ -3940,6 +3953,8 @@ var createBroadcastsCollection = (pluginConfig) => {
           description: "Email subject line"
         }
       },
+      // Add any additional fields from customizations after subject
+      ...customizations?.additionalFields || [],
       {
         type: "row",
         fields: [
@@ -3961,10 +3976,13 @@ var createBroadcastsCollection = (pluginConfig) => {
                   description: "Preview text shown in email clients"
                 }
               },
-              createEmailContentField({
-                admin: {
-                  description: "Email content"
-                }
+              // Apply content field customization if provided
+              customizations?.fieldOverrides?.content ? customizations.fieldOverrides.content(createEmailContentField({
+                admin: { description: "Email content" },
+                additionalBlocks: customizations.customBlocks
+              })) : createEmailContentField({
+                admin: { description: "Email content" },
+                additionalBlocks: customizations?.customBlocks
               })
             ]
           },