From 00f031e382c643e5e5fabd952921f219b894fdd1 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Wed, 15 Jan 2025 02:52:34 +1100
Subject: [PATCH] [Refactor] Remove old workarounds (#2242)

---
 src/components/install/GpuPicker.vue |  3 ++-
 src/utils/envUtil.ts                 | 15 +++++++--------
 src/views/InstallView.vue            | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/install/GpuPicker.vue b/src/components/install/GpuPicker.vue
index 56f14b427..498c76a55 100644
--- a/src/components/install/GpuPicker.vue
+++ b/src/components/install/GpuPicker.vue
@@ -130,12 +130,13 @@
 </template>
 
 <script setup lang="ts">
+import type { TorchDeviceType } from '@comfyorg/comfyui-electron-types'
 import Tag from 'primevue/tag'
 import ToggleSwitch from 'primevue/toggleswitch'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { TorchDeviceType, electronAPI } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
 
 const { t } = useI18n()
 
diff --git a/src/utils/envUtil.ts b/src/utils/envUtil.ts
index 6a8fd6fa0..b5b987ca7 100644
--- a/src/utils/envUtil.ts
+++ b/src/utils/envUtil.ts
@@ -1,17 +1,16 @@
-import { ElectronAPI } from '@comfyorg/comfyui-electron-types'
-
-export type InstallOptions = Parameters<ElectronAPI['installComfyUI']>[0]
-export type TorchDeviceType = InstallOptions['device']
+import {
+  ElectronAPI,
+  ElectronContextMenuOptions
+} from '@comfyorg/comfyui-electron-types'
 
 export function isElectron() {
-  return 'electronAPI' in window && window['electronAPI'] !== undefined
+  return 'electronAPI' in window && window.electronAPI !== undefined
 }
 
 export function electronAPI() {
-  return (window as any)['electronAPI'] as ElectronAPI
+  return (window as any).electronAPI as ElectronAPI
 }
 
-type NativeContextOptions = Parameters<ElectronAPI['showContextMenu']>[0]
-export function showNativeMenu(options?: NativeContextOptions) {
+export function showNativeMenu(options?: ElectronContextMenuOptions) {
   electronAPI()?.showContextMenu(options)
 }
diff --git a/src/views/InstallView.vue b/src/views/InstallView.vue
index 8eb7c6b16..bed5a83c1 100644
--- a/src/views/InstallView.vue
+++ b/src/views/InstallView.vue
@@ -103,6 +103,10 @@
 </template>
 
 <script setup lang="ts">
+import type {
+  InstallOptions,
+  TorchDeviceType
+} from '@comfyorg/comfyui-electron-types'
 import Button from 'primevue/button'
 import Step from 'primevue/step'
 import StepList from 'primevue/steplist'
@@ -116,11 +120,7 @@ import DesktopSettingsConfiguration from '@/components/install/DesktopSettingsCo
 import GpuPicker from '@/components/install/GpuPicker.vue'
 import InstallLocationPicker from '@/components/install/InstallLocationPicker.vue'
 import MigrationPicker from '@/components/install/MigrationPicker.vue'
-import {
-  type InstallOptions,
-  type TorchDeviceType,
-  electronAPI
-} from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const device = ref<TorchDeviceType>(null)