refactor: core extension on-demand import

src/components/load3d/Load3DControls.vue

@@ -88,7 +88,7 @@ import type {
   LightConfig,
   ModelConfig,
   SceneConfig
-} from '@/extensions/core/load3d/interfaces'
+} from '@/extensions/core/extensions/load3d/interfaces'
 
 const sceneConfig = defineModel<SceneConfig>('sceneConfig')
 const modelConfig = defineModel<ModelConfig>('modelConfig')

src/components/load3d/controls/CameraControls.vue

@@ -22,7 +22,7 @@ import Button from 'primevue/button'
 import { computed } from 'vue'
 
 import PopupSlider from '@/components/load3d/controls/PopupSlider.vue'
-import type { CameraType } from '@/extensions/core/load3d/interfaces'
+import type { CameraType } from '@/extensions/core/extensions/load3d/interfaces'
 
 const cameraType = defineModel<CameraType>('cameraType')
 const fov = defineModel<number>('fov')

src/components/load3d/controls/LightControls.vue

@@ -35,7 +35,7 @@ import Button from 'primevue/button'
 import Slider from 'primevue/slider'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
-import type { MaterialMode } from '@/extensions/core/load3d/interfaces'
+import type { MaterialMode } from '@/extensions/core/extensions/load3d/interfaces'
 import { useSettingStore } from '@/platform/settings/settingStore'
 
 const lightIntensity = defineModel<number>('lightIntensity')

src/components/load3d/controls/ModelControls.vue

@@ -68,7 +68,7 @@ import { computed, onMounted, onUnmounted, ref } from 'vue'
 import type {
   MaterialMode,
   UpDirection
-} from '@/extensions/core/load3d/interfaces'
+} from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 
 const materialMode = defineModel<MaterialMode>('materialMode')

src/components/load3d/controls/SceneControls.vue

@@ -95,7 +95,7 @@ import Button from 'primevue/button'
 import { computed, ref } from 'vue'
 
 import PopupSlider from '@/components/load3d/controls/PopupSlider.vue'
-import type { BackgroundRenderModeType } from '@/extensions/core/load3d/interfaces'
+import type { BackgroundRenderModeType } from '@/extensions/core/extensions/load3d/interfaces'
 
 const emit = defineEmits<{
   (e: 'updateBackgroundImage', file: File | null): void

src/components/load3d/controls/viewer/ViewerCameraControls.vue

@@ -31,7 +31,7 @@ import Select from 'primevue/select'
 import Slider from 'primevue/slider'
 import { computed } from 'vue'
 
-import type { CameraType } from '@/extensions/core/load3d/interfaces'
+import type { CameraType } from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 
 const cameras = [

src/components/load3d/controls/viewer/ViewerModelControls.vue

@@ -29,7 +29,7 @@ import { computed } from 'vue'
 import type {
   MaterialMode,
   UpDirection
-} from '@/extensions/core/load3d/interfaces'
+} from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 
 const upDirection = defineModel<UpDirection>('upDirection')

src/composables/useLoad3d.ts

@@ -2,8 +2,8 @@ import { toRef } from '@vueuse/core'
 import type { MaybeRef } from '@vueuse/core'
 import { nextTick, ref, toRaw, watch } from 'vue'
 
-import Load3d from '@/extensions/core/load3d/Load3d'
-import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+import Load3d from '@/extensions/core/extensions/load3d/Load3d'
+import Load3dUtils from '@/extensions/core/extensions/load3d/Load3dUtils'
 import type {
   AnimationItem,
   CameraConfig,
@@ -13,7 +13,7 @@ import type {
   ModelConfig,
   SceneConfig,
   UpDirection
-} from '@/extensions/core/load3d/interfaces'
+} from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useToastStore } from '@/platform/updates/common/toastStore'

src/composables/useLoad3dDrag.ts

@@ -1,7 +1,7 @@
 import { computed, ref, toValue } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
 
-import { SUPPORTED_EXTENSIONS } from '@/extensions/core/load3d/interfaces'
+import { SUPPORTED_EXTENSIONS } from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 

