@ndla/article-converter 6.5.2 → 6.5.4

package/es/plugins/copyParagraphPlugin.js

@@ -10,8 +10,9 @@ import { domToReact } from "html-react-parser";
 import { CopyParagraphButton } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const copyParagraphPlugin = (node, converterOpts, opts) => {
+  var _parent$attribs;
   const parent = node.parent;
-  if (parent?.name === "section" || parent?.name === "div" && Object.keys(parent.attribs ?? {}).length === 0) {
+  if ((parent === null || parent === void 0 ? void 0 : parent.name) === "section" || (parent === null || parent === void 0 ? void 0 : parent.name) === "div" && Object.keys((_parent$attribs = parent.attribs) !== null && _parent$attribs !== void 0 ? _parent$attribs : {}).length === 0) {
     return _jsx(CopyParagraphButton, {
       copyText: node.attribs["data-text"],
       lang: opts.articleLanguage,

package/es/plugins/divPlugin.js

@@ -7,11 +7,8 @@
  */
 
 import { domToReact, attributesToProps } from "html-react-parser";
-import partition from "lodash/partition";
 import { FileList, RelatedArticleList, Grid, GridParallaxItem, FramedContent } from "@ndla/ui";
-import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-import { Fragment as _Fragment } from "@emotion/react/jsx-runtime";
-import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 export const divPlugin = (node, opts) => {
   if (node.attribs["data-type"] === "framed-content" || node.attribs.class === "c-bodybox") {
     return _jsx(FramedContent, {
@@ -26,7 +23,11 @@ export const divPlugin = (node, opts) => {
     });
   } else if (node.attribs["data-type"] === "file" && node.childNodes.length) {
     const elements = node.childNodes.filter(c => c.type === "tag" && c.name === "ndlaembed" && c.attribs["data-resource"] === "file");
-    const [pdfs, files] = partition(elements, el => el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block");
+    const [pdfs, files] = elements.reduce((acc, el) => {
+      const arr = el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block" ? acc[0] : acc[1];
+      arr.push(el);
+      return acc;
+    }, [[], []]);
     return _jsxs(_Fragment, {
       children: [files.length ? _jsx(FileList, {
         children: domToReact(files, opts)

package/es/plugins/embed/audioEmbedPlugin.js

@@ -10,11 +10,12 @@ import { attributesToProps } from "html-react-parser";
 import { AudioEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const audioEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return _jsx(AudioEmbed, {
     embed: data,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     lang: opts.articleLanguage
   });
 };

package/es/plugins/embed/blogPostEmbedPlugin.js

@@ -9,8 +9,9 @@
 import { attributesToProps } from "html-react-parser";
 import { BlogPostV2 } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-export const errorSvgSrc = `data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E`;
+export const errorSvgSrc = "data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E";
 export const blogPostEmbedPlugin = (element, _, opts) => {
+  var _data$data$metaImage$, _data$data$metaImage;
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"]);
   const {
@@ -28,7 +29,7 @@ export const blogPostEmbedPlugin = (element, _, opts) => {
     path: opts.path,
     metaImage: {
       alt: alt ? alt : "",
-      url: data.status === "success" ? data.data.metaImage?.image.imageUrl ?? errorSvgSrc : errorSvgSrc
+      url: data.status === "success" ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.image.imageUrl) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : errorSvgSrc : errorSvgSrc
     }
   });
 };

package/es/plugins/embed/brightcoveEmbedPlugin.js

@@ -10,11 +10,12 @@ import { attributesToProps } from "html-react-parser";
 import { BrightcoveEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const brightcoveEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return _jsx(BrightcoveEmbed, {
     embed: data,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     renderContext: opts.renderContext
   });
 };

package/es/plugins/embed/codeEmbedPlugin.js

@@ -7,7 +7,7 @@
  */
 
 import { attributesToProps } from "html-react-parser";
-import { CodeEmbed } from "@ndla/code";
+import { CodeEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const codeEmbedPlugin = element => {
   const props = attributesToProps(element.attribs);

package/es/plugins/embed/conceptEmbedPlugin.js

@@ -10,12 +10,13 @@ import { attributesToProps } from "html-react-parser";
 import { ConceptEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const conceptEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return _jsx(ConceptEmbed, {
     embed: data,
     fullWidth: true,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/es/plugins/embed/contactBlockEmbedPlugin.js

@@ -10,6 +10,7 @@ import { attributesToProps } from "html-react-parser";
 import { ContactBlock } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const contactBlockEmbedPlugin = (element, _, opts) => {
+  var _opts$canonicalUrls;
   const props = attributesToProps(element.attribs);
   const embedData = JSON.parse(props["data-json"]);
   const {
@@ -31,6 +32,6 @@ export const contactBlockEmbedPlugin = (element, _, opts) => {
     name: name,
     blob: blob,
     lang: opts.articleLanguage,
-    imageCanonicalUrl: opts.canonicalUrls?.image
+    imageCanonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image
   });
 };

package/es/plugins/embed/contentLinkEmbedPlugin.js

@@ -6,10 +6,10 @@
  *
  */
 
-import { attributesToProps } from "html-react-parser";
+import { attributesToProps, domToReact } from "html-react-parser";
 import { ContentLinkEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-export const contentLinkEmbedPlugin = (element, _, _ref) => {
+export const contentLinkEmbedPlugin = (element, opts, _ref) => {
   let {
     isOembed
   } = _ref;
@@ -17,6 +17,7 @@ export const contentLinkEmbedPlugin = (element, _, _ref) => {
   const data = JSON.parse(props["data-json"]);
   return _jsx(ContentLinkEmbed, {
     embed: data,
-    isOembed: isOembed
+    isOembed: isOembed,
+    children: domToReact(element.children, opts)
   });
 };

package/es/plugins/embed/imageEmbedPlugin.js

@@ -10,16 +10,17 @@ import { attributesToProps } from "html-react-parser";
 import { ImageEmbed } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const imageEmbedPlugin = (element, _, opts) => {
+  var _element$parentNode, _opts$components, _opts$canonicalUrls;
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"]);
-  const inGrid = element.parentNode?.parentNode?.attribs?.["data-type"] === "grid";
+  const inGrid = ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.attribs) === null || _element$parentNode === void 0 ? void 0 : _element$parentNode["data-type"]) === "grid";
   return _jsx(ImageEmbed, {
     inGrid: inGrid,
     embed: data,
     path: opts.path,
     previewAlt: opts.previewAlt,
-    heartButton: opts.components?.heartButton,
-    canonicalUrl: opts.canonicalUrls?.image,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
+    canonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/es/plugins/olPlugin.js

@@ -10,11 +10,12 @@ import { attributesToProps, domToReact } from "html-react-parser";
 import { OrderedList } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const olPlugin = (node, converterOpts, opts) => {
+  var _node$attribs$class;
   const props = attributesToProps(node.attribs);
   const letterClass = node.attribs["data-type"] === "letters" ? "ol-list--roman" : false;
   const num = node.attribs["start"];
-  const numClass = num ? `ol-reset-${num}` : false;
-  const classes = [node.attribs.class ?? false, letterClass, numClass].filter(c => !!c).join(" ");
+  const numClass = num ? "ol-reset-".concat(num) : false;
+  const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(c => !!c).join(" ");
   return _jsx(OrderedList, {
     ...props,
     className: classes.length ? classes : undefined,

package/es/plugins/paragraphPlugin.js

@@ -11,7 +11,8 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const paragraphPlugin = (node, converterOpts, opts) => {
   const props = attributesToProps(node.attribs);
   if (node.attribs["data-align"] === "center") {
-    const classes = [node.attribs.class ?? "", "u-text-center"].filter(c => !!c).join(" ");
+    var _node$attribs$class;
+    const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", "u-text-center"].filter(c => !!c).join(" ");
     return _jsx("p", {
       ...props,
       lang: opts.articleLanguage,

package/es/plugins/spanPlugin.js

@@ -10,11 +10,12 @@ import { attributesToProps, domToReact } from "html-react-parser";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const spanPlugin = (node, opts) => {
   if (node.attribs["data-size"] === "large") {
+    var _node$attribs$class;
     const props = attributesToProps(node.attribs);
     return _jsx("span", {
       ...props,
       "data-size": undefined,
-      className: `${node.attribs.class ?? ""} u-large-body-text`,
+      className: "".concat((_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", " u-large-body-text"),
       children: domToReact(node.children, opts)
     });
   }

package/es/plugins/ulPlugin.js

@@ -10,8 +10,9 @@ import { attributesToProps, domToReact } from "html-react-parser";
 import { UnOrderedList } from "@ndla/ui";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const ulPlugin = (node, converterOpts, opts) => {
+  var _node$attribs$class;
   const props = attributesToProps(node.attribs);
-  const classes = [node.attribs.class ?? "", node.attribs["data-type"] === "two-column" ? "o-list--two-columns" : ""].filter(c => !!c).join(" ");
+  const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", node.attribs["data-type"] === "two-column" ? "o-list--two-columns" : ""].filter(c => !!c).join(" ");
   return _jsx(UnOrderedList, {
     ...props,
     className: classes,

package/es/transform.js

@@ -12,7 +12,7 @@ import { basePlugins, oembedPlugins } from "./plugins";
 import { embedPlugins } from "./plugins/embed";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 const transform = (content, opts) => {
-  const plugins = opts?.isOembed ? oembedPlugins : basePlugins;
+  const plugins = opts !== null && opts !== void 0 && opts.isOembed ? oembedPlugins : basePlugins;
   const options = {
     replace: node => {
       if (!("attribs" in node)) {

package/lib/index.js

@@ -24,5 +24,5 @@ Object.defineProperty(exports, "transform", {
 var _transform = _interopRequireDefault(require("./transform"));
 var _extractEmbedMeta = _interopRequireWildcard(require("./extractEmbedMeta"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/plugins/copyParagraphPlugin.js

@@ -16,8 +16,9 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const copyParagraphPlugin = (node, converterOpts, opts) => {
+  var _parent$attribs;
   const parent = node.parent;
-  if (parent?.name === "section" || parent?.name === "div" && Object.keys(parent.attribs ?? {}).length === 0) {
+  if ((parent === null || parent === void 0 ? void 0 : parent.name) === "section" || (parent === null || parent === void 0 ? void 0 : parent.name) === "div" && Object.keys((_parent$attribs = parent.attribs) !== null && _parent$attribs !== void 0 ? _parent$attribs : {}).length === 0) {
     return (0, _jsxRuntime.jsx)(_ui.CopyParagraphButton, {
       copyText: node.attribs["data-text"],
       lang: opts.articleLanguage,

package/lib/plugins/divPlugin.js

@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.divPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _partition = _interopRequireDefault(require("lodash/partition"));
 var _ui = require("@ndla/ui");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) 2023-present, NDLA.
  *
@@ -31,7 +29,11 @@ const divPlugin = (node, opts) => {
     });
   } else if (node.attribs["data-type"] === "file" && node.childNodes.length) {
     const elements = node.childNodes.filter(c => c.type === "tag" && c.name === "ndlaembed" && c.attribs["data-resource"] === "file");
-    const [pdfs, files] = (0, _partition.default)(elements, el => el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block");
+    const [pdfs, files] = elements.reduce((acc, el) => {
+      const arr = el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block" ? acc[0] : acc[1];
+      arr.push(el);
+      return acc;
+    }, [[], []]);
     return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [files.length ? (0, _jsxRuntime.jsx)(_ui.FileList, {
         children: (0, _htmlReactParser.domToReact)(files, opts)

package/lib/plugins/embed/audioEmbedPlugin.js

@@ -16,11 +16,12 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const audioEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return (0, _jsxRuntime.jsx)(_ui.AudioEmbed, {
     embed: data,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     lang: opts.articleLanguage
   });
 };

package/lib/plugins/embed/blogPostEmbedPlugin.js

@@ -15,8 +15,9 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  *
  */
 
-const errorSvgSrc = exports.errorSvgSrc = `data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E`;
+const errorSvgSrc = exports.errorSvgSrc = "data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E";
 const blogPostEmbedPlugin = (element, _, opts) => {
+  var _data$data$metaImage$, _data$data$metaImage;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
   const {
@@ -34,7 +35,7 @@ const blogPostEmbedPlugin = (element, _, opts) => {
     path: opts.path,
     metaImage: {
       alt: alt ? alt : "",
-      url: data.status === "success" ? data.data.metaImage?.image.imageUrl ?? errorSvgSrc : errorSvgSrc
+      url: data.status === "success" ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.image.imageUrl) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : errorSvgSrc : errorSvgSrc
     }
   });
 };

package/lib/plugins/embed/brightcoveEmbedPlugin.js

@@ -16,11 +16,12 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const brightcoveEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return (0, _jsxRuntime.jsx)(_ui.BrightcoveEmbed, {
     embed: data,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     renderContext: opts.renderContext
   });
 };

package/lib/plugins/embed/codeEmbedPlugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.codeEmbedPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _code = require("@ndla/code");
+var _ui = require("@ndla/ui");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * Copyright (c) 2023-present, NDLA.
@@ -18,7 +18,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 const codeEmbedPlugin = element => {
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
-  return (0, _jsxRuntime.jsx)(_code.CodeEmbed, {
+  return (0, _jsxRuntime.jsx)(_ui.CodeEmbed, {
     embed: data
   });
 };

package/lib/plugins/embed/conceptEmbedPlugin.js

@@ -16,12 +16,13 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const conceptEmbedPlugin = (element, _, opts) => {
+  var _opts$components;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
   return (0, _jsxRuntime.jsx)(_ui.ConceptEmbed, {
     embed: data,
     fullWidth: true,
-    heartButton: opts.components?.heartButton,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/lib/plugins/embed/contactBlockEmbedPlugin.js

@@ -16,6 +16,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const contactBlockEmbedPlugin = (element, _, opts) => {
+  var _opts$canonicalUrls;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const embedData = JSON.parse(props["data-json"]);
   const {
@@ -37,7 +38,7 @@ const contactBlockEmbedPlugin = (element, _, opts) => {
     name: name,
     blob: blob,
     lang: opts.articleLanguage,
-    imageCanonicalUrl: opts.canonicalUrls?.image
+    imageCanonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image
   });
 };
 exports.contactBlockEmbedPlugin = contactBlockEmbedPlugin;

package/lib/plugins/embed/contentLinkEmbedPlugin.js

@@ -15,7 +15,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  *
  */
 
-const contentLinkEmbedPlugin = (element, _, _ref) => {
+const contentLinkEmbedPlugin = (element, opts, _ref) => {
   let {
     isOembed
   } = _ref;
@@ -23,7 +23,8 @@ const contentLinkEmbedPlugin = (element, _, _ref) => {
   const data = JSON.parse(props["data-json"]);
   return (0, _jsxRuntime.jsx)(_ui.ContentLinkEmbed, {
     embed: data,
-    isOembed: isOembed
+    isOembed: isOembed,
+    children: (0, _htmlReactParser.domToReact)(element.children, opts)
   });
 };
 exports.contentLinkEmbedPlugin = contentLinkEmbedPlugin;

package/lib/plugins/embed/imageEmbedPlugin.js

@@ -16,16 +16,17 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const imageEmbedPlugin = (element, _, opts) => {
+  var _element$parentNode, _opts$components, _opts$canonicalUrls;
   const props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   const data = JSON.parse(props["data-json"]);
-  const inGrid = element.parentNode?.parentNode?.attribs?.["data-type"] === "grid";
+  const inGrid = ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.attribs) === null || _element$parentNode === void 0 ? void 0 : _element$parentNode["data-type"]) === "grid";
   return (0, _jsxRuntime.jsx)(_ui.ImageEmbed, {
     inGrid: inGrid,
     embed: data,
     path: opts.path,
     previewAlt: opts.previewAlt,
-    heartButton: opts.components?.heartButton,
-    canonicalUrl: opts.canonicalUrls?.image,
+    heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
+    canonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/lib/plugins/olPlugin.js

@@ -16,11 +16,12 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const olPlugin = (node, converterOpts, opts) => {
+  var _node$attribs$class;
   const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
   const letterClass = node.attribs["data-type"] === "letters" ? "ol-list--roman" : false;
   const num = node.attribs["start"];
-  const numClass = num ? `ol-reset-${num}` : false;
-  const classes = [node.attribs.class ?? false, letterClass, numClass].filter(c => !!c).join(" ");
+  const numClass = num ? "ol-reset-".concat(num) : false;
+  const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(c => !!c).join(" ");
   return (0, _jsxRuntime.jsx)(_ui.OrderedList, {
     ...props,
     className: classes.length ? classes : undefined,

package/lib/plugins/paragraphPlugin.js

@@ -17,7 +17,8 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 const paragraphPlugin = (node, converterOpts, opts) => {
   const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
   if (node.attribs["data-align"] === "center") {
-    const classes = [node.attribs.class ?? "", "u-text-center"].filter(c => !!c).join(" ");
+    var _node$attribs$class;
+    const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", "u-text-center"].filter(c => !!c).join(" ");
     return (0, _jsxRuntime.jsx)("p", {
       ...props,
       lang: opts.articleLanguage,

package/lib/plugins/spanPlugin.js

@@ -16,11 +16,12 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 
 const spanPlugin = (node, opts) => {
   if (node.attribs["data-size"] === "large") {
+    var _node$attribs$class;
     const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
     return (0, _jsxRuntime.jsx)("span", {
       ...props,
       "data-size": undefined,
-      className: `${node.attribs.class ?? ""} u-large-body-text`,
+      className: "".concat((_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", " u-large-body-text"),
       children: (0, _htmlReactParser.domToReact)(node.children, opts)
     });
   }

package/lib/plugins/ulPlugin.js

@@ -16,8 +16,9 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 const ulPlugin = (node, converterOpts, opts) => {
+  var _node$attribs$class;
   const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-  const classes = [node.attribs.class ?? "", node.attribs["data-type"] === "two-column" ? "o-list--two-columns" : ""].filter(c => !!c).join(" ");
+  const classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : "", node.attribs["data-type"] === "two-column" ? "o-list--two-columns" : ""].filter(c => !!c).join(" ");
   return (0, _jsxRuntime.jsx)(_ui.UnOrderedList, {
     ...props,
     className: classes,

package/lib/transform.js

@@ -19,7 +19,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const transform = (content, opts) => {
-  const plugins = opts?.isOembed ? _plugins.oembedPlugins : _plugins.basePlugins;
+  const plugins = opts !== null && opts !== void 0 && opts.isOembed ? _plugins.oembedPlugins : _plugins.basePlugins;
   const options = {
     replace: node => {
       if (!("attribs" in node)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "6.5.2",
+  "version": "6.5.4",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -28,13 +28,12 @@
   ],
   "devDependencies": {
     "@ndla/types-backend": "^0.2.64",
-    "@ndla/types-embed": "^4.1.4"
+    "@ndla/types-embed": "^4.1.5"
   },
   "dependencies": {
-    "@ndla/code": "^5.0.55",
-    "@ndla/ui": "^50.14.2",
-    "html-react-parser": "^5.1.8",
-    "lodash": "^4.17.20"
+    "@ndla/code": "^5.0.56",
+    "@ndla/ui": "^50.15.0",
+    "html-react-parser": "^5.1.8"
   },
   "peerDependencies": {
     "@emotion/react": "^11.10.4",
@@ -48,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6f31613765124c41ad09c92274ce136b8cb9e2a3"
+  "gitHead": "f6949c46c9b1b0876c2d5e5d5ec4f1b31db1c28b"
 }

package/src/plugins/divPlugin.tsx

@@ -7,7 +7,6 @@
  */
 
 import { domToReact, attributesToProps, Element, DOMNode } from "html-react-parser";
-import partition from "lodash/partition";
 import { FileList, RelatedArticleList, Grid, GridType, GridParallaxItem, FramedContent } from "@ndla/ui";
 import { PluginType } from "./types";
 
@@ -28,9 +27,13 @@ export const divPlugin: PluginType = (node, opts) => {
     const elements = node.childNodes.filter(
       (c): c is Element => c.type === "tag" && c.name === "ndlaembed" && c.attribs["data-resource"] === "file",
     );
-    const [pdfs, files] = partition(
-      elements,
-      (el) => el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block",
+    const [pdfs, files] = elements.reduce<[Element[], Element[]]>(
+      (acc, el) => {
+        const arr = el.attribs["data-type"] === "pdf" && el.attribs["data-display"] === "block" ? acc[0] : acc[1];
+        arr.push(el);
+        return acc;
+      },
+      [[], []],
     );
 
     return (

package/src/plugins/embed/codeEmbedPlugin.tsx

@@ -7,8 +7,8 @@
  */
 
 import { attributesToProps } from "html-react-parser";
-import { CodeEmbed } from "@ndla/code";
 import { CodeMetaData } from "@ndla/types-embed";
+import { CodeEmbed } from "@ndla/ui";
 import { PluginType } from "../types";
 
 export const codeEmbedPlugin: PluginType = (element) => {

package/src/plugins/embed/contentLinkEmbedPlugin.tsx

@@ -6,13 +6,17 @@
  *
  */
 
-import { attributesToProps } from "html-react-parser";
+import { DOMNode, attributesToProps, domToReact } from "html-react-parser";
 import { ContentLinkMetaData } from "@ndla/types-embed";
 import { ContentLinkEmbed } from "@ndla/ui";
 import { PluginType } from "../types";
 
-export const contentLinkEmbedPlugin: PluginType = (element, _, { isOembed }) => {
+export const contentLinkEmbedPlugin: PluginType = (element, opts, { isOembed }) => {
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"] as string) as ContentLinkMetaData;
-  return <ContentLinkEmbed embed={data} isOembed={isOembed} />;
+  return (
+    <ContentLinkEmbed embed={data} isOembed={isOembed}>
+      {domToReact(element.children as DOMNode[], opts)}
+    </ContentLinkEmbed>
+  );
 };