From 2b6ba82b4b222fc584bfba45e6497275148f1835 Mon Sep 17 00:00:00 2001
From: mrdrogdrog <mr.drogdrog@gmail.com>
Date: Wed, 30 Sep 2020 23:22:17 +0200
Subject: [PATCH] Set wasmfolder (#619)

---
 .../graphviz/graphviz-frame.tsx               | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx b/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx
index ecdd7c694..d5e570acc 100644
--- a/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx
+++ b/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx
@@ -25,16 +25,24 @@ export const GraphvizFrame: React.FC<GraphvizFrameProps> = ({ code }) => {
     }
     const actualContainer = container.current
 
-    Promise.all([import(/* webpackChunkName: "d3-graphviz" */ 'd3-graphviz'), import('@hpcc-js/wasm')]).then(([imp]) => {
-      try {
-        setError(undefined)
-        imp.graphviz(actualContainer, { useWorker: false, zoom: false })
-          .onerror(showError)
-          .renderDot(code)
-      } catch (error) {
-        showError(error)
-      }
-    }).catch(() => { console.error('error while loading graphviz') })
+    import('@hpcc-js/wasm')
+      .then((wasmPlugin) => {
+        wasmPlugin.wasmFolder('/static/js')
+      })
+      .then(() => import(/* webpackChunkName: "d3-graphviz" */ 'd3-graphviz'))
+      .then((graphvizImport) => {
+        try {
+          setError(undefined)
+          graphvizImport.graphviz(actualContainer, {
+            useWorker: false,
+            zoom: false
+          })
+            .onerror(showError)
+            .renderDot(code)
+        } catch (error) {
+          showError(error)
+        }
+      }).catch(() => { console.error('error while loading graphviz') })
   }, [code, error, showError])
 
   return <Fragment>