From d59f8780208e82e0f7b55f751ef6d148a4cdfe44 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Thu, 6 Oct 2022 17:49:10 +0800 Subject: [PATCH 1/3] fix: use async in render-after-error --- cypress/platform/render-after-error.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cypress/platform/render-after-error.html b/cypress/platform/render-after-error.html index 267ffade1..059f79345 100644 --- a/cypress/platform/render-after-error.html +++ b/cypress/platform/render-after-error.html @@ -14,15 +14,16 @@ mermaid.init({ startOnLoad: false }); mermaid.mermaidAPI.initialize({ securityLevel: 'strict' }); + (async () => { + try { + console.log('rendering'); + await mermaid.mermaidAPI.render('graphDiv', `>`); + } catch (e) {} - try { - console.log('rendering'); - mermaid.mermaidAPI.render('graphDiv', `>`); - } catch (e) {} - - mermaid.mermaidAPI.render('graphDiv', `graph LR\n a --> b`, (html) => { - document.getElementById('graph').innerHTML = html; - }); + await mermaid.mermaidAPI.render('graphDiv', `graph LR\n a --> b`, (html) => { + document.getElementById('graph').innerHTML = html; + }); + })(); From 3e3de72093a256fd5a6efd9ef44549f67d737d2b Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Fri, 7 Oct 2022 14:51:37 +0800 Subject: [PATCH 2/3] fix: dynamic import --- cypress/platform/knsv2.html | 2 +- cypress/platform/viewer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html index 91a3bbaad..ca2333cd5 100644 --- a/cypress/platform/knsv2.html +++ b/cypress/platform/knsv2.html @@ -100,7 +100,7 @@ mindmap logLevel: 0, // basePath: './packages/', // themeVariables: { darkMode: true }, - extraDiagrams: ['./mermaid-mindmap-detector.core.mjs'], + extraDiagrams: ['./mermaid-mindmap-detector.esm.mjs'], // extraDiagrams: ['../../mermaid-mindmap/registry.ts'], }); function callback() { diff --git a/cypress/platform/viewer.js b/cypress/platform/viewer.js index ff70e0abe..ce1ccc94f 100644 --- a/cypress/platform/viewer.js +++ b/cypress/platform/viewer.js @@ -36,7 +36,7 @@ const contentLoaded = function () { document.getElementsByTagName('body')[0].appendChild(div); } - graphObj.mermaid.extraDiagrams = ['/mermaid-mindmap-detector.core.mjs']; + graphObj.mermaid.extraDiagrams = ['/mermaid-mindmap-detector.esm.mjs']; mermaid2.initialize(graphObj.mermaid); mermaid2.init(); From 66bc844cc9ec45fbf806b43407f14c468fde9d16 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Fri, 7 Oct 2022 14:53:16 +0800 Subject: [PATCH 3/3] chore: cleanup --- packages/mermaid/src/diagram-api/detectType.ts | 3 --- packages/mermaid/src/mermaid.ts | 3 --- 2 files changed, 6 deletions(-) diff --git a/packages/mermaid/src/diagram-api/detectType.ts b/packages/mermaid/src/diagram-api/detectType.ts index 6a31dd1a9..340cbfbae 100644 --- a/packages/mermaid/src/diagram-api/detectType.ts +++ b/packages/mermaid/src/diagram-api/detectType.ts @@ -54,9 +54,6 @@ export const addDetector = ( loader: DiagramLoader | null ) => { detectors[key] = { detector, loader }; - // TODO: Remove - // eslint-disable-next-line no-console - console.log(detectors); }; export const getDiagramLoader = (key: string) => detectors[key].loader; diff --git a/packages/mermaid/src/mermaid.ts b/packages/mermaid/src/mermaid.ts index d59c43ec7..07bd2ccfe 100644 --- a/packages/mermaid/src/mermaid.ts +++ b/packages/mermaid/src/mermaid.ts @@ -58,9 +58,6 @@ const init = async function ( if (typeof conf.extraDiagrams !== 'undefined' && conf.extraDiagrams.length > 0) { // config.extraDiagrams.forEach(async (diagram: string) => { const { id, detector, loadDiagram } = await import(conf.extraDiagrams[0]); - // TODO: Remove - // eslint-disable-next-line no-console - console.log(id, detector, loadDiagram); addDetector(id, detector, loadDiagram); // }); }