From 8bfb1009ce7ab9977244c83e68802172dd67f207 Mon Sep 17 00:00:00 2001 From: snomiao Date: Sun, 19 Oct 2025 00:02:04 +0000 Subject: [PATCH] [style] migrate to @prettier/plugin-oxc for faster formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace @trivago/prettier-plugin-sort-imports with @prettier/plugin-oxc and @ianvs/prettier-plugin-sort-imports for improved performance. Changes: - Add @prettier/plugin-oxc (Rust-based fast parser) - Add @ianvs/prettier-plugin-sort-imports (import sorting compatible with oxc) - Remove @trivago/prettier-plugin-sort-imports - Update .prettierrc to use new plugins and compatible import order config - Reformat all files with new plugin configuration 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .prettierrc | 22 +- .storybook/preview.ts | 4 + apps/desktop-ui/.storybook/preview.ts | 3 + .../tabs/terminal/BaseTerminal.vue | 3 +- .../install/InstallLocationPicker.vue | 8 +- .../maintenance/TaskListStatusIcon.vue | 3 +- .../maintenance/TerminalOutputDrawer.vue | 3 +- .../bottomPanelTabs/useTerminal.ts | 5 +- apps/desktop-ui/src/main.ts | 4 + apps/desktop-ui/src/utils/refUtil.ts | 2 +- .../src/views/DesktopDialogView.vue | 2 +- apps/desktop-ui/src/views/MaintenanceView.vue | 3 +- apps/desktop-ui/src/views/ServerStartView.vue | 7 +- apps/desktop-ui/vite.config.mts | 5 +- browser_tests/fixtures/ComfyPage.ts | 14 +- browser_tests/fixtures/UserSelectPage.ts | 3 +- browser_tests/fixtures/components/Topbar.ts | 3 +- browser_tests/fixtures/utils/taskHistory.ts | 5 +- .../fixtures/utils/vueNodeFixtures.ts | 3 +- browser_tests/helpers/templates.ts | 3 +- browser_tests/tests/actionbar.spec.ts | 3 +- browser_tests/tests/changeTracker.spec.ts | 4 +- browser_tests/tests/chatHistory.spec.ts | 3 +- browser_tests/tests/customIcons.spec.ts | 3 +- browser_tests/tests/dialog.spec.ts | 3 +- browser_tests/tests/groupNode.spec.ts | 3 +- browser_tests/tests/interaction.spec.ts | 7 +- browser_tests/tests/remoteWidgets.spec.ts | 3 +- browser_tests/tests/templates.spec.ts | 3 +- .../vueNodes/interactions/node/move.spec.ts | 4 +- .../text/multilineStringWidget.spec.ts | 4 +- .../tests/workflowTabThumbnail.spec.ts | 2 +- browser_tests/utils/backupUtils.ts | 3 +- build/plugins/comfyAPIPlugin.ts | 1 + build/plugins/generateImportMapPlugin.ts | 5 +- package.json | 3 +- packages/design-system/src/iconCollection.ts | 5 +- pnpm-lock.yaml | 264 ++++++++++++++---- pnpm-workspace.yaml | 3 +- scripts/check-unused-i18n-keys.ts | 1 + scripts/diff-i18n.ts | 2 +- scripts/generate-json-schema.ts | 1 + scripts/size-collect.js | 3 +- scripts/size-report.js | 3 +- src/components/bottomPanel/BottomPanel.vue | 3 +- .../tabs/shortcuts/ViewControlsPanel.vue | 4 +- .../tabs/terminal/BaseTerminal.vue | 3 +- .../tabs/terminal/CommandTerminal.vue | 3 +- .../tabs/terminal/LogsTerminal.vue | 3 +- .../breadcrumb/SubgraphBreadcrumbItem.vue | 3 +- src/components/button/IconButton.vue | 4 +- src/components/button/IconTextButton.vue | 4 +- src/components/button/TextButton.vue | 4 +- src/components/common/FormItem.vue | 3 +- src/components/common/SearchBox.vue | 3 +- src/components/common/TreeExplorer.vue | 8 +- .../common/TreeExplorerTreeNode.test.ts | 6 +- .../common/TreeExplorerTreeNode.vue | 8 +- src/components/common/VirtualGrid.vue | 3 +- .../dialog/content/ErrorDialogContent.vue | 6 +- .../dialog/content/UpdatePasswordContent.vue | 3 +- .../content/credit/CreditTopUpOption.vue | 7 +- .../content/setting/KeybindingPanel.vue | 4 +- .../dialog/content/setting/UsageLogsTable.vue | 4 +- .../dialog/content/signin/ApiKeyForm.vue | 3 +- .../dialog/content/signin/SignInForm.test.ts | 3 +- .../dialog/content/signin/SignInForm.vue | 6 +- .../dialog/content/signin/SignUpForm.vue | 6 +- src/components/graph/GraphCanvas.vue | 8 +- src/components/graph/NodeTooltip.vue | 4 +- src/components/graph/SelectionToolbox.vue | 3 +- src/components/graph/TitleEditor.vue | 7 +- .../graph/modals/ZoomControlsModal.vue | 3 +- .../selectionToolbox/ColorPickerButton.vue | 11 +- .../ExtensionCommandButton.vue | 3 +- .../graph/selectionToolbox/NodeOptions.vue | 8 +- src/components/graph/widgets/DomWidget.vue | 10 +- .../helpcenter/HelpCenterMenuContent.vue | 10 +- src/components/input/MultiSelect.vue | 8 +- src/components/input/SingleSelect.vue | 3 +- src/components/load3d/Load3D.vue | 6 +- src/components/load3d/Load3DAnimation.vue | 4 +- .../load3d/Load3DAnimationScene.vue | 2 +- src/components/load3d/Load3DScene.vue | 4 +- src/components/searchbox/NodeSearchBox.vue | 7 +- .../searchbox/NodeSearchBoxPopover.vue | 10 +- src/components/searchbox/NodeSearchFilter.vue | 3 +- src/components/searchbox/NodeSearchItem.vue | 6 +- src/components/sidebar/ComfyMenuButton.vue | 6 +- src/components/sidebar/SidebarIcon.vue | 3 +- .../sidebar/tabs/ModelLibrarySidebarTab.vue | 10 +- .../sidebar/tabs/NodeLibrarySidebarTab.vue | 8 +- .../sidebar/tabs/QueueSidebarTab.vue | 9 +- .../tabs/modelLibrary/DownloadItem.vue | 6 +- .../tabs/modelLibrary/ModelTreeLeaf.vue | 10 +- .../tabs/nodeLibrary/NodeTreeFolder.vue | 6 +- .../sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue | 10 +- .../sidebar/tabs/queue/TaskItem.vue | 3 +- .../tabs/workflows/WorkflowTreeLeaf.vue | 6 +- .../topbar/CurrentUserButton.test.ts | 3 +- .../topbar/CurrentUserPopover.test.ts | 3 +- src/components/topbar/WorkflowTab.vue | 6 +- src/components/topbar/WorkflowTabs.vue | 14 +- src/components/ui/slider/Slider.vue | 8 +- .../auth/useFirebaseAuthActions.ts | 6 +- .../useCommandSubcategories.ts | 3 +- .../bottomPanelTabs/useTerminal.ts | 5 +- .../canvas/useSelectedLiteGraphItems.ts | 8 +- .../canvas/useSelectionToolboxPosition.ts | 3 +- .../element/useAbsolutePosition.ts | 3 +- src/composables/element/useDomClipping.ts | 3 +- src/composables/graph/useGroupMenuOptions.ts | 7 +- src/composables/graph/useMoreOptionsMenu.ts | 3 +- src/composables/graph/useNodeCustomization.ts | 4 +- .../graph/useSelectionMenuOptions.ts | 3 +- src/composables/graph/useSelectionState.ts | 7 +- src/composables/graph/useVueNodeLifecycle.ts | 6 +- src/composables/graph/useWidgetValue.ts | 3 +- src/composables/node/useNodeBadge.ts | 10 +- src/composables/node/useWatchWidget.ts | 3 +- src/composables/useCanvasDrop.ts | 9 +- src/composables/useContextMenuTranslation.ts | 13 +- src/composables/useCoreCommands.ts | 10 +- src/composables/useGlobalLitegraph.ts | 4 +- src/composables/useIntersectionObserver.ts | 3 +- src/composables/useLazyPagination.ts | 3 +- src/composables/useLoad3dViewer.ts | 4 +- src/composables/usePaste.ts | 3 +- src/composables/usePopoverSizing.ts | 3 +- src/composables/usePragmaticDragAndDrop.ts | 3 +- src/composables/useTemplateFiltering.ts | 3 +- src/core/graph/subgraph/SubgraphNode.vue | 12 +- src/core/graph/subgraph/proxyWidgetUtils.ts | 6 +- .../graph/subgraph/useSubgraphNodeDialog.ts | 3 +- src/extensions/core/clipspace.ts | 3 +- src/extensions/core/contextMenuFilter.ts | 4 +- src/extensions/core/groupNode.ts | 6 +- src/extensions/core/groupNodeManage.ts | 7 +- src/extensions/core/groupOptions.ts | 8 +- src/extensions/core/load3d.ts | 6 +- src/extensions/core/load3d/Load3d.ts | 14 +- src/extensions/core/load3d/Load3dAnimation.ts | 2 +- src/extensions/core/load3d/SceneManager.ts | 2 +- src/extensions/core/load3d/interfaces.ts | 2 +- src/extensions/core/maskEditorOld.ts | 3 +- src/extensions/core/maskeditor.ts | 9 +- src/extensions/core/noteNode.ts | 7 +- src/extensions/core/rerouteNode.ts | 4 +- src/extensions/core/saveMesh.ts | 2 +- src/extensions/core/selectionBorder.ts | 2 +- src/extensions/core/uploadImage.ts | 4 +- src/extensions/core/widgetInputs.ts | 21 +- src/lib/litegraph/src/LGraph.ts | 22 +- src/lib/litegraph/src/LGraphBadge.ts | 3 +- src/lib/litegraph/src/LGraphButton.ts | 3 +- src/lib/litegraph/src/LGraphCanvas.ts | 31 +- src/lib/litegraph/src/LGraphGroup.ts | 6 +- src/lib/litegraph/src/LGraphNode.ts | 38 +-- src/lib/litegraph/src/LLink.ts | 4 +- src/lib/litegraph/src/LiteGraphGlobal.ts | 10 +- src/lib/litegraph/src/Reroute.ts | 11 +- .../src/canvas/FloatingRenderLink.ts | 6 +- src/lib/litegraph/src/canvas/LinkConnector.ts | 6 +- .../litegraph/src/canvas/MovingInputLink.ts | 8 +- .../litegraph/src/canvas/MovingLinkBase.ts | 8 +- .../litegraph/src/canvas/MovingOutputLink.ts | 8 +- src/lib/litegraph/src/canvas/RenderLink.ts | 6 +- .../src/canvas/ToInputFromIoNodeLink.ts | 8 +- .../litegraph/src/canvas/ToInputRenderLink.ts | 8 +- .../src/canvas/ToOutputFromIoNodeLink.ts | 6 +- .../src/canvas/ToOutputFromRerouteLink.ts | 2 +- .../src/canvas/ToOutputRenderLink.ts | 6 +- src/lib/litegraph/src/canvas/measureSlots.ts | 2 +- .../infrastructure/LGraphCanvasEventMap.ts | 2 +- .../src/infrastructure/LGraphEventMap.ts | 2 +- .../infrastructure/LinkConnectorEventMap.ts | 6 +- src/lib/litegraph/src/interfaces.ts | 2 +- src/lib/litegraph/src/litegraph.ts | 4 +- src/lib/litegraph/src/measure.ts | 2 +- src/lib/litegraph/src/node/NodeInputSlot.ts | 7 +- src/lib/litegraph/src/node/NodeOutputSlot.ts | 7 +- src/lib/litegraph/src/node/NodeSlot.ts | 2 +- src/lib/litegraph/src/node/SlotBase.ts | 2 +- .../src/subgraph/EmptySubgraphInput.ts | 2 +- .../src/subgraph/EmptySubgraphOutput.ts | 2 +- .../src/subgraph/ExecutableNodeDTO.ts | 4 +- .../src/subgraph/SubgraphIONodeBase.ts | 14 +- .../litegraph/src/subgraph/SubgraphInput.ts | 6 +- .../src/subgraph/SubgraphInputNode.ts | 12 +- .../litegraph/src/subgraph/SubgraphNode.ts | 32 ++- .../litegraph/src/subgraph/SubgraphOutput.ts | 6 +- .../src/subgraph/SubgraphOutputNode.ts | 12 +- .../src/subgraph/SubgraphSlotBase.ts | 11 +- .../litegraph/src/subgraph/subgraphUtils.ts | 13 +- src/lib/litegraph/src/types/NodeLike.ts | 2 +- src/lib/litegraph/src/types/serialisation.ts | 10 +- src/lib/litegraph/src/utils/arrange.ts | 2 +- src/lib/litegraph/src/widgets/AssetWidget.ts | 3 +- .../src/widgets/BaseSteppedWidget.ts | 7 +- src/lib/litegraph/src/widgets/BaseWidget.ts | 12 +- .../litegraph/src/widgets/BooleanWidget.ts | 7 +- src/lib/litegraph/src/widgets/ButtonWidget.ts | 7 +- src/lib/litegraph/src/widgets/ChartWidget.ts | 7 +- src/lib/litegraph/src/widgets/ColorWidget.ts | 7 +- .../src/widgets/DisconnectedWidget.ts | 3 +- .../litegraph/src/widgets/FileUploadWidget.ts | 7 +- .../litegraph/src/widgets/GalleriaWidget.ts | 7 +- .../src/widgets/ImageCompareWidget.ts | 7 +- src/lib/litegraph/src/widgets/KnobWidget.ts | 7 +- src/lib/litegraph/src/widgets/LegacyWidget.ts | 3 +- .../litegraph/src/widgets/MarkdownWidget.ts | 7 +- .../src/widgets/MultiSelectWidget.ts | 7 +- .../src/widgets/SelectButtonWidget.ts | 7 +- src/lib/litegraph/src/widgets/SliderWidget.ts | 7 +- src/lib/litegraph/src/widgets/TextWidget.ts | 7 +- .../litegraph/src/widgets/TextareaWidget.ts | 7 +- .../litegraph/src/widgets/TreeSelectWidget.ts | 7 +- src/lib/litegraph/src/widgets/widgetMap.ts | 2 +- src/main.ts | 5 + .../assets/components/AssetBrowserModal.vue | 6 +- .../components/AssetFilterBar.stories.ts | 6 +- .../assets/components/MediaAssetCard.vue | 10 +- .../composables/useAssetBrowserDialog.ts | 3 +- .../composables/useAssetFilterOptions.ts | 3 +- src/platform/assets/services/assetService.ts | 12 +- .../assets/utils/createModelNodeFromAsset.ts | 13 +- .../settings/composables/useSettingSearch.ts | 4 +- .../settings/composables/useSettingUI.ts | 15 +- src/platform/updates/common/releaseService.ts | 3 +- src/platform/updates/common/releaseStore.ts | 3 +- .../workflow/core/services/workflowService.ts | 8 +- .../management/stores/workflowStore.ts | 8 +- .../composables/useWorkflowValidation.ts | 6 +- .../validation/schemas/workflowSchema.ts | 3 +- src/renderer/core/canvas/canvasStore.ts | 3 +- .../core/canvas/links/linkConnectorAdapter.ts | 4 +- .../core/canvas/links/linkDropOrchestrator.ts | 6 +- .../canvas/litegraph/litegraphLinkAdapter.ts | 20 +- .../core/canvas/litegraph/slotCalculations.ts | 2 +- src/renderer/core/layout/slots/register.ts | 4 +- src/renderer/core/layout/store/layoutStore.ts | 65 +++-- .../core/layout/sync/useLinkLayoutSync.ts | 8 +- .../core/layout/sync/useSlotLayoutSync.ts | 3 +- .../layout/transform/useTransformSettling.ts | 3 +- .../minimap/composables/useMinimapGraph.ts | 3 +- .../composables/useMinimapInteraction.ts | 3 +- .../minimap/composables/useMinimapRenderer.ts | 3 +- .../minimap/composables/useMinimapViewport.ts | 3 +- .../minimap/minimapCanvasRenderer.ts | 3 +- .../vueNodes/components/InputSlot.vue | 9 +- .../vueNodes/components/NodeSlots.test.ts | 3 +- .../vueNodes/components/OutputSlot.vue | 9 +- .../vueNodes/components/SlotConnectionDot.vue | 3 +- .../composables/useNodePointerInteractions.ts | 3 +- .../vueNodes/composables/useNodeTooltips.ts | 3 +- .../composables/useSlotElementTracking.ts | 3 +- .../composables/useSlotLinkInteraction.ts | 23 +- .../composables/useVueNodeResizeTracking.ts | 16 +- .../execution/useNodeExecutionState.ts | 3 +- .../vueNodes/layout/useNodeLayout.ts | 17 +- .../vueNodes/preview/useNodePreviewState.ts | 3 +- .../widgets/components/WidgetAudioUI.vue | 2 +- .../widgets/components/WidgetButton.test.ts | 3 +- .../components/WidgetColorPicker.test.ts | 5 +- .../widgets/components/WidgetColorPicker.vue | 12 +- .../widgets/components/WidgetGalleria.test.ts | 9 +- .../widgets/components/WidgetGalleria.vue | 4 +- .../components/WidgetImageCompare.test.ts | 5 +- .../components/WidgetInputNumberInput.vue | 4 +- .../components/WidgetInputNumberSlider.vue | 4 +- .../components/WidgetInputText.test.ts | 3 +- .../widgets/components/WidgetInputText.vue | 4 +- .../components/WidgetMultiSelect.test.ts | 3 +- .../widgets/components/WidgetMultiSelect.vue | 4 +- .../widgets/components/WidgetSelect.test.ts | 3 +- .../widgets/components/WidgetSelect.vue | 6 +- .../components/WidgetSelectDefault.vue | 4 +- .../components/WidgetSelectDropdown.vue | 14 +- .../widgets/components/WidgetTextarea.vue | 4 +- .../components/WidgetToggleSwitch.test.ts | 3 +- .../widgets/components/WidgetToggleSwitch.vue | 4 +- .../components/WidgetTreeSelect.test.ts | 6 +- .../widgets/components/WidgetTreeSelect.vue | 4 +- .../form/dropdown/FormDropdownMenuItem.vue | 3 +- .../composables/audio/useAudioPlayback.ts | 3 +- .../composables/audio/useAudioWaveform.ts | 3 +- .../widgets/composables/useBooleanWidget.ts | 6 +- .../widgets/composables/useChartWidget.ts | 8 +- .../composables/useChatHistoryWidget.ts | 7 +- .../widgets/composables/useComboWidget.ts | 28 +- .../widgets/composables/useFloatWidget.ts | 6 +- .../composables/useImagePreviewWidget.ts | 8 +- .../widgets/composables/useIntWidget.ts | 12 +- .../composables/useProgressTextWidget.ts | 7 +- .../widgets/composables/useStringWidget.ts | 6 +- .../widgets/registry/widgetRegistry.ts | 2 +- src/schemas/nodeDef/migration.ts | 8 +- src/scripts/app.ts | 21 +- src/scripts/changeTracker.ts | 3 +- src/scripts/domWidget.ts | 4 +- src/scripts/metadata/avif.ts | 2 +- src/scripts/metadata/ebml.ts | 2 +- src/scripts/metadata/gltf.ts | 6 +- src/scripts/metadata/isobmff.ts | 2 +- src/scripts/ui.ts | 2 +- src/scripts/ui/components/button.ts | 2 +- src/scripts/ui/components/popup.ts | 2 +- src/scripts/ui/menu/index.ts | 1 + src/scripts/widgets.ts | 3 +- src/services/colorPaletteService.ts | 7 +- src/services/comfyRegistryService.ts | 3 +- src/services/customerEventsService.ts | 3 +- src/services/dialogService.ts | 14 +- src/services/keybindingService.ts | 2 +- src/services/litegraphService.ts | 12 +- src/services/nodeHelpService.ts | 2 +- src/services/nodeOrganizationService.ts | 3 +- src/services/nodeSearchService.ts | 7 +- src/stores/commandStore.ts | 3 +- src/stores/dialogStore.ts | 3 +- src/stores/domWidgetStore.ts | 3 +- src/stores/electronDownloadStore.ts | 6 +- src/stores/executionStore.ts | 12 +- src/stores/firebaseAuthStore.ts | 10 +- src/stores/keybindingStore.ts | 5 +- src/stores/modelToNodeStore.ts | 3 +- src/stores/nodeBookmarkStore.ts | 4 +- src/stores/nodeDefStore.ts | 7 +- src/stores/subgraphStore.ts | 4 +- src/stores/widgetStore.ts | 9 +- src/types/litegraph-augmentation.d.ts | 1 + src/utils/executableGroupNodeChildDTO.ts | 14 +- src/utils/executableGroupNodeDto.ts | 10 +- src/utils/executionUtil.ts | 10 +- src/utils/fuseUtil.ts | 7 +- src/utils/graphTraversalUtil.ts | 7 +- src/utils/linkFixer.ts | 2 +- src/utils/litegraphUtil.ts | 5 +- src/utils/markdownRendererUtil.ts | 2 +- src/utils/nodeDefUtil.ts | 16 +- src/utils/nodeHelpUtil.ts | 2 +- src/utils/vintageClipboard.ts | 10 +- src/views/GraphView.vue | 2 +- src/views/UserSelectView.vue | 3 +- .../ManagerProgressDialogContent.test.ts | 3 +- .../manager/ManagerDialogContent.vue | 8 +- .../manager/PackVersionBadge.test.ts | 3 +- .../PackVersionSelectorPopover.test.ts | 3 +- .../manager/button/PackEnableToggle.test.ts | 3 +- .../manager/infoPanel/InfoPanel.vue | 4 +- .../manager/infoPanel/InfoPanelMultiItem.vue | 2 +- .../infoPanel/tabs/DescriptionTabPanel.vue | 5 +- .../components/manager/packCard/PackCard.vue | 10 +- .../registrySearchBar/RegistrySearchBar.vue | 11 +- .../skeleton/PackCardGridSkeleton.test.ts | 3 +- .../composables/nodePack/usePacksSelection.ts | 3 +- .../composables/nodePack/usePacksStatus.ts | 3 +- .../composables/useImportFailedDetection.ts | 3 +- .../manager/composables/useManagerQueue.ts | 3 +- .../composables/useManagerStatePersistence.ts | 4 +- .../manager/services/comfyManagerService.ts | 3 +- .../assets/components/AssetFilterBar.test.ts | 9 +- .../composables/useAssetFilterOptions.test.ts | 6 +- .../utils/createModelNodeFromAsset.test.ts | 4 +- tests-ui/tests/apiTypes.test.ts | 4 +- tests-ui/tests/audioService.test.ts | 4 +- tests-ui/tests/comfyWorkflow.test.ts | 1 + .../tabs/terminal/BaseTerminal.test.ts | 3 +- .../canvas/useSelectedLiteGraphItems.test.ts | 6 +- .../graph/useSelectionState.test.ts | 2 +- .../composables/graph/useWidgetValue.test.ts | 4 +- .../composables/useErrorHandling.test.ts | 6 +- .../useFrontendVersionMismatchWarning.test.ts | 3 +- .../litegraph/canvas/LinkConnector.test.ts | 7 +- ...nkConnectorSubgraphInputValidation.test.ts | 13 +- .../tests/litegraph/core/LGraphButton.test.ts | 3 +- .../core/LGraphCanvas.titleButtons.test.ts | 7 +- .../tests/litegraph/core/LGraphNode.test.ts | 16 +- .../core/LGraphNode.titleButtons.test.ts | 8 +- .../core/LinkConnector.integration.test.ts | 7 +- .../litegraph/core/LinkConnector.test.ts | 12 +- .../tests/litegraph/core/NodeSlot.test.ts | 8 +- .../litegraph/core/ToOutputRenderLink.test.ts | 6 +- .../tests/litegraph/core/litegraph.test.ts | 7 +- .../tests/litegraph/core/serialise.test.ts | 8 +- .../infrastructure/Rectangle.test.ts | 3 +- .../subgraph/ExecutableNodeDTO.test.ts | 7 +- .../tests/litegraph/subgraph/Subgraph.test.ts | 9 +- .../subgraph/SubgraphConversion.test.ts | 6 +- .../subgraph/SubgraphNode.titleButton.test.ts | 3 +- .../subgraph/SubgraphSlotConnections.test.ts | 15 +- .../subgraph/SubgraphWidgetPromotion.test.ts | 11 +- .../subgraph/fixtures/subgraphFixtures.ts | 3 +- .../subgraph/fixtures/subgraphHelpers.ts | 12 +- .../litegraph/subgraph/subgraphUtils.test.ts | 6 +- .../litegraph/utils/spaceDistribution.test.ts | 4 +- tests-ui/tests/litegraph/utils/widget.test.ts | 6 +- .../tests/minimap/MinimapDataSource.test.ts | 2 +- tests-ui/tests/nodeSource.test.ts | 2 +- .../renderer/core/layout/layoutStore.test.ts | 2 +- .../core/layout/utils/layoutMath.test.ts | 4 +- .../core/layout/utils/mappers.test.ts | 4 +- .../minimap/minimapCanvasRenderer.test.ts | 7 +- .../composables/useNodeEventHandlers.test.ts | 4 +- .../composables/useWorkflowThumbnail.test.ts | 6 +- .../services/keybindingService.escape.test.ts | 2 +- tests-ui/tests/store/nodeDefStore.test.ts | 2 +- .../store/subgraphNavigationStore.test.ts | 6 +- .../subgraphNavigationStore.viewport.test.ts | 6 +- tests-ui/tests/store/workflowStore.test.ts | 6 +- .../tests/types/nodeIdentification.test.ts | 4 +- .../utils/migration/migrateReroute.test.ts | 1 + tests-ui/tests/utils/serachAndReplace.test.ts | 3 +- tests-ui/tests/utils/spatial/QuadTree.test.ts | 2 +- tests-ui/tests/widgets/proxyWidget.test.ts | 7 +- vite.config.mts | 3 +- vite.electron.config.mts | 3 +- vite.types.config.mts | 1 + vitest.setup.ts | 1 + 419 files changed, 1559 insertions(+), 1187 deletions(-) diff --git a/.prettierrc b/.prettierrc index 07c5ccc220..bb98e70de2 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,15 +4,15 @@ "semi": false, "trailingComma": "none", "printWidth": 80, - "importOrder": ["^@core/(.*)$", "", "^@/(.*)$", "^[./]"], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true, - "overrides": [ - { - "files": "*.{js,cjs,mjs,ts,cts,mts,tsx,vue}", - "options": { - "plugins": ["@trivago/prettier-plugin-sort-imports"] - } - } - ] + "importOrder": [ + "^@core/(.*)$", + "", + "", + "", + "^@/(.*)$", + "", + "^[./]" + ], + "importOrderTypeScriptVersion": "5.0.0", + "plugins": ["@prettier/plugin-oxc", "@ianvs/prettier-plugin-sort-imports"] } diff --git a/.storybook/preview.ts b/.storybook/preview.ts index bfe81f4311..562103fbb1 100644 --- a/.storybook/preview.ts +++ b/.storybook/preview.ts @@ -3,14 +3,18 @@ import Aura from '@primevue/themes/aura' import { setup } from '@storybook/vue3' import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite' import { createPinia } from 'pinia' + import 'primeicons/primeicons.css' + import PrimeVue from 'primevue/config' import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import Tooltip from 'primevue/tooltip' import '@/assets/css/style.css' + import { i18n } from '@/i18n' + import '@/lib/litegraph/public/css/litegraph.css' const ComfyUIPreset = definePreset(Aura, { diff --git a/apps/desktop-ui/.storybook/preview.ts b/apps/desktop-ui/.storybook/preview.ts index a0ead30cc1..fcab8a6d1a 100644 --- a/apps/desktop-ui/.storybook/preview.ts +++ b/apps/desktop-ui/.storybook/preview.ts @@ -3,13 +3,16 @@ import Aura from '@primevue/themes/aura' import { setup } from '@storybook/vue3' import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite' import { createPinia } from 'pinia' + import 'primeicons/primeicons.css' + import PrimeVue from 'primevue/config' import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import Tooltip from 'primevue/tooltip' import '@/assets/css/style.css' + import { i18n } from '@/i18n' const ComfyUIPreset = definePreset(Aura, { diff --git a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue index ca0dcf34ec..4f461cc456 100644 --- a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue +++ b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue @@ -29,8 +29,7 @@ import { useElementHover, useEventListener } from '@vueuse/core' import type { IDisposable } from '@xterm/xterm' import Button from 'primevue/button' -import type { Ref } from 'vue' -import { computed, onMounted, onUnmounted, ref } from 'vue' +import { computed, onMounted, onUnmounted, ref, type Ref } from 'vue' import { useI18n } from 'vue-i18n' import { useTerminal } from '@/composables/bottomPanelTabs/useTerminal' diff --git a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue index 6b139c1e9e..75ffe21df1 100644 --- a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue +++ b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue @@ -104,8 +104,10 @@