Merge branch 'develop' into dateNote

2025-11-01 19:05:59 +01:00 · 2025-06-04 22:54:10 +03:00
parent 3339b36e61 4475568d19
commit 9bfadd7799
64 changed files with 4455 additions and 1578 deletions
--- a/apps/edit-docs/src/utils.ts
+++ b/apps/edit-docs/src/utils.ts
@@ -38,7 +38,8 @@ export function startElectron(callback: () => void): DeferredPromise<void> {
        console.log("Electron is ready!");

        // Start the server.
-        await import("@triliumnext/server/src/main.js");
+        const startTriliumServer = (await import("@triliumnext/server/src/www.js")).default;
+        await startTriliumServer();

        // Create the main window.
        await windowService.createMainWindow(electron.app);