[Lint] Sort imports

.github/workflows/format.yaml

@@ -20,4 +20,4 @@ jobs:
       run: npm ci
 
     - name: Run Prettier check
-      run: npx prettier --check './**/*.{js,ts,tsx,vue}'
+      run: npm run format:check

.prettierrc

@@ -3,5 +3,8 @@
   "tabWidth": 2,
   "semi": false,
   "trailingComma": "none",
-  "printWidth": 80
+  "printWidth": 80,
+  "importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true
 }

browser_tests/actionbar.spec.ts

@@ -1,6 +1,7 @@
 import type { Response } from '@playwright/test'
-import type { StatusWsMessage } from '../src/types/apiTypes.ts'
 import { expect, mergeTests } from '@playwright/test'
+
+import type { StatusWsMessage } from '../src/types/apiTypes.ts'
 import { comfyPageFixture } from './fixtures/ComfyPage'
 import { webSocketFixture } from './fixtures/ws.ts'
 

browser_tests/browserTabTitle.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Browser tab title', () => {

browser_tests/changeTracker.spec.ts

@@ -1,7 +1,7 @@
 import {
   ComfyPage,
-  comfyPageFixture as test,
-  comfyExpect as expect
+  comfyExpect as expect,
+  comfyPageFixture as test
 } from './fixtures/ComfyPage'
 
 async function beforeChange(comfyPage: ComfyPage) {

browser_tests/colorPalette.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 const customColorPalettes = {

browser_tests/commands.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Keybindings', () => {

browser_tests/copyPaste.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Copy Paste', () => {

browser_tests/dialog.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load workflow warning', () => {

browser_tests/extensionAPI.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Topbar commands', () => {

browser_tests/fixtures/ComfyPage.ts

@@ -1,24 +1,26 @@
-import type { Page, Locator, APIRequestContext } from '@playwright/test'
+import type { APIRequestContext, Locator, Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 import { test as base } from '@playwright/test'
-import { ComfyActionbar } from '../helpers/actionbar'
 import dotenv from 'dotenv'
-dotenv.config()
 import * as fs from 'fs'
-import { NodeBadgeMode } from '../../src/types/nodeSource'
+
+import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
 import type { NodeId } from '../../src/types/comfyWorkflow'
 import type { KeyCombo } from '../../src/types/keyBindingTypes'
+import { NodeBadgeMode } from '../../src/types/nodeSource'
+import { ComfyActionbar } from '../helpers/actionbar'
 import { ComfyTemplates } from '../helpers/templates'
 import { ComfyNodeSearchBox } from './components/ComfyNodeSearchBox'
+import { SettingDialog } from './components/SettingDialog'
 import {
   NodeLibrarySidebarTab,
   WorkflowsSidebarTab
 } from './components/SidebarTab'
 import { Topbar } from './components/Topbar'
-import { NodeReference } from './utils/litegraphUtils'
 import type { Position, Size } from './types'
-import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
-import { SettingDialog } from './components/SettingDialog'
+import { NodeReference } from './utils/litegraphUtils'
+
+dotenv.config()
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>
 

browser_tests/fixtures/UserSelectPage.ts

@@ -1,5 +1,5 @@
-import { Page } from 'playwright'
 import { test as base } from '@playwright/test'
+import { Page } from 'playwright'
 
 export class UserSelectPage {
   constructor(

browser_tests/fixtures/utils/litegraphUtils.ts

@@ -1,6 +1,7 @@
-import { ManageGroupNode } from '../../helpers/manageGroupNode'
-import type { NodeId } from '../../../src/types/comfyWorkflow'
 import type { Page } from '@playwright/test'
+
+import type { NodeId } from '../../../src/types/comfyWorkflow'
+import { ManageGroupNode } from '../../helpers/manageGroupNode'
 import type { ComfyPage } from '../ComfyPage'
 import type { Position, Size } from '../types'
 

browser_tests/globalSetup.ts

@@ -1,7 +1,8 @@
 import { FullConfig } from '@playwright/test'
-import { backupPath } from './utils/backupUtils'
 import dotenv from 'dotenv'
 
+import { backupPath } from './utils/backupUtils'
+
 dotenv.config()
 
 export default function globalSetup(config: FullConfig) {

browser_tests/globalTeardown.ts

@@ -1,7 +1,8 @@
 import { FullConfig } from '@playwright/test'
-import { restorePath } from './utils/backupUtils'
 import dotenv from 'dotenv'
 
+import { restorePath } from './utils/backupUtils'
+
 dotenv.config()
 
 export default function globalTeardown(config: FullConfig) {

browser_tests/graphCanvasMenu.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Graph Canvas Menu', () => {

browser_tests/groupNode.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { ComfyPage, comfyPageFixture as test } from './fixtures/ComfyPage'
 import type { NodeReference } from './fixtures/utils/litegraphUtils'
 

browser_tests/helpers/actionbar.ts

@@ -1,4 +1,5 @@
-import type { Page, Locator } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
+
 import type { AutoQueueMode } from '../../src/stores/queueStore'
 
 export class ComfyActionbar {

browser_tests/helpers/manageGroupNode.ts

@@ -1,4 +1,5 @@
 import { Locator, Page } from '@playwright/test'
+
 export class ManageGroupNode {
   footer: Locator
   header: Locator

browser_tests/helpers/templates.ts

@@ -1,4 +1,5 @@
 import { Locator, Page } from '@playwright/test'
+
 export class ComfyTemplates {
   readonly content: Locator
 

browser_tests/interaction.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Item Interaction', () => {

browser_tests/keybindings.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Keybindings', () => {

browser_tests/litegraphEvent.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 function listenForEvent(): Promise<Event> {

browser_tests/loadWorkflowInMedia.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load Workflow in Media', () => {

browser_tests/menu.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Menu', () => {

browser_tests/nodeBadge.spec.ts

@@ -1,7 +1,8 @@
 import { expect } from '@playwright/test'
-import { comfyPageFixture as test } from './fixtures/ComfyPage'
+
 import type { ComfyApp } from '../src/scripts/app'
 import { NodeBadgeMode } from '../src/types/nodeSource'
+import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Node Badge', () => {
   test('Can add badge', async ({ comfyPage }) => {

browser_tests/nodeDisplay.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 // If an input is optional by node definition, it should be shown as

browser_tests/nodeSearchBox.spec.ts

@@ -1,6 +1,6 @@
 import {
-  comfyPageFixture as test,
-  comfyExpect as expect
+  comfyExpect as expect,
+  comfyPageFixture as test
 } from './fixtures/ComfyPage'
 
 test.describe('Node search box', () => {

browser_tests/primitiveNode.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 import type { NodeReference } from './fixtures/utils/litegraphUtils'
 

browser_tests/propertiesPanel.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Properties Panel', () => {

browser_tests/rerouteNode.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Reroute Node', () => {

browser_tests/rightClickMenu.spec.ts

@@ -1,6 +1,7 @@
 import { expect } from '@playwright/test'
-import { comfyPageFixture as test } from './fixtures/ComfyPage'
+
 import { NodeBadgeMode } from '../src/types/nodeSource'
+import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Canvas Right Click Menu', () => {
   // See https://github.com/comfyanonymous/ComfyUI/issues/3883

browser_tests/templates.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Templates', () => {

browser_tests/textWidgetTruncate.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Combo text widget', () => {

browser_tests/userSelectView.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { userSelectPageFixture as test } from './fixtures/UserSelectPage'
 
 /**

browser_tests/utils/backupUtils.ts

@@ -1,5 +1,5 @@
-import path from 'path'
 import fs from 'fs-extra'
+import path from 'path'
 
 type PathParts = readonly [string, ...string[]]
 

eslint.config.js

@@ -1,8 +1,8 @@
-import globals from 'globals'
 import pluginJs from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import pluginVue from 'eslint-plugin-vue'
 import unusedImports from 'eslint-plugin-unused-imports'
+import pluginVue from 'eslint-plugin-vue'
+import globals from 'globals'
+import tseslint from 'typescript-eslint'
 
 export default [
   {

lint-staged.config.js

@@ -11,7 +11,7 @@ export default {
 
 function formatAndEslint(fileNames) {
   return [
-    `prettier --write ${fileNames.join(' ')}`,
+    `prettier --write ${fileNames.join(' ')} --plugin @trivago/prettier-plugin-sort-imports`,
     `eslint --fix ${fileNames.join(' ')}`
   ]
 }