@adobe/helix-importer 1.16.0 → 2.0.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [2.0.0](https://github.com/adobe/helix-importer/compare/v1.16.1...v2.0.0) (2022-09-23)
+
+
+### Features
+
+* upgrade to latest md2docx ([4a8a38c](https://github.com/adobe/helix-importer/commit/4a8a38cb3ef0ff0ca2489b12f6b801af1e84d85b))
+
+
+### BREAKING CHANGES
+
+* svg2png was replaced with image2png
+
+## [1.16.1](https://github.com/adobe/helix-importer/compare/v1.16.0...v1.16.1) (2022-09-15)
+
+
+### Bug Fixes
+
+* better u tag support ([#27](https://github.com/adobe/helix-importer/issues/27)) ([6ffb3a3](https://github.com/adobe/helix-importer/commit/6ffb3a3f6bc86194bcce88dd5bdff2059162af3c))
+
 # [1.16.0](https://github.com/adobe/helix-importer/compare/v1.15.0...v1.16.0) (2022-08-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "1.16.0",
+  "version": "2.0.0",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -11,7 +11,7 @@
   "scripts": {
     "lint": "eslint .",
     "test": "c8 mocha",
-    "test-ci": "c8 mocha && codecov",
+    "test-ci": "c8 mocha",
     "semantic-release": "semantic-release",
     "prepare": "npx husky install"
   },
@@ -26,37 +26,35 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
-    "@adobe/helix-docx2md": "1.0.6",
-    "@adobe/helix-mediahandler": "1.0.2",
+    "@adobe/helix-docx2md": "1.1.1",
+    "@adobe/helix-mediahandler": "1.2.4",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.11.0",
-    "codecov": "3.8.3",
+    "c8": "7.12.0",
     "dirname-filename-esm": "1.1.1",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
-    "husky": "7.0.4",
-    "lint-staged": "12.3.1",
-    "mocha": "9.2.0",
+    "husky": "8.0.1",
+    "lint-staged": "13.0.3",
+    "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
-    "mock-fs": "5.1.2",
-    "semantic-release": "19.0.2"
+    "mock-fs": "5.1.4",
+    "semantic-release": "19.0.5"
   },
-  "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/helix-md2docx": "1.4.3",
+    "@adobe/helix-md2docx": "2.0.1",
     "form-data": "4.0.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.1.0",
     "hast-util-to-html": "8.0.3",
-    "hast-util-to-mdast": "8.3.0",
-    "jsdom": "19.0.0",
-    "node-fetch": "3.2.0",
-    "rehype-parse": "8.0.3",
+    "hast-util-to-mdast": "8.4.1",
+    "jsdom": "20.0.0",
+    "node-fetch": "3.2.10",
+    "rehype-parse": "8.0.4",
     "rehype-remark": "9.1.2",
     "remark-stringify": "10.0.2",
-    "unified": "10.1.1"
+    "unified": "10.1.2"
   }
 }

package/src/importer/HTML2x.js

@@ -159,7 +159,7 @@ async function html2x(
     logger,
     mdast2docxOptions: {
       stylesXML: config.docxStylesXML,
-      svg2png: config.svg2png,
+      image2png: config.image2png,
     },
   });
 

package/src/importer/PageImporter.js

@@ -65,7 +65,18 @@ export default class PageImporter {
           },
           u: (h, node) => {
             if (node.children && node.children.length > 0) {
-              const children = node.children.map((child) => processor.stringify(child).trim());
+              const children = node.children.map((child) => {
+                try {
+                  if (child.type === 'element' && child.tagName !== 'span') {
+                    const n = h(child, child.tagName, child.children);
+                    return processor.stringify(n).trim();
+                  }
+                  return processor.stringify(child).trim();
+                } catch (e) {
+                  // cannot stringify the node, return html
+                  return toHtml(child);
+                }
+              });
               return h(node, 'html', `<u>${children.join()}</u>`);
             }
             return '';
@@ -194,11 +205,13 @@ export default class PageImporter {
     ].forEach((tag) => DOMUtils.reviewInlineElement(document, tag));
 
     // u a tag combo is not handled properly by unified js and is discouraged anyway -> remove the u
-    document.querySelectorAll('u > a').forEach((a) => {
-      const p = a.parentNode;
-      p.before(a);
-      p.remove();
+    const us = [];
+    document.querySelectorAll('u > a, u > span > a').forEach((a) => {
+      const u = a.closest('u');
+      u.before(a);
+      us.push(u);
     });
+    us.forEach((u) => u.remove());
 
     const imgs = document.querySelectorAll('img');
     imgs.forEach((img) => {

package/test/importers/fixtures/u.spec.html

@@ -13,5 +13,8 @@
     <p>
       <u><a href="https:/www.sample.com/a">Unlined link</a></u> or <a href="https:/www.sample.com/b"><u>Linked underline</u></a> ?
     </p>
+    <p><u><strong>Some underline and strong text</strong></u></p>
+    <p><u><a href="https://www.austinparks.org/" adhocenable="false">U and A are not friends</a>,&nbsp;<a href="http://www.bgcaustin.org/" adhocenable="false">Boys &amp; Girls Clubs of the Austin Area</a>,&nbsp;<a href="http://www.thefirstteeaustin.org/club/scripts/public/public.asp" adhocenable="false">The First Tee of Greater Austin</a>&nbsp;</u></p>
+    <p><u><span class="theme-color"><a href="https://www.austinparks.org/" adhocenable="false">U and A are not friends</a>,&nbsp;<a href="http://www.bgcaustin.org/" adhocenable="false">Boys &amp; Girls Clubs of the Austin Area</a>,&nbsp;<a href="http://www.thefirstteeaustin.org/club/scripts/public/public.asp" adhocenable="false">The First Tee of Greater Austin</a>&nbsp;</span></u></p>
   </body>
 </html>

package/test/importers/fixtures/u.spec.md

@@ -16,4 +16,10 @@ Some normal text with random <u>underline</u> or <u>span with underline</u> or <
 
 -   <u>li underline 3</u>
 
-[Unlined link](https:/www.sample.com/a) or [<u>Linked underline</u>](https:/www.sample.com/b) ?
+[Unlined link](https:/www.sample.com/a) or [<u>Linked underline</u>](https:/www.sample.com/b) ?
+
+<u>**Some underline and strong text**</u>
+
+[U and A are not friends](https://www.austinparks.org/)[Boys & Girls Clubs of the Austin Area](http://www.bgcaustin.org/)[The First Tee of Greater Austin](http://www.thefirstteeaustin.org/club/scripts/public/public.asp)
+
+[U and A are not friends](https://www.austinparks.org/)[Boys & Girls Clubs of the Austin Area](http://www.bgcaustin.org/)[The First Tee of Greater Austin](http://www.thefirstteeaustin.org/club/scripts/public/public.asp)