src/composables/useLoad3dViewer.ts

@@ -1,13 +1,13 @@
 import { ref, toRaw, watch } from 'vue'
 
-import Load3d from '@/extensions/core/load3d/Load3d'
-import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+import Load3d from '@/extensions/core/extensions/load3d/Load3d'
+import Load3dUtils from '@/extensions/core/extensions/load3d/Load3dUtils'
 import type {
   BackgroundRenderModeType,
   CameraType,
   MaterialMode,
   UpDirection
-} from '@/extensions/core/load3d/interfaces'
+} from '@/extensions/core/extensions/load3d/interfaces'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useToastStore } from '@/platform/updates/common/toastStore'

src/extensions/core/clipspace.ts → src/extensions/core/extensions/clipspace/index.ts

@@ -1,6 +1,6 @@
-import { app } from '../../scripts/app'
-import { ComfyApp } from '../../scripts/app'
-import { $el, ComfyDialog } from '../../scripts/ui'
+import { app } from '@/scripts/app'
+import { ComfyApp } from '@/scripts/app'
+import { $el, ComfyDialog } from '@/scripts/ui'
 
 export class ClipspaceDialog extends ComfyDialog {
   static items: Array<

src/extensions/core/extensions/cloudBadges/comfy.ext.config.ts

@@ -0,0 +1,7 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Cloud.Badges',
+  activationEvents: ['*'],
+  comfyCloud: true,
+})

src/extensions/core/extensions/cloudFeedbackTopbarButton/comfy.ext.config.ts

@@ -0,0 +1,7 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Cloud.FeedbackButton',
+  activationEvents: ['*'],
+  comfyCloud: true,
+})

src/extensions/core/extensions/cloudRemoteConfig/comfy.ext.config.ts

@@ -0,0 +1,7 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Cloud.RemoteConfig',
+  activationEvents: ['*'],
+  comfyCloud: true,
+})

src/extensions/core/extensions/cloudSessionCookie/comfy.ext.config.ts

@@ -0,0 +1,7 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Cloud.SessionCookie',
+  activationEvents: ['*'],
+  comfyCloud: true,
+})

src/extensions/core/extensions/cloudSubscription/comfy.ext.config.ts

@@ -0,0 +1,9 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Cloud.Subscription',
+  activationEvents: ['*'],
+  comfyCloud: {
+    subscriptionRequired: true,
+  },
+})

src/extensions/core/contextMenuFilter.ts → src/extensions/core/extensions/contextMenuFilter/index.ts

@@ -4,7 +4,7 @@ import {
   isComboWidget
 } from '@/lib/litegraph/src/litegraph'
 
-import { app } from '../../scripts/app'
+import { app } from '@/scripts/app'
 
 // Adds filtering to combo context menus
 

src/extensions/core/editAttention.ts → src/extensions/core/extensions/editAttention/index.ts

@@ -1,4 +1,4 @@
-import { app } from '../../scripts/app'
+import { app } from '@/scripts/app'
 
 // Allows you to edit the attention weight by holding ctrl (or cmd) and using the up/down arrow keys
 

src/extensions/core/groupNode.ts → src/extensions/core/extensions/groupNode/index.ts

@@ -25,10 +25,10 @@ import { ExecutableGroupNodeChildDTO } from '@/utils/executableGroupNodeChildDTO
 import { GROUP } from '@/utils/executableGroupNodeDto'
 import { deserialiseAndCreate, serialise } from '@/utils/vintageClipboard'
 
