AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(web): harden Mermaid preference reads against test window stubs
tianma-if7a7f89339fed
diff --git a/apps/web/src/components/ThemeProvider.tsx b/apps/web/src/components/ThemeProvider.tsxindex 326f6334..6dc52b79 100644--- a/apps/web/src/components/ThemeProvider.tsx+++ b/apps/web/src/components/ThemeProvider.tsx@@ -141,31 +141,34 @@ const getSystemTheme = () =>const resolveTheme = (preference: ThemePreference): ResolvedTheme =>preference === "system" ? getSystemTheme() : preference;-export const getStoredThemePreference = (): ThemePreference => {- if (typeof window === "undefined") {- return "system";+// localStorage can be missing or blocked in restricted browsers, private mode,+// and unit tests that stub `window` without a storage implementation.+const readLocalStorageItem = (key: string): string | null => {+ if (typeof window === "undefined") return null;+ try {+ return window.localStorage?.getItem(key) ?? null;+ } catch {+ return null;}+};- const stored = window.localStorage.getItem(THEME_STORAGE_KEY);+export const getStoredThemePreference = (): ThemePreference => {+ const stored = readLocalStorageItem(THEME_STORAGE_KEY);return stored === "light" || stored === "dark" || stored === "system" ? stored : "system";};export const getStoredMermaidTheme = (): MermaidThemeName => {- if (typeof window === "undefined") return "zinc-light";- const stored = window.localStorage.getItem(MERMAID_THEME_STORAGE_KEY);+ const stored = readLocalStorageItem(MERMAID_THEME_STORAGE_KEY);return MERMAID_THEME_NAMES.includes(stored as MermaidThemeName) ? stored as MermaidThemeName : "zinc-light";};export const getStoredMermaidRenderer = (): MermaidRenderer => {- if (typeof window === "undefined") return "beautiful";- const stored = window.localStorage.getItem(MERMAID_RENDERER_STORAGE_KEY);+ const stored = readLocalStorageItem(MERMAID_RENDERER_STORAGE_KEY);return MERMAID_RENDERERS.includes(stored as MermaidRenderer) ? stored as MermaidRenderer : "beautiful";};export const getStoredEditorTheme = (): string => {- if (typeof window === "undefined") return "default";- const stored = window.localStorage.getItem(EDITOR_THEME_STORAGE_KEY);- return stored || "default";+ return readLocalStorageItem(EDITOR_THEME_STORAGE_KEY) || "default";};const isHexColor = (value: unknown): value is string => typeof value === "string" && /^#[0-9a-f]{6}$/i.test(value);diff --git a/apps/web/src/lib/api.test.mjs b/apps/web/src/lib/api.test.mjsindex ce08705e..2d29c693 100644--- a/apps/web/src/lib/api.test.mjs+++ b/apps/web/src/lib/api.test.mjs@@ -1,4 +1,4 @@-import { describe, expect, test } from "bun:test";+import { afterAll, describe, expect, test } from "bun:test";const storage = new Map();const calls = [];@@ -6,7 +6,9 @@ const events = [];let completeSave;let secureSessionToken = "";let failSecureSessionWrite = false;+const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");+// Must be installed before importing modules that read `window` at load time.globalThis.window = {location: { hostname: "notes.example.com", origin: "https://notes.example.com" },edgeeverDesktop: {@@ -51,6 +53,14 @@ globalThis.window = {},};+afterAll(() => {+ if (originalWindow) {+ Object.defineProperty(globalThis, "window", originalWindow);+ } else {+ delete globalThis.window;+ }+});+const {DESKTOP_API_BASE_URL_STORAGE_KEY,api,diff --git a/apps/web/src/lib/desktop-repository.test.mjs b/apps/web/src/lib/desktop-repository.test.mjsindex 483251bd..b3568d83 100644--- a/apps/web/src/lib/desktop-repository.test.mjs+++ b/apps/web/src/lib/desktop-repository.test.mjs@@ -1,7 +1,9 @@-import { describe, expect, test } from "bun:test";+import { afterAll, describe, expect, test } from "bun:test";let lastRequest = null;+const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");+// Must be installed before importing modules that read `window` at load time.globalThis.window = {location: { hostname: "notes.example.com", origin: "https://notes.example.com" },dispatchEvent: () => true,@@ -17,6 +19,14 @@ globalThis.window = {},};+afterAll(() => {+ if (originalWindow) {+ Object.defineProperty(globalThis, "window", originalWindow);+ } else {+ delete globalThis.window;+ }+});+const { createDesktopRepository } = await import("./desktop-repository.ts");describe("desktop repository notebook filters", () => {diff --git a/apps/web/src/lib/desktop-resources.test.mjs b/apps/web/src/lib/desktop-resources.test.mjsindex d5e41340..5c11acbb 100644--- a/apps/web/src/lib/desktop-resources.test.mjs+++ b/apps/web/src/lib/desktop-resources.test.mjs@@ -1,10 +1,21 @@-import { describe, expect, test } from "bun:test";+import { afterAll, describe, expect, test } from "bun:test";+const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");++// Must be installed before importing modules that read `window` at load time.globalThis.window = {location: { hostname: "notes.example.com", origin: "https://notes.example.com" },edgeeverDesktop: { isAvailable: true, apiBaseUrl: "https://notes.example.com" },};+afterAll(() => {+ if (originalWindow) {+ Object.defineProperty(globalThis, "window", originalWindow);+ } else {+ delete globalThis.window;+ }+});+const {mapTiptapResourceUrls,createStagedResourceListItem,diff --git a/apps/web/src/lib/mermaid-renderer.test.mjs b/apps/web/src/lib/mermaid-renderer.test.mjsindex d364cfff..c0e3ed6e 100644--- a/apps/web/src/lib/mermaid-renderer.test.mjs+++ b/apps/web/src/lib/mermaid-renderer.test.mjs@@ -1,4 +1,4 @@-import { describe, expect, test } from "bun:test";+import { afterEach, describe, expect, test } from "bun:test";import { renderMermaidSVG } from "beautiful-mermaid";import mermaid from "mermaid";import { getStoredMermaidRenderer } from "../components/ThemeProvider";@@ -9,8 +9,48 @@ const GANTT_SOURCE = `ganttsection WebCompatibility fallback :fallback, 2026-07-30, 1d`;+const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");++const restoreWindow = () => {+ if (originalWindow) {+ Object.defineProperty(globalThis, "window", originalWindow);+ } else {+ delete globalThis.window;+ }+};++afterEach(() => {+ restoreWindow();+});+describe("Mermaid renderer fallback", () => {test("defaults to the compact renderer when no browser preference exists", () => {+ delete globalThis.window;+ expect(getStoredMermaidRenderer()).toBe("beautiful");+ });++ test("defaults to the compact renderer when window exists without localStorage", () => {+ globalThis.window = {+ location: { hostname: "notes.example.com" },+ };+ expect(getStoredMermaidRenderer()).toBe("beautiful");+ });++ test("defaults to the compact renderer when localStorage is empty or blocked", () => {+ globalThis.window = {+ localStorage: {+ getItem: () => null,+ },+ };+ expect(getStoredMermaidRenderer()).toBe("beautiful");++ globalThis.window = {+ localStorage: {+ getItem: () => {+ throw new Error("blocked");+ },+ },+ };expect(getStoredMermaidRenderer()).toBe("beautiful");});