domma-cms 0.15.0 → 0.16.0

package/plugins/invoice/plugin.js

@@ -0,0 +1,283 @@
+/**
+ * Invoice Plugin — Server
+ *
+ * Endpoints (mounted at /api/plugins/invoice):
+ *   GET    /issuers              admin   list issuers
+ *   POST   /issuers              admin   create issuer
+ *   PUT    /issuers/:id          admin   update issuer
+ *   DELETE /issuers/:id          admin   delete issuer
+ *
+ *   GET    /receivers            admin   list receivers
+ *   POST   /receivers            admin   create receiver
+ *   PUT    /receivers/:id        admin   update receiver
+ *   DELETE /receivers/:id        admin   delete receiver
+ *
+ *   GET    /invoices             admin   list invoices (with computed totals)
+ *   GET    /invoices/:id         admin   single invoice with computed totals
+ *   POST   /invoices             admin   create invoice (auto-numbers if number omitted)
+ *   PUT    /invoices/:id         admin   update invoice
+ *   DELETE /invoices/:id         admin   delete invoice
+ *   GET    /invoices/:id/print   admin   printable HTML (browser to PDF)
+ */
+import path from 'path';
+import fs from 'fs/promises';
+import {fileURLToPath} from 'url';
+
+import defaultConfig from './config.js';
+import {createEntry, deleteEntry, getEntry, listEntries, updateEntry} from '../../server/services/collections.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const TEMPLATE_PATH = path.join(__dirname, 'templates', 'invoice-print.html');
+
+const ISSUERS_SLUG   = 'invoice-issuers';
+const RECEIVERS_SLUG = 'invoice-receivers';
+const INVOICES_SLUG  = 'invoices';
+
+function escapeHtml(str) {
+    return String(str ?? '')
+        .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;').replace(/'/g, '&#39;');
+}
+
+function flattenList(result) {
+    const arr = Array.isArray(result) ? result : (result?.entries || []);
+    return arr.map((e) => ({ id: e.id, ...(e.data ?? e) }));
+}
+
+function toRecord(entry) {
+    return { id: entry.id, ...(entry.data ?? entry) };
+}
+
+function round2(n) {
+    return Math.round((Number(n) + Number.EPSILON) * 100) / 100;
+}
+
+function computeTotals(invoice) {
+    const items = Array.isArray(invoice.lineItems) ? invoice.lineItems : [];
+    let subtotal = 0;
+    for (const li of items) {
+        const qty   = Number(li.quantity) || 0;
+        const price = Number(li.unitPrice) || 0;
+        subtotal += qty * price;
+    }
+    subtotal = round2(subtotal);
+    const vatRate = invoice.vatEnabled ? (Number(invoice.vatRate) || 0) : 0;
+    const vat = round2(subtotal * (vatRate / 100));
+    const total = round2(subtotal + vat);
+    return { subtotal, vat, total, vatRate };
+}
+
+function withTotals(invoice) {
+    return { ...invoice, totals: computeTotals(invoice) };
+}
+
+function formatMoney(amount, currency = 'GBP') {
+    try {
+        return new Intl.NumberFormat('en-GB', { style: 'currency', currency }).format(Number(amount) || 0);
+    } catch {
+        return `${currency} ${Number(amount).toFixed(2)}`;
+    }
+}
+
+function formatDate(iso) {
+    if (!iso) return '';
+    return new Date(iso).toLocaleDateString('en-GB', { day: 'numeric', month: 'long', year: 'numeric' });
+}
+
+async function nextInvoiceNumber(prefix, padding) {
+    const year = new Date().getFullYear();
+    const all = flattenList(await listEntries(INVOICES_SLUG, { limit: 100000 }));
+    const re = new RegExp(`^${prefix}-${year}-(\\d+)$`);
+    let max = 0;
+    for (const inv of all) {
+        const m = re.exec(String(inv.number || ''));
+        if (m) {
+            const n = parseInt(m[1], 10);
+            if (n > max) max = n;
+        }
+    }
+    return `${prefix}-${year}-${String(max + 1).padStart(padding, '0')}`;
+}
+
+async function loadPrintTemplate() {
+    return fs.readFile(TEMPLATE_PATH, 'utf8');
+}
+
+function fillTemplate(template, vars) {
+    return template.replace(/\{\{(\w+)\}\}/g, (_, key) => {
+        const v = vars[key];
+        return v === undefined || v === null ? '' : String(v);
+    });
+}
+
+export default async function invoicePlugin(fastify, options) {
+    const { authenticate, requireAdmin } = options.auth;
+    const settings = { ...defaultConfig, ...(options.settings || {}) };
+    const adminGuard = { preHandler: [authenticate, requireAdmin] };
+
+    // Issuers
+    fastify.get('/issuers', adminGuard, async () => {
+        return flattenList(await listEntries(ISSUERS_SLUG, { limit: 1000 }));
+    });
+
+    fastify.post('/issuers', adminGuard, async (request, reply) => {
+        const body = request.body ?? {};
+        if (!body.name || typeof body.name !== 'string' || !body.name.trim()) {
+            return reply.code(400).send({ error: 'name is required' });
+        }
+        const entry = await createEntry(ISSUERS_SLUG, body, { source: 'admin' });
+        return reply.code(201).send(toRecord(entry));
+    });
+
+    fastify.put('/issuers/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(ISSUERS_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Issuer not found' });
+        const updated = await updateEntry(ISSUERS_SLUG, request.params.id, { ...existing.data, ...(request.body ?? {}) });
+        return toRecord(updated);
+    });
+
+    fastify.delete('/issuers/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(ISSUERS_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Issuer not found' });
+        await deleteEntry(ISSUERS_SLUG, request.params.id);
+        return { ok: true };
+    });
+
+    // Receivers
+    fastify.get('/receivers', adminGuard, async () => {
+        return flattenList(await listEntries(RECEIVERS_SLUG, { limit: 1000 }));
+    });
+
+    fastify.post('/receivers', adminGuard, async (request, reply) => {
+        const body = request.body ?? {};
+        if (!body.name || typeof body.name !== 'string' || !body.name.trim()) {
+            return reply.code(400).send({ error: 'name is required' });
+        }
+        const entry = await createEntry(RECEIVERS_SLUG, body, { source: 'admin' });
+        return reply.code(201).send(toRecord(entry));
+    });
+
+    fastify.put('/receivers/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(RECEIVERS_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Receiver not found' });
+        const updated = await updateEntry(RECEIVERS_SLUG, request.params.id, { ...existing.data, ...(request.body ?? {}) });
+        return toRecord(updated);
+    });
+
+    fastify.delete('/receivers/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(RECEIVERS_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Receiver not found' });
+        await deleteEntry(RECEIVERS_SLUG, request.params.id);
+        return { ok: true };
+    });
+
+    // Invoices
+    fastify.get('/invoices', adminGuard, async () => {
+        const list = flattenList(await listEntries(INVOICES_SLUG, { limit: 100000, sort: 'createdAt', order: 'desc' }));
+        return list.map(withTotals);
+    });
+
+    fastify.get('/invoices/:id', adminGuard, async (request, reply) => {
+        const entry = await getEntry(INVOICES_SLUG, request.params.id);
+        if (!entry) return reply.code(404).send({ error: 'Invoice not found' });
+        return withTotals(toRecord(entry));
+    });
+
+    fastify.post('/invoices', adminGuard, async (request, reply) => {
+        const body = request.body ?? {};
+        if (!body.issuerId)   return reply.code(400).send({ error: 'issuerId is required' });
+        if (!body.receiverId) return reply.code(400).send({ error: 'receiverId is required' });
+
+        const data = {
+            number:      body.number || await nextInvoiceNumber(settings.numberPrefix, settings.numberPadding),
+            issuerId:    String(body.issuerId),
+            receiverId:  String(body.receiverId),
+            issueDate:   body.issueDate || new Date().toISOString().slice(0, 10),
+            dueDate:     body.dueDate || '',
+            status:      body.status || 'draft',
+            currency:    body.currency || settings.defaultCurrency,
+            vatEnabled:  body.vatEnabled !== undefined ? Boolean(body.vatEnabled) : true,
+            vatRate:     body.vatRate !== undefined ? Number(body.vatRate) : settings.defaultVatRate,
+            lineItems:   Array.isArray(body.lineItems) ? body.lineItems : [],
+            notes:       body.notes ?? ''
+        };
+
+        const entry = await createEntry(INVOICES_SLUG, data, { source: 'admin' });
+        return reply.code(201).send(withTotals(toRecord(entry)));
+    });
+
+    fastify.put('/invoices/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(INVOICES_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Invoice not found' });
+        const merged = { ...existing.data, ...(request.body ?? {}) };
+        if (Array.isArray(request.body?.lineItems)) merged.lineItems = request.body.lineItems;
+        const updated = await updateEntry(INVOICES_SLUG, request.params.id, merged);
+        return withTotals(toRecord(updated));
+    });
+
+    fastify.delete('/invoices/:id', adminGuard, async (request, reply) => {
+        const existing = await getEntry(INVOICES_SLUG, request.params.id);
+        if (!existing) return reply.code(404).send({ error: 'Invoice not found' });
+        await deleteEntry(INVOICES_SLUG, request.params.id);
+        return { ok: true };
+    });
+
+    // Print view (HTML; user prints to PDF from browser)
+    fastify.get('/invoices/:id/print', adminGuard, async (request, reply) => {
+        const entry = await getEntry(INVOICES_SLUG, request.params.id);
+        if (!entry) return reply.code(404).send('Invoice not found');
+        const invoice = withTotals(toRecord(entry));
+
+        const [issuerEntry, receiverEntry] = await Promise.all([
+            invoice.issuerId   ? getEntry(ISSUERS_SLUG,   invoice.issuerId)   : null,
+            invoice.receiverId ? getEntry(RECEIVERS_SLUG, invoice.receiverId) : null
+        ]);
+        const issuer   = issuerEntry   ? toRecord(issuerEntry)   : {};
+        const receiver = receiverEntry ? toRecord(receiverEntry) : {};
+
+        const currency = invoice.currency || settings.defaultCurrency;
+        const itemsHtml = (invoice.lineItems || []).map((li) => {
+            const qty   = Number(li.quantity) || 0;
+            const price = Number(li.unitPrice) || 0;
+            const lineTotal = round2(qty * price);
+            return `<tr>
+  <td>${escapeHtml(li.description || '')}</td>
+  <td class="num">${qty}</td>
+  <td class="num">${formatMoney(price, currency)}</td>
+  <td class="num">${formatMoney(lineTotal, currency)}</td>
+</tr>`;
+        }).join('');
+
+        const vatRow = invoice.vatEnabled
+            ? `<tr><th>VAT (${escapeHtml(String(invoice.totals.vatRate))}%)</th><td class="num">${formatMoney(invoice.totals.vat, currency)}</td></tr>`
+            : '';
+
+        const template = await loadPrintTemplate();
+        const html = fillTemplate(template, {
+            number:        escapeHtml(invoice.number || ''),
+            issueDate:     escapeHtml(formatDate(invoice.issueDate)),
+            dueDate:       invoice.dueDate ? `<div><strong>Due:</strong> ${escapeHtml(formatDate(invoice.dueDate))}</div>` : '',
+            status:        escapeHtml((invoice.status || 'draft').toUpperCase()),
+            issuerName:    escapeHtml(issuer.name || ''),
+            issuerLogo:    issuer.logoUrl ? `<img src="${escapeHtml(issuer.logoUrl)}" alt="${escapeHtml(issuer.name || '')}" class="logo">` : '',
+            issuerAddress: escapeHtml(issuer.address || '').replace(/\n/g, '<br>'),
+            issuerEmail:   escapeHtml(issuer.email || ''),
+            issuerPhone:   escapeHtml(issuer.phone || ''),
+            issuerVat:     issuer.vatNumber ? `<div>VAT: ${escapeHtml(issuer.vatNumber)}</div>` : '',
+            receiverName:    escapeHtml(receiver.company || receiver.name || ''),
+            receiverAddress: escapeHtml(receiver.address || '').replace(/\n/g, '<br>'),
+            receiverEmail:   escapeHtml(receiver.email || ''),
+            receiverVat:     receiver.vatNumber ? `<div>VAT: ${escapeHtml(receiver.vatNumber)}</div>` : '',
+            items:         itemsHtml || '<tr><td colspan="4" class="muted">No line items.</td></tr>',
+            subtotal:      formatMoney(invoice.totals.subtotal, currency),
+            vatRow,
+            total:         formatMoney(invoice.totals.total, currency),
+            notes:         invoice.notes ? `<div class="notes"><strong>Notes</strong><br>${escapeHtml(invoice.notes).replace(/\n/g, '<br>')}</div>` : '',
+            bankDetails:   issuer.bankDetails ? `<div class="bank"><strong>Payment</strong><br>${escapeHtml(issuer.bankDetails).replace(/\n/g, '<br>')}</div>` : '',
+            footerNote:    escapeHtml(settings.footerNote || ''),
+            autoPrint:     request.query.print === '1' ? '<script>window.addEventListener("load",()=>setTimeout(()=>window.print(),200));</script>' : ''
+        });
+
+        reply.type('text/html').send(html);
+    });
+}

