Revert "[Refactor] Extract RerouteNode as a separate file" (#2678)

Comfy-Org · Feb 22, 2025 · 064e982 · 064e982
1 parent f43eac7
commit 064e982
Show file tree

Hide file tree

Showing 4 changed files with 737 additions and 753 deletions.
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
@@ -1,12 +1,8 @@
 // @ts-strict-ignore
-import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
+import { type LGraph, LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
 import { LGraphNode, type NodeId } from '@comfyorg/litegraph/dist/LGraphNode'
 
-import { ManageGroupDialog } from '@/extensions/core/groupNodeManage'
 import { t } from '@/i18n'
-import { mergeIfValid } from '@/nodes/PrimitiveNode'
-import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useToastStore } from '@/stores/toastStore'
@@ -15,6 +11,11 @@ import { ComfyExtension } from '@/types/comfy'
 import { ComfyLink, ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
 import { deserialiseAndCreate, serialise } from '@/utils/vintageClipboard'
 
+import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+import { ManageGroupDialog } from './groupNodeManage'
+import { mergeIfValid } from './widgetInputs'
+
 type GroupNodeWorkflowData = {
   external: ComfyLink[]
   links: ComfyLink[]

diff --git a/src/extensions/core/rerouteNode.ts b/src/extensions/core/rerouteNode.ts
@@ -2,12 +2,8 @@
 import type { IContextMenuValue } from '@comfyorg/litegraph'
 import { LGraphCanvas, LGraphNode, LiteGraph } from '@comfyorg/litegraph'
 
-import {
-  getWidgetConfig,
-  mergeIfValid,
-  setWidgetConfig
-} from '@/nodes/PrimitiveNode'
-import { app } from '@/scripts/app'
+import { app } from '../../scripts/app'
+import { getWidgetConfig, mergeIfValid, setWidgetConfig } from './widgetInputs'
 
 // Node that allows you to redirect connections for cleaner graphs