@adobe/helix-importer 2.9.7 → 2.9.8

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.9.8](https://github.com/adobe/helix-importer/compare/v2.9.7...v2.9.8) (2023-06-26)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-md2docx to v2.1.6 ([#169](https://github.com/adobe/helix-importer/issues/169)) ([232cb97](https://github.com/adobe/helix-importer/commit/232cb97011a4210fad6f240e9cd2e25886279b62))
+
 ## [2.9.7](https://github.com/adobe/helix-importer/compare/v2.9.6...v2.9.7) (2023-05-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "2.9.7",
+  "version": "2.9.8",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -27,34 +27,34 @@
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.2",
     "@adobe/helix-docx2md": "1.4.3",
-    "@adobe/helix-mediahandler": "2.1.11",
+    "@adobe/helix-mediahandler": "2.2.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.13.0",
+    "c8": "8.0.0",
     "dirname-filename-esm": "1.1.1",
-    "eslint": "8.40.0",
+    "eslint": "8.43.0",
     "husky": "8.0.3",
     "lint-staged": "13.2.2",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "mock-fs": "5.2.0",
-    "semantic-release": "21.0.2"
+    "semantic-release": "21.0.5"
   },
   "license": "Apache-2.0",
   "dependencies": {
     "@adobe/helix-markdown-support": "6.1.2",
-    "@adobe/helix-md2docx": "2.1.5",
+    "@adobe/helix-md2docx": "2.1.6",
     "@adobe/mdast-util-gridtables": "1.0.6",
     "@adobe/remark-gridtables": "1.0.2",
     "form-data": "4.0.0",
     "fs-extra": "11.1.1",
     "hast-util-to-mdast": "9.0.0",
-    "jsdom": "22.0.0",
+    "jsdom": "22.1.0",
     "node-fetch": "3.3.1",
     "rehype-parse": "8.0.4",
     "rehype-remark": "github:adobe-rnd/rehype-remark#45735e80a3d3c805d3c4211ae035f718ddd10bcb",
-    "remark-stringify": "10.0.2",
+    "remark-stringify": "10.0.3",
     "unified": "10.1.2"
   }
 }

package/src/utils/DOMUtils.js

@@ -256,12 +256,23 @@ export default class DOMUtils {
   }
 
   static getImgFromBackground(element, document) {
-    const url = element?.style?.['background-image'];
-    if (url && url.toLowerCase() !== 'none') {
-      const src = url.replace(/url\(/gm, '').replace(/'/gm, '').replace(/\)/gm, '');
-      const img = document.createElement('img');
-      img.src = src;
-      return img;
+    const styleAttr = element?.getAttribute('style')?.split(';');
+    if (styleAttr) {
+      styleAttr.forEach((style) => {
+        const [prop, value] = style.split(':');
+        if (prop === 'background-image') {
+          const trimmedValue = value.replace(/\s/g, '');
+          const elStyle = element.style;
+          elStyle.backgroundImage = trimmedValue;
+        }
+      });
+      const url = element.style.backgroundImage;
+      if (url && url.toLowerCase() !== 'none') {
+        const src = url.replace(/url\(/gm, '').replace(/'/gm, '').replace(/\)/gm, '');
+        const img = document.createElement('img');
+        img.src = src;
+        return img;
+      }
     }
     return null;
   }

package/test/utils/DOMUtils.spec.js

@@ -13,7 +13,7 @@
 /* eslint-disable no-shadow */
 
 import { strictEqual } from 'assert';
-import { describe, it } from 'mocha';
+import { describe, it, xit } from 'mocha';
 
 import { JSDOM } from 'jsdom';
 
@@ -410,4 +410,14 @@ describe('DOMUtils#getImgFromBackground', () => {
     test(createElement('p', {}, { 'background-image': 'url(https://www.server.com/image.jpg)' }, 'Some content'), '<img src="https://www.server.com/image.jpg">');
     test(createElement('div', { class: 'someclass' }, { 'background-image': 'url("https://www.server.com/image.jpg")', background: 'rgb(0, 0, 0) none repeat scroll 0% 0% / auto padding-box border-box' }, '<div><div>Some divs</div><div>More divs</div></div>'), '<img src="https://www.server.com/image.jpg">');
   });
+
+  // `createElement` uses JSDOM to create the test-DOM
+  // the workaround in DOMUtils#getImgFromBackground exists _precisely_
+  // because of a potential bug in JSDOM due to which it doesn't
+  // parse `url()` with whitespaces correctly
+  // disabling the test, keeping it as a reference
+  xit('with background-image style containing whitespace in url()', () => {
+    test(createElement('p', {}, { 'background-image': 'url( /image.jpg )' }, 'Some content'), '<img src="/image.jpg">');
+    test(createElement('div', { class: 'someclass' }, { 'background-image': 'url( https://www.server.com/image.jpg )', background: 'rgb(0, 0, 0) none repeat scroll 0% 0% / auto padding-box border-box' }, '<div><div>Some divs</div><div>More divs</div></div>'), '<img src="https://www.server.com/image.jpg">');
+  });
 });