package/plugins/invoice/plugin.json

@@ -0,0 +1,85 @@
+{
+  "name": "invoice",
+  "displayName": "Invoices",
+  "version": "1.0.0",
+  "description": "Lightweight invoice generator. Manage issuers, receivers, line items, optional VAT, and produce a print-ready invoice you can save as PDF from the browser.",
+  "author": "Darryl Waterhouse",
+  "date": "2026-05-04",
+  "icon": "file-text",
+  "admin": {
+    "css": [
+      "admin/css/index.css"
+    ],
+    "sidebar": [
+      {
+        "id": "invoice",
+        "text": "Invoices",
+        "icon": "file-text",
+        "url": "#/plugins/invoice",
+        "section": "#/plugins/invoice",
+        "children": [
+          {
+            "id": "invoice-list",
+            "text": "Invoices",
+            "url": "#/plugins/invoice"
+          },
+          {
+            "id": "invoice-issuers",
+            "text": "Issuers",
+            "url": "#/plugins/invoice/issuers"
+          },
+          {
+            "id": "invoice-receivers",
+            "text": "Receivers",
+            "url": "#/plugins/invoice/receivers"
+          }
+        ]
+      }
+    ],
+    "routes": [
+      {
+        "path": "/plugins/invoice",
+        "view": "plugin-invoice-list",
+        "title": "Invoices - Domma CMS"
+      },
+      {
+        "path": "/plugins/invoice/new",
+        "view": "plugin-invoice-editor",
+        "title": "New Invoice - Domma CMS"
+      },
+      {
+        "path": "/plugins/invoice/edit/:id",
+        "view": "plugin-invoice-editor",
+        "title": "Edit Invoice - Domma CMS"
+      },
+      {
+        "path": "/plugins/invoice/issuers",
+        "view": "plugin-invoice-issuers",
+        "title": "Issuers - Domma CMS"
+      },
+      {
+        "path": "/plugins/invoice/receivers",
+        "view": "plugin-invoice-receivers",
+        "title": "Receivers - Domma CMS"
+      }
+    ],
+    "views": {
+      "plugin-invoice-list": {
+        "entry": "invoice/admin/views/index.js?v=a7963ce7",
+        "exportName": "indexView"
+      },
+      "plugin-invoice-editor": {
+        "entry": "invoice/admin/views/editor.js?v=897f0259",
+        "exportName": "editorView"
+      },
+      "plugin-invoice-issuers": {
+        "entry": "invoice/admin/views/issuers.js?v=ce720b84",
+        "exportName": "issuersView"
+      },
+      "plugin-invoice-receivers": {
+        "entry": "invoice/admin/views/receivers.js?v=c4b34b26",
+        "exportName": "receiversView"
+      }
+    }
+  }
+}

