#2596 の変更提案プルリクエスト

src/backend/electron/ipc.ts

@@ -1,41 +1,23 @@
-import {
-  BrowserWindow,
-  ipcMain,
-  IpcMainInvokeEvent,
-  IpcRendererEvent,
-} from "electron";
+import { BrowserWindow, ipcMain, IpcMainInvokeEvent } from "electron";
 import { IpcIHData, IpcSOData } from "@/type/ipc";
 import { createLogger } from "@/helpers/log";
 
 const log = createLogger("ipc");
 
-export type IpcRendererInvoke = {
-  [K in keyof IpcIHData]: (
-    ...args: IpcIHData[K]["args"]
-  ) => Promise<IpcIHData[K]["return"]>;
-};
-
 export type IpcMainHandle = {
   [K in keyof IpcIHData]: (
     event: IpcMainInvokeEvent,
     ...args: IpcIHData[K]["args"]
   ) => Promise<IpcIHData[K]["return"]> | IpcIHData[K]["return"];
 };
 
-export type IpcMainSend = {
+type IpcMainSend = {
   [K in keyof IpcSOData]: (
     win: BrowserWindow,
     ...args: IpcSOData[K]["args"]
   ) => void;
 };
 
-export type IpcRendererOn = {
-  [K in keyof IpcSOData]: (
-    event: IpcRendererEvent,
-    ...args: IpcSOData[K]["args"]
-  ) => Promise<IpcSOData[K]["return"]> | IpcSOData[K]["return"];
-};
-
 // FIXME: asを使わないようオーバーロードにした。オーバーロードも使わない書き方にしたい。
 export function registerIpcMainHandle<T extends IpcMainHandle>(
   listeners: T,

src/backend/electron/renderer/ipc.ts

@@ -0,0 +1,7 @@
+import { IpcIHData } from "@/type/ipc";
+
+export type IpcRendererInvoke = {
+  [K in keyof IpcIHData]: (
+    ...args: IpcIHData[K]["args"]
+  ) => Promise<IpcIHData[K]["return"]>;
+};

src/components/App.vue

@@ -42,7 +42,7 @@ import { setFontToCss, setThemeToCss } from "@/domain/dom";
 import { useCommonMenuBarData } from "@/domain/menuBarData";
 import { concatMenuBarData } from "@/domain/menuBarData";
 import { isElectron } from "@/helpers/platform";
-import { useElectronMenuBarData } from "@/backend/electron/menuBarData";
+import { useElectronMenuBarData } from "@/backend/electron/renderer/menuBarData";
 
 const store = useStore();
 

vite.config.mts

@@ -126,7 +126,7 @@ export default defineConfig((options) => {
           },
           {
             // ref: https://electron-vite.github.io/guide/preload-not-split.html
-            entry: "./backend/electron/preload.ts",
+            entry: "./backend/electron/renderer/preload.ts",
             onstart({ reload }) {
               if (!skipLaunchElectron) {
                 reload();