diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index b3d6f20c28..8d37d5f2ad 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -1,5 +1,5 @@
-import { ROUTES } from '../constants';
 import { getManualChatModal } from './modals/chat-modal';
+import { ROUTES } from '../constants';
 
 /**
  * Types
diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index d01f046d75..6835346012 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -1,5 +1,5 @@
-import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
 import { getUniqueWorkflowName } from '../utils/workflowUtils';
 
 const WorkflowsPage = new WorkflowsPageClass();
diff --git a/cypress/e2e/10-settings-log-streaming.cy.ts b/cypress/e2e/10-settings-log-streaming.cy.ts
index 9acec76f42..1954543ca0 100644
--- a/cypress/e2e/10-settings-log-streaming.cy.ts
+++ b/cypress/e2e/10-settings-log-streaming.cy.ts
@@ -1,6 +1,6 @@
 import { SettingsLogStreamingPage } from '../pages';
-import { getVisibleModalOverlay } from '../utils/modal';
 import { getVisibleDropdown } from '../utils';
+import { getVisibleModalOverlay } from '../utils/modal';
 
 const settingsLogStreamingPage = new SettingsLogStreamingPage();
 
diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 6453443376..7e3b5ef8ad 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -4,9 +4,9 @@ import {
 	SET_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
 } from '../constants';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { MessageBox as MessageBoxClass } from '../pages/modals/message-box';
 import { NDV } from '../pages/ndv';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 // Suite-specific constants
 const CODE_NODE_NEW_NAME = 'Something else';
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index 53dad1cc89..8a42521d84 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -1,5 +1,3 @@
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-import { successToast } from '../pages/notifications';
 import {
 	MANUAL_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
@@ -9,6 +7,8 @@ import {
 	IF_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
+import { successToast } from '../pages/notifications';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
 describe('Canvas Actions', () => {
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 325e509e79..4c7cccaafe 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -1,5 +1,3 @@
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-import { NDV, WorkflowExecutionsTab } from '../pages';
 import {
 	MANUAL_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
@@ -9,6 +7,8 @@ import {
 	SWITCH_NODE_NAME,
 	MERGE_NODE_NAME,
 } from './../constants';
+import { NDV, WorkflowExecutionsTab } from '../pages';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
 const ExecutionsTab = new WorkflowExecutionsTab();
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 43103415e3..3bbbd0b293 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -1,10 +1,10 @@
-import { WorkflowPage, NDV } from '../pages';
-import { getVisibleSelect } from '../utils';
 import {
 	MANUAL_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 } from './../constants';
+import { WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 791a704174..9346004388 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -1,7 +1,8 @@
 import { nanoid } from 'nanoid';
+
+import { BACKEND_BASE_URL, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { cowBase64 } from '../support/binaryTestFiles';
-import { BACKEND_BASE_URL, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index c90a884325..e2af15f101 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -1,3 +1,4 @@
+import * as projects from '../composables/projects';
 import { INSTANCE_MEMBERS, INSTANCE_OWNER, INSTANCE_ADMIN, NOTION_NODE_NAME } from '../constants';
 import {
 	CredentialsModal,
@@ -8,7 +9,6 @@ import {
 	WorkflowsPage,
 } from '../pages';
 import { getVisibleDropdown, getVisiblePopper, getVisibleSelect } from '../utils';
-import * as projects from '../composables/projects';
 
 /**
  * User U1 - Instance owner
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index b53b0fdf53..fe91a72935 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -1,8 +1,8 @@
 import { INSTANCE_MEMBERS, INSTANCE_OWNER, INSTANCE_ADMIN } from '../constants';
 import { MainSidebar, SettingsSidebar, SettingsUsersPage } from '../pages';
+import { errorToast, successToast } from '../pages/notifications';
 import { PersonalSettingsPage } from '../pages/settings-personal';
 import { getVisibleSelect } from '../utils';
-import { errorToast, successToast } from '../pages/notifications';
 
 /**
  * User A - Instance owner
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index d2c463f1bb..d6b8d08fd5 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -1,5 +1,5 @@
-import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 import { SCHEDULE_TRIGGER_NODE_NAME, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
+import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 import { clearNotifications, errorToast, successToast } from '../pages/notifications';
 
 const workflowPage = new WorkflowPageClass();
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 9dbe6c6b5d..dbc613bd64 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -1,4 +1,5 @@
 import { type ICredentialType } from 'n8n-workflow';
+
 import {
 	AGENT_NODE_NAME,
 	AI_TOOL_HTTP_NODE_NAME,
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index 5f2a260143..19256f3bf9 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -1,7 +1,8 @@
 import type { RouteHandler } from 'cypress/types/net-stubbing';
+
+import executionOutOfMemoryServerResponse from '../fixtures/responses/execution-out-of-memory-server-response.json';
 import { WorkflowPage } from '../pages';
 import { WorkflowExecutionsTab } from '../pages/workflow-executions-tab';
-import executionOutOfMemoryServerResponse from '../fixtures/responses/execution-out-of-memory-server-response.json';
 import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
diff --git a/cypress/e2e/21-community-nodes.cy.ts b/cypress/e2e/21-community-nodes.cy.ts
index bf88d3d24c..17f82ec573 100644
--- a/cypress/e2e/21-community-nodes.cy.ts
+++ b/cypress/e2e/21-community-nodes.cy.ts
@@ -1,11 +1,11 @@
 import type { ICredentialType } from 'n8n-workflow';
-import { NodeCreator } from '../pages/features/node-creator';
-import CustomNodeFixture from '../fixtures/Custom_node.json';
-import { CredentialsModal, WorkflowPage } from '../pages';
-import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
-import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
+
 import CustomCredential from '../fixtures/Custom_credential.json';
-import { getVisibleSelect } from '../utils';
+import CustomNodeFixture from '../fixtures/Custom_node.json';
+import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
+import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
+import { CredentialsModal, WorkflowPage } from '../pages';
+import { NodeCreator } from '../pages/features/node-creator';
 import {
 	confirmCommunityNodeUninstall,
 	confirmCommunityNodeUpdate,
@@ -13,6 +13,7 @@ import {
 	installFirstCommunityNode,
 	visitCommunityNodesSettings,
 } from '../pages/settings-community-nodes';
+import { getVisibleSelect } from '../utils';
 
 const credentialsModal = new CredentialsModal();
 const nodeCreatorFeature = new NodeCreator();
diff --git a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
index 4c733df90d..eca3af81fb 100644
--- a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
+++ b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
@@ -1,5 +1,18 @@
 import type { ExecutionError } from 'n8n-workflow/src';
-import { NDV, WorkflowPage as WorkflowPageClass } from '../pages';
+
+import {
+	closeManualChatModal,
+	getManualChatMessages,
+	getManualChatModalLogs,
+	getManualChatModalLogsEntries,
+	sendManualChatMessage,
+} from '../composables/modals/chat-modal';
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import {
+	clickCreateNewCredential,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+} from '../composables/ndv';
 import {
 	addLanguageModelNodeToParent,
 	addMemoryNodeToParent,
@@ -18,19 +31,7 @@ import {
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
 } from '../constants';
-import {
-	clickCreateNewCredential,
-	clickExecuteNode,
-	clickGetBackToCanvas,
-} from '../composables/ndv';
-import { setCredentialValues } from '../composables/modals/credential-modal';
-import {
-	closeManualChatModal,
-	getManualChatMessages,
-	getManualChatModalLogs,
-	getManualChatModalLogsEntries,
-	sendManualChatMessage,
-} from '../composables/modals/chat-modal';
+import { NDV, WorkflowPage as WorkflowPageClass } from '../pages';
 import { createMockNodeExecutionData, getVisibleSelect, runMockWorkflowExecution } from '../utils';
 
 const ndv = new NDV();
diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
index dd0d3b06ba..e9b814597d 100644
--- a/cypress/e2e/27-cloud.cy.ts
+++ b/cypress/e2e/27-cloud.cy.ts
@@ -1,3 +1,4 @@
+import planData from '../fixtures/Plan_data_opt_in_trial.json';
 import {
 	BannerStack,
 	MainSidebar,
@@ -5,7 +6,6 @@ import {
 	visitPublicApiPage,
 	getPublicApiUpgradeCTA,
 } from '../pages';
-import planData from '../fixtures/Plan_data_opt_in_trial.json';
 
 const mainSidebar = new MainSidebar();
 const bannerStack = new BannerStack();
diff --git a/cypress/e2e/27-two-factor-authentication.cy.ts b/cypress/e2e/27-two-factor-authentication.cy.ts
index 21319dd79b..dc62a0c58c 100644
--- a/cypress/e2e/27-two-factor-authentication.cy.ts
+++ b/cypress/e2e/27-two-factor-authentication.cy.ts
@@ -1,9 +1,10 @@
 import generateOTPToken from 'cypress-otp';
+
+import { MainSidebar } from './../pages/sidebar/main-sidebar';
 import { INSTANCE_OWNER, INSTANCE_ADMIN, BACKEND_BASE_URL } from '../constants';
 import { SigninPage } from '../pages';
-import { PersonalSettingsPage } from '../pages/settings-personal';
 import { MfaLoginPage } from '../pages/mfa-login';
-import { MainSidebar } from './../pages/sidebar/main-sidebar';
+import { PersonalSettingsPage } from '../pages/settings-personal';
 
 const MFA_SECRET = 'KVKFKRCPNZQUYMLXOVYDSQKJKZDTSRLD';
 
diff --git a/cypress/e2e/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
index 5cc6657416..5b52889c94 100644
--- a/cypress/e2e/29-templates.cy.ts
+++ b/cypress/e2e/29-templates.cy.ts
@@ -1,9 +1,9 @@
+import OnboardingWorkflow from '../fixtures/Onboarding_workflow.json';
+import WorkflowTemplate from '../fixtures/Workflow_template_write_http_query.json';
+import { MainSidebar } from '../pages/sidebar/main-sidebar';
 import { TemplatesPage } from '../pages/templates';
 import { WorkflowPage } from '../pages/workflow';
 import { WorkflowsPage } from '../pages/workflows';
-import { MainSidebar } from '../pages/sidebar/main-sidebar';
-import OnboardingWorkflow from '../fixtures/Onboarding_workflow.json';
-import WorkflowTemplate from '../fixtures/Workflow_template_write_http_query.json';
 
 const templatesPage = new TemplatesPage();
 const workflowPage = new WorkflowPage();
diff --git a/cypress/e2e/30-langchain.cy.ts b/cypress/e2e/30-langchain.cy.ts
index c6d0f4ab4d..0deec76e9f 100644
--- a/cypress/e2e/30-langchain.cy.ts
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -1,4 +1,34 @@
-import { createMockNodeExecutionData, runMockWorkflowExecution } from '../utils';
+import {
+	AGENT_NODE_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+	AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
+	AI_TOOL_CODE_NODE_NAME,
+	AI_TOOL_WIKIPEDIA_NODE_NAME,
+	BASIC_LLM_CHAIN_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	CHAT_TRIGGER_NODE_DISPLAY_NAME,
+} from './../constants';
+import {
+	closeManualChatModal,
+	getManualChatDialog,
+	getManualChatMessages,
+	getManualChatModal,
+	getManualChatModalLogs,
+	getManualChatModalLogsEntries,
+	getManualChatModalLogsTree,
+	sendManualChatMessage,
+} from '../composables/modals/chat-modal';
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import {
+	clickCreateNewCredential,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+	toggleParameterCheckboxInputByName,
+} from '../composables/ndv';
 import {
 	addLanguageModelNodeToParent,
 	addMemoryNodeToParent,
@@ -14,37 +44,7 @@ import {
 	openNode,
 	getConnectionBySourceAndTarget,
 } from '../composables/workflow';
-import {
-	clickCreateNewCredential,
-	clickExecuteNode,
-	clickGetBackToCanvas,
-	toggleParameterCheckboxInputByName,
-} from '../composables/ndv';
-import { setCredentialValues } from '../composables/modals/credential-modal';
-import {
-	closeManualChatModal,
-	getManualChatDialog,
-	getManualChatMessages,
-	getManualChatModal,
-	getManualChatModalLogs,
-	getManualChatModalLogsEntries,
-	getManualChatModalLogsTree,
-	sendManualChatMessage,
-} from '../composables/modals/chat-modal';
-import {
-	AGENT_NODE_NAME,
-	MANUAL_CHAT_TRIGGER_NODE_NAME,
-	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-	MANUAL_TRIGGER_NODE_NAME,
-	AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
-	AI_TOOL_CALCULATOR_NODE_NAME,
-	AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
-	AI_TOOL_CODE_NODE_NAME,
-	AI_TOOL_WIKIPEDIA_NODE_NAME,
-	BASIC_LLM_CHAIN_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
-	CHAT_TRIGGER_NODE_DISPLAY_NAME,
-} from './../constants';
+import { createMockNodeExecutionData, runMockWorkflowExecution } from '../utils';
 
 describe('Langchain Integration', () => {
 	beforeEach(() => {
diff --git a/cypress/e2e/31-demo.cy.ts b/cypress/e2e/31-demo.cy.ts
index eed3198c83..32307361fd 100644
--- a/cypress/e2e/31-demo.cy.ts
+++ b/cypress/e2e/31-demo.cy.ts
@@ -1,7 +1,7 @@
 import workflow from '../fixtures/Manual_wait_set.json';
 import { importWorkflow, visitDemoPage } from '../pages/demo';
-import { WorkflowPage } from '../pages/workflow';
 import { errorToast } from '../pages/notifications';
+import { WorkflowPage } from '../pages/workflow';
 
 const workflowPage = new WorkflowPage();
 
diff --git a/cypress/e2e/34-template-credentials-setup.cy.ts b/cypress/e2e/34-template-credentials-setup.cy.ts
index c5d9f2643f..815f4b1ceb 100644
--- a/cypress/e2e/34-template-credentials-setup.cy.ts
+++ b/cypress/e2e/34-template-credentials-setup.cy.ts
@@ -1,3 +1,8 @@
+import * as setupCredsModal from '../composables/modals/workflow-credential-setup-modal';
+import * as formStep from '../composables/setup-template-form-step';
+import { getSetupWorkflowCredentialsButton } from '../composables/setup-workflow-credentials-button';
+import TestTemplate1 from '../fixtures/Test_Template_1.json';
+import TestTemplate2 from '../fixtures/Test_Template_2.json';
 import {
 	clickUseWorkflowButtonByTitle,
 	visitTemplateCollectionPage,
@@ -5,11 +10,6 @@ import {
 } from '../pages/template-collection';
 import * as templateCredentialsSetupPage from '../pages/template-credential-setup';
 import { WorkflowPage } from '../pages/workflow';
-import * as formStep from '../composables/setup-template-form-step';
-import { getSetupWorkflowCredentialsButton } from '../composables/setup-workflow-credentials-button';
-import * as setupCredsModal from '../composables/modals/workflow-credential-setup-modal';
-import TestTemplate1 from '../fixtures/Test_Template_1.json';
-import TestTemplate2 from '../fixtures/Test_Template_2.json';
 
 const workflowPage = new WorkflowPage();
 
diff --git a/cypress/e2e/36-versions.cy.ts b/cypress/e2e/36-versions.cy.ts
index 1d4fc51808..d749ae4537 100644
--- a/cypress/e2e/36-versions.cy.ts
+++ b/cypress/e2e/36-versions.cy.ts
@@ -1,10 +1,10 @@
-import { WorkflowsPage } from '../pages/workflows';
 import {
 	closeVersionUpdatesPanel,
 	getVersionCard,
 	getVersionUpdatesPanelOpenButton,
 	openVersionUpdatesPanel,
 } from '../composables/versions';
+import { WorkflowsPage } from '../pages/workflows';
 
 const workflowsPage = new WorkflowsPage();
 
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index e2bf63df7d..59ed6bcb84 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -1,3 +1,4 @@
+import * as projects from '../composables/projects';
 import { INSTANCE_MEMBERS, MANUAL_TRIGGER_NODE_NAME, NOTION_NODE_NAME } from '../constants';
 import {
 	WorkflowsPage,
@@ -8,7 +9,6 @@ import {
 	NDV,
 	MainSidebar,
 } from '../pages';
-import * as projects from '../composables/projects';
 import { getVisibleDropdown, getVisibleModalOverlay, getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index bb47ef4765..9dfe128322 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,8 +1,8 @@
-import { NodeCreator } from '../pages/features/node-creator';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-import { NDV } from '../pages/ndv';
-import { getVisibleSelect } from '../utils';
 import { IF_NODE_NAME } from '../constants';
+import { NodeCreator } from '../pages/features/node-creator';
+import { NDV } from '../pages/ndv';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { getVisibleSelect } from '../utils';
 
 const nodeCreatorFeature = new NodeCreator();
 const WorkflowPage = new WorkflowPageClass();
diff --git a/cypress/e2e/44-routing.cy.ts b/cypress/e2e/44-routing.cy.ts
index 67a092235b..1d3a8746a9 100644
--- a/cypress/e2e/44-routing.cy.ts
+++ b/cypress/e2e/44-routing.cy.ts
@@ -1,7 +1,7 @@
-import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-import { EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 import { getSaveChangesModal } from '../composables/modals/save-changes-modal';
+import { EDIT_FIELDS_SET_NODE_NAME } from '../constants';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
 
 const WorkflowsPage = new WorkflowsPageClass();
 const WorkflowPage = new WorkflowPageClass();
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index d38eb402b9..4608b5eefc 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,8 +1,8 @@
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import { clickCreateNewCredential } from '../composables/ndv';
 import { MANUAL_TRIGGER_NODE_DISPLAY_NAME, NOTION_NODE_NAME } from '../constants';
 import { NDV, WorkflowPage } from '../pages';
 import { NodeCreator } from '../pages/features/node-creator';
-import { clickCreateNewCredential } from '../composables/ndv';
-import { setCredentialValues } from '../composables/modals/credential-modal';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index d26e0ded5d..5b422b4589 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -1,7 +1,8 @@
 import { nanoid } from 'nanoid';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+
 import { NDV } from '../pages/ndv';
 import { successToast } from '../pages/notifications';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 7c7c3be554..8571b174d9 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -5,11 +5,11 @@ import {
 	EDIT_FIELDS_SET_NODE_NAME,
 	NOTION_NODE_NAME,
 } from '../constants';
+import { WorkflowExecutionsTab } from '../pages';
+import { errorToast, successToast } from '../pages/notifications';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
 import { getVisibleSelect } from '../utils';
-import { WorkflowExecutionsTab } from '../pages';
-import { errorToast, successToast } from '../pages/notifications';
 
 const NEW_WORKFLOW_NAME = 'Something else';
 const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
diff --git a/cypress/pages/mfa-login.ts b/cypress/pages/mfa-login.ts
index ae4d916ba9..66fc197e3f 100644
--- a/cypress/pages/mfa-login.ts
+++ b/cypress/pages/mfa-login.ts
@@ -1,7 +1,7 @@
-import { N8N_AUTH_COOKIE } from '../constants';
 import { BasePage } from './base';
 import { SigninPage } from './signin';
 import { WorkflowsPage } from './workflows';
+import { N8N_AUTH_COOKIE } from '../constants';
 
 export class MfaLoginPage extends BasePage {
 	url = '/mfa';
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index f14f6be0b7..cd3ded63f8 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -1,5 +1,5 @@
-import { BasePage } from '../base';
 import { getVisibleSelect } from '../../utils';
+import { BasePage } from '../base';
 
 export class CredentialsModal extends BasePage {
 	getters = {
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 8bd7ccf95f..b775deec6d 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -1,5 +1,5 @@
-import { getVisiblePopper, getVisibleSelect } from '../utils';
 import { BasePage } from './base';
+import { getVisiblePopper, getVisibleSelect } from '../utils';
 
 export class NDV extends BasePage {
 	getters = {
diff --git a/cypress/pages/settings-log-streaming.ts b/cypress/pages/settings-log-streaming.ts
index cc1ea1250d..9063b8dc41 100644
--- a/cypress/pages/settings-log-streaming.ts
+++ b/cypress/pages/settings-log-streaming.ts
@@ -1,5 +1,5 @@
-import { getVisibleSelect } from '../utils';
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
 
 export class SettingsLogStreamingPage extends BasePage {
 	url = '/settings/log-streaming';
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index 9872fbc668..4574f95691 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -1,7 +1,8 @@
 import generateOTPToken from 'cypress-otp';
+
+import { BasePage } from './base';
 import { ChangePasswordModal } from './modals/change-password-modal';
 import { MfaSetupModal } from './modals/mfa-setup-modal';
-import { BasePage } from './base';
 
 const changePasswordModal = new ChangePasswordModal();
 const mfaSetupModal = new MfaSetupModal();
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index d188896225..1eaebc911a 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -1,8 +1,8 @@
-import { SettingsSidebar } from './sidebar/settings-sidebar';
+import { BasePage } from './base';
 import { MainSidebar } from './sidebar/main-sidebar';
+import { SettingsSidebar } from './sidebar/settings-sidebar';
 import { WorkflowPage } from './workflow';
 import { WorkflowsPage } from './workflows';
-import { BasePage } from './base';
 
 const workflowPage = new WorkflowPage();
 const workflowsPage = new WorkflowsPage();
diff --git a/cypress/pages/signin.ts b/cypress/pages/signin.ts
index 22d0fd163a..a97fe4888e 100644
--- a/cypress/pages/signin.ts
+++ b/cypress/pages/signin.ts
@@ -1,6 +1,6 @@
-import { N8N_AUTH_COOKIE } from '../constants';
 import { BasePage } from './base';
 import { WorkflowsPage } from './workflows';
+import { N8N_AUTH_COOKIE } from '../constants';
 
 export class SigninPage extends BasePage {
 	url = '/signin';
diff --git a/cypress/pages/template-credential-setup.ts b/cypress/pages/template-credential-setup.ts
index 3fa4d20671..06c1baab8e 100644
--- a/cypress/pages/template-credential-setup.ts
+++ b/cypress/pages/template-credential-setup.ts
@@ -1,6 +1,6 @@
-import * as formStep from '../composables/setup-template-form-step';
-import { overrideFeatureFlag } from '../composables/featureFlags';
 import { CredentialsModal, MessageBox } from './modals';
+import { overrideFeatureFlag } from '../composables/featureFlags';
+import * as formStep from '../composables/setup-template-form-step';
 
 const credentialsModal = new CredentialsModal();
 const messageBox = new MessageBox();
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index c74624686e..6ac9a939b2 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -1,4 +1,5 @@
 import { BasePage } from './base';
+
 import Chainable = Cypress.Chainable;
 
 export class VariablesPage extends BasePage {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 0c2a269607..89186ee34e 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,8 +1,8 @@
+import { BasePage } from './base';
+import { NodeCreator } from './features/node-creator';
 import { META_KEY } from '../constants';
 import { getVisibleSelect } from '../utils';
 import { getUniqueWorkflowName } from '../utils/workflowUtils';
-import { BasePage } from './base';
-import { NodeCreator } from './features/node-creator';
 
 const nodeCreator = new NodeCreator();
 export class WorkflowPage extends BasePage {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 808c0b6aca..35f100fded 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,7 +1,7 @@
 import 'cypress-real-events';
-import FakeTimers from '@sinonjs/fake-timers';
 import type { FrontendSettings } from '@n8n/api-types';
-import { WorkflowPage } from '../pages';
+import FakeTimers from '@sinonjs/fake-timers';
+
 import {
 	BACKEND_BASE_URL,
 	INSTANCE_ADMIN,
@@ -9,6 +9,7 @@ import {
 	INSTANCE_OWNER,
 	N8N_AUTH_COOKIE,
 } from '../constants';
+import { WorkflowPage } from '../pages';
 import { getUniqueWorkflowName } from '../utils/workflowUtils';
 
 Cypress.Commands.add('setAppDate', (targetDate: number | Date) => {
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 4d5d7a7f9a..0fe782499d 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -1,5 +1,6 @@
 import cloneDeep from 'lodash/cloneDeep';
 import merge from 'lodash/merge';
+
 import { settings } from './commands';
 
 before(() => {
diff --git a/cypress/utils/executions.ts b/cypress/utils/executions.ts
index e42e2152d6..eb0dbfc251 100644
--- a/cypress/utils/executions.ts
+++ b/cypress/utils/executions.ts
@@ -1,5 +1,6 @@
-import { nanoid } from 'nanoid';
 import type { IDataObject, IPinData, ITaskData, ITaskDataConnections } from 'n8n-workflow';
+import { nanoid } from 'nanoid';
+
 import { clickExecuteWorkflowButton } from '../composables/workflow';
 
 export function createMockNodeExecutionData(
diff --git a/packages/@n8n/api-types/src/push/index.ts b/packages/@n8n/api-types/src/push/index.ts
index 3eefb0851c..b97a179141 100644
--- a/packages/@n8n/api-types/src/push/index.ts
+++ b/packages/@n8n/api-types/src/push/index.ts
@@ -1,10 +1,10 @@
-import type { ExecutionPushMessage } from './execution';
-import type { WorkflowPushMessage } from './workflow';
-import type { HotReloadPushMessage } from './hot-reload';
-import type { WorkerPushMessage } from './worker';
-import type { WebhookPushMessage } from './webhook';
 import type { CollaborationPushMessage } from './collaboration';
 import type { DebugPushMessage } from './debug';
+import type { ExecutionPushMessage } from './execution';
+import type { HotReloadPushMessage } from './hot-reload';
+import type { WebhookPushMessage } from './webhook';
+import type { WorkerPushMessage } from './worker';
+import type { WorkflowPushMessage } from './workflow';
 
 export type PushMessage =
 	| ExecutionPushMessage
diff --git a/packages/@n8n/benchmark/src/commands/list.ts b/packages/@n8n/benchmark/src/commands/list.ts
index 7bcc4de2ce..34b8273209 100644
--- a/packages/@n8n/benchmark/src/commands/list.ts
+++ b/packages/@n8n/benchmark/src/commands/list.ts
@@ -1,6 +1,7 @@
 import { Command } from '@oclif/core';
-import { ScenarioLoader } from '@/scenario/scenario-loader';
+
 import { testScenariosPath } from '@/config/common-flags';
+import { ScenarioLoader } from '@/scenario/scenario-loader';
 
 export default class ListCommand extends Command {
 	static description = 'List all available scenarios';
diff --git a/packages/@n8n/benchmark/src/commands/run.ts b/packages/@n8n/benchmark/src/commands/run.ts
index eb895c842e..164eef0f41 100644
--- a/packages/@n8n/benchmark/src/commands/run.ts
+++ b/packages/@n8n/benchmark/src/commands/run.ts
@@ -1,11 +1,12 @@
 import { Command, Flags } from '@oclif/core';
-import { ScenarioLoader } from '@/scenario/scenario-loader';
-import { ScenarioRunner } from '@/test-execution/scenario-runner';
+
+import { testScenariosPath } from '@/config/common-flags';
 import { N8nApiClient } from '@/n8n-api-client/n8n-api-client';
 import { ScenarioDataFileLoader } from '@/scenario/scenario-data-loader';
+import { ScenarioLoader } from '@/scenario/scenario-loader';
 import type { K6Tag } from '@/test-execution/k6-executor';
 import { K6Executor } from '@/test-execution/k6-executor';
-import { testScenariosPath } from '@/config/common-flags';
+import { ScenarioRunner } from '@/test-execution/scenario-runner';
 
 export default class RunCommand extends Command {
 	static description = 'Run all (default) or specified test scenarios';
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/authenticated-n8n-api-client.ts b/packages/@n8n/benchmark/src/n8n-api-client/authenticated-n8n-api-client.ts
index 0272181799..2555ea8061 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/authenticated-n8n-api-client.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/authenticated-n8n-api-client.ts
@@ -1,4 +1,5 @@
 import type { AxiosRequestConfig } from 'axios';
+
 import { N8nApiClient } from './n8n-api-client';
 
 export class AuthenticatedN8nApiClient extends N8nApiClient {
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts b/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
index 76eea4284c..92bcfad89f 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
@@ -1,6 +1,7 @@
-import type { AuthenticatedN8nApiClient } from './authenticated-n8n-api-client';
 import type { Workflow } from '@/n8n-api-client/n8n-api-client.types';
 
+import type { AuthenticatedN8nApiClient } from './authenticated-n8n-api-client';
+
 export class WorkflowApiClient {
 	constructor(private readonly apiClient: AuthenticatedN8nApiClient) {}
 
diff --git a/packages/@n8n/benchmark/src/scenario/scenario-data-loader.ts b/packages/@n8n/benchmark/src/scenario/scenario-data-loader.ts
index b601d19902..12fcc58ee3 100644
--- a/packages/@n8n/benchmark/src/scenario/scenario-data-loader.ts
+++ b/packages/@n8n/benchmark/src/scenario/scenario-data-loader.ts
@@ -1,7 +1,8 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import type { Scenario } from '@/types/scenario';
+
 import type { Workflow } from '@/n8n-api-client/n8n-api-client.types';
+import type { Scenario } from '@/types/scenario';
 
 /**
  * Loads scenario data files from FS
diff --git a/packages/@n8n/benchmark/src/scenario/scenario-loader.ts b/packages/@n8n/benchmark/src/scenario/scenario-loader.ts
index 13cc52daf0..4f315c1bf7 100644
--- a/packages/@n8n/benchmark/src/scenario/scenario-loader.ts
+++ b/packages/@n8n/benchmark/src/scenario/scenario-loader.ts
@@ -1,6 +1,7 @@
+import { createHash } from 'node:crypto';
 import * as fs from 'node:fs';
 import * as path from 'path';
-import { createHash } from 'node:crypto';
+
 import type { Scenario, ScenarioManifest } from '@/types/scenario';
 
 export class ScenarioLoader {
diff --git a/packages/@n8n/benchmark/src/test-execution/k6-executor.ts b/packages/@n8n/benchmark/src/test-execution/k6-executor.ts
index f99ffd80d9..4fcf11d45b 100644
--- a/packages/@n8n/benchmark/src/test-execution/k6-executor.ts
+++ b/packages/@n8n/benchmark/src/test-execution/k6-executor.ts
@@ -1,9 +1,10 @@
 import fs from 'fs';
-import path from 'path';
 import assert from 'node:assert/strict';
+import path from 'path';
 import { $, which, tmpfile } from 'zx';
-import type { Scenario } from '@/types/scenario';
+
 import { buildTestReport, type K6Tag } from '@/test-execution/test-report';
+import type { Scenario } from '@/types/scenario';
 export type { K6Tag };
 
 export type K6ExecutorOpts = {
diff --git a/packages/@n8n/benchmark/src/test-execution/scenario-runner.ts b/packages/@n8n/benchmark/src/test-execution/scenario-runner.ts
index 135ebc6007..84d1d8b096 100644
--- a/packages/@n8n/benchmark/src/test-execution/scenario-runner.ts
+++ b/packages/@n8n/benchmark/src/test-execution/scenario-runner.ts
@@ -1,9 +1,10 @@
-import type { K6Executor } from './k6-executor';
-import type { Scenario } from '@/types/scenario';
+import { AuthenticatedN8nApiClient } from '@/n8n-api-client/authenticated-n8n-api-client';
 import type { N8nApiClient } from '@/n8n-api-client/n8n-api-client';
 import type { ScenarioDataFileLoader } from '@/scenario/scenario-data-loader';
 import { ScenarioDataImporter } from '@/test-execution/scenario-data-importer';
-import { AuthenticatedN8nApiClient } from '@/n8n-api-client/authenticated-n8n-api-client';
+import type { Scenario } from '@/types/scenario';
+
+import type { K6Executor } from './k6-executor';
 
 /**
  * Runs scenarios
diff --git a/packages/@n8n/benchmark/src/test-execution/test-report.ts b/packages/@n8n/benchmark/src/test-execution/test-report.ts
index d3177aeb79..8e858c5e66 100644
--- a/packages/@n8n/benchmark/src/test-execution/test-report.ts
+++ b/packages/@n8n/benchmark/src/test-execution/test-report.ts
@@ -1,4 +1,5 @@
 import { nanoid } from 'nanoid';
+
 import type { Scenario } from '@/types/scenario';
 
 export type K6Tag = {
diff --git a/packages/@n8n/chat/src/App.vue b/packages/@n8n/chat/src/App.vue
index ec90bef425..0614b7cf73 100644
--- a/packages/@n8n/chat/src/App.vue
+++ b/packages/@n8n/chat/src/App.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue';
 import hljs from 'highlight.js/lib/core';
-import hljsXML from 'highlight.js/lib/languages/xml';
 import hljsJavascript from 'highlight.js/lib/languages/javascript';
+import hljsXML from 'highlight.js/lib/languages/xml';
+import { computed, onMounted } from 'vue';
+
 import { Chat, ChatWindow } from '@n8n/chat/components';
 import { useOptions } from '@n8n/chat/composables';
 
diff --git a/packages/@n8n/chat/src/__stories__/App.stories.ts b/packages/@n8n/chat/src/__stories__/App.stories.ts
index 043039753f..5c93917a74 100644
--- a/packages/@n8n/chat/src/__stories__/App.stories.ts
+++ b/packages/@n8n/chat/src/__stories__/App.stories.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { StoryObj } from '@storybook/vue3';
 import { onMounted } from 'vue';
-import type { ChatOptions } from '@n8n/chat/types';
+
 import { createChat } from '@n8n/chat/index';
+import type { ChatOptions } from '@n8n/chat/types';
 
 const webhookUrl = 'http://localhost:5678/webhook/f406671e-c954-4691-b39a-66c90aa2f103/chat';
 
diff --git a/packages/@n8n/chat/src/__tests__/index.spec.ts b/packages/@n8n/chat/src/__tests__/index.spec.ts
index 5307880d67..4a52fbc925 100644
--- a/packages/@n8n/chat/src/__tests__/index.spec.ts
+++ b/packages/@n8n/chat/src/__tests__/index.spec.ts
@@ -1,4 +1,5 @@
 import { fireEvent, waitFor } from '@testing-library/vue';
+
 import {
 	createFetchResponse,
 	createGetLatestMessagesResponse,
diff --git a/packages/@n8n/chat/src/__tests__/utils/selectors.ts b/packages/@n8n/chat/src/__tests__/utils/selectors.ts
index a510652b0d..0f586d7796 100644
--- a/packages/@n8n/chat/src/__tests__/utils/selectors.ts
+++ b/packages/@n8n/chat/src/__tests__/utils/selectors.ts
@@ -1,4 +1,5 @@
 import { screen } from '@testing-library/vue';
+
 import { defaultMountingTarget } from '@n8n/chat/constants';
 
 export function getMountingTarget(target = defaultMountingTarget) {
diff --git a/packages/@n8n/chat/src/components/Chat.vue b/packages/@n8n/chat/src/components/Chat.vue
index 685b0805bc..168021250f 100644
--- a/packages/@n8n/chat/src/components/Chat.vue
+++ b/packages/@n8n/chat/src/components/Chat.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import Close from 'virtual:icons/mdi/close';
 import { computed, nextTick, onMounted } from 'vue';
-import Layout from '@n8n/chat/components/Layout.vue';
+
 import GetStarted from '@n8n/chat/components/GetStarted.vue';
 import GetStartedFooter from '@n8n/chat/components/GetStartedFooter.vue';
-import MessagesList from '@n8n/chat/components/MessagesList.vue';
 import Input from '@n8n/chat/components/Input.vue';
+import Layout from '@n8n/chat/components/Layout.vue';
+import MessagesList from '@n8n/chat/components/MessagesList.vue';
 import { useI18n, useChat, useOptions } from '@n8n/chat/composables';
 import { chatEventBus } from '@n8n/chat/event-buses';
 
diff --git a/packages/@n8n/chat/src/components/ChatFile.vue b/packages/@n8n/chat/src/components/ChatFile.vue
index 997954b6c8..d3c3c2db7d 100644
--- a/packages/@n8n/chat/src/components/ChatFile.vue
+++ b/packages/@n8n/chat/src/components/ChatFile.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import IconFileText from 'virtual:icons/mdi/fileText';
-import IconFileMusic from 'virtual:icons/mdi/fileMusic';
-import IconFileImage from 'virtual:icons/mdi/fileImage';
-import IconFileVideo from 'virtual:icons/mdi/fileVideo';
 import IconDelete from 'virtual:icons/mdi/closeThick';
+import IconFileImage from 'virtual:icons/mdi/fileImage';
+import IconFileMusic from 'virtual:icons/mdi/fileMusic';
+import IconFileText from 'virtual:icons/mdi/fileText';
+import IconFileVideo from 'virtual:icons/mdi/fileVideo';
 import IconPreview from 'virtual:icons/mdi/openInNew';
-
 import { computed, type FunctionalComponent } from 'vue';
 
 const props = defineProps<{
diff --git a/packages/@n8n/chat/src/components/ChatWindow.vue b/packages/@n8n/chat/src/components/ChatWindow.vue
index 8e0d05daf8..bd5ddbbb5b 100644
--- a/packages/@n8n/chat/src/components/ChatWindow.vue
+++ b/packages/@n8n/chat/src/components/ChatWindow.vue
@@ -2,6 +2,7 @@
 import IconChat from 'virtual:icons/mdi/chat';
 import IconChevronDown from 'virtual:icons/mdi/chevron-down';
 import { nextTick, ref } from 'vue';
+
 import Chat from '@n8n/chat/components/Chat.vue';
 import { chatEventBus } from '@n8n/chat/event-buses';
 
diff --git a/packages/@n8n/chat/src/components/GetStartedFooter.vue b/packages/@n8n/chat/src/components/GetStartedFooter.vue
index dca1d16bc6..698fa4c2c2 100644
--- a/packages/@n8n/chat/src/components/GetStartedFooter.vue
+++ b/packages/@n8n/chat/src/components/GetStartedFooter.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { useI18n } from '@n8n/chat/composables';
 import PoweredBy from '@n8n/chat/components/PoweredBy.vue';
+import { useI18n } from '@n8n/chat/composables';
 
 const { t, te } = useI18n();
 </script>
diff --git a/packages/@n8n/chat/src/components/Input.vue b/packages/@n8n/chat/src/components/Input.vue
index af4b3343b7..3e823917e0 100644
--- a/packages/@n8n/chat/src/components/Input.vue
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -1,12 +1,14 @@
 <script setup lang="ts">
-import IconSend from 'virtual:icons/mdi/send';
-import IconFilePlus from 'virtual:icons/mdi/filePlus';
-import { computed, onMounted, onUnmounted, ref, unref } from 'vue';
 import { useFileDialog } from '@vueuse/core';
-import ChatFile from './ChatFile.vue';
+import IconFilePlus from 'virtual:icons/mdi/filePlus';
+import IconSend from 'virtual:icons/mdi/send';
+import { computed, onMounted, onUnmounted, ref, unref } from 'vue';
+
 import { useI18n, useChat, useOptions } from '@n8n/chat/composables';
 import { chatEventBus } from '@n8n/chat/event-buses';
 
+import ChatFile from './ChatFile.vue';
+
 export interface ArrowKeyDownPayload {
 	key: 'ArrowUp' | 'ArrowDown';
 	currentInputValue: string;
diff --git a/packages/@n8n/chat/src/components/Layout.vue b/packages/@n8n/chat/src/components/Layout.vue
index 6ed1744f31..3c1546e8d4 100644
--- a/packages/@n8n/chat/src/components/Layout.vue
+++ b/packages/@n8n/chat/src/components/Layout.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref } from 'vue';
+
 import { chatEventBus } from '@n8n/chat/event-buses';
 
 const chatBodyRef = ref<HTMLElement | null>(null);
diff --git a/packages/@n8n/chat/src/components/Message.vue b/packages/@n8n/chat/src/components/Message.vue
index c98bd9c9eb..f584516332 100644
--- a/packages/@n8n/chat/src/components/Message.vue
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -1,18 +1,20 @@
 <script lang="ts" setup>
 /* eslint-disable @typescript-eslint/naming-convention */
