@ones-editor/editor 2.8.36 → 2.9.1-beta.3

package/dist/index.js

@@ -10099,6 +10099,54 @@ var __publicField = (obj, key, value) => {
       }
     };
   }
+  async function loadEmsJs(id, mjsUrl, mjsName, jsCode) {
+    const promise = new Promise((resolve, reject) => {
+      const script = document.getElementById(id);
+      if (script) {
+        setTimeout(() => {
+          resolve();
+        });
+        return;
+      }
+      const funName = `emsjs_${genId()}`;
+      window[funName] = (err) => {
+        if (err) {
+          console.error("loadEmsJs error:", mjsUrl, err);
+          const script2 = document.getElementById(id);
+          if (script2) {
+            script2.remove();
+          }
+          reject(err);
+        } else {
+          resolve();
+        }
+      };
+      const code = `
+    try {
+      const ${mjsName} = await import('${mjsUrl}');
+      window.${mjsName} = ${mjsName}.default;
+      ${jsCode}
+      window.${funName}();
+    } catch (err) {
+      window.${funName}(err);
+    }
+    window.${funName} = undefined;
+    delete window.${funName};
+    `;
+      const elem2 = document.createElement("script");
+      elem2.type = "module";
+      elem2.async = true;
+      elem2.id = id;
+      elem2.innerHTML = code;
+      document.head.appendChild(elem2);
+    });
+    try {
+      await lockers.lock(id);
+      await promise;
+    } finally {
+      lockers.release(id);
+    }
+  }
   async function loadJsPromise(url, id) {
     const promise = new Promise((resolve, reject) => {
       loadJs(url, id, (err) => {
@@ -85860,26 +85908,25 @@ ${docStr}
     var _a;
     const mermaidOptions = editor.getComponentOptions("mermaid") || {};
     const mermaidJsResource = ((_a = mermaidOptions.cdn) == null ? void 0 : _a.mermaid) || MERMAID_SCRIPTS;
-    await loadJsPromise(mermaidJsResource, MERMAID_SCRIPT_ID);
+    try {
+      await loadEmsJs(MERMAID_SCRIPT_ID, mermaidJsResource, "mermaid", "");
+    } catch (err) {
+      logger$k.error("Resource load failed: Mermaid javaScript resource injection failed", err instanceof Error ? err.message : String(err));
+    }
     const mermaid = window.mermaid;
     assert(logger$k, mermaid, "Resource load failed: Mermaid javaScript resource injection failed");
     const id = genId();
-    const promise = new Promise((resolve, reject) => {
-      try {
-        mermaid.mermaidAPI.render(id, code, (svgCode2) => {
-          setTimeout(() => {
-            resolve(svgCode2);
-          });
-        });
-      } catch (err) {
-        err.message = err.str;
-        const delId = `d${id}`;
-        const el = document.getElementById(delId);
-        el == null ? void 0 : el.remove();
-        reject(err);
-      }
-    });
-    const svgCode = await promise;
+    let svgCode = "";
+    try {
+      const { svg } = await mermaid.render(id, code);
+      svgCode = svg;
+    } catch (err) {
+      err.message = err.str;
+      const delId = `d${id}`;
+      const el = document.getElementById(delId);
+      el == null ? void 0 : el.remove();
+      throw err;
+    }
     const domParser = new DOMParser();
     const xml = domParser.parseFromString(svgCode, "image/svg+xml");
     const xmlSvg = xml.firstChild;
@@ -94641,7 +94688,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.8.36";
+    editor.version = "2.9.1-beta.3";
     return editor;
   }
   function isDoc(doc2) {
@@ -94755,7 +94802,7 @@ ${JSON.stringify(error2, null, 2)}`);
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.36";
+    editor.version = "2.9.1-beta.3";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -141267,6 +141314,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.isValidOffset = isValidOffset;
   exports2.isVisibleBlock = isVisibleBlock;
   exports2.isYesterday = isYesterday;
+  exports2.loadEmsJs = loadEmsJs;
   exports2.loadJs = loadJs;
   exports2.loadJsPromise = loadJsPromise;
   exports2.lockers = lockers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.8.36",
+  "version": "2.9.1-beta.3",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
@@ -48,7 +48,7 @@
     "marked-extended-latex": "^1.1.0",
     "markmap-common": "0.15.3",
     "markmap-view": "0.15.4",
-    "mermaid": "^9.1.0",
+    "mermaid": "11.6.0",
     "mime-db": "^1.52.0",
     "nanoid": "^3.2.0",
     "ot-json1": "^1.0.2",