sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(monorepo/electron): rewrite server imports

pull/1738/head
Elian Doran 2025-04-18 23:56:52 +07:00
parent 5fd8038cb7
commit 00ca0e6e32
No known key found for this signature in database
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_regroup/package.json
Unescape Escape View File

@ -62,7 +62,6 @@
"@electron/rebuild": "3.7.2",
"@playwright/test": "1.51.1",
"@stylistic/eslint-plugin": "4.2.0",
"@types/electron-squirrel-startup": "1.0.2",
"@types/express": "5.0.1",
"@types/node": "22.14.1",
"@types/yargs": "17.0.33",

2
apps/electron/src/electron-main.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { initializeTranslations } from "./src/services/i18n.js";
import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js";
await initializeTranslations();
await import("./electron.js");

10
apps/electron/src/electron.ts
Unescape Escape View File

@ -3,10 +3,10 @@
import electron from "electron";
import electronDebug from "electron-debug";
import electronDl from "electron-dl";
import sqlInit from "./src/services/sql_init.js";
import windowService from "./src/services/window.js";
import tray from "./src/services/tray.js";
import options from "./src/services/options.js";
import sqlInit from "@triliumnext/server/src/services/sql_init.js";
import windowService from "@triliumnext/server/src/services/window.js";
import tray from "@triliumnext/server/src/services/tray.js";
import options from "@triliumnext/server/src/services/options.js";
// Prevent Trilium starting twice on first install and on uninstall for the Windows installer.
if ((await import("electron-squirrel-startup")).default) {
@ -64,4 +64,4 @@ electron.app.on("will-quit", () => {
// this is to disable electron warning spam in the dev console (local development only)
process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
await import("./src/main.js");
await import("@triliumnext/server/src/main.js");