Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

desktop: use nodenext module resolution to fix `could not resolve` errors

Abdullah Attacddd08c32d3c
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index 429d3de69..0e20df525 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -19,22 +19,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* eslint-disable no-var */
import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
-import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
// import type { NNCrypto } from "@notesnook/crypto";
import { ipcRenderer } from "electron";
import { platform } from "os";
declare global {
var os: () => "mas" | ReturnType<typeof platform>;
- var electronTRPC: RendererGlobalElectronTRPC;
+ var electronTRPC: any;
// var NativeNNCrypto: (new () => NNCrypto) | undefined;
}
process.once("loaded", async () => {
- const electronTRPC: RendererGlobalElectronTRPC = {
- sendMessage: (operation) =>
+ const electronTRPC = {
+ sendMessage: (operation: any) =>
ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
- onMessage: (callback) =>
+ onMessage: (callback: any) =>
ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
};
globalThis.electronTRPC = electronTRPC;
diff --git a/apps/desktop/src/utils/asset-manager.ts b/apps/desktop/src/utils/asset-manager.ts
index c8f7b959a..ed4c3a48e 100644
--- a/apps/desktop/src/utils/asset-manager.ts
+++ b/apps/desktop/src/utils/asset-manager.ts
@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import { NativeImage, nativeImage } from "electron";
import path from "path";
import { isDevelopment } from "./index";
+// @ts-expect-error stupid icojs
import { ParsedImage, parseICO } from "icojs";
import { getSystemTheme } from "./theme";
import { readFile } from "fs/promises";
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index a9aa657b6..7aee472c8 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -2,7 +2,9 @@
"extends": "../../tsconfig",
"compilerOptions": {
"outDir": "./dist/",
- "lib": ["ESNext"]
+ "lib": ["ESNext"],
+ "moduleResolution": "nodenext",
+ "module": "nodenext"
},
"include": ["src", "global.d.ts"]
}