@adobe/helix-importer 3.2.1 → 3.2.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [3.2.3](https://github.com/adobe/helix-importer/compare/v3.2.2...v3.2.3) (2024-02-14)
+
+
+### Bug Fixes
+
+* improve comment cleanup regex ([0a16dc5](https://github.com/adobe/helix-importer/commit/0a16dc527d792f2f1485abf550367ce5deaf3216))
+* improve comment cleanup regex ([8f1a7cd](https://github.com/adobe/helix-importer/commit/8f1a7cd0658ae85e084b557480c576b2624c5a6f))
+
+## [3.2.2](https://github.com/adobe/helix-importer/compare/v3.2.1...v3.2.2) (2024-01-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-md2docx to v2.1.41 ([#302](https://github.com/adobe/helix-importer/issues/302)) ([3feed69](https://github.com/adobe/helix-importer/commit/3feed6927ac4ef29f107eb97740ef32427cce223))
+
 ## [3.2.1](https://github.com/adobe/helix-importer/compare/v3.2.0...v3.2.1) (2024-01-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -26,9 +26,9 @@
     "*.js": "eslint"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.5",
-    "@adobe/helix-docx2md": "1.5.0",
-    "@adobe/helix-mediahandler": "2.4.7",
+    "@adobe/eslint-config-helix": "2.0.6",
+    "@adobe/helix-docx2md": "1.5.1",
+    "@adobe/helix-mediahandler": "2.4.9",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
@@ -40,10 +40,10 @@
     "chai": "5.0.3",
     "dirname-filename-esm": "1.1.1",
     "eslint": "8.56.0",
-    "husky": "9.0.7",
+    "husky": "9.0.10",
     "jsdom": "24.0.0",
-    "lint-staged": "15.2.0",
-    "mocha": "10.2.0",
+    "lint-staged": "15.2.2",
+    "mocha": "10.3.0",
     "mocha-multi-reporters": "1.5.1",
     "mock-fs": "5.2.0",
     "remark-parse": "11.0.0",
@@ -53,7 +53,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@adobe/helix-markdown-support": "7.1.0",
-    "@adobe/helix-md2docx": "2.1.39",
+    "@adobe/helix-md2docx": "2.1.41",
     "@adobe/mdast-util-gridtables": "4.0.0",
     "@adobe/remark-gridtables": "3.0.0",
     "form-data": "4.0.0",

package/src/utils/DOMUtils.js

@@ -139,8 +139,8 @@ export default class DOMUtils {
     // eslint-disable-next-line no-param-reassign
     document.body.innerHTML = document.body.innerHTML
       // remove html comments
-      .replace(/><!--(?!>)[\S\s]*?-->/gm, '>')
-      .replace(/\n<!--(?!>)[\S\s]*?-->/gm, '\n');
+      .replace(/(>\s*)<!--(?!>)[\S\s]*?-->/gm, '$1')
+      .replace(/<!--(?!>)[\S\s]*?-->/gm, '');
   }
 
   static removeSpans(document) {

package/test/utils/DOMUtils.spec.js

@@ -182,6 +182,8 @@ describe('DOMUtils#removeCommments tests', () => {
     test('<p><!-- useless comment \n multiline --></p>', '<p></p>');
     test('<p><!-- useless comment \n multiline \n multiline --></p>', '<p></p>');
     test('<!-- useless comment --><p>The content stays</p><!-- another useless comment with \n line break -->', '<p>The content stays</p>');
+    test('<p>The content stays<!-- useless comment inside an element --></p>', '<p>The content stays</p>');
+    test('<p>The content and spaces stay</p>  <!-- a useless comment preceded by spaces -->', '<p>The content and spaces stay</p>  ');
     test('<p>This is a paragraph.</p>\n\x3C!--\n<p>Look at this cool image:</p>\n<img border="0" src="pic_trulli.jpg" alt="Trulli">\n-->\n<p>This is a paragraph too.</p>\x3C!-- same line -->\n\x3C!-- single line -->', '<p>This is a paragraph.</p>\n\n<p>This is a paragraph too.</p>\n');
     test('<div some-crazy-attribute="" <!--=""><!-- useless comment --></div>', '<div some-crazy-attribute="" <!--=""></div>');
   });