+import hljs from 'highlight.js/lib/core';
+import bash from 'highlight.js/lib/languages/bash';
+import javascript from 'highlight.js/lib/languages/javascript';
+import python from 'highlight.js/lib/languages/python';
+import typescript from 'highlight.js/lib/languages/typescript';
+import xml from 'highlight.js/lib/languages/xml';
+import type MarkdownIt from 'markdown-it';
+import markdownLink from 'markdown-it-link-attributes';
 import { computed, ref, toRefs, onMounted } from 'vue';
 import VueMarkdown from 'vue-markdown-render';
-import hljs from 'highlight.js/lib/core';
-import javascript from 'highlight.js/lib/languages/javascript';
-import typescript from 'highlight.js/lib/languages/typescript';
-import python from 'highlight.js/lib/languages/python';
-import xml from 'highlight.js/lib/languages/xml';
-import bash from 'highlight.js/lib/languages/bash';
-import markdownLink from 'markdown-it-link-attributes';
-import type MarkdownIt from 'markdown-it';
-import ChatFile from './ChatFile.vue';
-import type { ChatMessage, ChatMessageText } from '@n8n/chat/types';
+
 import { useOptions } from '@n8n/chat/composables';
+import type { ChatMessage, ChatMessageText } from '@n8n/chat/types';
+
+import ChatFile from './ChatFile.vue';
 
 const props = defineProps<{
 	message: ChatMessage;
diff --git a/packages/@n8n/chat/src/components/MessageTyping.vue b/packages/@n8n/chat/src/components/MessageTyping.vue
index b7e9df48e5..328ba6566e 100644
--- a/packages/@n8n/chat/src/components/MessageTyping.vue
+++ b/packages/@n8n/chat/src/components/MessageTyping.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
-import { Message } from './index';
+
 import type { ChatMessage } from '@n8n/chat/types';
 
+import { Message } from './index';
+
 const props = withDefaults(
 	defineProps<{
 		animation?: 'bouncing' | 'scaling';
diff --git a/packages/@n8n/chat/src/components/MessagesList.vue b/packages/@n8n/chat/src/components/MessagesList.vue
index d9673ee852..1a0cc31874 100644
--- a/packages/@n8n/chat/src/components/MessagesList.vue
+++ b/packages/@n8n/chat/src/components/MessagesList.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
+
 import Message from '@n8n/chat/components/Message.vue';
-import type { ChatMessage } from '@n8n/chat/types';
 import MessageTyping from '@n8n/chat/components/MessageTyping.vue';
 import { useChat } from '@n8n/chat/composables';
+import type { ChatMessage } from '@n8n/chat/types';
 
 defineProps<{
 	messages: ChatMessage[];
diff --git a/packages/@n8n/chat/src/composables/useChat.ts b/packages/@n8n/chat/src/composables/useChat.ts
index a7ec614732..c472713528 100644
--- a/packages/@n8n/chat/src/composables/useChat.ts
+++ b/packages/@n8n/chat/src/composables/useChat.ts
@@ -1,4 +1,5 @@
 import { inject } from 'vue';
+
 import { ChatSymbol } from '@n8n/chat/constants';
 import type { Chat } from '@n8n/chat/types';
 
diff --git a/packages/@n8n/chat/src/composables/useI18n.ts b/packages/@n8n/chat/src/composables/useI18n.ts
index 68cfc33813..2f335cd6fc 100644
--- a/packages/@n8n/chat/src/composables/useI18n.ts
+++ b/packages/@n8n/chat/src/composables/useI18n.ts
@@ -1,4 +1,5 @@
 import { isRef } from 'vue';
+
 import { useOptions } from '@n8n/chat/composables/useOptions';
 
 export function useI18n() {
diff --git a/packages/@n8n/chat/src/composables/useOptions.ts b/packages/@n8n/chat/src/composables/useOptions.ts
index 5223ad09df..c78af2dafa 100644
--- a/packages/@n8n/chat/src/composables/useOptions.ts
+++ b/packages/@n8n/chat/src/composables/useOptions.ts
@@ -1,4 +1,5 @@
 import { inject } from 'vue';
+
 import { ChatOptionsSymbol } from '@n8n/chat/constants';
 import type { ChatOptions } from '@n8n/chat/types';
 
diff --git a/packages/@n8n/chat/src/constants/symbols.ts b/packages/@n8n/chat/src/constants/symbols.ts
index 618d48e960..75d0f531a5 100644
--- a/packages/@n8n/chat/src/constants/symbols.ts
+++ b/packages/@n8n/chat/src/constants/symbols.ts
@@ -1,4 +1,5 @@
 import type { InjectionKey } from 'vue';
+
 import type { Chat, ChatOptions } from '@n8n/chat/types';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/packages/@n8n/chat/src/index.ts b/packages/@n8n/chat/src/index.ts
index eb45e0b963..7738f088b1 100644
--- a/packages/@n8n/chat/src/index.ts
+++ b/packages/@n8n/chat/src/index.ts
@@ -1,11 +1,13 @@
 import './main.scss';
 
 import { createApp } from 'vue';
-import App from './App.vue';
-import type { ChatOptions } from '@n8n/chat/types';
+
 import { defaultMountingTarget, defaultOptions } from '@n8n/chat/constants';
-import { createDefaultMountingTarget } from '@n8n/chat/utils';
 import { ChatPlugin } from '@n8n/chat/plugins';
+import type { ChatOptions } from '@n8n/chat/types';
+import { createDefaultMountingTarget } from '@n8n/chat/utils';
+
+import App from './App.vue';
 
 export function createChat(options?: Partial<ChatOptions>) {
 	const resolvedOptions: ChatOptions = {
diff --git a/packages/@n8n/chat/src/plugins/chat.ts b/packages/@n8n/chat/src/plugins/chat.ts
index 5dcb39a1e5..31b1e6dd3c 100644
--- a/packages/@n8n/chat/src/plugins/chat.ts
+++ b/packages/@n8n/chat/src/plugins/chat.ts
@@ -1,10 +1,11 @@
+import { v4 as uuidv4 } from 'uuid';
 import type { Plugin } from 'vue';
 import { computed, nextTick, ref } from 'vue';
-import { v4 as uuidv4 } from 'uuid';
-import type { ChatMessage, ChatOptions } from '@n8n/chat/types';
-import { chatEventBus } from '@n8n/chat/event-buses';
+
 import * as api from '@n8n/chat/api';
 import { ChatOptionsSymbol, ChatSymbol, localStorageSessionIdKey } from '@n8n/chat/constants';
+import { chatEventBus } from '@n8n/chat/event-buses';
+import type { ChatMessage, ChatOptions } from '@n8n/chat/types';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const ChatPlugin: Plugin<ChatOptions> = {
diff --git a/packages/@n8n/chat/src/types/chat.ts b/packages/@n8n/chat/src/types/chat.ts
index 43a5dde193..4d72f9e717 100644
--- a/packages/@n8n/chat/src/types/chat.ts
+++ b/packages/@n8n/chat/src/types/chat.ts
@@ -1,4 +1,5 @@
 import type { Ref } from 'vue';
+
 import type { ChatMessage } from '@n8n/chat/types/messages';
 
 export interface Chat {
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index b41c68686c..676249254a 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -1,16 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import * as qs from 'querystring';
-import { Agent } from 'https';
 import axios from 'axios';
 import type { AxiosRequestConfig } from 'axios';
-import { getAuthError } from './utils';
+import { Agent } from 'https';
+import * as qs from 'querystring';
+
 import type { ClientOAuth2TokenData } from './ClientOAuth2Token';
 import { ClientOAuth2Token } from './ClientOAuth2Token';
 import { CodeFlow } from './CodeFlow';
 import { CredentialsFlow } from './CredentialsFlow';
 import type { Headers } from './types';
+import { getAuthError } from './utils';
 
 export interface ClientOAuth2RequestObject {
 	url: string;
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
index c59fa0de46..2bcacdf112 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
@@ -1,6 +1,6 @@
 import type { ClientOAuth2, ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
-import { auth, expects, getRequestOptions } from './utils';
 import { DEFAULT_HEADERS } from './constants';
+import { auth, expects, getRequestOptions } from './utils';
 
 export interface ClientOAuth2TokenData extends Record<string, string | undefined> {
 	token_type?: string | undefined;
diff --git a/packages/@n8n/client-oauth2/src/CodeFlow.ts b/packages/@n8n/client-oauth2/src/CodeFlow.ts
index 3fda119a00..6d0fff235e 100644
--- a/packages/@n8n/client-oauth2/src/CodeFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CodeFlow.ts
@@ -1,4 +1,5 @@
 import * as qs from 'querystring';
+
 import type { ClientOAuth2, ClientOAuth2Options } from './ClientOAuth2';
 import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
 import { DEFAULT_HEADERS, DEFAULT_URL_BASE } from './constants';
diff --git a/packages/@n8n/client-oauth2/test/CodeFlow.test.ts b/packages/@n8n/client-oauth2/test/CodeFlow.test.ts
index f479769c77..303b529d34 100644
--- a/packages/@n8n/client-oauth2/test/CodeFlow.test.ts
+++ b/packages/@n8n/client-oauth2/test/CodeFlow.test.ts
@@ -1,8 +1,10 @@
 import nock from 'nock';
-import { ClientOAuth2, ClientOAuth2Token } from '../src';
-import * as config from './config';
+
 import { AuthError } from '@/utils';
 
+import * as config from './config';
+import { ClientOAuth2, ClientOAuth2Token } from '../src';
+
 describe('CodeFlow', () => {
 	beforeAll(async () => {
 		nock.disableNetConnect();
diff --git a/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
index 39978c41f8..c0c2ff39f8 100644
--- a/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
+++ b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
@@ -1,8 +1,9 @@
 import nock from 'nock';
-import type { Headers } from '../src/types';
+
+import * as config from './config';
 import type { ClientOAuth2Options } from '../src';
 import { ClientOAuth2, ClientOAuth2Token } from '../src';
-import * as config from './config';
+import type { Headers } from '../src/types';
 
 describe('CredentialsFlow', () => {
 	beforeAll(async () => {
diff --git a/packages/@n8n/codemirror-lang/src/expressions/index.ts b/packages/@n8n/codemirror-lang/src/expressions/index.ts
index 929cb32cd4..3067a74331 100644
--- a/packages/@n8n/codemirror-lang/src/expressions/index.ts
+++ b/packages/@n8n/codemirror-lang/src/expressions/index.ts
@@ -1,5 +1,6 @@
 import { LRLanguage, LanguageSupport, foldNodeProp, foldInside } from '@codemirror/language';
 import { styleTags, tags as t } from '@lezer/highlight';
+
 import { parser } from './grammar';
 
 export const parserWithMetaData = parser.configure({
diff --git a/packages/@n8n/codemirror-lang/test/expressions/expressions.test.ts b/packages/@n8n/codemirror-lang/test/expressions/expressions.test.ts
index 0896bb580f..0e778efcf5 100644
--- a/packages/@n8n/codemirror-lang/test/expressions/expressions.test.ts
+++ b/packages/@n8n/codemirror-lang/test/expressions/expressions.test.ts
@@ -1,6 +1,7 @@
+import { fileTests as runTestFile } from '@lezer/generator/dist/test';
 import fs from 'fs';
 import path from 'path';
-import { fileTests as runTestFile } from '@lezer/generator/dist/test';
+
 import { n8nLanguage } from '../../src/expressions/index';
 
 describe('expressions language', () => {
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index fd1dc50c18..c6e456709c 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -1,18 +1,18 @@
-import { Config, Env, Nested } from './decorators';
+import { CacheConfig } from './configs/cache.config';
 import { CredentialsConfig } from './configs/credentials.config';
 import { DatabaseConfig } from './configs/database.config';
-import { VersionNotificationsConfig } from './configs/version-notifications.config';
-import { PublicApiConfig } from './configs/public-api.config';
-import { ExternalSecretsConfig } from './configs/external-secrets.config';
-import { TemplatesConfig } from './configs/templates.config';
-import { EventBusConfig } from './configs/event-bus.config';
-import { NodesConfig } from './configs/nodes.config';
-import { ExternalStorageConfig } from './configs/external-storage.config';
-import { WorkflowsConfig } from './configs/workflows.config';
 import { EndpointsConfig } from './configs/endpoints.config';
-import { CacheConfig } from './configs/cache.config';
+import { EventBusConfig } from './configs/event-bus.config';
+import { ExternalSecretsConfig } from './configs/external-secrets.config';
+import { ExternalStorageConfig } from './configs/external-storage.config';
+import { NodesConfig } from './configs/nodes.config';
+import { PublicApiConfig } from './configs/public-api.config';
 import { ScalingModeConfig } from './configs/scaling-mode.config';
+import { TemplatesConfig } from './configs/templates.config';
 import { UserManagementConfig } from './configs/user-management.config';
+import { VersionNotificationsConfig } from './configs/version-notifications.config';
+import { WorkflowsConfig } from './configs/workflows.config';
+import { Config, Env, Nested } from './decorators';
 
 @Config
 export class GlobalConfig {
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index f7c1d48e21..1d3e5f971d 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
-import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
+import { Container } from 'typedi';
+
 import { GlobalConfig } from '../src/index';
 
 jest.mock('fs');
diff --git a/packages/@n8n/config/test/decorators.test.ts b/packages/@n8n/config/test/decorators.test.ts
index 8267399a03..c5c90b70a0 100644
--- a/packages/@n8n/config/test/decorators.test.ts
+++ b/packages/@n8n/config/test/decorators.test.ts
@@ -1,4 +1,5 @@
 import { Container } from 'typedi';
+
 import { Config, Env } from '../src/decorators';
 
 describe('decorators', () => {
diff --git a/packages/@n8n/imap/src/ImapSimple.ts b/packages/@n8n/imap/src/ImapSimple.ts
index eb6dc07722..f87677ce94 100644
--- a/packages/@n8n/imap/src/ImapSimple.ts
+++ b/packages/@n8n/imap/src/ImapSimple.ts
@@ -4,8 +4,8 @@ import type Imap from 'imap';
 import { type ImapMessage } from 'imap';
 
 import { getMessage } from './helpers/getMessage';
-import type { Message, MessagePart } from './types';
 import { PartData } from './PartData';
+import type { Message, MessagePart } from './types';
 
 const IMAP_EVENTS = ['alert', 'mail', 'expunge', 'uidvalidity', 'update', 'close', 'end'] as const;
 
diff --git a/packages/@n8n/imap/src/PartData.ts b/packages/@n8n/imap/src/PartData.ts
index d4ad353a97..3c9bcc437d 100644
--- a/packages/@n8n/imap/src/PartData.ts
+++ b/packages/@n8n/imap/src/PartData.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-import * as qp from 'quoted-printable';
 import * as iconvlite from 'iconv-lite';
+import * as qp from 'quoted-printable';
 import * as utf8 from 'utf8';
 import * as uuencode from 'uuencode';
 
diff --git a/packages/@n8n/imap/src/helpers/getMessage.ts b/packages/@n8n/imap/src/helpers/getMessage.ts
index 09b5118667..ed5562e573 100644
--- a/packages/@n8n/imap/src/helpers/getMessage.ts
+++ b/packages/@n8n/imap/src/helpers/getMessage.ts
@@ -4,6 +4,7 @@ import {
 	type ImapMessageBodyInfo,
 	type ImapMessageAttributes,
 } from 'imap';
+
 import type { Message, MessageBodyPart } from '../types';
 
 /**
diff --git a/packages/@n8n/imap/src/index.ts b/packages/@n8n/imap/src/index.ts
index f82cfca037..515f0b32c1 100644
--- a/packages/@n8n/imap/src/index.ts
+++ b/packages/@n8n/imap/src/index.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import Imap from 'imap';
-import { ImapSimple } from './ImapSimple';
+
 import { ConnectionClosedError, ConnectionEndedError, ConnectionTimeoutError } from './errors';
+import { ImapSimple } from './ImapSimple';
 import type { ImapSimpleOptions, MessagePart } from './types';
 
 /**
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index 1ec0410a88..629749289a 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -338,7 +338,17 @@ const config = (module.exports = {
 		/**
 		 * https://github.com/import-js/eslint-plugin-import/blob/master/docs/rules/order.md
 		 */
-		'import/order': 'error',
+		'import/order': [
+			'error',
+			{
+				alphabetize: {
+					order: 'asc',
+					caseInsensitive: true,
+				},
+				groups: [['builtin', 'external'], 'internal', ['parent', 'index', 'sibling'], 'object'],
+				'newlines-between': 'always',
+			},
+		],
 
 		// ----------------------------------
 		//   eslint-plugin-n8n-local-rules
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 6c7c7227ab..a3a1e612ab 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -28,17 +28,6 @@ module.exports = {
 
 		// TODO: Remove this
 		'import/no-cycle': 'warn',
-		'import/order': [
-			'error',
-			{
-				alphabetize: {
-					order: 'asc',
-					caseInsensitive: true,
-				},
-				groups: [['builtin', 'external'], 'internal', ['parent', 'index', 'sibling'], 'object'],
-				'newlines-between': 'always',
-			},
-		],
 		'import/extensions': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
 		'@typescript-eslint/no-explicit-any': 'warn',
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index 58705ee8c6..deece11c63 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -11,7 +11,6 @@ module.exports = {
 	rules: {
 		// TODO: Remove these
 		'import/no-default-export': 'warn',
-		'import/order': 'off',
 		'@typescript-eslint/no-unsafe-argument': 'warn',
 		'@typescript-eslint/no-unsafe-return': 'warn',
 		'@typescript-eslint/no-unsafe-member-access': 'warn',
diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/design-system/src/__tests__/setup.ts
index 9ebe505648..3ad85f014a 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/design-system/src/__tests__/setup.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import { config } from '@vue/test-utils';
+
 import { N8nPlugin } from 'n8n-design-system/plugin';
 
 config.global.plugins = [N8nPlugin];
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
index 8bf85cca2c..9c3f7d2c23 100644
--- a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
+++ b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
@@ -1,6 +1,7 @@
-import AssistantAvatar from './AssistantAvatar.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import AssistantAvatar from './AssistantAvatar.vue';
+
 export default {
 	title: 'Assistant/AssistantAvatar',
 	component: AssistantAvatar,
diff --git a/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts b/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts
index 94857ed4db..f77e9d1e37 100644
--- a/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts
+++ b/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AssistantAvatar from '../AssistantAvatar.vue';
 
 describe('AskAssistantAvatar', () => {
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
index 6d41905aed..18b03eee71 100644
--- a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
+++ b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
@@ -1,7 +1,8 @@
-import AskAssistantButton from './AskAssistantButton.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import AskAssistantButton from './AskAssistantButton.vue';
+
 export default {
 	title: 'Assistant/AskAssistantButton',
 	component: AskAssistantButton,
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
index 5cb1824699..74d0a36316 100644
--- a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
+++ b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { ref } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
 import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
 import AssistantText from '../AskAssistantText/AssistantText.vue';
 import BetaTag from '../BetaTag/BetaTag.vue';
-import { useI18n } from '../../composables/useI18n';
 
 const { t } = useI18n();
 
diff --git a/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts b/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts
index 13d96d4a62..3edf52e279 100644
--- a/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts
+++ b/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AskAssistantButton from '../AskAssistantButton.vue';
 
 describe('AskAssistantButton', () => {
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
index 45da527485..aa0e2bd19f 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
@@ -1,5 +1,6 @@
-import AskAssistantChat from './AskAssistantChat.vue';
 import type { StoryFn } from '@storybook/vue3';
+
+import AskAssistantChat from './AskAssistantChat.vue';
 import type { ChatUI } from '../../types/assistant';
 
 export default {
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index 63f4bf9a86..3b52dd54d8 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
-import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
-import AssistantText from '../AskAssistantText/AssistantText.vue';
-import AssistantAvatar from '../AskAssistantAvatar/AssistantAvatar.vue';
-import AssistantLoadingMessage from '../AskAssistantLoadingMessage/AssistantLoadingMessage.vue';
-import CodeDiff from '../CodeDiff/CodeDiff.vue';
-import type { ChatUI } from '../../types/assistant';
-import BlinkingCursor from '../BlinkingCursor/BlinkingCursor.vue';
-
 import Markdown from 'markdown-it';
-import InlineAskAssistantButton from '../InlineAskAssistantButton/InlineAskAssistantButton.vue';
-import BetaTag from '../BetaTag/BetaTag.vue';
-import { useI18n } from '../../composables/useI18n';
 import markdownLink from 'markdown-it-link-attributes';
+import { computed, ref } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
+import type { ChatUI } from '../../types/assistant';
+import AssistantAvatar from '../AskAssistantAvatar/AssistantAvatar.vue';
+import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
+import AssistantLoadingMessage from '../AskAssistantLoadingMessage/AssistantLoadingMessage.vue';
+import AssistantText from '../AskAssistantText/AssistantText.vue';
+import BetaTag from '../BetaTag/BetaTag.vue';
+import BlinkingCursor from '../BlinkingCursor/BlinkingCursor.vue';
+import CodeDiff from '../CodeDiff/CodeDiff.vue';
+import InlineAskAssistantButton from '../InlineAskAssistantButton/InlineAskAssistantButton.vue';
 
 const { t } = useI18n();
 
diff --git a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
index 08312e9adc..eef958a006 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AskAssistantChat from '../AskAssistantChat.vue';
 import { n8nHtml } from 'n8n-design-system/directives';
 
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
index 976872d8db..1dc1bac819 100644
--- a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
+++ b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
@@ -1,6 +1,7 @@
-import AssistantIcon from './AssistantIcon.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import AssistantIcon from './AssistantIcon.vue';
+
 export default {
 	title: 'Assistant/AssistantIcon',
 	component: AssistantIcon,
diff --git a/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts b/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts
index 3192d26461..0ad1b13d19 100644
--- a/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts
+++ b/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AssistantIcon from '../AssistantIcon.vue';
 
 describe('AssistantIcon', () => {
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
index 317db52179..3e24204102 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
@@ -1,6 +1,7 @@
-import AssistantLoadingMessage from './AssistantLoadingMessage.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import AssistantLoadingMessage from './AssistantLoadingMessage.vue';
+
 export default {
 	title: 'Assistant/AskAssistantLoadingMessage',
 	component: AssistantLoadingMessage,
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
index 2aa045565e..48cb4d9654 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { defineProps, withDefaults } from 'vue';
+
 import AssistantAvatar from '../AskAssistantAvatar/AssistantAvatar.vue';
 
 withDefaults(
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts b/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
index 870127f0d3..68cfb2c657 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
@@ -1,6 +1,7 @@
-import DemoComponent from './DemoComponent.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import DemoComponent from './DemoComponent.vue';
+
 export default {
 	title: 'Assistant/AskAssistantLoadingMessageTransitions',
 	component: DemoComponent,
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue b/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
index deaf903af5..1660e139aa 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue';
+
 import AssistantLoadingMessage from './AssistantLoadingMessage.vue';
 import Notice from '../N8nNotice/Notice.vue';
 
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts b/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts
index 86f9b8ae51..d3d1261c8a 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AssistantLoadingMessage from '../AssistantLoadingMessage.vue';
 
 describe('AssistantLoadingMessage', () => {
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts b/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
index cb6280e579..ca75ee5e3b 100644
--- a/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
+++ b/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
@@ -1,6 +1,7 @@
-import AssistantText from './AssistantText.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import AssistantText from './AssistantText.vue';
+
 export default {
 	title: 'Assistant/AssistantText',
 	component: AssistantText,
diff --git a/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts b/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts
index 9e648bf178..30aa136674 100644
--- a/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts
+++ b/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import AssistantText from '../AssistantText.vue';
 
 describe('AssistantText', () => {
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.stories.ts b/packages/design-system/src/components/BetaTag/BetaTag.stories.ts
index 541ce06871..e093863694 100644
--- a/packages/design-system/src/components/BetaTag/BetaTag.stories.ts
+++ b/packages/design-system/src/components/BetaTag/BetaTag.stories.ts
@@ -1,6 +1,7 @@
-import BetaTag from './BetaTag.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import BetaTag from './BetaTag.vue';
+
 export default {
 	title: 'Assistant/BetaTag',
 	component: BetaTag,
diff --git a/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts b/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts
index a22b540485..7f92713ce8 100644
--- a/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts
+++ b/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import BetaTag from '../BetaTag.vue';
 
 describe('BetaTag', () => {
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
index 419aef4fcc..848baa244f 100644
--- a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
+++ b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
@@ -1,6 +1,7 @@
-import BlinkingCursor from './BlinkingCursor.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import BlinkingCursor from './BlinkingCursor.vue';
+
 export default {
 	title: 'Assistant/BlinkingCursor',
 	component: BlinkingCursor,
diff --git a/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts b/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts
index 50d1e650fd..65c4193e8d 100644
--- a/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts
+++ b/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import BlinkingCursor from '../BlinkingCursor.vue';
 
 describe('BlinkingCursor', () => {
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts b/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
index c2f09548ed..05e469bc2d 100644
--- a/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
@@ -1,6 +1,7 @@
-import CodeDiff from './CodeDiff.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import CodeDiff from './CodeDiff.vue';
+
 export default {
 	title: 'Assistant/CodeDiff',
 	component: CodeDiff,
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.vue b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
index de4a8d8274..cb2016c976 100644
--- a/packages/design-system/src/components/CodeDiff/CodeDiff.vue
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import parseDiff from 'parse-diff';
 import { computed } from 'vue';
+
 import { useI18n } from 'n8n-design-system/composables/useI18n';
 
 const MIN_LINES = 4;
diff --git a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts b/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
index 145482bf7d..c92a15efeb 100644
--- a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
+++ b/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import CodeDiff from '../CodeDiff.vue';
 
 describe('CodeDiff', () => {
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts b/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
index 853e06f8a9..250950d6d7 100644
--- a/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
+++ b/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
@@ -1,6 +1,7 @@
 import { render } from '@testing-library/vue';
 import { beforeAll, describe } from 'vitest';
 import { createRouter, createWebHistory } from 'vue-router';
+
 import CondtionalRouterLink from '../CondtionalRouterLink.vue';
 
 const slots = {
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
index fddc922050..4790d946f9 100644
--- a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
+++ b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
@@ -1,7 +1,8 @@
-import InlineAskAssistantButton from './InlineAskAssistantButton.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import InlineAskAssistantButton from './InlineAskAssistantButton.vue';
+
 export default {
 	title: 'Assistant/InlineAskAssistantButton',
 	component: InlineAskAssistantButton,
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
index b314ecbfc7..38918611d7 100644
--- a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
+++ b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { computed } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
 import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
 import AssistantText from '../AskAssistantText/AssistantText.vue';
-import { useI18n } from '../../composables/useI18n';
 
 const { t } = useI18n();
 
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
index b8d90ca151..5ef4f70cb7 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
@@ -1,7 +1,8 @@
-import N8nActionBox from './ActionBox.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nActionBox from './ActionBox.vue';
+
 export default {
 	title: 'Atoms/ActionBox',
 	component: N8nActionBox,
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index edb877b3d6..a43d7a6d7e 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
+import N8nTooltip from 'n8n-design-system/components/N8nTooltip/Tooltip.vue';
+import type { ButtonType } from 'n8n-design-system/types/button';
+
 import N8nButton from '../N8nButton';
+import N8nCallout, { type CalloutTheme } from '../N8nCallout';
 import N8nHeading from '../N8nHeading';
 import N8nText from '../N8nText';
-import N8nCallout, { type CalloutTheme } from '../N8nCallout';
-import type { ButtonType } from 'n8n-design-system/types/button';
-import N8nTooltip from 'n8n-design-system/components/N8nTooltip/Tooltip.vue';
 
 interface ActionBoxProps {
 	emoji: string;
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
index caf90bbc0a..8bbbee267f 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8NActionBox from '../ActionBox.vue';
 
 describe('N8NActionBox', () => {
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
index 30148d3e13..1de5c76fe1 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
@@ -1,6 +1,7 @@
-import N8nActionDropdown from './ActionDropdown.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nActionDropdown from './ActionDropdown.vue';
+
 export default {
 	title: 'Atoms/ActionDropdown',
 	component: N8nActionDropdown,
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
index 643d677c04..7284dea7dd 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -5,12 +5,14 @@
 // by Element UI dropdown component).
 // It can be used in different parts of editor UI while ActionToggle
 // is designed to be used in card components.
-import { ref, useCssModule, useAttrs, computed } from 'vue';
 import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
+import { ref, useCssModule, useAttrs, computed } from 'vue';
+
+import type { IconSize } from 'n8n-design-system/types/icon';
+
+import type { ActionDropdownItem } from '../../types';
 import N8nIcon from '../N8nIcon';
 import { N8nKeyboardShortcut } from '../N8nKeyboardShortcut';
-import type { ActionDropdownItem } from '../../types';
-import type { IconSize } from 'n8n-design-system/types/icon';
 
 const TRIGGER = ['click', 'hover'] as const;
 
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
index 1a3db8f69e..40c605f225 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nActionDropdown from '../ActionDropdown.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
index bf52cfe3e5..5cb7a7b9da 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
@@ -1,7 +1,8 @@
-import N8nActionToggle from './ActionToggle.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nActionToggle from './ActionToggle.vue';
+
 export default {
 	title: 'Atoms/ActionToggle',
 	component: N8nActionToggle,
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
index 2885d1c601..78da26b4af 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
+
 import type { UserAction } from 'n8n-design-system/types';
-import N8nIcon from '../N8nIcon';
 import type { IconOrientation, IconSize } from 'n8n-design-system/types/icon';
 
+import N8nIcon from '../N8nIcon';
+
 const SIZE = ['mini', 'small', 'medium'] as const;
 const THEME = ['default', 'dark'] as const;
 
diff --git a/packages/design-system/src/components/N8nAlert/Alert.stories.ts b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
index 97ef9c8a0b..f828397953 100644
--- a/packages/design-system/src/components/N8nAlert/Alert.stories.ts
+++ b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nAlert from './Alert.vue';
 import N8nIcon from '../N8nIcon';
 
diff --git a/packages/design-system/src/components/N8nAlert/Alert.vue b/packages/design-system/src/components/N8nAlert/Alert.vue
index 6a401ecf2f..a344fa9c8b 100644
--- a/packages/design-system/src/components/N8nAlert/Alert.vue
+++ b/packages/design-system/src/components/N8nAlert/Alert.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
+
 import N8nIcon from '../N8nIcon';
 
 type AlertProps = {
diff --git a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
index 6be8dc2f10..fe1d5d3aeb 100644
--- a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
+++ b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
@@ -1,6 +1,7 @@
 import { render, screen } from '@testing-library/vue';
-import N8nAlert from '../Alert.vue';
+
 import N8nIcon from '../../N8nIcon';
+import N8nAlert from '../Alert.vue';
 
 describe('components', () => {
 	describe('N8nAlert', () => {
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
index fe58696d18..6835567999 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nAvatar from './Avatar.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index 246140f940..1957401f34 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import Avatar from 'vue-boring-avatars';
+
 import { getInitials } from '../../utils/labelUtil';
 
 interface AvatarProps {
diff --git a/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts b/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
index 4fdeef6229..3abc2b5b53 100644
--- a/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
+++ b/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nAvatar from '../Avatar.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nBadge/Badge.stories.ts b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
index e8442fd6a0..09a07758ac 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.stories.ts
+++ b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nBadge from './Badge.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nBadge/Badge.vue b/packages/design-system/src/components/N8nBadge/Badge.vue
index 245aca5f17..8fe8968478 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.vue
+++ b/packages/design-system/src/components/N8nBadge/Badge.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { TextSize } from 'n8n-design-system/types/text';
+
 import N8nText from '../N8nText';
 
 const THEME = [
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
index 250f329da9..20d6a29d84 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
+++ b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nBadge from '../Badge.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
index 09b1c73ef0..333b150c2c 100644
--- a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nBlockUi from './BlockUi.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts b/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts
index 7b9c619048..2238f07b22 100644
--- a/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts
+++ b/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/vue';
+
 import N8nBlockUi from '../BlockUi.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nButton/Button.stories.ts b/packages/design-system/src/components/N8nButton/Button.stories.ts
index 8234849097..3aef3d5a05 100644
--- a/packages/design-system/src/components/N8nButton/Button.stories.ts
+++ b/packages/design-system/src/components/N8nButton/Button.stories.ts
@@ -1,7 +1,8 @@
-import N8nButton from './Button.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nButton from './Button.vue';
+
 export default {
 	title: 'Atoms/Button',
 	component: N8nButton,
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/design-system/src/components/N8nButton/Button.vue
index b365354e08..f0c0c71a77 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { useCssModule, computed, useAttrs, watchEffect } from 'vue';
+
+import type { ButtonProps } from 'n8n-design-system/types/button';
+
 import N8nIcon from '../N8nIcon';
 import N8nSpinner from '../N8nSpinner';
-import type { ButtonProps } from 'n8n-design-system/types/button';
 
 const $style = useCssModule();
 const attrs = useAttrs();
diff --git a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
index 9ead6c7344..371599f877 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
+++ b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nButton from '../Button.vue';
 
 const slots = {
diff --git a/packages/design-system/src/components/N8nCallout/Callout.stories.ts b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
index fe2f398899..9d30101ff1 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.stories.ts
+++ b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
@@ -1,7 +1,8 @@
+import type { StoryFn } from '@storybook/vue3';
+
 import N8nCallout from './Callout.vue';
 import N8nLink from '../N8nLink';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Callout',
diff --git a/packages/design-system/src/components/N8nCallout/Callout.vue b/packages/design-system/src/components/N8nCallout/Callout.vue
index 1ab024be08..9d866715c1 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.vue
+++ b/packages/design-system/src/components/N8nCallout/Callout.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
-import N8nText from '../N8nText';
-import N8nIcon from '../N8nIcon';
+
 import type { IconSize } from 'n8n-design-system/types/icon';
 
+import N8nIcon from '../N8nIcon';
+import N8nText from '../N8nText';
+
 const THEMES = ['info', 'success', 'secondary', 'warning', 'danger', 'custom'] as const;
 export type CalloutTheme = (typeof THEMES)[number];
 
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
index a55c32bf9f..782ce7c417 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
+++ b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nCallout from '../Callout.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nCard/Card.stories.ts b/packages/design-system/src/components/N8nCard/Card.stories.ts
index 6b54c2a30f..3652dca373 100644
--- a/packages/design-system/src/components/N8nCard/Card.stories.ts
+++ b/packages/design-system/src/components/N8nCard/Card.stories.ts
@@ -1,5 +1,6 @@
-import N8nCard from './Card.vue';
 import type { StoryFn } from '@storybook/vue3';
+
+import N8nCard from './Card.vue';
 import N8nButton from '../N8nButton/Button.vue';
 import N8nIcon from '../N8nIcon/Icon.vue';
 import N8nText from '../N8nText/Text.vue';
diff --git a/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts b/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts
index 82c190faa5..3228a51e2b 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts
+++ b/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nCard from '../Card.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
index c5c065ee5e..ef67fd62bb 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
@@ -1,6 +1,7 @@
-import N8nCheckbox from './Checkbox.vue';
-import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+import N8nCheckbox from './Checkbox.vue';
 
 export default {
 	title: 'Atoms/Checkbox',
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
index 4e4ff3946c..c6bf3f51be 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
 import { ElCheckbox } from 'element-plus';
 import type { CheckboxValueType } from 'element-plus';
+import { ref } from 'vue';
+
 import N8nInputLabel from '../N8nInputLabel';
 
 const LABEL_SIZE = ['small', 'medium'] as const;
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts b/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
index 0ec4f91660..43ef21a9c5 100644
--- a/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nCheckbox from '../Checkbox.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
index a9f11a3165..eceda7c3d0 100644
--- a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
@@ -1,6 +1,7 @@
-import N8nCircleLoader from './CircleLoader.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nCircleLoader from './CircleLoader.vue';
+
 export default {
 	title: 'Atoms/CircleLoader',
 	component: N8nCircleLoader,
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
index a05b4c219a..76b76d5a30 100644
--- a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
+++ b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8NCircleLoader from '../CircleLoader.vue';
 
 describe('N8NCircleLoader', () => {
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
index e72e35ea6e..d4d93885e2 100644
--- a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
@@ -1,5 +1,6 @@
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nColorPicker from './ColorPicker.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
index d4e461809e..dd58a14bcb 100644
--- a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import { uid } from '../../utils';
 import { ElColorPicker } from 'element-plus';
+import { computed, ref } from 'vue';
+
+import { uid } from '../../utils';
 import N8nInput from '../N8nInput';
 
 export type ColorPickerProps = {
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
index 702db17aa2..bf1253b8b9 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nColorPicker from '../ColorPicker.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
index e32a808d5c..dd979e561a 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
@@ -1,6 +1,7 @@
-import N8nDatatable from './Datatable.vue';
 import type { StoryFn } from '@storybook/vue3';
+
 import { rows, columns } from './__tests__/data';
+import N8nDatatable from './Datatable.vue';
 
 export default {
 	title: 'Atoms/Datatable',
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index 8e733e0758..3a28a4d54c 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
 import { computed, ref, useCssModule } from 'vue';
-import N8nSelect from '../N8nSelect';
+
+import { useI18n } from '../../composables/useI18n';
+import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
+import { getValueByPath } from '../../utils';
 import N8nOption from '../N8nOption';
 import N8nPagination from '../N8nPagination';
-import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
-import { useI18n } from '../../composables/useI18n';
-import { getValueByPath } from '../../utils';
+import N8nSelect from '../N8nSelect';
 
 const ALL_ROWS = -1;
 
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
index 3bead6c227..c19fa3ca0d 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
@@ -1,8 +1,10 @@
 import { render } from '@testing-library/vue';
-import N8nDatatable from '../Datatable.vue';
-import { rows, columns } from './data';
+
 import { removeDynamicAttributes } from 'n8n-design-system/utils';
 
+import { rows, columns } from './data';
+import N8nDatatable from '../Datatable.vue';
+
 const stubs = [
 	'n8n-option',
 	'n8n-button',
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/data.ts b/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
index a9bd9078cb..8572bec8ec 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
@@ -1,5 +1,6 @@
 import type { PropType } from 'vue';
 import { defineComponent, h } from 'vue';
+
 import type { DatatableColumn, DatatableRow } from '../../../types';
 import N8nButton from '../../N8nButton';
 
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
index 3db1bc1f01..76cf502578 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
@@ -1,7 +1,8 @@
-import N8nFormBox from './FormBox.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nFormBox from './FormBox.vue';
+
 export default {
 	title: 'Modules/FormBox',
 	component: N8nFormBox,
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index 54f010a7ef..7c33a95a78 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
+import type { IFormInput } from 'n8n-design-system/types';
+
+import { createFormEventBus } from '../../utils';
+import N8nButton from '../N8nButton';
 import N8nFormInputs from '../N8nFormInputs';
 import N8nHeading from '../N8nHeading';
 import N8nLink from '../N8nLink';
-import N8nButton from '../N8nButton';
-import type { IFormInput } from 'n8n-design-system/types';
-import { createFormEventBus } from '../../utils';
 
 interface FormBoxProps {
 	title?: string;
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
index e69972ea0c..0181aae574 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
@@ -1,7 +1,8 @@
-import N8nFormInput from './FormInput.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nFormInput from './FormInput.vue';
+
 export default {
 	title: 'Modules/FormInput',
 	component: N8nFormInput,
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 0266d8347e..5f187611da 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -1,14 +1,9 @@
 <script lang="ts" setup>
+import { ElSwitch } from 'element-plus';
 import { computed, reactive, onMounted, ref, watch, useSlots } from 'vue';
 
-import N8nInput from '../N8nInput';
-import N8nSelect from '../N8nSelect';
-import N8nOption from '../N8nOption';
-import N8nInputLabel from '../N8nInputLabel';
-import N8nCheckbox from '../N8nCheckbox';
-import { ElSwitch } from 'element-plus';
-
 import { getValidationError, VALIDATORS } from './validators';
+import { t } from '../../locale';
 import type {
 	Rule,
 	RuleGroup,
@@ -21,8 +16,11 @@ import type {
 	CheckboxLabelSizePropType,
 	InputAutocompletePropType,
 } from '../../types';
-
-import { t } from '../../locale';
+import N8nCheckbox from '../N8nCheckbox';
+import N8nInput from '../N8nInput';
+import N8nInputLabel from '../N8nInputLabel';
+import N8nOption from '../N8nOption';
+import N8nSelect from '../N8nSelect';
 
 export interface Props {
 	modelValue: Validatable;
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
index d01968b3c2..733f6cc594 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
@@ -1,7 +1,8 @@
-import N8nFormInputs from './FormInputs.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nFormInputs from './FormInputs.vue';
+
 export default {
 	title: 'Modules/FormInputs',
 	component: N8nFormInputs,
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 977a10a88f..8a27b28137 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch } from 'vue';
-import N8nFormInput from '../N8nFormInput';
+
 import type { IFormInput } from '../../types';
-import ResizeObserver from '../ResizeObserver';
 import type { FormEventBus } from '../../utils';
 import { createFormEventBus } from '../../utils';
+import N8nFormInput from '../N8nFormInput';
+import ResizeObserver from '../ResizeObserver';
 
 export type FormInputsProps = {
 	inputs?: IFormInput[];
diff --git a/packages/design-system/src/components/N8nHeading/Heading.stories.ts b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
index 8110662bc1..e079ac440f 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.stories.ts
+++ b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nHeading from './Heading.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nIcon/Icon.stories.ts b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
index 1b5d3b115a..65bb997330 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.stories.ts
+++ b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nIcon from './Icon.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/design-system/src/components/N8nIcon/Icon.vue
index 00e5fed31c..dc764fab24 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/design-system/src/components/N8nIcon/Icon.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import type { FontAwesomeIconProps } from '@fortawesome/vue-fontawesome';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+
 import type { IconSize, IconColor } from 'n8n-design-system/types/icon';
+
 import N8nText from '../N8nText';
 
 interface IconProps {
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
index a5207fdb4d..d31738904f 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
@@ -1,7 +1,8 @@
-import N8nIconButton from './IconButton.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nIconButton from './IconButton.vue';
+
 export default {
 	title: 'Atoms/Icon Button',
 	component: N8nIconButton,
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/design-system/src/components/N8nIconButton/IconButton.vue
index 3d2c0a0541..52770c1853 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { IconButtonProps } from 'n8n-design-system/types/button';
+
 import N8nButton from '../N8nButton';
 
 defineOptions({ name: 'N8nIconButton' });
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
index 75a28abf45..f74429d99b 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
@@ -1,6 +1,7 @@
-import N8nInfoAccordion from './InfoAccordion.vue';
-import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+import N8nInfoAccordion from './InfoAccordion.vue';
 
 export default {
 	title: 'Atoms/Info Accordion',
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index e500c73cd6..dc669a0984 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
-import N8nText from '../N8nText';
-import N8nIcon from '../N8nIcon';
+
 import type { IconColor } from 'n8n-design-system/types/icon';
+
 import { createEventBus, type EventBus } from '../../utils';
+import N8nIcon from '../N8nIcon';
+import N8nText from '../N8nText';
 
 interface IAccordionItem {
 	id: string;
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
index cf27c72a72..675600da19 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nInfoTip from './InfoTip.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
index c551000006..cde570d716 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
 import type { Placement } from 'element-plus';
+import { computed } from 'vue';
+
 import N8nIcon from '../N8nIcon';
 import N8nTooltip from '../N8nTooltip';
 
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
index b25713001b..ce3eb230fa 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nInfoTip from '../InfoTip.vue';
 
 const slots = {
diff --git a/packages/design-system/src/components/N8nInput/Input.stories.ts b/packages/design-system/src/components/N8nInput/Input.stories.ts
index 2ab4056259..a178b0365f 100644
--- a/packages/design-system/src/components/N8nInput/Input.stories.ts
+++ b/packages/design-system/src/components/N8nInput/Input.stories.ts
@@ -1,8 +1,9 @@
-import N8nInput from './Input.vue';
-import N8nIcon from '../N8nIcon';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nInput from './Input.vue';
+import N8nIcon from '../N8nIcon';
+
 export default {
 	title: 'Atoms/Input',
 	component: N8nInput,
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index e4a3f57af1..39cda6ce30 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
 import { ElInput } from 'element-plus';
-import { uid } from '../../utils';
-import type { InputSize, InputType } from 'n8n-design-system/types/input';
+import { computed, ref } from 'vue';
+
 import type { ElementPlusSizePropType, InputAutocompletePropType } from 'n8n-design-system/types';
+import type { InputSize, InputType } from 'n8n-design-system/types/input';
+
+import { uid } from '../../utils';
 
 interface InputProps {
 	modelValue?: string | number;
diff --git a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
index d4fb295d71..cea5a1f006 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
+++ b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nInput from '../Input.vue';
 
 describe('N8nInput', () => {
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
index 0feb1283a1..c112b869e2 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
@@ -1,6 +1,7 @@
+import type { StoryFn } from '@storybook/vue3';
+
 import N8nInputLabel from './InputLabel.vue';
 import N8nInput from '../N8nInput';
-import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input Label',
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index bda96c2e21..31e0d1ca46 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
-import N8nText from '../N8nText';
-import N8nIcon from '../N8nIcon';
-import N8nTooltip from '../N8nTooltip';
 import type { TextColor } from 'n8n-design-system/types/text';
 
+import N8nIcon from '../N8nIcon';
+import N8nText from '../N8nText';
+import N8nTooltip from '../N8nTooltip';
+
 const SIZE = ['small', 'medium'] as const;
 
 interface InputLabelProps {
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
index feee3265c0..b2522deca6 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
@@ -1,7 +1,8 @@
-import N8nInputNumber from './InputNumber.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nInputNumber from './InputNumber.vue';
+
 export default {
 	title: 'Atoms/Input Number',
 	component: N8nInputNumber,
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
index 35c370bd1c..de90395ef5 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import type { ElementPlusSizePropType, InputSize } from 'n8n-design-system/types';
 import { ElInputNumber } from 'element-plus';
 import { computed } from 'vue';
 
+import type { ElementPlusSizePropType, InputSize } from 'n8n-design-system/types';
+
 type InputNumberProps = {
 	size?: InputSize;
 	min?: number;
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts b/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
index d45f1a0a09..9198670f20 100644
--- a/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
@@ -1,6 +1,7 @@
-import N8nKeyboardShorcut from './N8nKeyboardShortcut.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nKeyboardShorcut from './N8nKeyboardShortcut.vue';
+
 export default {
 	title: 'Atoms/KeyboardShortcut',
 	component: N8nKeyboardShorcut,
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
index 5ca8d64b8a..77bbc2d8c0 100644
--- a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
+
 import { useDeviceSupport } from '../../composables/useDeviceSupport';
 import type { KeyboardShortcut } from '../../types/keyboardshortcut';
 
diff --git a/packages/design-system/src/components/N8nLink/Link.stories.ts b/packages/design-system/src/components/N8nLink/Link.stories.ts
index b11a7f4afd..0c4b920701 100644
--- a/packages/design-system/src/components/N8nLink/Link.stories.ts
+++ b/packages/design-system/src/components/N8nLink/Link.stories.ts
@@ -1,7 +1,8 @@
-import N8nLink from './Link.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nLink from './Link.vue';
+
 export default {
 	title: 'Atoms/Link',
 	component: N8nLink,
diff --git a/packages/design-system/src/components/N8nLink/Link.vue b/packages/design-system/src/components/N8nLink/Link.vue
index 4c325f6473..2f3f5e88c8 100644
--- a/packages/design-system/src/components/N8nLink/Link.vue
+++ b/packages/design-system/src/components/N8nLink/Link.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import type { RouteLocationRaw } from 'vue-router';
-import N8nText from '../N8nText';
-import N8nRoute from '../N8nRoute';
+
 import type { TextSize } from 'n8n-design-system/types/text';
 
+import N8nRoute from '../N8nRoute';
+import N8nText from '../N8nText';
+
 const THEME = ['primary', 'danger', 'text', 'secondary'] as const;
 
 interface LinkProps {
diff --git a/packages/design-system/src/components/N8nLoading/Loading.stories.ts b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
index 5d2ac6c435..859bd30cc8 100644
--- a/packages/design-system/src/components/N8nLoading/Loading.stories.ts
+++ b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nLoading from './Loading.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
index 783d9eeead..b5e51396cb 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nMarkdown from './Markdown.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index 45de891020..7f55c0c6f1 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
 import type { Options as MarkdownOptions } from 'markdown-it';
 import Markdown from 'markdown-it';
-import markdownLink from 'markdown-it-link-attributes';
 import markdownEmoji from 'markdown-it-emoji';
+import markdownLink from 'markdown-it-link-attributes';
 import markdownTaskLists from 'markdown-it-task-lists';
+import { computed, ref } from 'vue';
 import xss, { friendlyAttrValue, whiteList } from 'xss';
 
-import N8nLoading from '../N8nLoading';
 import { escapeMarkdown, toggleCheckbox } from '../../utils/markdown';
+import N8nLoading from '../N8nLoading';
 
 interface IImage {
 	id: string;
diff --git a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts b/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
index ac2faac7b3..1ee181d8bb 100644
--- a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
+++ b/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
@@ -1,4 +1,5 @@
 import { render, fireEvent } from '@testing-library/vue';
+
 import N8nMarkdown from '../Markdown.vue';
 import { n8nHtml } from 'n8n-design-system/directives';
 
diff --git a/packages/design-system/src/components/N8nMenu/Menu.stories.ts b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
index bca1eff3bd..b5bf903a4d 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.stories.ts
+++ b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
@@ -1,8 +1,9 @@
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
 import N8nMenu from './Menu.vue';
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue3';
-import { action } from '@storybook/addon-actions';
 
 export default {
 	title: 'Atoms/Menu',
diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index 56c8b2d0ab..596206977f 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.vue
+++ b/packages/design-system/src/components/N8nMenu/Menu.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
+import { ElMenu } from 'element-plus';
 import { computed, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { ElMenu } from 'element-plus';
-import N8nMenuItem from '../N8nMenuItem';
+
 import type { IMenuItem } from '../../types';
+import N8nMenuItem from '../N8nMenuItem';
 import { doesMenuItemMatchCurrentRoute } from '../N8nMenuItem/routerUtil';
 
 interface MenuProps {
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
index bb8df005a9..8cf0accb5d 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
@@ -1,6 +1,7 @@
-import N8nMenuItem from '.';
-import { ElMenu } from 'element-plus';
 import type { StoryFn } from '@storybook/vue3';
+import { ElMenu } from 'element-plus';
+
+import N8nMenuItem from '.';
 
 export default {
 	title: 'Atoms/MenuItem',
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index f4f01b16d9..03fdb7e182 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup>
+import { ElSubMenu, ElMenuItem } from 'element-plus';
 import { computed, useCssModule } from 'vue';
 import { useRoute } from 'vue-router';
-import { ElSubMenu, ElMenuItem } from 'element-plus';
-import N8nTooltip from '../N8nTooltip';
-import N8nIcon from '../N8nIcon';
-import ConditionalRouterLink from '../ConditionalRouterLink';
-import type { IMenuItem } from '../../types';
+
 import { doesMenuItemMatchCurrentRoute } from './routerUtil';
+import type { IMenuItem } from '../../types';
 import { getInitials } from '../../utils/labelUtil';
+import ConditionalRouterLink from '../ConditionalRouterLink';
+import N8nIcon from '../N8nIcon';
+import N8nTooltip from '../N8nTooltip';
 
 interface MenuItemProps {
 	item: IMenuItem;
diff --git a/packages/design-system/src/components/N8nMenuItem/routerUtil.ts b/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
index a32df485fd..30d4c20b38 100644
--- a/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
+++ b/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
@@ -1,6 +1,7 @@
-import type { IMenuItem } from 'n8n-design-system/types';
 import type { RouteLocationNormalizedLoaded, RouteLocationRaw } from 'vue-router';
 
+import type { IMenuItem } from 'n8n-design-system/types';
+
 /**
  * Checks if the given menu item matches the current route.
  */
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
index 6e22518afa..99dfa85740 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
@@ -1,6 +1,7 @@
-import N8nNodeCreatorNode from './NodeCreatorNode.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nNodeCreatorNode from './NodeCreatorNode.vue';
+
 export default {
 	title: 'Modules/Node Creator Node',
 	component: N8nNodeCreatorNode,
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index 909db76930..bef3b5a261 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { ElTag } from 'element-plus';
+
 import { useI18n } from '../../composables/useI18n';
 import type { NodeCreatorTag } from '../../types/node-creator-node';
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import N8nTooltip from '../N8nTooltip';
-import { ElTag } from 'element-plus';
 
 export interface Props {
 	active?: boolean;
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
index 2d5f085e95..c99ae9c7bb 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
@@ -1,6 +1,7 @@
-import N8nNodeIcon from './NodeIcon.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nNodeIcon from './NodeIcon.vue';
+
 export default {
 	title: 'Atoms/NodeIcon',
 	component: N8nNodeIcon,
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
index be173979d4..f4cf18877a 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import type { Placement } from 'element-plus';
+import { computed } from 'vue';
+
 import N8nTooltip from '../N8nTooltip';
 
 interface NodeIconProps {
diff --git a/packages/design-system/src/components/N8nNotice/Notice.stories.ts b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
index aa4db557a9..6f197d6f99 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.stories.ts
+++ b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
@@ -1,6 +1,7 @@
-import N8nNotice from './Notice.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nNotice from './Notice.vue';
+
 export default {
 	title: 'Atoms/Notice',
 	component: N8nNotice,
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index f630e95e59..a69ef3f584 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { computed, ref, useCssModule } from 'vue';
 import sanitize from 'sanitize-html';
+import { computed, ref, useCssModule } from 'vue';
+
 import N8nText from '../../components/N8nText';
 import { uid } from '../../utils';
 
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
index 180815e536..25c098b558 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
+++ b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
@@ -1,8 +1,10 @@
 import { render } from '@testing-library/vue';
-import N8nNotice from '../Notice.vue';
+
 import { N8nText } from 'n8n-design-system/components';
 import { n8nHtml } from 'n8n-design-system/directives';
 
+import N8nNotice from '../Notice.vue';
+
 describe('components', () => {
 	describe('N8nNotice', () => {
 		it('should render correctly', () => {
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
index 20381c31e3..d3d5af8843 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
+++ b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nPagination from './Pagination.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nPopover/Popover.stories.ts b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
index afe37f8b7f..4359769879 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.stories.ts
+++ b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nPopover from './Popover.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
index 4d29b64379..73340b38c8 100644
--- a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
+++ b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
@@ -1,6 +1,7 @@
-import N8nPulse from './Pulse.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nPulse from './Pulse.vue';
+
 export default {
 	title: 'Atoms/Pulse',
 	component: N8nPulse,
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
index 5551d34f2d..5847e8411a 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
@@ -1,8 +1,8 @@
-import N8nRadioButtons from './RadioButtons.vue';
-
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nRadioButtons from './RadioButtons.vue';
+
 export default {
 	title: 'Atoms/RadioButtons',
 	component: N8nRadioButtons,
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
index fb2a496c3c..b949f346f5 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
@@ -1,5 +1,6 @@
-import type { ComponentInstance } from 'vue';
 import type { StoryFn } from '@storybook/vue3';
+import type { ComponentInstance } from 'vue';
+
 import N8nRecycleScroller from './RecycleScroller.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
index 765067c855..85c83db428 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nRecycleScroller from '../RecycleScroller.vue';
 
 const itemSize = 100;
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
index 6c7773a062..3b36469a37 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
@@ -1,8 +1,9 @@
-import { type StoryFn } from '@storybook/vue3';
 import { type ActionOptions, action } from '@storybook/addon-actions';
-import N8nResizeWrapper from './ResizeWrapper.vue';
+import { type StoryFn } from '@storybook/vue3';
 import { ref } from 'vue';
 
+import N8nResizeWrapper from './ResizeWrapper.vue';
+
 // TODO: remove this after converting ResizeWrapper to composition API
 interface ResizeData extends ActionOptions {
 	height: number;
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
index fe344ed483..6403e03c48 100644
--- a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
+++ b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
@@ -1,5 +1,6 @@
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nResizeableSticky from './ResizeableSticky.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
index f75fc0e0ef..ea72c506b7 100644
--- a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
+++ b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import { computed, ref, useAttrs } from 'vue';
+
 import N8nResizeWrapper, { type ResizeData } from '../N8nResizeWrapper/ResizeWrapper.vue';
+import { defaultStickyProps } from '../N8nSticky/constants';
 import N8nSticky from '../N8nSticky/Sticky.vue';
 import type { StickyProps } from '../N8nSticky/types';
-import { defaultStickyProps } from '../N8nSticky/constants';
 
 type ResizeableStickyProps = StickyProps & {
 	scale?: number;
diff --git a/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts b/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
index fb5c16b1ee..430c8f1ae0 100644
--- a/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
+++ b/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nRoute from '../Route.vue';
 
 describe('N8nRoute', () => {
diff --git a/packages/design-system/src/components/N8nSelect/Select.stories.ts b/packages/design-system/src/components/N8nSelect/Select.stories.ts
index b95c5b9b1d..de3bca1a2f 100644
--- a/packages/design-system/src/components/N8nSelect/Select.stories.ts
+++ b/packages/design-system/src/components/N8nSelect/Select.stories.ts
@@ -1,8 +1,9 @@
-import type { StoryFn } from '@storybook/vue3';
-import N8nSelect from './Select.vue';
-import N8nOption from '../N8nOption';
-import N8nIcon from '../N8nIcon';
 import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+import N8nSelect from './Select.vue';
+import N8nIcon from '../N8nIcon';
+import N8nOption from '../N8nOption';
 
 export default {
 	title: 'Atoms/Select',
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 8fc1223abb..1e2870c5d1 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import { ElSelect } from 'element-plus';
 import type { PropType } from 'vue';
 import { computed, ref, useAttrs } from 'vue';
-import { ElSelect } from 'element-plus';
+
 import type { SelectSize } from 'n8n-design-system/types';
+
 import { isEventBindingElementAttribute } from '../../utils';
 
 type InnerSelectRef = InstanceType<typeof ElSelect>;
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
index 170cfdaa3f..bba6055e46 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
@@ -1,10 +1,12 @@
-import { defineComponent, ref } from 'vue';
-import { render, waitFor, within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import N8nSelect from '../Select.vue';
-import N8nOption from '../../N8nOption/Option.vue';
+import { render, waitFor, within } from '@testing-library/vue';
+import { defineComponent, ref } from 'vue';
+
 import { removeDynamicAttributes } from 'n8n-design-system/utils';
 
+import N8nOption from '../../N8nOption/Option.vue';
+import N8nSelect from '../Select.vue';
+
 describe('components', () => {
 	describe('N8nSelect', () => {
 		it('should render correctly', () => {
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
index 7e1865b604..ab9cac400b 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nSpinner from './Spinner.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.vue b/packages/design-system/src/components/N8nSpinner/Spinner.vue
index 66ac825c3b..ddee4f4d76 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.vue
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { TextSize } from 'n8n-design-system/types/text';
+
 import N8nIcon from '../N8nIcon';
 
 const TYPE = ['dots', 'ring'] as const;
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
index 1411f2c05e..bb9ef279f8 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
+++ b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
@@ -1,5 +1,6 @@
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nSticky from './Sticky.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 9e258b4afa..73aa4933a3 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
+
+import { defaultStickyProps } from './constants';
+import type { StickyProps } from './types';
+import { useI18n } from '../../composables/useI18n';
 import N8nInput from '../N8nInput';
 import N8nMarkdown from '../N8nMarkdown';
 import N8nText from '../N8nText';
-import { useI18n } from '../../composables/useI18n';
-import { defaultStickyProps } from './constants';
-import type { StickyProps } from './types';
 
 const props = withDefaults(defineProps<StickyProps>(), defaultStickyProps);
 
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
index 6b383cc30c..756505f722 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
+++ b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
@@ -1,8 +1,8 @@
-import N8nTabs from './Tabs.vue';
-
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nTabs from './Tabs.vue';
+
 export default {
 	title: 'Atoms/Tabs',
 	component: N8nTabs,
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index ff1b142e51..501b3bd3b2 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
-import N8nIcon from '../N8nIcon';
 import type { RouteLocationRaw } from 'vue-router';
 
+import N8nIcon from '../N8nIcon';
+
 interface TabOptions {
 	value: string;
 	label?: string;
diff --git a/packages/design-system/src/components/N8nTag/Tag.stories.ts b/packages/design-system/src/components/N8nTag/Tag.stories.ts
index c2f25a4089..6dddecea7e 100644
--- a/packages/design-system/src/components/N8nTag/Tag.stories.ts
+++ b/packages/design-system/src/components/N8nTag/Tag.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nTag from './Tag.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nTags/Tags.stories.ts b/packages/design-system/src/components/N8nTags/Tags.stories.ts
index 89590c75ab..d24a96432c 100644
--- a/packages/design-system/src/components/N8nTags/Tags.stories.ts
+++ b/packages/design-system/src/components/N8nTags/Tags.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nTags from './Tags.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nTags/Tags.vue b/packages/design-system/src/components/N8nTags/Tags.vue
index 43ebb107e7..ac6406a8d0 100644
--- a/packages/design-system/src/components/N8nTags/Tags.vue
+++ b/packages/design-system/src/components/N8nTags/Tags.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import N8nTag from '../N8nTag';
-import N8nLink from '../N8nLink';
+
 import { useI18n } from '../../composables/useI18n';
+import N8nLink from '../N8nLink';
+import N8nTag from '../N8nTag';
 
 interface ITag {
 	id: string;
diff --git a/packages/design-system/src/components/N8nText/Text.stories.ts b/packages/design-system/src/components/N8nText/Text.stories.ts
index 50577dfba4..fd12f968d1 100644
--- a/packages/design-system/src/components/N8nText/Text.stories.ts
+++ b/packages/design-system/src/components/N8nText/Text.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nText from './Text.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index 055a79c3dd..7ed36f4179 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
+
 import type { TextSize, TextColor, TextAlign } from 'n8n-design-system/types/text';
 
 interface TextProps {
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
index 191d9e4135..7e405803d9 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nTooltip from './Tooltip.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index 34339fd0be..d0eb5b610e 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import type { PropType } from 'vue';
 import { ElTooltip } from 'element-plus';
+import type { PropType } from 'vue';
+
 import type { IN8nButton } from 'n8n-design-system/types';
+
 import N8nButton from '../N8nButton';
 
 export type Justify =
diff --git a/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts b/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
index abcd416f36..8fe4219d2d 100644
--- a/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
+++ b/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
@@ -1,5 +1,6 @@
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
+import { render } from '@testing-library/vue';
+
 import N8nTooltip from '../Tooltip.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nTree/Tree.stories.ts b/packages/design-system/src/components/N8nTree/Tree.stories.ts
index d8f98dc903..e0f9713065 100644
--- a/packages/design-system/src/components/N8nTree/Tree.stories.ts
+++ b/packages/design-system/src/components/N8nTree/Tree.stories.ts
@@ -1,6 +1,7 @@
-import N8nTree from './Tree.vue';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nTree from './Tree.vue';
+
 export default {
 	title: 'Atoms/Tree',
 	component: N8nTree,
diff --git a/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts b/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts
index 4a5bfec92b..1728a6f9fc 100644
--- a/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts
+++ b/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import N8nTree from '../Tree.vue';
 
 describe('components', () => {
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
index 2a8c5d7a94..9479d91943 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import N8nUserInfo from './UserInfo.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
index fd8c3f061c..f34818d2a0 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
-import N8nText from '../N8nText';
+
+import { useI18n } from '../../composables/useI18n';
 import N8nAvatar from '../N8nAvatar';
 import N8nBadge from '../N8nBadge';
-import { useI18n } from '../../composables/useI18n';
+import N8nText from '../N8nText';
 
 interface UsersInfoProps {
 	firstName?: string;
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
index 6bae7d537f..d4e358f2d4 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
@@ -1,7 +1,8 @@
-import N8nUserSelect from './UserSelect.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
+import N8nUserSelect from './UserSelect.vue';
+
 export default {
 	title: 'Modules/UserSelect',
 	component: N8nUserSelect,
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
index feeaa1a8d2..ca99214639 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import N8nUserInfo from '../N8nUserInfo';
-import N8nSelect from '../N8nSelect';
-import N8nOption from '../N8nOption';
+
 import { useI18n } from '../../composables/useI18n';
 import type { IUser, SelectSize } from '../../types';
+import N8nOption from '../N8nOption';
+import N8nSelect from '../N8nSelect';
+import N8nUserInfo from '../N8nUserInfo';
 
 interface UserSelectProps {
 	users?: IUser[];
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts b/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
index b19bbe3e67..6d6e4aa575 100644
--- a/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { StoryFn } from '@storybook/vue3';
+
 import UserStack from './UserStack.vue';
 
 export default {
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.vue b/packages/design-system/src/components/N8nUserStack/UserStack.vue
index bb338d3c61..b1a9bf8f11 100644
--- a/packages/design-system/src/components/N8nUserStack/UserStack.vue
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
+
 import type { IUser, UserStackGroups } from 'n8n-design-system/types';
+
 import N8nAvatar from '../N8nAvatar';
 import N8nUserInfo from '../N8nUserInfo';
 
diff --git a/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts b/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
index bae51036a7..b08fe3d3d3 100644
--- a/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
+++ b/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
@@ -1,7 +1,9 @@
 import { render } from '@testing-library/vue';
-import UserStack from '../UserStack.vue';
+
 import { N8nAvatar, N8nUserInfo } from 'n8n-design-system/main';
 
+import UserStack from '../UserStack.vue';
+
 describe('UserStack', () => {
 	it('should render flat user list', () => {
 		const { container } = render(UserStack, {
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
index 3c73a8ce67..cfaf9b3fb0 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
@@ -1,8 +1,10 @@
-import N8nUsersList from './UsersList.vue';
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
+
 import type { IUser } from 'n8n-design-system/types';
 
+import N8nUsersList from './UsersList.vue';
+
 export default {
 	title: 'Modules/UsersList',
 	component: N8nUsersList,
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.vue b/packages/design-system/src/components/N8nUsersList/UsersList.vue
index e4a6870d06..a4d61d2db3 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.vue
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
+import type { IUser, UserAction } from '../../types';
 import N8nActionToggle from '../N8nActionToggle';
 import N8nBadge from '../N8nBadge';
 import N8nUserInfo from '../N8nUserInfo';
-import type { IUser, UserAction } from '../../types';
-import { useI18n } from '../../composables/useI18n';
 
 interface UsersListProps {
 	users: IUser[];
diff --git a/packages/design-system/src/directives/n8n-truncate.test.ts b/packages/design-system/src/directives/n8n-truncate.test.ts
index ec8922d2bc..89cd771283 100644
--- a/packages/design-system/src/directives/n8n-truncate.test.ts
+++ b/packages/design-system/src/directives/n8n-truncate.test.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import { n8nTruncate } from './n8n-truncate';
 
 describe('Directive n8n-truncate', () => {
diff --git a/packages/design-system/src/directives/n8n-truncate.ts b/packages/design-system/src/directives/n8n-truncate.ts
index 8d454654c0..27e678f4d5 100644
--- a/packages/design-system/src/directives/n8n-truncate.ts
+++ b/packages/design-system/src/directives/n8n-truncate.ts
@@ -1,4 +1,5 @@
 import type { DirectiveBinding, ObjectDirective } from 'vue';
+
 import { truncate } from '../utils/string';
 
 /**
diff --git a/packages/design-system/src/locale/index.ts b/packages/design-system/src/locale/index.ts
index 325b1d0dcd..48652a5a65 100644
--- a/packages/design-system/src/locale/index.ts
+++ b/packages/design-system/src/locale/index.ts
@@ -1,7 +1,8 @@
-import defaultLang from '../locale/lang/en';
-import createFormatTemplate from './format';
 import type { N8nLocale, N8nLocaleTranslateFn } from 'n8n-design-system/types';
 
+import createFormatTemplate from './format';
+import defaultLang from '../locale/lang/en';
+
 // import { ElementLocale } from 'element-plus';
 // import ElementLang from 'element-plus/lib/locale/lang/en';
 //
diff --git a/packages/design-system/src/plugin.ts b/packages/design-system/src/plugin.ts
index c6d3d2a6c9..446dc579dc 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -1,4 +1,5 @@
 import type { Component, Plugin } from 'vue';
+
 import * as components from './components';
 import * as directives from './directives';
 
diff --git a/packages/design-system/src/styleguide/ColorCircles.vue b/packages/design-system/src/styleguide/ColorCircles.vue
index 007d731bd8..55f4c1f9bc 100644
--- a/packages/design-system/src/styleguide/ColorCircles.vue
+++ b/packages/design-system/src/styleguide/ColorCircles.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue';
+
 import { getHex, resolveHSLCalc } from './ColorCircles.utils';
 
 const props = defineProps<{ colors: string[] }>();
diff --git a/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts b/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts
index d961fd40e5..0e8f7cb479 100644
--- a/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts
+++ b/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/vue';
 import { mock, mockClear } from 'vitest-mock-extended';
+
 import ColorCircles from '../ColorCircles.vue';
 
 describe('ColorCircles', () => {
diff --git a/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts b/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts
index 3ae44c8757..9ac613c4d3 100644
--- a/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts
+++ b/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/vue';
 import { mock, mockClear } from 'vitest-mock-extended';
+
 import Sizes from '../Sizes.vue';
 
 describe('Sizes', () => {
diff --git a/packages/design-system/src/styleguide/border.stories.ts b/packages/design-system/src/styleguide/border.stories.ts
index 9bfc2b497d..bf14d4eaee 100644
--- a/packages/design-system/src/styleguide/border.stories.ts
+++ b/packages/design-system/src/styleguide/border.stories.ts
@@ -1,4 +1,5 @@
 import { type StoryFn } from '@storybook/vue3';
+
 import VariableTable from './VariableTable.vue';
 
 export default {
diff --git a/packages/design-system/src/styleguide/colors.stories.ts b/packages/design-system/src/styleguide/colors.stories.ts
index 7eca60a850..74eab515e9 100644
--- a/packages/design-system/src/styleguide/colors.stories.ts
+++ b/packages/design-system/src/styleguide/colors.stories.ts
@@ -1,4 +1,5 @@
 import { type StoryFn } from '@storybook/vue3';
+
 import ColorCircles from './ColorCircles.vue';
 
 export default {
diff --git a/packages/design-system/src/styleguide/colorsprimitives.stories.ts b/packages/design-system/src/styleguide/colorsprimitives.stories.ts
index 430664a29e..6f041cb13f 100644
--- a/packages/design-system/src/styleguide/colorsprimitives.stories.ts
+++ b/packages/design-system/src/styleguide/colorsprimitives.stories.ts
@@ -1,4 +1,5 @@
 import { type StoryFn } from '@storybook/vue3';
+
 import ColorCircles from './ColorCircles.vue';
 
 export default {
diff --git a/packages/design-system/src/styleguide/fonts.stories.ts b/packages/design-system/src/styleguide/fonts.stories.ts
index 6542603ded..8020f2c45e 100644
--- a/packages/design-system/src/styleguide/fonts.stories.ts
+++ b/packages/design-system/src/styleguide/fonts.stories.ts
@@ -1,4 +1,5 @@
 import { type StoryFn } from '@storybook/vue3';
+
 import Sizes from './Sizes.vue';
 import VariableTable from './VariableTable.vue';
 
diff --git a/packages/design-system/src/styleguide/spacing.stories.ts b/packages/design-system/src/styleguide/spacing.stories.ts
index cf4311a21f..c4aaca845b 100644
--- a/packages/design-system/src/styleguide/spacing.stories.ts
+++ b/packages/design-system/src/styleguide/spacing.stories.ts
@@ -1,4 +1,5 @@
 import { type StoryFn } from '@storybook/vue3';
+
 import Sizes from './Sizes.vue';
 
 export default {
diff --git a/packages/design-system/src/styleguide/utilities/spacing.stories.ts b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
index 065383a5d1..591f82df43 100644
--- a/packages/design-system/src/styleguide/utilities/spacing.stories.ts
+++ b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
@@ -1,4 +1,5 @@
 import type { StoryFn } from '@storybook/vue3';
+
 import SpacingPreview from '../components/SpacingPreview.vue';
 
 export default {
diff --git a/packages/workflow/.eslintrc.js b/packages/workflow/.eslintrc.js
index 32422b2846..fa81226338 100644
--- a/packages/workflow/.eslintrc.js
+++ b/packages/workflow/.eslintrc.js
@@ -12,7 +12,6 @@ module.exports = {
 		complexity: 'error',
 
 		// TODO: remove these
-		'import/order': 'off',
 		'@typescript-eslint/no-base-to-string': 'warn',
 		'@typescript-eslint/no-explicit-any': 'warn',
 		'@typescript-eslint/no-redundant-type-constituents': 'warn',
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index b878fcedf0..8a6d568d24 100644
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ b/packages/workflow/src/ErrorReporterProxy.ts
@@ -1,5 +1,5 @@
-import * as Logger from './LoggerProxy';
 import { ApplicationError, type ReportingOptions } from './errors/application.error';
+import * as Logger from './LoggerProxy';
 
 interface ErrorReporter {
 	report: (error: Error | string, options?: ReportingOptions) => void;
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 018a8e9e24..dc7c661b56 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -1,6 +1,15 @@
-import { DateTime, Duration, Interval } from 'luxon';
 import * as tmpl from '@n8n_io/riot-tmpl';
+import { DateTime, Duration, Interval } from 'luxon';
 
+import { ApplicationError } from './errors/application.error';
+import { ExpressionExtensionError } from './errors/expression-extension.error';
+import { ExpressionError } from './errors/expression.error';
+import { evaluateExpression, setErrorHandler } from './ExpressionEvaluatorProxy';
+import { sanitizer, sanitizerName } from './ExpressionSandboxing';
+import { extend, extendOptional } from './Extensions';
+import { extendSyntax } from './Extensions/ExpressionExtension';
+import { extendedFunctions } from './Extensions/ExtendedFunctions';
+import { getGlobalState } from './GlobalState';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -15,18 +24,8 @@ import type {
 	NodeParameterValueType,
 	WorkflowExecuteMode,
 } from './Interfaces';
-import { ExpressionError } from './errors/expression.error';
-import { ExpressionExtensionError } from './errors/expression-extension.error';
-import { WorkflowDataProxy } from './WorkflowDataProxy';
 import type { Workflow } from './Workflow';
-
-import { extend, extendOptional } from './Extensions';
-import { extendedFunctions } from './Extensions/ExtendedFunctions';
-import { extendSyntax } from './Extensions/ExpressionExtension';
-import { evaluateExpression, setErrorHandler } from './ExpressionEvaluatorProxy';
-import { getGlobalState } from './GlobalState';
-import { ApplicationError } from './errors/application.error';
-import { sanitizer, sanitizerName } from './ExpressionSandboxing';
+import { WorkflowDataProxy } from './WorkflowDataProxy';
 
 const IS_FRONTEND_IN_DEV_MODE =
 	typeof process === 'object' &&
diff --git a/packages/workflow/src/ExpressionEvaluatorProxy.ts b/packages/workflow/src/ExpressionEvaluatorProxy.ts
index 74d5c46e8f..37dec8af51 100644
--- a/packages/workflow/src/ExpressionEvaluatorProxy.ts
+++ b/packages/workflow/src/ExpressionEvaluatorProxy.ts
@@ -1,9 +1,10 @@
-import * as tmpl from '@n8n_io/riot-tmpl';
 import type { ReturnValue, TmplDifference } from '@n8n/tournament';
 import { Tournament } from '@n8n/tournament';
+import * as tmpl from '@n8n_io/riot-tmpl';
+
+import { PrototypeSanitizer } from './ExpressionSandboxing';
 import type { ExpressionEvaluatorType } from './Interfaces';
 import * as LoggerProxy from './LoggerProxy';
-import { PrototypeSanitizer } from './ExpressionSandboxing';
 
 type Evaluator = (expr: string, data: unknown) => tmpl.ReturnValue;
 type ErrorHandler = (error: Error) => void;
diff --git a/packages/workflow/src/ExpressionSandboxing.ts b/packages/workflow/src/ExpressionSandboxing.ts
index 8240f8babb..7562e8efa2 100644
--- a/packages/workflow/src/ExpressionSandboxing.ts
+++ b/packages/workflow/src/ExpressionSandboxing.ts
@@ -1,4 +1,5 @@
 import { type ASTAfterHook, astBuilders as b, astVisit } from '@n8n/tournament';
+
 import { ExpressionError } from './errors';
 
 const forbiddenMembers = ['__proto__', 'prototype', 'constructor', 'getPrototypeOf'];
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index a97049ece3..cd58d735f6 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -1,10 +1,10 @@
 import deepEqual from 'deep-equal';
 import uniqWith from 'lodash/uniqWith';
 
-import { ExpressionError } from '../errors/expression.error';
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { Extension, ExtensionMap } from './Extensions';
 import { compact as oCompact } from './ObjectExtensions';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
+import { ExpressionError } from '../errors/expression.error';
 import { randomInt } from '../utils';
 
 function first(value: unknown[]): unknown {
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index 8c38fc35bf..e6e721c74c 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,5 +1,3 @@
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
-
 import { DateTime } from 'luxon';
 import type {
 	DateTimeUnit,
@@ -8,9 +6,11 @@ import type {
 	LocaleOptions,
 	WeekdayNumbers,
 } from 'luxon';
+
 import type { ExtensionMap } from './Extensions';
-import { convertToDateTime } from './utils';
 import { toDateTime as stringToDateTime } from './StringExtensions';
+import { convertToDateTime } from './utils';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 const durationUnits = [
 	'milliseconds',
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 615e793ecc..2c8d745bd8 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -1,23 +1,22 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { DateTime } from 'luxon';
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
-import { parse, visit, types, print } from 'recast';
-import { getOption } from 'recast/lib/util';
+import type { ExpressionKind } from 'ast-types/gen/kinds';
 import type { Config as EsprimaConfig } from 'esprima-next';
 import { parse as esprimaParse } from 'esprima-next';
+import { DateTime } from 'luxon';
+import { parse, visit, types, print } from 'recast';
+import { getOption } from 'recast/lib/util';
 
 import { arrayExtensions } from './ArrayExtensions';
-import { dateExtensions } from './DateExtensions';
-import { numberExtensions } from './NumberExtensions';
-import { stringExtensions } from './StringExtensions';
-import { objectExtensions } from './ObjectExtensions';
-import type { ExpressionKind } from 'ast-types/gen/kinds';
-
-import type { ExpressionChunk, ExpressionCode } from './ExpressionParser';
-import { joinExpression, splitExpression } from './ExpressionParser';
 import { booleanExtensions } from './BooleanExtensions';
+import { dateExtensions } from './DateExtensions';
+import { joinExpression, splitExpression } from './ExpressionParser';
+import type { ExpressionChunk, ExpressionCode } from './ExpressionParser';
 import type { ExtensionMap } from './Extensions';
+import { numberExtensions } from './NumberExtensions';
+import { objectExtensions } from './ObjectExtensions';
+import { stringExtensions } from './StringExtensions';
 import { checkIfValueDefinedOrThrow } from './utils';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 const EXPRESSION_EXTENDER = 'extend';
 const EXPRESSION_EXTENDER_OPTIONAL = 'extendOptional';
diff --git a/packages/workflow/src/Extensions/ExtendedFunctions.ts b/packages/workflow/src/Extensions/ExtendedFunctions.ts
index 091cdc8b0c..75ad05fd2e 100644
--- a/packages/workflow/src/Extensions/ExtendedFunctions.ts
+++ b/packages/workflow/src/Extensions/ExtendedFunctions.ts
@@ -1,6 +1,6 @@
-import { ExpressionError } from '../errors/expression.error';
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import { average as aAverage } from './ArrayExtensions';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
+import { ExpressionError } from '../errors/expression.error';
 
 const min = Math.min;
 const max = Math.max;
diff --git a/packages/workflow/src/Extensions/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index b13520be4d..7fc5a97e3e 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -2,8 +2,9 @@
  * @jest-environment jsdom
  */
 import { DateTime } from 'luxon';
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
+
 import type { ExtensionMap } from './Extensions';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 function format(value: number, extraArgs: unknown[]): string {
 	const [locales = 'en-US', config = {}] = extraArgs as [
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index 8970318e1c..58759890ad 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -1,5 +1,5 @@
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { ExtensionMap } from './Extensions';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 function isEmpty(value: object): boolean {
 	return Object.keys(value).length === 0;
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index 8b4e025bf6..4f42b546da 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,13 +1,14 @@
-import SHA from 'jssha';
-import MD5 from 'md5';
 import { toBase64, fromBase64 } from 'js-base64';
-import { titleCase } from 'title-case';
-import type { Extension, ExtensionMap } from './Extensions';
-import { transliterate } from 'transliteration';
-import { ExpressionExtensionError } from '../errors/expression-extension.error';
+import SHA from 'jssha';
 import { DateTime } from 'luxon';
-import { tryToParseDateTime } from '../TypeValidation';
+import MD5 from 'md5';
+import { titleCase } from 'title-case';
+import { transliterate } from 'transliteration';
+
+import type { Extension, ExtensionMap } from './Extensions';
 import { toDateTime as numberToDateTime } from './NumberExtensions';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
+import { tryToParseDateTime } from '../TypeValidation';
 
 export const SupportedHashAlgorithms = [
 	'md5',
diff --git a/packages/workflow/src/Extensions/utils.ts b/packages/workflow/src/Extensions/utils.ts
index e56d37a691..1e8509db40 100644
--- a/packages/workflow/src/Extensions/utils.ts
+++ b/packages/workflow/src/Extensions/utils.ts
@@ -1,4 +1,5 @@
 import { DateTime } from 'luxon';
+
 import { ExpressionExtensionError } from '../errors/expression-extension.error';
 
 // Utility functions and type guards for expression extensions
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 4ad9612d6d..17f24c3096 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,28 +1,28 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager';
+import type { AxiosProxyConfig } from 'axios';
 import type * as express from 'express';
 import type FormData from 'form-data';
 import type { PathLike } from 'fs';
 import type { IncomingHttpHeaders } from 'http';
-import type { SecureContextOptions } from 'tls';
-import type { Readable } from 'stream';
-import type { URLSearchParams } from 'url';
 import type { RequestBodyMatcher } from 'nock';
 import type { Client as SSHClient } from 'ssh2';
+import type { Readable } from 'stream';
+import type { SecureContextOptions } from 'tls';
+import type { URLSearchParams } from 'url';
 
 import type { CODE_EXECUTION_MODES, CODE_LANGUAGES, LOG_LEVELS } from './Constants';
 import type { IDeferredPromise } from './DeferredPromise';
-import type { ExecutionStatus } from './ExecutionStatus';
+import type { ExecutionCancelledError } from './errors';
 import type { ExpressionError } from './errors/expression.error';
-import type { Workflow } from './Workflow';
+import type { NodeApiError } from './errors/node-api.error';
+import type { NodeOperationError } from './errors/node-operation.error';
 import type { WorkflowActivationError } from './errors/workflow-activation.error';
 import type { WorkflowOperationError } from './errors/workflow-operation.error';
+import type { ExecutionStatus } from './ExecutionStatus';
+import type { Workflow } from './Workflow';
 import type { WorkflowHooks } from './WorkflowHooks';
-import type { ExecutionCancelledError } from './errors';
-import type { NodeOperationError } from './errors/node-operation.error';
-import type { NodeApiError } from './errors/node-api.error';
-import type { AxiosProxyConfig } from 'axios';
-import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager';
 
 export interface IAdditionalCredentialOptions {
 	oauth2?: IOAuth2Options;
diff --git a/packages/workflow/src/MessageEventBus.ts b/packages/workflow/src/MessageEventBus.ts
index 48c80e9b52..f873299090 100644
--- a/packages/workflow/src/MessageEventBus.ts
+++ b/packages/workflow/src/MessageEventBus.ts
@@ -1,4 +1,5 @@
 import type { DateTime } from 'luxon';
+
 import type { INodeCredentials } from './Interfaces';
 
 // ===============================
diff --git a/packages/workflow/src/NativeMethods/index.ts b/packages/workflow/src/NativeMethods/index.ts
index f51d64f89c..1ba9d9759f 100644
--- a/packages/workflow/src/NativeMethods/index.ts
+++ b/packages/workflow/src/NativeMethods/index.ts
@@ -1,9 +1,9 @@
-import { stringMethods } from './String.methods';
 import { arrayMethods } from './Array.methods';
+import { booleanMethods } from './Boolean.methods';
 import { numberMethods } from './Number.methods';
 import { objectMethods } from './Object.Methods';
+import { stringMethods } from './String.methods';
 import type { NativeDoc } from '../Extensions/Extensions';
-import { booleanMethods } from './Boolean.methods';
 
 const NATIVE_METHODS: NativeDoc[] = [
 	stringMethods,
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 9e68a03a80..6869652f4f 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -10,6 +10,8 @@ import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import uniqBy from 'lodash/uniqBy';
 
+import { SINGLE_EXECUTION_NODES } from './Constants';
+import { ApplicationError } from './errors/application.error';
 import { NodeConnectionType } from './Interfaces';
 import type {
 	FieldType,
@@ -44,18 +46,15 @@ import type {
 	NodeHint,
 	INodeExecutionData,
 } from './Interfaces';
+import { validateFilterParameter } from './NodeParameters/FilterParameter';
 import {
 	isFilterValue,
 	isResourceMapperValue,
 	isValidResourceLocatorParameterValue,
 } from './type-guards';
-import { deepCopy } from './utils';
-
-import type { Workflow } from './Workflow';
-import { validateFilterParameter } from './NodeParameters/FilterParameter';
 import { validateFieldType } from './TypeValidation';
-import { ApplicationError } from './errors/application.error';
-import { SINGLE_EXECUTION_NODES } from './Constants';
+import { deepCopy } from './utils';
+import type { Workflow } from './Workflow';
 
 export const cronNodeOptions: INodePropertyCollection[] = [
 	{
diff --git a/packages/workflow/src/NodeParameters/FilterParameter.ts b/packages/workflow/src/NodeParameters/FilterParameter.ts
index e1191394df..b2df097b09 100644
--- a/packages/workflow/src/NodeParameters/FilterParameter.ts
+++ b/packages/workflow/src/NodeParameters/FilterParameter.ts
@@ -1,4 +1,6 @@
 import type { DateTime } from 'luxon';
+
+import { ApplicationError } from '../errors/application.error';
 import type {
 	FilterConditionValue,
 	FilterOperatorType,
@@ -8,9 +10,8 @@ import type {
 	Result,
 	ValidationResult,
 } from '../Interfaces';
-import { validateFieldType } from '../TypeValidation';
 import * as LoggerProxy from '../LoggerProxy';
-import { ApplicationError } from '../errors/application.error';
+import { validateFieldType } from '../TypeValidation';
 
 type FilterConditionMetadata = {
 	index: number;
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index 8824f9c516..fe7fac6790 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -11,6 +11,8 @@ import merge from 'lodash/merge';
 import set from 'lodash/set';
 import url from 'node:url';
 
+import { NodeApiError } from './errors/node-api.error';
+import { NodeOperationError } from './errors/node-operation.error';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -40,14 +42,9 @@ import type {
 	JsonObject,
 	CloseFunction,
 } from './Interfaces';
-
 import * as NodeHelpers from './NodeHelpers';
-
-import type { Workflow } from './Workflow';
-
-import { NodeOperationError } from './errors/node-operation.error';
-import { NodeApiError } from './errors/node-api.error';
 import { sleep } from './utils';
+import type { Workflow } from './Workflow';
 
 export class RoutingNode {
 	additionalData: IWorkflowExecuteAdditionalData;
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index b28a59f654..42c6571b3b 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -1,16 +1,3 @@
-import { getNodeParameters } from './NodeHelpers';
-import type {
-	IConnection,
-	INode,
-	INodeNameIndex,
-	INodesGraph,
-	INodeGraphItem,
-	INodesGraphResult,
-	IWorkflowBase,
-	INodeTypes,
-	IDataObject,
-} from './Interfaces';
-import { ApplicationError } from './errors/application.error';
 import {
 	AGENT_LANGCHAIN_NODE_TYPE,
 	AI_TRANSFORM_NODE_TYPE,
@@ -26,6 +13,19 @@ import {
 	WEBHOOK_NODE_TYPE,
 	WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE,
 } from './Constants';
+import { ApplicationError } from './errors/application.error';
+import type {
+	IConnection,
+	INode,
+	INodeNameIndex,
+	INodesGraph,
+	INodeGraphItem,
+	INodesGraphResult,
+	IWorkflowBase,
+	INodeTypes,
+	IDataObject,
+} from './Interfaces';
+import { getNodeParameters } from './NodeHelpers';
 
 export function getNodeTypeForName(workflow: IWorkflowBase, nodeName: string): INode | undefined {
 	return workflow.nodes.find((node) => node.name === nodeName);
diff --git a/packages/workflow/src/TypeValidation.ts b/packages/workflow/src/TypeValidation.ts
index a2c299303f..d15a0a07be 100644
--- a/packages/workflow/src/TypeValidation.ts
+++ b/packages/workflow/src/TypeValidation.ts
@@ -1,7 +1,8 @@
-import { DateTime } from 'luxon';
-import type { FieldType, INodePropertyOptions, ValidationResult } from './Interfaces';
 import isObject from 'lodash/isObject';
+import { DateTime } from 'luxon';
+
 import { ApplicationError } from './errors';
+import type { FieldType, INodePropertyOptions, ValidationResult } from './Interfaces';
 import { jsonParse } from './utils';
 
 export const tryToParseNumber = (value: unknown): number => {
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index aa4131bfc6..c60b949449 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -7,6 +7,15 @@
 
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 
+import {
+	MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE,
+	NODES_WITH_RENAMABLE_CONTENT,
+	STARTING_NODE_TYPES,
+} from './Constants';
+import type { IDeferredPromise } from './DeferredPromise';
+import { ApplicationError } from './errors/application.error';
+import { Expression } from './Expression';
+import { getGlobalState } from './GlobalState';
 import type {
 	IConnections,
 	IExecuteResponsePromiseData,
@@ -45,19 +54,9 @@ import type {
 	INodeOutputConfiguration,
 } from './Interfaces';
 import { Node, NodeConnectionType } from './Interfaces';
-import type { IDeferredPromise } from './DeferredPromise';
-
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
 import { RoutingNode } from './RoutingNode';
-import { Expression } from './Expression';
-import {
-	MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE,
-	NODES_WITH_RENAMABLE_CONTENT,
-	STARTING_NODE_TYPES,
-} from './Constants';
-import { ApplicationError } from './errors/application.error';
-import { getGlobalState } from './GlobalState';
 
 function dedupe<T>(arr: T[]): T[] {
 	return [...new Set(arr)];
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 8e9cf49f03..1ceb62fb7b 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -2,9 +2,14 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
-import { DateTime, Duration, Interval, Settings } from 'luxon';
 import * as jmespath from 'jmespath';
+import { DateTime, Duration, Interval, Settings } from 'luxon';
 
+import { augmentArray, augmentObject } from './AugmentObject';
+import { SCRIPTING_NODE_TYPES } from './Constants';
+import { ApplicationError } from './errors/application.error';
+import { ExpressionError, type ExpressionErrorOptions } from './errors/expression.error';
+import { getGlobalState } from './GlobalState';
 import {
 	type IDataObject,
 	type IExecuteData,
@@ -23,13 +28,8 @@ import {
 	NodeConnectionType,
 } from './Interfaces';
 import * as NodeHelpers from './NodeHelpers';
-import { ExpressionError, type ExpressionErrorOptions } from './errors/expression.error';
-import type { Workflow } from './Workflow';
-import { augmentArray, augmentObject } from './AugmentObject';
 import { deepCopy } from './utils';
-import { getGlobalState } from './GlobalState';
-import { ApplicationError } from './errors/application.error';
-import { SCRIPTING_NODE_TYPES } from './Constants';
+import type { Workflow } from './Workflow';
 import { getPinDataIfManualExecution } from './WorkflowDataProxyHelpers';
 
 export function isResourceLocatorValue(value: unknown): value is INodeParameterResourceLocator {
diff --git a/packages/workflow/src/errors/abstract/node.error.ts b/packages/workflow/src/errors/abstract/node.error.ts
index ceaa7f0954..dfa8f9819e 100644
--- a/packages/workflow/src/errors/abstract/node.error.ts
+++ b/packages/workflow/src/errors/abstract/node.error.ts
@@ -1,6 +1,6 @@
-import { isTraversableObject, jsonParse } from '../../utils';
-import type { IDataObject, INode, JsonObject } from '../../Interfaces';
 import { ExecutionBaseError } from './execution-base.error';
+import type { IDataObject, INode, JsonObject } from '../../Interfaces';
+import { isTraversableObject, jsonParse } from '../../utils';
 
 /**
  * Descriptive messages for common errors.
diff --git a/packages/workflow/src/errors/application.error.ts b/packages/workflow/src/errors/application.error.ts
index 954df90a78..7cd3095cf0 100644
--- a/packages/workflow/src/errors/application.error.ts
+++ b/packages/workflow/src/errors/application.error.ts
@@ -1,5 +1,5 @@
-import callsites from 'callsites';
 import type { Event } from '@sentry/node';
+import callsites from 'callsites';
 
 export type Level = 'warning' | 'error' | 'fatal' | 'info';
 
diff --git a/packages/workflow/src/errors/credential-access-error.ts b/packages/workflow/src/errors/credential-access-error.ts
index 0fce04cf4e..6de0c3ec96 100644
--- a/packages/workflow/src/errors/credential-access-error.ts
+++ b/packages/workflow/src/errors/credential-access-error.ts
@@ -1,5 +1,5 @@
-import type { INode } from '../Interfaces';
 import { ExecutionBaseError } from './abstract/execution-base.error';
+import type { INode } from '../Interfaces';
 
 export class CredentialAccessError extends ExecutionBaseError {
 	override readonly description =
diff --git a/packages/workflow/src/errors/expression.error.ts b/packages/workflow/src/errors/expression.error.ts
index ac73010957..02b3c74444 100644
--- a/packages/workflow/src/errors/expression.error.ts
+++ b/packages/workflow/src/errors/expression.error.ts
@@ -1,5 +1,5 @@
-import type { IDataObject } from '../Interfaces';
 import { ExecutionBaseError } from './abstract/execution-base.error';
+import type { IDataObject } from '../Interfaces';
 
 export interface ExpressionErrorOptions {
 	cause?: Error;
diff --git a/packages/workflow/src/errors/node-api.error.ts b/packages/workflow/src/errors/node-api.error.ts
index 47f231bcef..f18f2e6fed 100644
--- a/packages/workflow/src/errors/node-api.error.ts
+++ b/packages/workflow/src/errors/node-api.error.ts
@@ -1,7 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
+import { AxiosError } from 'axios';
 import { parseString } from 'xml2js';
+
+import { NodeError } from './abstract/node.error';
+import type { ReportingOptions } from './application.error';
+import {
+	NO_OP_NODE_TYPE,
+	UNKNOWN_ERROR_DESCRIPTION,
+	UNKNOWN_ERROR_MESSAGE,
+	UNKNOWN_ERROR_MESSAGE_CRED,
+} from '../Constants';
 import type {
 	INode,
 	JsonObject,
@@ -9,16 +19,7 @@ import type {
 	IStatusCodeMessages,
 	Functionality,
 } from '../Interfaces';
-import { NodeError } from './abstract/node.error';
 import { removeCircularRefs } from '../utils';
-import type { ReportingOptions } from './application.error';
-import { AxiosError } from 'axios';
-import {
-	NO_OP_NODE_TYPE,
-	UNKNOWN_ERROR_DESCRIPTION,
-	UNKNOWN_ERROR_MESSAGE,
-	UNKNOWN_ERROR_MESSAGE_CRED,
-} from '../Constants';
 
 export interface NodeOperationErrorOptions {
 	message?: string;
diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
index c55cd003cc..00a7a179cc 100644
--- a/packages/workflow/src/errors/node-operation.error.ts
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -1,7 +1,7 @@
-import type { INode, JsonObject } from '../Interfaces';
-import type { NodeOperationErrorOptions } from './node-api.error';
 import { NodeError } from './abstract/node.error';
 import { ApplicationError } from './application.error';
+import type { NodeOperationErrorOptions } from './node-api.error';
+import type { INode, JsonObject } from '../Interfaces';
 
 /**
  * Class for instantiating an operational error, e.g. an invalid credentials error.
diff --git a/packages/workflow/src/errors/trigger-close.error.ts b/packages/workflow/src/errors/trigger-close.error.ts
index 19d3b7a769..25b5e186b8 100644
--- a/packages/workflow/src/errors/trigger-close.error.ts
+++ b/packages/workflow/src/errors/trigger-close.error.ts
@@ -1,5 +1,5 @@
-import type { INode } from '../Interfaces';
 import { ApplicationError, type Level } from './application.error';
+import type { INode } from '../Interfaces';
 
 interface TriggerCloseErrorOptions extends ErrorOptions {
 	level: Level;
diff --git a/packages/workflow/src/errors/workflow-activation.error.ts b/packages/workflow/src/errors/workflow-activation.error.ts
index 2ea7e5628f..8e2c493d9a 100644
--- a/packages/workflow/src/errors/workflow-activation.error.ts
+++ b/packages/workflow/src/errors/workflow-activation.error.ts
@@ -1,6 +1,6 @@
-import type { INode } from '../Interfaces';
 import { ExecutionBaseError } from './abstract/execution-base.error';
 import type { ApplicationError } from './application.error';
+import type { INode } from '../Interfaces';
 
 interface WorkflowActivationErrorOptions {
 	cause?: Error;
diff --git a/packages/workflow/src/errors/workflow-operation.error.ts b/packages/workflow/src/errors/workflow-operation.error.ts
index 936b6bea10..40bdd100e5 100644
--- a/packages/workflow/src/errors/workflow-operation.error.ts
+++ b/packages/workflow/src/errors/workflow-operation.error.ts
@@ -1,5 +1,5 @@
-import type { INode } from '../Interfaces';
 import { ExecutionBaseError } from './abstract/execution-base.error';
+import type { INode } from '../Interfaces';
 
 /**
  * Class for instantiating an operational error, e.g. a timeout error.
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index c0330955c3..4fba8de101 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -1,16 +1,15 @@
-import FormData from 'form-data';
-import { merge } from 'lodash';
-
-import { ALPHABET } from './Constants';
-import type { BinaryFileType, IDisplayOptions, INodeProperties, JsonObject } from './Interfaces';
-import { ApplicationError } from './errors/application.error';
-
 import {
 	parse as esprimaParse,
 	Syntax,
 	type Node as SyntaxNode,
 	type ExpressionStatement,
 } from 'esprima-next';
+import FormData from 'form-data';
+import { merge } from 'lodash';
+
+import { ALPHABET } from './Constants';
+import { ApplicationError } from './errors/application.error';
+import type { BinaryFileType, IDisplayOptions, INodeProperties, JsonObject } from './Interfaces';
 
 const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
 
diff --git a/packages/workflow/test/AugmentObject.test.ts b/packages/workflow/test/AugmentObject.test.ts
index fcb126e4eb..457567b993 100644
--- a/packages/workflow/test/AugmentObject.test.ts
+++ b/packages/workflow/test/AugmentObject.test.ts
@@ -1,5 +1,5 @@
-import type { IDataObject } from '@/Interfaces';
 import { augmentArray, augmentObject } from '@/AugmentObject';
+import type { IDataObject } from '@/Interfaces';
 import { deepCopy } from '@/utils';
 
 describe('AugmentObject', () => {
diff --git a/packages/workflow/test/Expression.test.ts b/packages/workflow/test/Expression.test.ts
index 42cd682dbc..abfb5895da 100644
--- a/packages/workflow/test/Expression.test.ts
+++ b/packages/workflow/test/Expression.test.ts
@@ -3,15 +3,17 @@
  */
 
 import { DateTime, Duration, Interval } from 'luxon';
-import { Workflow } from '@/Workflow';
-import * as Helpers from './Helpers';
-import type { ExpressionTestEvaluation, ExpressionTestTransform } from './ExpressionFixtures/base';
-import { baseFixtures } from './ExpressionFixtures/base';
-import type { INodeExecutionData } from '@/Interfaces';
-import { extendSyntax } from '@/Extensions/ExpressionExtension';
+
 import { ExpressionError } from '@/errors/expression.error';
 import { setDifferEnabled, setEvaluator } from '@/ExpressionEvaluatorProxy';
+import { extendSyntax } from '@/Extensions/ExpressionExtension';
+import type { INodeExecutionData } from '@/Interfaces';
+import { Workflow } from '@/Workflow';
+
 import { workflow } from './ExpressionExtensions/Helpers';
+import { baseFixtures } from './ExpressionFixtures/base';
+import type { ExpressionTestEvaluation, ExpressionTestTransform } from './ExpressionFixtures/base';
+import * as Helpers from './Helpers';
 
 setDifferEnabled(true);
 
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index 6759c9e02d..d85ec4a257 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -2,8 +2,8 @@
  * @jest-environment jsdom
  */
 
-import { arrayExtensions } from '../../src/Extensions/ArrayExtensions';
 import { evaluate } from './Helpers';
+import { arrayExtensions } from '../../src/Extensions/ArrayExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Array Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
index eccb53e50b..842158a5b3 100644
--- a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
@@ -2,8 +2,8 @@
  * @jest-environment jsdom
  */
 
-import { booleanExtensions } from '../../src/Extensions/BooleanExtensions';
 import { evaluate } from './Helpers';
+import { booleanExtensions } from '../../src/Extensions/BooleanExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Boolean Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 2e542fc377..09a5761d65 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -3,7 +3,9 @@
  */
 
 import { DateTime } from 'luxon';
+
 import { getGlobalState } from '@/GlobalState';
+
 import { evaluate, getLocalISOString } from './Helpers';
 import { dateExtensions } from '../../src/Extensions/DateExtensions';
 
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index 15980c67e2..e08f4f05c4 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -6,6 +6,7 @@
 
 import { extendTransform, extend } from '@/Extensions';
 import { joinExpression, splitExpression } from '@/Extensions/ExpressionParser';
+
 import { evaluate } from './Helpers';
 import { ExpressionExtensionError } from '../../src/errors/expression-extension.error';
 
diff --git a/packages/workflow/test/ExpressionExtensions/Helpers.ts b/packages/workflow/test/ExpressionExtensions/Helpers.ts
index 54836960e5..2c2e8ffde7 100644
--- a/packages/workflow/test/ExpressionExtensions/Helpers.ts
+++ b/packages/workflow/test/ExpressionExtensions/Helpers.ts
@@ -1,5 +1,6 @@
 import type { IDataObject } from '@/Interfaces';
 import { Workflow } from '@/Workflow';
+
 import * as Helpers from '../Helpers';
 
 export const nodeTypes = Helpers.NodeTypes();
diff --git a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
index 1f41e853a1..ff51ec180a 100644
--- a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
@@ -3,6 +3,7 @@
  */
 
 import { numberExtensions } from '@/Extensions/NumberExtensions';
+
 import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
index 4a78037488..1107ceae54 100644
--- a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
@@ -1,5 +1,5 @@
-import { objectExtensions } from '../../src/Extensions/ObjectExtensions';
 import { evaluate } from './Helpers';
+import { objectExtensions } from '../../src/Extensions/ObjectExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Object Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index 70ec97c915..35b2318868 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -2,6 +2,7 @@
  * @jest-environment jsdom
  */
 import { DateTime } from 'luxon';
+
 import { evaluate } from './Helpers';
 import { ExpressionExtensionError } from '../../src/errors';
 
diff --git a/packages/workflow/test/ExpressionFixtures/base.ts b/packages/workflow/test/ExpressionFixtures/base.ts
index f05d098fd5..1988180aa0 100644
--- a/packages/workflow/test/ExpressionFixtures/base.ts
+++ b/packages/workflow/test/ExpressionFixtures/base.ts
@@ -1,5 +1,5 @@
-import type { GenericValue, IDataObject } from '@/Interfaces';
 import { ExpressionError } from '@/errors/expression.error';
+import type { GenericValue, IDataObject } from '@/Interfaces';
 
 interface ExpressionTestBase {
 	type: 'evaluation' | 'transform';
diff --git a/packages/workflow/test/ExpressionSandboxing.test.ts b/packages/workflow/test/ExpressionSandboxing.test.ts
index f2ba200f8e..dbec453443 100644
--- a/packages/workflow/test/ExpressionSandboxing.test.ts
+++ b/packages/workflow/test/ExpressionSandboxing.test.ts
@@ -1,6 +1,7 @@
-import { PrototypeSanitizer, sanitizer } from '@/ExpressionSandboxing';
 import { Tournament } from '@n8n/tournament';
 
+import { PrototypeSanitizer, sanitizer } from '@/ExpressionSandboxing';
+
 const tournament = new Tournament(
 	(e) => {
 		throw e;
diff --git a/packages/workflow/test/FilterParameter.test.ts b/packages/workflow/test/FilterParameter.test.ts
index b22460f998..d8914ef773 100644
--- a/packages/workflow/test/FilterParameter.test.ts
+++ b/packages/workflow/test/FilterParameter.test.ts
@@ -1,8 +1,9 @@
-import { arrayContainsValue, executeFilter } from '@/NodeParameters/FilterParameter';
-import type { FilterConditionValue, FilterValue } from '@/Interfaces';
 import merge from 'lodash/merge';
 import { DateTime } from 'luxon';
 
+import type { FilterConditionValue, FilterValue } from '@/Interfaces';
+import { arrayContainsValue, executeFilter } from '@/NodeParameters/FilterParameter';
+
 type DeepPartial<T> = {
 	[P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
 };
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index c618f5fd0c..f72c041c69 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
-import path from 'path';
 import { mock } from 'jest-mock-extended';
 import get from 'lodash/get';
+import path from 'path';
 
 import type {
 	IExecuteSingleFunctions,
@@ -13,6 +13,7 @@ import type {
 	IRunExecutionData,
 } from '@/Interfaces';
 import type { Workflow } from '@/Workflow';
+
 import { NodeTypes as NodeTypesClass } from './NodeTypes';
 
 export function getExecuteSingleFunctions(
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
index 12033fd28d..04aafb1610 100644
--- a/packages/workflow/test/NodeErrors.test.ts
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -1,6 +1,7 @@
-import type { INode, JsonObject } from '@/Interfaces';
 import { NodeOperationError } from '@/errors';
 import { NodeApiError } from '@/errors/node-api.error';
+import type { INode, JsonObject } from '@/Interfaces';
+
 import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '../src/Constants';
 
 const node: INode = {
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 583d423c60..f3ecc161ca 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -6,7 +6,6 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from '@/Interfaces';
-import type { Workflow } from '@/Workflow';
 import {
 	getNodeParameters,
 	getNodeHints,
@@ -15,6 +14,7 @@ import {
 	applyDeclarativeNodeOptionParameters,
 	convertNodeToAiTool,
 } from '@/NodeHelpers';
+import type { Workflow } from '@/Workflow';
 
 describe('NodeHelpers', () => {
 	describe('getNodeParameters', () => {
diff --git a/packages/workflow/test/NodeTypes.ts b/packages/workflow/test/NodeTypes.ts
index f255d92e62..9cd5c548f2 100644
--- a/packages/workflow/test/NodeTypes.ts
+++ b/packages/workflow/test/NodeTypes.ts
@@ -1,4 +1,5 @@
 import { mock } from 'jest-mock-extended';
+
 import {
 	NodeConnectionType,
 	type IDataObject,
diff --git a/packages/workflow/test/RoutingNode.test.ts b/packages/workflow/test/RoutingNode.test.ts
index 16f9735d37..a38f4551e2 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/workflow/test/RoutingNode.test.ts
@@ -1,3 +1,5 @@
+import { mock } from 'jest-mock-extended';
+
 import type {
 	INode,
 	INodeExecutionData,
@@ -16,14 +18,12 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	IExecuteFunctions,
 } from '@/Interfaces';
+import { applyDeclarativeNodeOptionParameters } from '@/NodeHelpers';
 import { RoutingNode } from '@/RoutingNode';
+import * as utilsModule from '@/utils';
 import { Workflow } from '@/Workflow';
 
-import * as utilsModule from '@/utils';
-
 import * as Helpers from './Helpers';
-import { applyDeclarativeNodeOptionParameters } from '@/NodeHelpers';
-import { mock } from 'jest-mock-extended';
 
 const postReceiveFunction1 = async function (
 	this: IExecuteSingleFunctions,
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index c1f46d2d66..9c51b0f1db 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -1,19 +1,20 @@
-import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 import { mock } from 'jest-mock-extended';
+import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 
+import { STICKY_NODE_TYPE } from '@/Constants';
+import { ApplicationError } from '@/errors';
+import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
+import * as nodeHelpers from '@/NodeHelpers';
 import {
 	ANONYMIZATION_CHARACTER as CHAR,
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
 } from '@/TelemetryHelpers';
-import { nodeTypes } from './ExpressionExtensions/Helpers';
-import * as nodeHelpers from '@/NodeHelpers';
-import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
-import { STICKY_NODE_TYPE } from '@/Constants';
-import { ApplicationError } from '@/errors';
 import { randomInt } from '@/utils';
 
+import { nodeTypes } from './ExpressionExtensions/Helpers';
+
 describe('getDomainBase should return protocol plus domain', () => {
 	test('in valid URLs', () => {
 		for (const url of validUrls(numericId)) {
diff --git a/packages/workflow/test/TypeValidation.test.ts b/packages/workflow/test/TypeValidation.test.ts
index f01af4cedc..54504bf7f4 100644
--- a/packages/workflow/test/TypeValidation.test.ts
+++ b/packages/workflow/test/TypeValidation.test.ts
@@ -1,4 +1,5 @@
 import { DateTime } from 'luxon';
+
 import { getValueDescription, validateFieldType } from '@/TypeValidation';
 
 describe('Type Validation', () => {
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index df0e85f49b..bdd5fec8b9 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -1,4 +1,5 @@
 import { mock } from 'jest-mock-extended';
+
 import { NodeConnectionType } from '@/Interfaces';
 import type {
 	IBinaryKeyData,
@@ -18,8 +19,8 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	NodeParameterValueType,
 } from '@/Interfaces';
-import { Workflow, type WorkflowParameters } from '@/Workflow';
 import * as NodeHelpers from '@/NodeHelpers';
+import { Workflow, type WorkflowParameters } from '@/Workflow';
 
 process.env.TEST_VARIABLE_1 = 'valueEnvVariable1';
 
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index 230c11198b..ac9504dcd8 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -1,3 +1,4 @@
+import { ExpressionError } from '@/errors/expression.error';
 import type {
 	IExecuteData,
 	INode,
@@ -8,7 +9,7 @@ import type {
 } from '@/Interfaces';
 import { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
-import { ExpressionError } from '@/errors/expression.error';
+
 import * as Helpers from './Helpers';
 
 const loadFixture = (fixture: string) => {
diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts
index 7d0783a65c..c988aa9930 100644
--- a/packages/workflow/test/errors/node.error.test.ts
+++ b/packages/workflow/test/errors/node.error.test.ts
@@ -1,7 +1,8 @@
 import { mock } from 'jest-mock-extended';
-import type { INode } from '@/Interfaces';
+
 import { NodeApiError } from '@/errors/node-api.error';
 import { NodeOperationError } from '@/errors/node-operation.error';
+import type { INode } from '@/Interfaces';
 
 describe('NodeError', () => {
 	const node = mock<INode>();