From 733967f65a5b2ad3a87fc604aeee2d6db9d2b98e Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 28 Feb 2023 16:55:25 +0530 Subject: [PATCH 1/3] fix #4157: Inject only fontFamily without replacing themeVariables --- docs/config/setup/modules/mermaidAPI.md | 2 +- packages/mermaid/src/mermaidAPI.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/config/setup/modules/mermaidAPI.md b/docs/config/setup/modules/mermaidAPI.md index 0406baa81..5049c4885 100644 --- a/docs/config/setup/modules/mermaidAPI.md +++ b/docs/config/setup/modules/mermaidAPI.md @@ -95,7 +95,7 @@ mermaid.initialize(config); #### Defined in -[mermaidAPI.ts:680](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L680) +[mermaidAPI.ts:683](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L683) ## Functions diff --git a/packages/mermaid/src/mermaidAPI.ts b/packages/mermaid/src/mermaidAPI.ts index 64e0bbce2..34f26c418 100644 --- a/packages/mermaid/src/mermaidAPI.ts +++ b/packages/mermaid/src/mermaidAPI.ts @@ -579,7 +579,10 @@ const render = async function ( function initialize(options: MermaidConfig = {}) { // Handle legacy location of font-family configuration if (options?.fontFamily && !options.themeVariables?.fontFamily) { - options.themeVariables = { fontFamily: options.fontFamily }; + if (!options.themeVariables) { + options.themeVariables = {}; + } + options.themeVariables.fontFamily = options.fontFamily; } // Set default options From 3a56af9633d500846e19a3a63e3f55b4c33f1ddf Mon Sep 17 00:00:00 2001 From: knsv Date: Tue, 28 Feb 2023 12:24:04 +0000 Subject: [PATCH 2/3] Update docs --- docs/config/setup/modules/mermaidAPI.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/setup/modules/mermaidAPI.md b/docs/config/setup/modules/mermaidAPI.md index 42b0261ea..5bedb8954 100644 --- a/docs/config/setup/modules/mermaidAPI.md +++ b/docs/config/setup/modules/mermaidAPI.md @@ -95,7 +95,7 @@ mermaid.initialize(config); #### Defined in -[mermaidAPI.ts:683](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L680) +[mermaidAPI.ts:662](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L662) ## Functions From 4a6056b558536f59a2da3a90afa02e2ad5c9ec84 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 28 Feb 2023 18:01:46 +0530 Subject: [PATCH 3/3] typo --- .lycheeignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lycheeignore b/.lycheeignore index d04e68074..4c781f6a0 100644 --- a/.lycheeignore +++ b/.lycheeignore @@ -9,7 +9,7 @@ https://mkdocs.org/ https://osawards.com/javascript/#nominees https://osawards.com/javascript/2019 -# Timeout error, maybe Twitter has anti-bot defences against GitHub's CI servers? +# Timeout error, maybe Twitter has anti-bot defenses against GitHub's CI servers? https://twitter.com/mermaidjs_ # Don't check files that are generated during the build via `pnpm docs:code`