go-gitea · Mar 4, 2023
diff --git a/‎package-lock.json
Lines changed: 211 additions & 45 deletions b/‎package-lock.json
Lines changed: 211 additions & 45 deletions
diff --git a/‎package.json
Lines changed: 1 addition & 1 deletion b/‎package.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎web_src/js/markup/mermaid.js
Lines changed: 20 additions & 21 deletions b/‎web_src/js/markup/mermaid.js
Lines changed: 20 additions & 21 deletions
diff --git a/‎webpack.config.js
Lines changed: 1 addition & 1 deletion b/‎webpack.config.js
Lines changed: 1 addition & 1 deletion
@@ -31,7 +31,7 @@
     "less": "4.1.3",
     "less-loader": "11.1.0",
     "license-checker-webpack-plugin": "0.2.1",
-    "mermaid": "9.3.0",
+    "mermaid": "10.0.2",
     "mini-css-extract-plugin": "2.7.2",
     "monaco-editor": "0.34.1",
     "monaco-editor-webpack-plugin": "7.0.1",
 
@@ -37,37 +37,36 @@ export async function renderMermaid() {
       continue;
     }
 
-    let valid;
     try {
-      valid = mermaid.parse(source);
+      await mermaid.parse(source);
     } catch (err) {
       displayError(el, err);
-    }
-
-    if (!valid) {
       el.closest('pre').classList.remove('is-loading');
       continue;
     }
 
     try {
       // can't use bindFunctions here because we can't cross the iframe boundary. This
       // means js-based interactions won't work but they aren't intended to work either
-      mermaid.mermaidAPI.render('mermaid', source, (svgStr) => {
-        const heightStr = (svgStr.match(/viewBox="(.+?)"/) || ['', ''])[1].split(/\s+/)[3];
-        if (!heightStr) return displayError(el, new Error('Could not determine chart height'));
-        const iframe = document.createElement('iframe');
-        iframe.classList.add('markup-render');
-        iframe.sandbox = 'allow-scripts';
-        iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`;
-        iframe.srcdoc = `<html><head><style>${iframeCss}</style></head><body>${svgStr}</body></html>`;
-        const mermaidBlock = document.createElement('div');
-        mermaidBlock.classList.add('mermaid-block');
-        mermaidBlock.append(iframe);
-        const btn = makeCodeCopyButton();
-        btn.setAttribute('data-clipboard-text', source);
-        mermaidBlock.append(btn);
-        el.closest('pre').replaceWith(mermaidBlock);
-      });
+      const {svg} = await mermaid.render('mermaid', source);
+      const heightStr = (svg.match(/viewBox="(.+?)"/) || ['', ''])[1].split(/\s+/)[3];
+      if (!heightStr) return displayError(el, new Error('Could not determine chart height'));
+
+      const iframe = document.createElement('iframe');
+      iframe.classList.add('markup-render');
+      iframe.sandbox = 'allow-scripts';
+      iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`;
+      iframe.srcdoc = `<html><head><style>${iframeCss}</style></head><body>${svg}</body></html>`;
+
+      const mermaidBlock = document.createElement('div');
+      mermaidBlock.classList.add('mermaid-block');
+      mermaidBlock.append(iframe);
+
+      const btn = makeCodeCopyButton();
+      btn.setAttribute('data-clipboard-text', source);
+
+      mermaidBlock.append(btn);
+      el.closest('pre').replaceWith(mermaidBlock);
     } catch (err) {
       displayError(el, err);
     }
 
@@ -234,7 +234,7 @@ export default {
         'khroma@*': {licenseName: 'MIT'}, // https://github.com/fabiospampinato/khroma/pull/33
       },
       emitError: true,
-      allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense)',
+      allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense OR EPL-1.0 OR EPL-2.0)',
       ignore: [
         'font-awesome',
       ],