fix: electron preload script

bitfocus · Jul 2, 2024 · beed579 · beed579
1 parent 6ee2259
commit beed579
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/satellite/src/electron.ts b/satellite/src/electron.ts
@@ -74,7 +74,7 @@ trayMenu.append(
 				height: 720,
 				autoHideMenuBar: isProduction,
 				webPreferences: {
-					preload: fileURLToPath(new URL('../dist/electronPreload.js', import.meta.url)),
+					preload: fileURLToPath(new URL('../dist/electronPreload.cjs', import.meta.url)),
 				},
 			})
 			configWindow.on('close', () => {

diff --git a/satellite/src/electronPreload.ts → satellite/src/electronPreload.cts b/satellite/src/electronPreload.ts → satellite/src/electronPreload.cts
@@ -1,7 +1,8 @@
-import { contextBridge, ipcRenderer } from 'electron'
+const { contextBridge, ipcRenderer } = require('electron')
+// @ts-expect-error
 import type { ApiConfigData, ApiStatusResponse } from './apiTypes.js'
 
-export const electronApi = {
+const electronApi = {
 	rescanSurfaces: (): void => ipcRenderer.send('rescan'),
 	getStatus: async (): Promise<ApiStatusResponse> => ipcRenderer.invoke('getStatus'),
 	getConfig: async (): Promise<ApiConfigData> => ipcRenderer.invoke('getConfig'),
@@ -10,3 +11,5 @@ export const electronApi = {
 }
 
 contextBridge.exposeInMainWorld('electronApi', electronApi)
+
+export type { electronApi }
diff --git a/satellite/tsconfig.build.json b/satellite/tsconfig.build.json
@@ -1,6 +1,6 @@
 {
 	"extends": "@tsconfig/node20/tsconfig.json",
-	"include": ["src/**/*.ts"],
+	"include": ["src/**/*.ts", "src/**/*.cts", "src/**/*.mts"],
 	"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
 	"compilerOptions": {
 		"outDir": "./dist",

diff --git a/webui/src/vite-env.d.ts b/webui/src/vite-env.d.ts
@@ -1,3 +1,3 @@
 /// <reference types="vite/client" />
 
-declare const electronApi: typeof import('../../dist/electronPreload').electronApi
+declare const electronApi: typeof import('../../satellite/dist/electronPreload.cjs').electronApi
diff --git a/webui/vite.config.ts b/webui/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig({
 			input: {
 				main: resolve(__dirname, 'index.html'),
 				electron: resolve(__dirname, 'electron.html'),
+				// preload: resolve(__dirname, 'preload.ts'),
 			},
 		},
 	},