@adobe/helix-importer 2.9.16 → 2.9.18

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.9.18](https://github.com/adobe/helix-importer/compare/v2.9.17...v2.9.18) (2023-08-02)
+
+
+### Bug Fixes
+
+* properly escape tilde ([#190](https://github.com/adobe/helix-importer/issues/190)) ([9853f17](https://github.com/adobe/helix-importer/commit/9853f17b9feeba52f910baeb6834f8c08ea5df08)), closes [#189](https://github.com/adobe/helix-importer/issues/189)
+
+## [2.9.17](https://github.com/adobe/helix-importer/compare/v2.9.16...v2.9.17) (2023-07-27)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-md2docx to v2.1.17 ([#195](https://github.com/adobe/helix-importer/issues/195)) ([bd7d92e](https://github.com/adobe/helix-importer/commit/bd7d92e0ad744688a5ab6f421194945a461a3611))
+
 ## [2.9.16](https://github.com/adobe/helix-importer/compare/v2.9.15...v2.9.16) (2023-07-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "2.9.16",
+  "version": "2.9.18",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -26,14 +26,14 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.2",
-    "@adobe/helix-docx2md": "1.4.11",
-    "@adobe/helix-mediahandler": "2.2.6",
+    "@adobe/helix-docx2md": "1.4.12",
+    "@adobe/helix-mediahandler": "2.2.7",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "8.0.0",
+    "c8": "8.0.1",
     "dirname-filename-esm": "1.1.1",
-    "eslint": "8.45.0",
+    "eslint": "8.46.0",
     "husky": "8.0.3",
     "lint-staged": "13.2.3",
     "mocha": "10.2.0",
@@ -44,14 +44,14 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@adobe/helix-markdown-support": "6.3.0",
-    "@adobe/helix-md2docx": "2.1.16",
+    "@adobe/helix-md2docx": "2.1.18",
     "@adobe/mdast-util-gridtables": "2.0.2",
     "@adobe/remark-gridtables": "1.0.4",
     "form-data": "4.0.0",
     "fs-extra": "11.1.1",
     "hast-util-to-mdast": "9.0.0",
     "jsdom": "22.1.0",
-    "node-fetch": "3.3.1",
+    "node-fetch": "3.3.2",
     "rehype-parse": "8.0.4",
     "rehype-remark": "github:adobe-rnd/rehype-remark#45735e80a3d3c805d3c4211ae035f718ddd10bcb",
     "remark-stringify": "10.0.3",

package/src/importer/PageImporter.js

@@ -99,7 +99,8 @@ export default class PageImporter {
         ruleSpaces: false,
       });
 
-    const file = await processor.process(resource.document.innerHTML);
+    const html = resource.document.innerHTML;
+    const file = await processor.process(html);
     let contents = String(file);
 
     // process image links
@@ -191,7 +192,6 @@ export default class PageImporter {
     this.cleanup(document);
     DOMUtils.reviewHeadings(document);
     DOMUtils.reviewParagraphs(document);
-    DOMUtils.escapeSpecialCharacters(document);
     [
       'b',
       'a',

package/src/utils/DOMUtils.js

@@ -113,11 +113,6 @@ export default class DOMUtils {
     }
   }
 
-  static escapeSpecialCharacters(document) {
-    // eslint-disable-next-line no-param-reassign
-    document.body.innerHTML = document.body.innerHTML.replace(/~/gm, '\\~');
-  }
-
   static reviewHeadings(document) {
     const tags = [...document.querySelectorAll('h1, h2, h3, h4, h5, h6')];
     for (let i = tags.length - 1; i >= 0; i -= 1) {

package/src/utils/MDUtils.js

@@ -20,7 +20,7 @@ export default class MDUtils {
   };
 
   static cleanupMarkdown(md) {
-    let ret = md?.replace(/\\\\~/gm, '\\~');
+    let ret = md;
     if (ret) {
       for (let i = 0; i < 20; i += 1) {
         let x = `${i}`;

package/test/importers/PageImporter.spec.js

@@ -178,6 +178,10 @@ describe('PageImporter tests - fixtures', () => {
     await featureTest('space');
   });
 
+  it('import - s', async () => {
+    await featureTest('s');
+  });
+
   it('import - sub and sup', async () => {
     await featureTest('subsup');
   });

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

@@ -6,4 +6,4 @@
 
 http://wwww.sample.com/c
 
-[Weird link](https://www.sample.com/app/answers/detail/a_id/17414//\~/axon%E2%84%A2-pclamp%E2%AE-and-digidata%E2%84%A2%3A-operating-system-compatibility#:\\\\\~:text=Digidata%201440%2C%201550%2C%201550A%2C,supported%20up%20to%20pCLAMP%2010.3.\&text=MiniDigi%201B%20is%20required%20for%20use%20under%2064%2Dbit%20Operating%20Systems.\&text=pCLAMP%209%20software%20is%20not,or%2064%2Dbit%20versions)
+[Weird link](https://www.sample.com/app/answers/detail/a_id/17414//~/axon%E2%84%A2-pclamp%E2%AE-and-digidata%E2%84%A2%3A-operating-system-compatibility#:\\\\~:text=Digidata%201440%2C%201550%2C%201550A%2C,supported%20up%20to%20pCLAMP%2010.3.\&text=MiniDigi%201B%20is%20required%20for%20use%20under%2064%2Dbit%20Operating%20Systems.\&text=pCLAMP%209%20software%20is%20not,or%2064%2Dbit%20versions)

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

@@ -10,5 +10,6 @@
         <span>US$59.99/mo</span>&nbsp;per license
       </b>
     </p>
+    <p>Text with ~tilde.</p>
   </body>
-</html>
+</html>

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

@@ -4,4 +4,6 @@
 
 removed ~~strikethrough 2~~ but added insert 3
 
-**~~US$84.99/mo~~ US$59.99/mo per license**
+**~~US$84.99/mo~~ US$59.99/mo per license**
+
+Text with \~tilde.

package/test/utils/DOMUtils.spec.js

@@ -130,18 +130,6 @@ describe('DOMUtils#reviewHeadings tests', () => {
   });
 });
 
-describe('DOMUtils#escapeSpecialCharacters tests', () => {
-  const test = (input, expected) => {
-    const { document } = (new JSDOM(input)).window;
-    DOMUtils.escapeSpecialCharacters(document);
-    strictEqual(document.body.innerHTML, expected);
-  };
-
-  it('escapeSpecialCharacters escape tidles', () => {
-    test('<p>Paragraph with 2 tildes: 20~30 and 40~50</p>', '<p>Paragraph with 2 tildes: 20\\~30 and 40\\~50</p>');
-  });
-});
-
 describe('DOMUtils#remove tests', () => {
   const test = (input, selectors, expected) => {
     const { document } = (new JSDOM(input)).window;

package/test/utils/MDUtils.spec.js

@@ -80,14 +80,6 @@ describe('MDUtils#cleanupMarkdown tests', () => {
     );
   });
 
-  it('MDUtils#cleanupMarkdown unescape tildes', () => {
-    strictEqual(
-      MDUtils.cleanupMarkdown('#A title\n~~Tilde can be an pb~~\n Especially \\\\~in the content'),
-      '#A title\n~~Tilde can be an pb~~\n Especially \\~in the content',
-      'unescape tildes',
-    );
-  });
-
   it('MDUtils#cleanupMarkdown replace weird spaces', () => {
     strictEqual(
       MDUtils.cleanupMarkdown('#A title\nReplaces the weird spaces characters: "
\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019"'),