@patternfly/quickstarts 6.2.0-prerelease.4 → 6.2.0-prerelease.6

package/dist/index.js

@@ -14,7 +14,7 @@ var server = require('react-dom/server');
 var CopyIcon = require('@patternfly/react-icons/dist/js/icons/copy-icon');
 var LightbulbIcon = require('@patternfly/react-icons/dist/js/icons/lightbulb-icon');
 var FireIcon = require('@patternfly/react-icons/dist/js/icons/fire-icon');
-var showdown = require('showdown');
+var marked = require('marked');
 var SyncAltIcon = require('@patternfly/react-icons/dist/js/icons/sync-alt-icon');
 var CheckCircleIcon = require('@patternfly/react-icons/dist/js/icons/check-circle-icon');
 require('@patternfly/react-icons/dist/js/icons/exclamation-circle-icon');
@@ -1208,16 +1208,7 @@ const useMultilineCopyClipboardShowdownExtension = () => {
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const DOMPurify = require('dompurify');
-const markdownConvert = (markdown, extensions) => {
-    const converter = new showdown.Converter({
-        tables: true,
-        openLinksInNewWindow: true,
-        strikethrough: true,
-        emoji: false,
-    });
-    if (extensions) {
-        converter.addExtension(extensions);
-    }
+const markdownConvert = (markdown, extensions) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     DOMPurify.addHook('beforeSanitizeElements', function (node) {
         // nodeType 1 = element type
         var _a;
@@ -1268,16 +1259,43 @@ const markdownConvert = (markdown, extensions) => {
             node.setAttribute('xlink:show', 'new');
         }
     });
-    return DOMPurify.sanitize(converter.makeHtml(markdown), {
-        USE_PROFILES: {
-            html: true,
-            svg: true,
-        },
-    });
-};
+    const reverseString = (str) => str.split('').reverse().join('');
+    // replace code fences that end in a double curly brace (which are used by our custom md extensions) with non
+    // markdown formatting related tokens so that marked doesn't try to parse them as code spans
+    //
+    // we want to reverse the string before we do the substitution so that we only match the opening code fence which
+    // corresponds to the closing code fence with the double curly brace
+    const reversedMarkdown = reverseString(markdown);
+    const reverseMarkdownWithSubstitutedCodeFences = reversedMarkdown.replace(/{{```((.|\n)*?)```/g, '{{@@@$1@@@');
+    const markdownWithSubstitutedCodeFences = reverseString(reverseMarkdownWithSubstitutedCodeFences);
+    const parsedMarkdown = yield marked.marked.parse(markdownWithSubstitutedCodeFences);
+    // Swap the temporary tokens back to code fences before we run the extensions
+    let md = parsedMarkdown.replace(/@@@/g, '```');
+    if (extensions) {
+        // Convert code spans back to md format before we run the custom extension regexes
+        md = md.replace(/<code>(.*)<\/code>/g, '`$1`');
+        extensions.forEach(({ regex, replace }) => {
+            if (regex) {
+                md = md.replace(regex, replace);
+            }
+        });
+        // Convert any remaining backticks back into code spans
+        md = md.replace(/`(.*)`/g, '<code>$1</code>');
+    }
+    return DOMPurify.sanitize(md);
+});
 const SyncMarkdownView = ({ content, emptyMsg, extensions, renderExtension, exactHeight, inline, className, }) => {
     const { getResource } = React__namespace.useContext(QuickStartContext);
-    const markup = React__namespace.useMemo(() => markdownConvert(content || emptyMsg || getResource('Not available'), extensions), [content, emptyMsg, extensions, getResource]);
+    const [markup, setMarkup] = React__namespace.useState('');
+    React__namespace.useEffect(() => {
+        function getMd() {
+            return tslib.__awaiter(this, void 0, void 0, function* () {
+                const md = yield markdownConvert(content || emptyMsg || getResource('Not available'), extensions);
+                setMarkup(md);
+            });
+        }
+        getMd();
+    }, [content, emptyMsg, getResource, extensions]);
     const innerProps = {
         renderExtension: (extensions === null || extensions === void 0 ? void 0 : extensions.length) > 0 ? renderExtension : undefined,
         exactHeight,