GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/9.2.0' into release/9.2.0

Browse Source
This commit is contained in:
Knut Sveidqvist 2022-10-19 07:52:14 +02:00
commit 8230c8f8b4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/mermaid/src/logger.ts
View File

@ -48,6 +48,7 @@ export const setLogLevel = function (level: keyof typeof LEVELS | number | strin
log.warn = () => {};
log.error = () => {};
log.fatal = () => {};
if (numericLevel <= LEVELS.fatal) {
log.fatal = console.error
? console.error.bind(console, format('FATAL'), 'color: orange')

11
packages/mermaid/src/mermaid.ts
View File

@ -159,7 +159,7 @@ const initThrowsErrors = function (
}
};
let lazyLoadingPromise: Promise<unknown> | undefined;
let lazyLoadingPromise: Promise<unknown> | undefined = undefined;
/**
* @param conf
* @deprecated This is an internal function and should not be used. Will be removed in v10.
@ -179,12 +179,15 @@ const registerLazyLoadedDiagrams = async (conf: MermaidConfig) => {
await lazyLoadingPromise;
};
let loadingPromise: Promise<unknown> | undefined = undefined;
const loadExternalDiagrams = async (conf: MermaidConfig) => {
// Only lazy load once
// TODO: This is a hack. We should either throw error when new diagrams are added, or load them anyway.
if (lazyLoadingPromise === undefined) {
if (loadingPromise === undefined) {
log.debug(`Loading ${conf?.lazyLoadedDiagrams?.length} external diagrams`);
// Load all lazy loaded diagrams in parallel
lazyLoadingPromise = Promise.allSettled(
loadingPromise = Promise.allSettled(
(conf?.lazyLoadedDiagrams ?? []).map(async (url: string) => {
const { id, detector, loadDiagram } = await import(url);
const { diagram } = await loadDiagram();
@ -192,7 +195,7 @@ const loadExternalDiagrams = async (conf: MermaidConfig) => {
})
);
}
await lazyLoadingPromise;
await loadingPromise;
};
/**