fix: infinite loop in parseUserConfig

marimo-team · Mar 19, 2024 · 8667c05 · 8667c05
1 parent 5e67e99
commit 8667c05
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/frontend/src/core/config/config-schema.ts b/frontend/src/core/config/config-schema.ts
@@ -99,12 +99,16 @@ export function parseAppConfig() {
 }
 
 export function parseUserConfig(): UserConfig {
-  try {
-    // For Pyodide, we use the local storage to store the user config.
-    if (isPyodide()) {
-      return UserConfigLocalStorage.get();
-    }
+  // For Pyodide, we use the local storage to store the user config.
+  if (isPyodide()) {
+    return UserConfigLocalStorage.get();
+  }
 
+  return parseUserConfigDOM();
+}
+
+function parseUserConfigDOM(): UserConfig {
+  try {
     const parsed = UserConfigSchema.parse(JSON.parse(getRawMarimoUserConfig()));
     for (const [key, value] of Object.entries(parsed.experimental)) {
       if (value === true) {
@@ -123,7 +127,7 @@ export function parseUserConfig(): UserConfig {
 export const UserConfigLocalStorage = new ZodLocalStorage<UserConfig>(
   "marimo:user-config",
   UserConfigSchema,
-  () => parseUserConfig(),
+  () => parseUserConfigDOM(),
 );
 
 function setFeatureFlag(