-import { api } from '../../scripts/api'
-import { app } from '../../scripts/app'
-import { ManageGroupDialog } from './groupNodeManage'
-import { mergeIfValid } from './widgetInputs'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { ManageGroupDialog } from '../groupNodeManage'
+import { mergeIfValid } from '../widgetInputs'
 
 type GroupNodeWorkflowData = {
   external: ComfyLink[]

src/extensions/core/groupNodeManage.ts → src/extensions/core/extensions/groupNodeManage/index.ts

@@ -6,11 +6,11 @@ import {
 } from '@/lib/litegraph/src/litegraph'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 
-import { type ComfyApp, app } from '../../scripts/app'
-import { $el } from '../../scripts/ui'
-import { ComfyDialog } from '../../scripts/ui/dialog'
-import { DraggableList } from '../../scripts/ui/draggableList'
-import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
+import { type ComfyApp, app } from '@/scripts/app'
+import { $el } from '@/scripts/ui'
+import { ComfyDialog } from '@/scripts/ui/dialog'
+import { DraggableList } from '@/scripts/ui/draggableList'
+import { GroupNodeConfig, GroupNodeHandler } from '../groupNode'
 import './groupNodeManage.css'
 
 const ORDER: symbol = Symbol()

src/extensions/core/groupOptions.ts → src/extensions/core/extensions/groupOptions/index.ts

@@ -10,7 +10,7 @@ import {
 import { useSettingStore } from '@/platform/settings/settingStore'
 import type { ComfyExtension } from '@/types/comfy'
 
-import { app } from '../../scripts/app'
+import { app } from '@/scripts/app'
 
 function setNodeMode(node: LGraphNode, mode: number) {
   node.mode = mode

src/extensions/core/load3d/AnimationManager.ts → src/extensions/core/extensions/load3d/AnimationManager.ts

@@ -4,7 +4,7 @@ import {
   type AnimationItem,
   type AnimationManagerInterface,
   type EventManagerInterface
-} from '@/extensions/core/load3d/interfaces'
+} from './interfaces'
 
 export class AnimationManager implements AnimationManagerInterface {
   currentAnimation: THREE.AnimationMixer | null = null

src/extensions/core/load3d/Load3DConfiguration.ts → src/extensions/core/extensions/load3d/Load3DConfiguration.ts

@@ -1,11 +1,11 @@
-import Load3d from '@/extensions/core/load3d/Load3d'
-import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+import Load3d from './Load3d'
+import Load3dUtils from './Load3dUtils'
 import type {
   CameraConfig,
   LightConfig,
   ModelConfig,
   SceneConfig
-} from '@/extensions/core/load3d/interfaces'
+} from './interfaces'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { api } from '@/scripts/api'

src/extensions/core/extensions/load3d/comfy.ext.config.ts

@@ -0,0 +1,111 @@
+import { defineComfyExtConfig } from '@/extensions/utils'
+
+export default defineComfyExtConfig({
+  name: 'Comfy.Load3D',
+  activationEvents: ['onWidgets:contributes', 'onCommands:contributes', 'onSettings:contributes'],
+  contributes: [
+    {
+      name: 'Comfy.Preview3D',
+      widgets: ['PREVIEW_3D'],
+    },
+    {
+      name: 'Comfy.Load3D',
+      widgets: ['LOAD_3D'],
+      settings: [
+        {
+          id: 'Comfy.Load3D.ShowGrid',
+          category: ['3D', 'Scene', 'Initial Grid Visibility'],
+          name: 'Initial Grid Visibility',
+          tooltip:
+            'Controls whether the grid is visible by default when a new 3D widget is created. This default can still be toggled individually for each widget after creation.',
+          type: 'boolean',
+          defaultValue: true,
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.BackgroundColor',
+          category: ['3D', 'Scene', 'Initial Background Color'],
+          name: 'Initial Background Color',
+          tooltip:
+            'Controls the default background color of the 3D scene. This setting determines the background appearance when a new 3D widget is created, but can be adjusted individually for each widget after creation.',
+          type: 'color',
+          defaultValue: '282828',
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.CameraType',
+          category: ['3D', 'Camera', 'Initial Camera Type'],
+          name: 'Initial Camera Type',
+          tooltip:
+            'Controls whether the camera is perspective or orthographic by default when a new 3D widget is created. This default can still be toggled individually for each widget after creation.',
+          type: 'combo',
+          options: ['perspective', 'orthographic'],
+          defaultValue: 'perspective',
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.LightIntensity',
+          category: ['3D', 'Light', 'Initial Light Intensity'],
+          name: 'Initial Light Intensity',
+          tooltip:
+            'Sets the default brightness level of lighting in the 3D scene. This value determines how intensely lights illuminate objects when a new 3D widget is created, but can be adjusted individually for each widget after creation.',
+          type: 'number',
+          defaultValue: 3,
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.LightIntensityMaximum',
+          category: ['3D', 'Light', 'Light Intensity Maximum'],
+          name: 'Light Intensity Maximum',
+          tooltip:
+            'Sets the maximum allowable light intensity value for 3D scenes. This defines the upper brightness limit that can be set when adjusting lighting in any 3D widget.',
+          type: 'number',
+          defaultValue: 10,
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.LightIntensityMinimum',
+          category: ['3D', 'Light', 'Light Intensity Minimum'],
+          name: 'Light Intensity Minimum',
+          tooltip:
+            'Sets the minimum allowable light intensity value for 3D scenes. This defines the lower brightness limit that can be set when adjusting lighting in any 3D widget.',
+          type: 'number',
+          defaultValue: 1,
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.LightAdjustmentIncrement',
+          category: ['3D', 'Light', 'Light Adjustment Increment'],
+          name: 'Light Adjustment Increment',
+          tooltip:
+            'Controls the increment size when adjusting light intensity in 3D scenes. A smaller step value allows for finer control over lighting adjustments, while a larger value results in more noticeable changes per adjustment.',
+          type: 'slider',
+          attrs: {
+            min: 0.1,
+            max: 1,
+            step: 0.1
+          },
+          defaultValue: 0.5,
+          experimental: true
+        },
+        {
+          id: 'Comfy.Load3D.3DViewerEnable',
+          category: ['3D', '3DViewer', 'Enable'],
+          name: 'Enable 3D Viewer (Beta)',
+          tooltip:
+            'Enables the 3D Viewer (Beta) for selected nodes. This feature allows you to visualize and interact with 3D models directly within the full size 3d viewer.',
+          type: 'boolean',
+          defaultValue: false,
+          experimental: true
+        }
+      ],
+      commands: [
+        {
+          id: 'Comfy.3DViewer.Open3DViewer',
+          icon: 'pi pi-pencil',
+          label: 'Open 3D Viewer (Beta) for Selected Node',
+        }
+      ],
+    },
+  ],
+})

src/extensions/core/load3d/exportMenuHelper.ts → src/extensions/core/extensions/load3d/exportMenuHelper.ts

@@ -1,7 +1,7 @@
 import { t } from '@/i18n'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
 import { useToastStore } from '@/platform/updates/common/toastStore'
-import Load3d from '@/extensions/core/load3d/Load3d'
+import Load3d from './Load3d'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 
 const EXPORT_FORMATS = [

src/extensions/core/load3d.ts → src/extensions/core/extensions/load3d/index.ts

@@ -3,9 +3,9 @@ import { nextTick } from 'vue'
 import Load3D from '@/components/load3d/Load3D.vue'
 import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue'
 import { nodeToLoad3dMap, useLoad3d } from '@/composables/useLoad3d'
-import { createExportMenuItems } from '@/extensions/core/load3d/exportMenuHelper'
-import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
-import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+import { createExportMenuItems } from './exportMenuHelper'
+import Load3DConfiguration from './Load3DConfiguration'
+import Load3dUtils from './Load3dUtils'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'

src/extensions/core/maskeditor/MaskEditorDialog.ts → src/extensions/core/extensions/maskeditor/MaskEditorDialog.ts

@@ -1,7 +1,7 @@
 import { t } from '@/i18n'
-import { api } from '../../../scripts/api'
-import { ComfyApp } from '../../../scripts/app'
-import { $el, ComfyDialog } from '../../../scripts/ui'
+import { api } from '@/scripts/api'
+import { ComfyApp } from '@/scripts/app'
+import { $el, ComfyDialog } from '@/scripts/ui'
 import { ClipspaceDialog } from '../clipspace'
 import { imageLayerFilenamesByTimestamp } from './utils/maskEditorLayerFilenames'
 import { CanvasHistory } from './CanvasHistory'