From 3e82d30a32943cd04b332a14643333a74efd53ef Mon Sep 17 00:00:00 2001
From: Alex <54153428+alexpietsch@users.noreply.github.com>
Date: Wed, 1 May 2024 11:32:08 +0200
Subject: [PATCH] fix: skipLibCheck

---
 electron.ts              | 34 ++++++++++++++++++----------------
 src/services/app_icon.ts |  2 +-
 tsconfig.json            |  3 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/electron.ts b/electron.ts
index 1cd5abdbd..88ff6f56e 100644
--- a/electron.ts
+++ b/electron.ts
@@ -1,10 +1,10 @@
 "use strict";
 
-const { app, globalShortcut, BrowserWindow } = require("electron");
-const sqlInit = require("./src/services/sql_init");
-const appIconService = require("./src/services/app_icon.js");
-const windowService = require("./src/services/window");
-const tray = require("./src/services/tray");
+import electron = require("electron");
+import sqlInit = require("./src/services/sql_init");
+import appIconService = require("./src/services/app_icon");
+import windowService = require("./src/services/window");
+import tray = require("./src/services/tray");
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 require("electron-debug")();
@@ -14,31 +14,33 @@ appIconService.installLocalAppIcon();
 require("electron-dl")({ saveAs: true });
 
 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
-app.commandLine.appendSwitch("enable-experimental-web-platform-features");
+electron.app.commandLine.appendSwitch(
+  "enable-experimental-web-platform-features"
+);
 
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
-app.on("window-all-closed", () => {
+electron.app.on("window-all-closed", () => {
   if (process.platform !== "darwin") {
-    app.quit();
+    electron.app.quit();
   }
 });
 
-app.on("ready", async () => {
-  //    app.setAppUserModelId('com.github.zadam.trilium');
+electron.app.on("ready", async () => {
+  //    electron.app.setAppUserModelId('com.github.zadam.trilium');
 
   // if db is not initialized -> setup process
   // if db is initialized, then we need to wait until the migration process is finished
   if (sqlInit.isDbInitialized()) {
     await sqlInit.dbReady;
 
-    await windowService.createMainWindow(app);
+    await windowService.createMainWindow(electron.app);
 
     if (process.platform === "darwin") {
-      app.on("activate", async () => {
-        if (BrowserWindow.getAllWindows().length === 0) {
-          await windowService.createMainWindow(app);
+      electron.app.on("activate", async () => {
+        if (electron.BrowserWindow.getAllWindows().length === 0) {
+          await windowService.createMainWindow(electron.app);
         }
       });
     }
@@ -51,8 +53,8 @@ app.on("ready", async () => {
   await windowService.registerGlobalShortcuts();
 });
 
-app.on("will-quit", () => {
-  globalShortcut.unregisterAll();
+electron.app.on("will-quit", () => {
+  electron.globalShortcut.unregisterAll();
 });
 
 // this is to disable electron warning spam in the dev console (local development only)
diff --git a/src/services/app_icon.ts b/src/services/app_icon.ts
index 91f85d3e9..95438b652 100644
--- a/src/services/app_icon.ts
+++ b/src/services/app_icon.ts
@@ -68,6 +68,6 @@ function getExePath() {
      return path.resolve(resourceDir.ELECTRON_APP_ROOT_DIR, 'trilium');
 }
 
-module.exports = {
+export = {
     installLocalAppIcon
 };
diff --git a/tsconfig.json b/tsconfig.json
index b7fb43db6..bf97f7be2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,7 +8,8 @@
 	  "noImplicitAny": true,
 	  "resolveJsonModule": true,
 	  "lib": ["ES2022"],
-	  "downlevelIteration": true
+	  "downlevelIteration": true,
+	  "skipLibCheck": true
 	},
 	"include": [
       "./src/**/*.js",