diff --git a/web-client/electron/main.js b/web-client/electron/main.ts similarity index 97% rename from web-client/electron/main.js rename to web-client/electron/main.ts index f56dab1936..ec03b35c3b 100644 --- a/web-client/electron/main.js +++ b/web-client/electron/main.ts @@ -17,6 +17,7 @@ const createMainWindow = () => { webPreferences: { nodeIntegration: true, preload: path.join(__dirname, "preload.js"), + // contextIsolation: false, }, }); const startURL = isDev @@ -37,6 +38,7 @@ app.whenReady().then(() => { pe.init({ // Function to check from the main process that user wants to install a plugin + //@ts-ignore confirmInstall: async (plugins) => { const answer = await dialog.showMessageBox({ message: `Are you sure you want to install the plugin ${plugins.join( diff --git a/web-client/package.json b/web-client/package.json index ec449181d8..dac21365e8 100644 --- a/web-client/package.json +++ b/web-client/package.json @@ -2,7 +2,7 @@ "name": "jan-web", "version": "0.1.0", "private": true, - "main": "./electron/main.js", + "main": "./electron/main.ts", "homepage": "./", "scripts": { "dev": "next dev", @@ -20,7 +20,7 @@ "productName": "Jan Desktop App", "files": [ "out/**/*", - "electron/main.js", + "electron/main.ts", "package.json" ], "extends": null, diff --git a/web-client/tsconfig.json b/web-client/tsconfig.json index eb6136bd20..a2f685441e 100644 --- a/web-client/tsconfig.json +++ b/web-client/tsconfig.json @@ -24,6 +24,14 @@ "@/graphql": ["./graphql/generated/graphql"] } }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "electron/renderer.js", "electron/preload.js", "electron/main.js"], + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts", + "electron/renderer.js", + "electron/preload.js", + "electron/main.ts" + ], "exclude": ["node_modules"] }