Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/core/IPCManager.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IpcMainEvents, IpcRendererEvents } from '@shared/ipc/events'
import type { ExtractArgs, ExtractHandler, IpcEventMap, IpcListenEventMap } from '@shared/ipc/types'
import { ipcMain } from 'electron'
import { IpcMainEvents, IpcRendererEvents } from '../../preload/ipcEvent'
import type { ExtractArgs, ExtractHandler, IpcEventMap, IpcListenEventMap } from '../../preload/ipcTypes'
import logger from './Logger'

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/core/WindowManager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IpcRendererEvents } from '@shared/ipc/events'
import { app, BrowserWindow, shell, WebContents } from 'electron'
import is from 'electron-is'
import EventEmitter from 'node:events'
import { IpcRendererEvents } from '../../preload/ipcEvent'
import { pages } from '../config/page'
import type { Pages } from '../config/types'
import ConfigManager from './ConfigManager'
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RendererEmitterInvokeFn, RendererEmitterSendFn, RendererHandlerFn } from '@preload/ipcEvent'
import { emitter, ipc } from '@renderer/ipc'
import { RendererEmitterInvokeFn, RendererEmitterSendFn, RendererHandlerFn } from '@shared/ipc/events'

/**
* 从本地存储加载配置
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/ipc/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IpcMainEvents, IpcRendererEvents } from '@preload/ipcEvent'
import { IpcMainEvents, IpcRendererEvents } from '@shared/ipc/events'
import { IpcEmitter, IpcListener } from './ipc'
import mitt from './mitt'
import { MittEventMap } from './types'
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/ipc/ipc.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ExtractArgs, ExtractHandler, IpcEventMap, IpcListenEventMap } from '@preload/ipcTypes'
import type { ExtractArgs, ExtractHandler, IpcEventMap, IpcListenEventMap } from '@shared/ipc/types'

/**
* Typed emitter for Electron `ipcRenderer`.
Expand Down
2 changes: 1 addition & 1 deletion src/preload/ipcEvent.d.ts → src/shared/ipc/events.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { OpenDialogOptions } from 'electron'
import type { ProgressInfo, UpdateCheckResult, UpdateInfo } from 'electron-updater'
import type { ComposEventMap, UserStore } from '../main/config/types'
import type { ComposEventMap, UserStore } from '../../main/config/types'

//主进程 handle IPC 事件
type IpcMainHandleEvents = {
Expand Down
File renamed without changes.
9 changes: 8 additions & 1 deletion tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@
".prettierrc.mjs",
"src/main/**/*",
"src/preload/*",
"src/shared/**/*"
],
"compilerOptions": {
"composite": true,
"types": ["electron-vite/node"]
"types": ["electron-vite/node"],
"baseUrl": ".",
"paths": {
"@shared/*": [
"src/shared/*"
]
}
}
}
5 changes: 4 additions & 1 deletion tsconfig.web.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"include": [
"src/renderer/src/**/*",
"src/renderer/src/**/*.vue",
"src/main/config/*.d.ts",
"src/preload/**/*.d.ts",
"src/shared/**/*",
"uno.config.ts",
],
"compilerOptions": {
Expand All @@ -17,6 +17,9 @@
],
"@preload/*": [
"src/preload/*"
],
"@shared/*": [
"src/shared/*"
]
}
}
Expand Down