From 7935b250d0491cdc153097346ab09816eb6b0bec Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 24 Apr 2025 22:16:59 +0300 Subject: [PATCH] fix(monorepo/desktop): remote not working --- apps/desktop/webpack.config.cjs | 11 +++++++---- apps/server/src/app.ts | 2 +- apps/server/src/services/window.ts | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs index 87db2ea4b..3b61bbc73 100644 --- a/apps/desktop/webpack.config.cjs +++ b/apps/desktop/webpack.config.cjs @@ -6,7 +6,7 @@ const outputDir = join(__dirname, 'dist'); module.exports = { output: { - path: outputDir + path: outputDir, }, target: [ "node" ], plugins: [ @@ -21,13 +21,12 @@ module.exports = { generatePackageJson: true, externalDependencies: [ "electron/main", + "@electron/remote/main", "electron", "@electron/remote", "better-sqlite3" ], - assets: [ - - ] + assets: [] }), new CopyPlugin({ patterns: [ @@ -42,6 +41,10 @@ module.exports = { { from: "../server/dist/assets", to: join(outputDir, "assets") + }, + { + from: "node_modules/@electron/remote", + to: join(outputDir, "node_modules/@electron/remote") } ] }) diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index ddd9bc2d0..87390a494 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -134,7 +134,7 @@ export default async function buildApp() { startScheduledCleanup(); if (utils.isElectron) { - (await import("@electron/remote/main/index.js")).initialize(); + (await import("@electron/remote/main")).initialize(); } return app; diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts index 91bedb40c..1c041be59 100644 --- a/apps/server/src/services/window.ts +++ b/apps/server/src/services/window.ts @@ -7,7 +7,7 @@ import log from "./log.js"; import sqlInit from "./sql_init.js"; import cls from "./cls.js"; import keyboardActionsService from "./keyboard_actions.js"; -import remoteMain from "@electron/remote/main/index.js"; +import * as remoteMain from "@electron/remote/main"; import { BrowserWindow, shell, type App, type BrowserWindowConstructorOptions, type WebContents } from "electron"; import { dialog, ipcMain } from "electron"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js";