diff --git a/.esbuild/server.ts b/.esbuild/server.ts
index aa7baeda0..372f92409 100644
--- a/.esbuild/server.ts
+++ b/.esbuild/server.ts
@@ -8,16 +8,17 @@ async function createServer() {
   const mermaidCtx = await context(
     getBuildConfig({ minify: false, core: false, entryName: 'mermaid' })
   );
-  mermaidCtx.watch();
   const externalCtx = await context(
     getBuildConfig({ minify: false, core: false, entryName: 'mermaid-example-diagram' })
   );
-  externalCtx.watch();
   const zenuml = await context(
     getBuildConfig({ minify: false, core: false, entryName: 'mermaid-zenuml' })
   );
-  // TODO: zenuml
+
+  mermaidCtx.watch();
+  externalCtx.watch();
   zenuml.watch();
+
   app.use(cors());
   app.use(express.static('./packages/mermaid/dist'));
   app.use(express.static('./packages/mermaid-zenuml/dist'));
diff --git a/cypress/platform/viewer.js b/cypress/platform/viewer.js
index 5192b1389..39f456c23 100644
--- a/cypress/platform/viewer.js
+++ b/cypress/platform/viewer.js
@@ -1,6 +1,6 @@
 import mermaid from './mermaid.esm.mjs';
-import externalExample from './mermaid-example-diagram.core.mjs';
-import zenUml from './mermaid-zenuml.core.mjs';
+import externalExample from './mermaid-example-diagram.esm.mjs';
+import zenUml from './mermaid-zenuml.esm.mjs';
 
 function b64ToUtf8(str) {
   return decodeURIComponent(escape(window.atob(str)));