@tryghost/kg-mobiledoc-html-renderer 5.1.1 → 5.3.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2021 Ghost Foundation
+Copyright (c) 2013-2022 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -36,4 +36,4 @@ Follow the instructions for the top-level repo.
 
 # Copyright & License
 
-Copyright (c) 2013-2021 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2022 Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/mobiledoc-html-renderer.js

@@ -74,6 +74,19 @@ class DomModifier {
         node.setAttribute('id', id);
     }
 
+    wrapBlockquoteContentInP(node) {
+        if (node.firstChild && node.firstChild.tagName === 'P') {
+            return;
+        }
+
+        const p = this.options.dom.createElement('p');
+        while (node.firstChild) {
+            p.appendChild(node.firstChild);
+        }
+
+        node.appendChild(p);
+    }
+
     modifyChildren(node) {
         walkDom(node, this.modify.bind(this));
     }
@@ -83,6 +96,11 @@ class DomModifier {
         if (node.nodeType === 1 && node.nodeName.match(/^h\d$/i)) {
             this.addHeadingId(node);
         }
+
+        // wrap blockquote content in P tag for emails
+        if (this.options.target === 'email' && node.nodeType === 1 && node.nodeName === 'BLOCKQUOTE') {
+            this.wrapBlockquoteContentInP(node);
+        }
     }
 }
 
@@ -98,12 +116,25 @@ class MobiledocHtmlRenderer {
 
     render(mobiledoc, _cardOptions = {}) {
         const ghostVersion = mobiledoc.ghostVersion || '4.0';
+
         const defaultCardOptions = {
             ghostVersion,
             target: 'html'
         };
         const cardOptions = Object.assign({}, defaultCardOptions, _cardOptions);
-        const rendererOptions = Object.assign({}, this.options, {cardOptions});
+
+        const sectionElementRenderer = {
+            ASIDE: function (tagName, dom) {
+                // we use ASIDE sections in Koenig as a workaround for applying
+                // a different blockquote style because mobiledoc doesn't support
+                // storing arbitrary attributes with sections
+                const blockquote = dom.createElement('blockquote');
+                blockquote.setAttribute('class', 'kg-blockquote-alt');
+                return blockquote;
+            }
+        };
+
+        const rendererOptions = Object.assign({}, this.options, {cardOptions, sectionElementRenderer});
         const renderer = new Renderer(rendererOptions);
         const rendered = renderer.render(mobiledoc);
         const serializer = new SimpleDom.HTMLSerializer(SimpleDom.voidMap);
@@ -119,7 +150,7 @@ class MobiledocHtmlRenderer {
 
         // Walk the DOM output and modify nodes as needed
         // eg. to add ID attributes to heading elements
-        const modifier = new DomModifier({ghostVersion});
+        const modifier = new DomModifier(Object.assign({}, cardOptions, {dom: this.options.dom}));
         modifier.modifyChildren(rendered.result);
 
         const output = serializer.serializeChildren(rendered.result);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@tryghost/kg-mobiledoc-html-renderer",
-  "version": "5.1.1",
+  "version": "5.3.2",
   "repository": "https://github.com/TryGhost/Koenig/tree/master/packages/kg-mobiledoc-html-renderer",
   "author": "Ghost Foundation",
   "license": "MIT",
   "main": "index.js",
   "scripts": {
     "dev": "echo \"Implement me!\"",
-    "test": "NODE_ENV=testing mocha './test/**/*.test.js'",
+    "test": "NODE_ENV=testing c8 --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "lint": "eslint . --ext .js --cache",
     "posttest": "yarn lint"
   },
   "engines": {
-    "node": "^12.22.1 || ^14.16.1"
+    "node": "^12.22.1 || ^14.17.0 || ^16.13.0"
   },
   "files": [
     "index.js",
@@ -26,5 +26,8 @@
     "semver": "^7.3.4",
     "simple-dom": "^1.4.0"
   },
-  "gitHead": "cfd026c7d40d10e9b1707063a7f5a11ffa90aa42"
+  "devDependencies": {
+    "c8": "7.11.0"
+  },
+  "gitHead": "d775807eb5039489e68197b9a2c31ae999499beb"
 }