Merge pull request #2987 from timmaffett/develop

protect config.js from attempting to use invalid theme name (which corrupted mermaid use until reset())
mermaid-js · May 2, 2022 · 8583c7b · 8583c7b
2 parents bae5b9d + 4a87fa1
commit 8583c7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/config.js b/src/config.js
@@ -27,7 +27,7 @@ export const updateCurrentConfig = (siteCfg, _directives) => {
 
   cfg = assignWithDepth(cfg, sumOfDirectives);
 
-  if (sumOfDirectives.theme) {
+  if (sumOfDirectives.theme && theme[sumOfDirectives.theme]) {
     const tmpConfigFromInitialize = assignWithDepth({}, configFromInitialize);
     const themeVariables = assignWithDepth(
       tmpConfigFromInitialize.themeVariables || {},
@@ -59,7 +59,7 @@ export const setSiteConfig = (conf) => {
   siteConfig = assignWithDepth({}, defaultConfig);
   siteConfig = assignWithDepth(siteConfig, conf);
 
-  if (conf.theme) {
+  if (conf.theme && theme[conf.theme]) {
     siteConfig.themeVariables = theme[conf.theme].getThemeVariables(conf.themeVariables);
   }