package/plugins/invoice/templates/invoice-print.html

@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Invoice {{number}}</title>
+<style>
+    :root { color-scheme: light; }
+    * { box-sizing: border-box; }
+    body {
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+        color: #222;
+        background: #f3f3f3;
+        margin: 0;
+        padding: 24px;
+        font-size: 14px;
+        line-height: 1.5;
+    }
+    .invoice {
+        max-width: 800px;
+        margin: 0 auto;
+        background: #fff;
+        padding: 48px 56px;
+        box-shadow: 0 4px 20px rgba(0,0,0,.08);
+    }
+    .top {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        gap: 24px;
+        border-bottom: 2px solid #e5e5e5;
+        padding-bottom: 24px;
+        margin-bottom: 32px;
+    }
+    .logo { max-height: 80px; max-width: 240px; display: block; margin-bottom: 12px; }
+    .meta { text-align: right; }
+    .meta h1 { margin: 0; font-size: 28px; letter-spacing: 1px; color: #000; }
+    .meta .number { font-size: 18px; color: #555; margin-top: 4px; }
+    .status {
+        display: inline-block;
+        padding: 4px 10px;
+        border-radius: 4px;
+        font-size: 11px;
+        font-weight: 600;
+        letter-spacing: .5px;
+        background: #eee;
+        color: #444;
+        margin-top: 8px;
+    }
+    .parties {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 32px;
+        margin-bottom: 32px;
+    }
+    .party h3 {
+        margin: 0 0 8px;
+        font-size: 11px;
+        text-transform: uppercase;
+        letter-spacing: 1px;
+        color: #888;
+    }
+    .party .name { font-weight: 700; font-size: 15px; margin-bottom: 4px; }
+    .party .lines { color: #555; font-size: 13px; }
+    table.items {
+        width: 100%;
+        border-collapse: collapse;
+        margin-bottom: 24px;
+    }
+    table.items th {
+        text-align: left;
+        font-size: 11px;
+        text-transform: uppercase;
+        letter-spacing: 1px;
+        color: #888;
+        padding: 8px 10px;
+        border-bottom: 2px solid #e5e5e5;
+    }
+    table.items td {
+        padding: 10px;
+        border-bottom: 1px solid #f0f0f0;
+    }
+    table.items td.num, table.items th.num { text-align: right; }
+    .totals {
+        width: 320px;
+        margin-left: auto;
+        margin-bottom: 32px;
+    }
+    .totals table { width: 100%; border-collapse: collapse; }
+    .totals th {
+        text-align: left;
+        padding: 8px 10px;
+        font-weight: 500;
+        color: #555;
+    }
+    .totals td.num {
+        text-align: right;
+        padding: 8px 10px;
+        font-variant-numeric: tabular-nums;
+    }
+    .totals .grand th, .totals .grand td {
+        font-size: 17px;
+        font-weight: 700;
+        color: #000;
+        border-top: 2px solid #222;
+        padding-top: 12px;
+    }
+    .footer {
+        margin-top: 32px;
+        padding-top: 16px;
+        border-top: 1px solid #e5e5e5;
+        font-size: 12px;
+        color: #888;
+    }
+    .notes, .bank {
+        margin-top: 24px;
+        padding: 12px 16px;
+        background: #fafafa;
+        border-radius: 4px;
+        font-size: 13px;
+    }
+    .muted { color: #999; font-style: italic; text-align: center; }
+    .actions {
+        max-width: 800px;
+        margin: 0 auto 16px;
+        display: flex;
+        justify-content: flex-end;
+        gap: 8px;
+    }
+    .actions button {
+        background: #222;
+        color: #fff;
+        border: 0;
+        padding: 8px 16px;
+        font-size: 13px;
+        border-radius: 4px;
+        cursor: pointer;
+    }
+    @media print {
+        body { background: #fff; padding: 0; }
+        .invoice { box-shadow: none; padding: 24px; }
+        .actions { display: none; }
+    }
+</style>
+</head>
+<body>
+
+<div class="actions">
+    <button onclick="window.print()">Print / Save as PDF</button>
+</div>
+
+<div class="invoice">
+    <div class="top">
+        <div>
+            {{issuerLogo}}
+            <div class="party">
+                <div class="name">{{issuerName}}</div>
+                <div class="lines">{{issuerAddress}}</div>
+                <div class="lines">{{issuerEmail}}</div>
+                <div class="lines">{{issuerPhone}}</div>
+                {{issuerVat}}
+            </div>
+        </div>
+        <div class="meta">
+            <h1>INVOICE</h1>
+            <div class="number">{{number}}</div>
+            <div>{{issueDate}}</div>
+            {{dueDate}}
+            <div class="status">{{status}}</div>
+        </div>
+    </div>
+
+    <div class="parties">
+        <div class="party">
+            <h3>Billed To</h3>
+            <div class="name">{{receiverName}}</div>
+            <div class="lines">{{receiverAddress}}</div>
+            <div class="lines">{{receiverEmail}}</div>
+            {{receiverVat}}
+        </div>
+    </div>
+
+    <table class="items">
+        <thead>
+            <tr>
+                <th>Description</th>
+                <th class="num">Qty</th>
+                <th class="num">Unit</th>
+                <th class="num">Total</th>
+            </tr>
+        </thead>
+        <tbody>
+            {{items}}
+        </tbody>
+    </table>
+
+    <div class="totals">
+        <table>
+            <tr><th>Subtotal</th><td class="num">{{subtotal}}</td></tr>
+            {{vatRow}}
+            <tr class="grand"><th>Total</th><td class="num">{{total}}</td></tr>
+        </table>
+    </div>
+
+    {{notes}}
+    {{bankDetails}}
+
+    <div class="footer">{{footerNote}}</div>
+</div>
+
+{{autoPrint}}
+
+</body>
+</html>

package/server/services/markdown.js

@@ -763,7 +763,7 @@ export function scrubCodeRegions(markdown) {
  * @param {string} markdown
  * @returns {string}
  */
-function processPluginShortcodes(markdown) {
+async function processPluginShortcodes(markdown) {
   const processors = getShortcodeProcessors();
   if (!processors.length) return markdown;
 
@@ -771,14 +771,34 @@ function processPluginShortcodes(markdown) {
   let result = scrubbed;
   const context = {parseShortcodeAttrs, scrubCodeRegions, marked, processCardBlocks, processGridBlocks, escapeAttr};
 
+  async function replaceAsync(input, regex, mapMatch) {
+    const matches = [];
+    input.replace(regex, (...args) => {
+      const offset = args[args.length - 2];
+      matches.push({ args: args.slice(0, -2), full: args[0], offset });
+      return args[0];
+    });
+    if (!matches.length) return input;
+    const out = await Promise.all(matches.map((m) => Promise.resolve(mapMatch(...m.args))));
+    let res = '';
+    let lastEnd = 0;
+    matches.forEach((m, i) => {
+      res += input.slice(lastEnd, m.offset) + out[i];
+      lastEnd = m.offset + m.full.length;
+    });
+    return res + input.slice(lastEnd);
+  }
+
   for (const {name, handler} of processors) {
     // Self-closing: [name attrs /]
-    result = result.replace(
+    result = await replaceAsync(
+      result,
       new RegExp(`\\[${name}([^\\]]*)\\s*\\/\\]`, 'gi'),
       (_, attrStr) => handler(attrStr, null, context)
     );
     // Wrapping: [name attrs]...[/name]
-    result = result.replace(
+    result = await replaceAsync(
+      result,
       new RegExp(`\\[${name}([^\\]]*)\\]([\\s\\S]*?)\\[\\/${name}\\]`, 'gi'),
       (_, attrStr, body) => handler(attrStr, body, context)
     );
@@ -2901,7 +2921,7 @@ export async function parseMarkdown(raw) {
   const withStaticBlock = await processStaticBlocks(withView);
   const withDconfig = processDConfigBlocks(withStaticBlock);
     const withEffects = processEffectsBlocks(withDconfig);
-    const withPluginShortcodes = processPluginShortcodes(withEffects);
+    const withPluginShortcodes = await processPluginShortcodes(withEffects);
   const withTabs = processTabsBlocks(withPluginShortcodes);
   const withAccordion = processAccordionBlocks(withTabs);
   const withCarousel = processCarouselBlocks(withAccordion);

package/server/services/renderer.js

@@ -312,11 +312,17 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
     const seoDescription = escapeHtml(seoMeta.description ?? site.seo?.defaultDescription ?? '');
     const ogImage = escapeHtml(seoMeta.ogImage ?? '');
 
+    const ogType = escapeHtml(seoMeta.ogType ?? 'website');
     const ogTags = [
         `<meta property="og:title" content="${seoTitle}">`,
         `<meta property="og:description" content="${seoDescription}">`,
-        `<meta property="og:image" content="${ogImage}">`
-    ].join('\n');
+        `<meta property="og:type" content="${ogType}">`,
+        ogImage ? `<meta property="og:image" content="${ogImage}">` : '',
+        `<meta name="twitter:card" content="${ogImage ? 'summary_large_image' : 'summary'}">`,
+        `<meta name="twitter:title" content="${seoTitle}">`,
+        `<meta name="twitter:description" content="${seoDescription}">`,
+        ogImage ? `<meta name="twitter:image" content="${ogImage}">` : ''
+    ].filter(Boolean).join('\n');
 
     const {fontLink, fontOverride} = buildFontVars(site.fontFamily, site.fontSize);
     const fontStyleTag = fontOverride ? `<style>${fontOverride}</style>` : '';
@@ -363,7 +369,7 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
         headInjectLate: [injection.headLate, customCssTag, navbarStyleTag].filter(Boolean).join('\n'),
         bodyEndInject: [
             injection.bodyEnd,
-            (page.usedComponents || [])
+            (seoMeta.usedComponents || [])
                 .map(n => `<script type="module" src="/api/components/${n}.js"></script>`)
                 .join('\n')
         ].filter(Boolean).join('\n'),