Skip to content

Commit 0cee8f9

Browse files
committed
refactor(mermaid): use webpack import for mermaid-elk
1 parent af1d654 commit 0cee8f9

File tree

7 files changed

+3
-62
lines changed

7 files changed

+3
-62
lines changed

Diff for: libraries/mermaid-elk/elk.min.js

-1
This file was deleted.

Diff for: libraries/mermaid-elk/package-lock.json

-13
This file was deleted.

Diff for: libraries/mermaid-elk/package.json

-13
This file was deleted.

Diff for: libraries/mermaid-elk/webpack.config.cjs

-19
This file was deleted.

Diff for: src/public/app/services/library_loader.ts

-9
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ const MERMAID: Library = {
7676
js: ["node_modules/mermaid/dist/mermaid.min.js"]
7777
};
7878

79-
/**
80-
* The ELK extension of Mermaid.js, which supports more advanced layouts.
81-
* See https://www.npmjs.com/package/@mermaid-js/layout-elk for more information.
82-
*/
83-
const MERMAID_ELK: Library = {
84-
js: ["libraries/mermaid-elk/elk.min.js"]
85-
};
86-
8779
const EXCALIDRAW: Library = {
8880
js: ["node_modules/react/umd/react.production.min.js", "node_modules/react-dom/umd/react-dom.production.min.js", "node_modules/@excalidraw/excalidraw/dist/excalidraw.production.min.js"]
8981
};
@@ -211,7 +203,6 @@ export default {
211203
WHEEL_ZOOM,
212204
FORCE_GRAPH,
213205
MERMAID,
214-
MERMAID_ELK,
215206
EXCALIDRAW,
216207
MARKJS,
217208
I18NEXT,

Diff for: src/public/app/services/mermaid.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import library_loader from "./library_loader.js";
2-
31
let elkLoaded = false;
42

53
/**
@@ -22,7 +20,6 @@ export async function loadElkIfNeeded(mermaidContent: string) {
2220
});
2321
if (parsedContent?.config?.layout === "elk") {
2422
elkLoaded = true;
25-
await library_loader.requireLibrary(library_loader.MERMAID_ELK);
26-
mermaid.registerLayoutLoaders(MERMAID_ELK);
23+
mermaid.registerLayoutLoaders((await import("@mermaid-js/layout-elk")).default);
2724
}
2825
}

Diff for: src/public/app/types.d.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,12 @@ declare global {
155155
registerLayoutLoaders(loader: MermaidLoader);
156156
parse(content: string, opts: {
157157
suppressErrors: true
158-
}): {
158+
}): Promise<{
159159
config: {
160160
layout: string;
161161
}
162-
}
162+
}>
163163
};
164-
var MERMAID_ELK: MermaidLoader;
165164

166165
var CKEditor: {
167166
BalloonEditor: {

0 commit comments

Comments
 (0)