Merge pull request #3574 from mermaid-js/sidv/fixE2E

fix(tests): E2E

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() {

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;
+        });
+      })();
     </script>
   </body>
 </html>

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();

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;

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);
       // });
     }