From 44e5fb9b06c794033204ef1744b54b3b87160082 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 18 Sep 2024 08:49:41 +0200
Subject: [PATCH 1/5] fix(editor): Replace v-html with custom directive to
 sanitize html (#10804)

Co-authored-by: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
---
 packages/design-system/package.json           |   1 -
 .../AskAssistantChat/AskAssistantChat.vue     |  14 +-
 .../__tests__/AskAssistantChat.spec.ts        |  21 ++
 .../AskAssistantChat.spec.ts.snap             |  18 --
 .../src/components/N8nActionBox/ActionBox.vue |   4 +-
 .../N8nInfoAccordion/InfoAccordion.vue        |   4 +-
 .../components/N8nInputLabel/InputLabel.vue   |   2 +-
 .../src/components/N8nMarkdown/Markdown.vue   |   2 +-
 .../N8nMarkdown/__tests__/Markdown.spec.ts    |  21 ++
 .../src/components/N8nNotice/Notice.vue       |   2 +-
 .../N8nNotice/__tests__/Notice.spec.ts        |   4 +
 .../src/components/N8nSticky/Sticky.vue       |   2 +-
 .../src/components/N8nTabs/Tabs.vue           |   2 +-
 .../src/components/N8nTooltip/Tooltip.vue     |   2 +-
 .../design-system/src/directives/index.ts     |   1 +
 .../src/directives/n8n-html.test.ts           |  45 ++++
 .../design-system/src/directives/n8n-html.ts  |  37 +++
 .../src/components/Error/NodeErrorView.vue    |   2 +-
 .../src/components/ExpressionEditModal.vue    |   2 +-
 .../src/components/FeatureComingSoon.vue      |   4 +-
 .../InlineExpressionTip.vue                   |   6 +-
 .../editor-ui/src/components/InputPanel.vue   |   2 +-
 .../editor-ui/src/components/MappingPill.vue  |   2 +-
 packages/editor-ui/src/components/Node.vue    |   2 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |   2 +-
 .../Node/NodeCreator/Modes/ActionsMode.vue    |  12 +-
 .../Renderers/CategorizedItemsRenderer.vue    |   2 +-
 .../src/components/ParameterInput.vue         |   4 +-
 .../src/components/ParameterInputHint.vue     |   4 +-
 .../src/components/PushConnectionTracker.vue  |   2 +-
 .../ResourceMapper/MappingModeSelect.vue      |   2 +-
 packages/editor-ui/src/components/RunData.vue |   4 +-
 packages/editor-ui/src/components/RunInfo.vue |   2 +-
 .../editor-ui/src/components/TitledList.vue   |   2 +-
 .../editor-ui/src/components/TriggerPanel.vue |   2 +-
 .../editor-ui/src/components/VersionCard.vue  |   4 +-
 .../src/components/WorkflowActivator.vue      |   2 +-
 .../src/components/WorkflowSettings.vue       |   2 +-
 .../src/components/banners/V1Banner.vue       |   4 +-
 .../banners/__tests__/V1Banner.spec.ts        |   8 +-
 .../__snapshots__/V1Banner.spec.ts.snap       | 226 ++++++++++++++----
 .../nodes/render-types/CanvasNodeDefault.vue  |   2 +-
 .../WorkflowExecutionAnnotationPanel.vue      |   2 +-
 .../editor-ui/src/views/SettingsLdapView.vue  |   2 +-
 .../src/views/SettingsLogStreamingView.vue    |   8 +-
 .../AppsRequiringCredsNotice.vue              |   2 +-
 .../SetupTemplateFormStep.vue                 |   2 +-
 .../src/views/TemplatesSearchView.vue         |   2 +-
 pnpm-lock.yaml                                |   3 -
 49 files changed, 379 insertions(+), 130 deletions(-)
 create mode 100644 packages/design-system/src/directives/n8n-html.test.ts
 create mode 100644 packages/design-system/src/directives/n8n-html.ts

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index d2cbb0678b301..e8f1f99196412 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -29,7 +29,6 @@
     "@types/sanitize-html": "^2.11.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitest/coverage-v8": "catalog:frontend",
-    "@vue/test-utils": "^2.4.3",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "sass": "^1.64.1",
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index de2f5e17685ea..63f4bf9a865aa 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -151,8 +151,7 @@ function growInput() {
 								/>
 							</div>
 							<div :class="$style.blockBody">
-								<!-- eslint-disable-next-line vue/no-v-html -->
-								<span v-html="renderMarkdown(message.content)"></span>
+								<span v-n8n-html="renderMarkdown(message.content)"></span>
 								<BlinkingCursor
 									v-if="streaming && i === messages?.length - 1 && message.title && message.content"
 								/>
@@ -160,19 +159,20 @@ function growInput() {
 						</div>
 					</div>
 					<div v-else-if="message.type === 'text'" :class="$style.textMessage">
-						<!-- eslint-disable-next-line vue/no-v-html -->
-						<span v-if="message.role === 'user'" v-html="renderMarkdown(message.content)"></span>
-						<!-- eslint-disable-next-line vue/no-v-html -->
+						<span
+							v-if="message.role === 'user'"
+							v-n8n-html="renderMarkdown(message.content)"
+						></span>
 						<div
 							v-else
+							v-n8n-html="renderMarkdown(message.content)"
 							:class="$style.assistantText"
-							v-html="renderMarkdown(message.content)"
 						></div>
 						<div
 							v-if="message?.codeSnippet"
 							:class="$style['code-snippet']"
 							data-test-id="assistant-code-snippet"
-							v-html="renderMarkdown(message.codeSnippet).trim()"
+							v-n8n-html="renderMarkdown(message.codeSnippet).trim()"
 						></div>
 						<BlinkingCursor
 							v-if="streaming && i === messages?.length - 1 && message.role === 'assistant'"
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 479931919206b..08312e9adc70b 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/vue';
 import AskAssistantChat from '../AskAssistantChat.vue';
+import { n8nHtml } from 'n8n-design-system/directives';
 
 describe('AskAssistantChat', () => {
 	it('renders default placeholder chat correctly', () => {
@@ -12,6 +13,11 @@ describe('AskAssistantChat', () => {
 	});
 	it('renders chat with messages correctly', () => {
 		const { container } = render(AskAssistantChat, {
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
 				messages: [
@@ -86,6 +92,11 @@ describe('AskAssistantChat', () => {
 	});
 	it('renders streaming chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
 				messages: [
@@ -105,6 +116,11 @@ describe('AskAssistantChat', () => {
 	});
 	it('renders end of session chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
 				messages: [
@@ -130,6 +146,11 @@ describe('AskAssistantChat', () => {
 	});
 	it('renders message with code snippet', () => {
 		const { container } = render(AskAssistantChat, {
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
 				messages: [
diff --git a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap b/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
index 8baba648f9f74..3a587f4fe75f1 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
@@ -129,9 +129,6 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
           <div
             class="textMessage"
           >
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <div
               class="assistantText"
             >
@@ -145,7 +142,6 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
               
 
             </div>
-            
             <!--v-if-->
             <!--v-if-->
           </div>
@@ -438,7 +434,6 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
           <div
             class="textMessage"
           >
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <span>
               <p>
                 Give it to me 
@@ -516,7 +511,6 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
               <div
                 class="blockBody"
               >
-                <!-- eslint-disable-next-line vue/no-v-html -->
                 <span>
                   <p>
                     Solution steps:
@@ -1060,9 +1054,6 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
           <div
             class="textMessage"
           >
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <div
               class="assistantText"
             >
@@ -1076,7 +1067,6 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
               
 
             </div>
-            
             <!--v-if-->
             <!--v-if-->
           </div>
@@ -1309,9 +1299,6 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
           <div
             class="textMessage"
           >
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <div
               class="assistantText"
             >
@@ -1325,7 +1312,6 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
               
 
             </div>
-            
             <div
               class="code-snippet"
               data-test-id="assistant-code-snippet"
@@ -1552,9 +1538,6 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
           <div
             class="textMessage"
           >
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <div
               class="assistantText"
             >
@@ -1568,7 +1551,6 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
               
 
             </div>
-            
             <!--v-if-->
             <!--v-if-->
           </div>
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index c048c3f6438c5..edb877b3d650f 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -37,7 +37,7 @@ withDefaults(defineProps<ActionBoxProps>(), {
 		<div :class="$style.description" @click="$emit('descriptionClick', $event)">
 			<N8nText color="text-base">
 				<slot name="description">
-					<span v-html="description"></span>
+					<span v-n8n-html="description"></span>
 				</slot>
 			</N8nText>
 		</div>
@@ -61,7 +61,7 @@ withDefaults(defineProps<ActionBoxProps>(), {
 			:class="$style.callout"
 		>
 			<N8nText color="text-base">
-				<span size="small" v-html="calloutText"></span>
+				<span size="small" v-n8n-html="calloutText"></span>
 			</N8nText>
 		</N8nCallout>
 	</div>
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index 71830b02dcac6..e500c73cd65f1 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -75,7 +75,7 @@ const onTooltipClick = (item: string, event: MouseEvent) => emit('tooltipClick',
 				<div v-for="item in items" :key="item.id" :class="$style.accordionItem">
 					<n8n-tooltip :disabled="!item.tooltip">
 						<template #content>
-							<div @click="onTooltipClick(item.id, $event)" v-html="item.tooltip"></div>
+							<div @click="onTooltipClick(item.id, $event)" v-n8n-html="item.tooltip"></div>
 						</template>
 						<N8nIcon :icon="item.icon" :color="item.iconColor" size="small" class="mr-2xs" />
 					</n8n-tooltip>
@@ -83,7 +83,7 @@ const onTooltipClick = (item: string, event: MouseEvent) => emit('tooltipClick',
 				</div>
 			</div>
 			<N8nText color="text-base" size="small" align="left">
-				<span v-html="description"></span>
+				<span v-n8n-html="description"></span>
 			</N8nText>
 			<slot name="customContent"></slot>
 		</div>
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index 6c527549ed0f3..bda96c2e21feb 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -58,7 +58,7 @@ const addTargetBlank = (html: string) =>
 				<N8nTooltip placement="top" :popper-class="$style.tooltipPopper" :show-after="300">
 					<N8nIcon icon="question-circle" size="small" />
 					<template #content>
-						<div v-html="addTargetBlank(tooltipText)" />
+						<div v-n8n-html="addTargetBlank(tooltipText)" />
 					</template>
 				</N8nTooltip>
 			</span>
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index c953ff9d657e5..45de891020bb3 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -202,7 +202,7 @@ const onCheckboxChange = (index: number) => {
 			@click="onClick"
 			@mousedown="onMouseDown"
 			@change="onChange"
-			v-html="htmlContent"
+			v-n8n-html="htmlContent"
 		/>
 		<div v-else :class="$style.markdown">
 			<div v-for="(_, index) in loadingBlocks" :key="index">
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 2c826f5192800..ac2faac7b308f 100644
--- a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
+++ b/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
@@ -1,10 +1,16 @@
 import { render, fireEvent } from '@testing-library/vue';
 import N8nMarkdown from '../Markdown.vue';
+import { n8nHtml } from 'n8n-design-system/directives';
 
 describe('components', () => {
 	describe('N8nMarkdown', () => {
 		it('should render unchecked checkboxes', () => {
 			const wrapper = render(N8nMarkdown, {
+				global: {
+					directives: {
+						n8nHtml,
+					},
+				},
 				props: {
 					content: '__TODO__\n- [ ] Buy milk\n- [ ] Buy socks\n',
 				},
@@ -18,6 +24,11 @@ describe('components', () => {
 
 		it('should render checked checkboxes', () => {
 			const wrapper = render(N8nMarkdown, {
+				global: {
+					directives: {
+						n8nHtml,
+					},
+				},
 				props: {
 					content: '__TODO__\n- [X] Buy milk\n- [X] Buy socks\n',
 				},
@@ -31,6 +42,11 @@ describe('components', () => {
 
 		it('should toggle checkboxes when clicked', async () => {
 			const wrapper = render(N8nMarkdown, {
+				global: {
+					directives: {
+						n8nHtml,
+					},
+				},
 				props: {
 					content: '__TODO__\n- [ ] Buy milk\n- [ ] Buy socks\n',
 				},
@@ -50,6 +66,11 @@ describe('components', () => {
 
 		it('should render inputs as plain text', () => {
 			const wrapper = render(N8nMarkdown, {
+				global: {
+					directives: {
+						n8nHtml,
+					},
+				},
 				props: {
 					content:
 						'__TODO__\n- [X] Buy milk\n- <input type="text" data-testid="text-input" value="Something"/>\n',
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index eb27aa2efdf8f..f630e95e59c77 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -73,7 +73,7 @@ const onClick = (event: MouseEvent) => {
 						:id="`${id}-content`"
 						:class="showFullContent ? $style['expanded'] : $style['truncated']"
 						role="region"
-						v-html="displayContent"
+						v-n8n-html="displayContent"
 					/>
 				</slot>
 			</N8nText>
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 84617dab515ec..180815e5367b0 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
+++ b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
@@ -1,6 +1,7 @@
 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';
 
 describe('components', () => {
 	describe('N8nNotice', () => {
@@ -41,6 +42,9 @@ describe('components', () => {
 							content: '<strong>Hello world!</strong> This is a notice.',
 						},
 						global: {
+							directives: {
+								n8nHtml,
+							},
 							components: {
 								'n8n-text': N8nText,
 							},
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 4b7dca944acb0..9e258b4afa75a 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -116,7 +116,7 @@ const onInputScroll = (event: WheelEvent) => {
 		</div>
 		<div v-if="editMode && shouldShowFooter" :class="$style.footer">
 			<N8nText size="xsmall" align="right">
-				<span v-html="t('sticky.markdownHint')"></span>
+				<span v-n8n-html="t('sticky.markdownHint')"></span>
 			</N8nText>
 		</div>
 	</div>
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 64277ca8630e9..ff1b142e516e2 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -89,7 +89,7 @@ const scrollRight = () => scroll(50);
 			>
 				<N8nTooltip :disabled="!option.tooltip" placement="bottom">
 					<template #content>
-						<div @click="handleTooltipClick(option.value, $event)" v-html="option.tooltip" />
+						<div @click="handleTooltipClick(option.value, $event)" v-n8n-html="option.tooltip" />
 					</template>
 					<a
 						v-if="option.href"
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index 6e8988c8b05fd..34339fd0be2b8 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -42,7 +42,7 @@ defineOptions({
 		<slot />
 		<template #content>
 			<slot name="content">
-				<div v-html="props.content"></div>
+				<div v-n8n-html="props.content"></div>
 			</slot>
 			<div
 				v-if="props.buttons.length"
diff --git a/packages/design-system/src/directives/index.ts b/packages/design-system/src/directives/index.ts
index eb939f0531e3e..be12514b675e1 100644
--- a/packages/design-system/src/directives/index.ts
+++ b/packages/design-system/src/directives/index.ts
@@ -1 +1,2 @@
 export { n8nTruncate } from './n8n-truncate';
+export { n8nHtml } from './n8n-html';
diff --git a/packages/design-system/src/directives/n8n-html.test.ts b/packages/design-system/src/directives/n8n-html.test.ts
new file mode 100644
index 0000000000000..94fb30de51290
--- /dev/null
+++ b/packages/design-system/src/directives/n8n-html.test.ts
@@ -0,0 +1,45 @@
+import { render } from '@testing-library/vue';
+import { n8nHtml } from './n8n-html';
+
+const TestComponent = {
+	props: {
+		html: {
+			type: String,
+		},
+	},
+	template: '<div v-n8n-html="html"></div>',
+};
+
+describe('Directive n8n-html', () => {
+	it('should sanitize html', async () => {
+		const { html } = render(TestComponent, {
+			props: {
+				html: '<span>text</span><a href="https://malicious.com" onclick="alert(1)">malicious</a><img alt="Ok" src="./images/logo.svg" onerror="alert(2)" /><script>alert(3)</script>',
+			},
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
+		});
+		expect(html()).toBe(
+			'<div><span>text</span><a href="https://malicious.com">malicious</a><img alt="Ok" src="./images/logo.svg"></div>',
+		);
+	});
+
+	it('should not touch safe html', async () => {
+		const { html } = render(TestComponent, {
+			props: {
+				html: '<span>text</span><a href="https://safe.com">safe</a><img alt="Ok" src="./images/logo.svg" />',
+			},
+			global: {
+				directives: {
+					n8nHtml,
+				},
+			},
+		});
+		expect(html()).toBe(
+			'<div><span>text</span><a href="https://safe.com">safe</a><img alt="Ok" src="./images/logo.svg"></div>',
+		);
+	});
+});
diff --git a/packages/design-system/src/directives/n8n-html.ts b/packages/design-system/src/directives/n8n-html.ts
new file mode 100644
index 0000000000000..875905d1d9ff0
--- /dev/null
+++ b/packages/design-system/src/directives/n8n-html.ts
@@ -0,0 +1,37 @@
+import sanitize from 'sanitize-html';
+import type { DirectiveBinding, ObjectDirective } from 'vue';
+
+/**
+ * Custom directive `n8nHtml` to replace v-html from Vue to sanitize content.
+ *
+ * Usage:
+ * In your Vue template, use the directive `v-n8n-html` passing the unsafe HTML.
+ *
+ * Example:
+ * <p v-n8n-html="'<a href="https://site.com" onclick="alert(1)">link</a>'">
+ *
+ * Compiles to: <p><a href="https://site.com">link</a></p>
+ *
+ * Hint: Do not use it on components
+ * https://vuejs.org/guide/reusability/custom-directives#usage-on-components
+ */
+
+const configuredSanitize = (html: string) =>
+	sanitize(html, {
+		allowedTags: sanitize.defaults.allowedTags.concat(['img', 'input']),
+		allowedAttributes: {
+			...sanitize.defaults.allowedAttributes,
+			input: ['type', 'id', 'checked'],
+			code: ['class'],
+			a: sanitize.defaults.allowedAttributes.a.concat(['data-*']),
+		},
+	});
+
+export const n8nHtml: ObjectDirective = {
+	beforeMount(el: HTMLElement, binding: DirectiveBinding<string>) {
+		el.innerHTML = configuredSanitize(binding.value);
+	},
+	beforeUpdate(el: HTMLElement, binding: DirectiveBinding<string>) {
+		el.innerHTML = configuredSanitize(binding.value);
+	},
+};
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 0bc3bf5387d03..aa0eac4c69ff0 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -445,7 +445,7 @@ async function onAskAssistantClick() {
 				v-if="error.description || error.context?.descriptionKey"
 				data-test-id="node-error-description"
 				class="node-error-view__header-description"
-				v-html="getErrorDescription()"
+				v-n8n-html="getErrorDescription()"
 			></div>
 			<div
 				v-if="isAskAssistantAvailable"
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
index cea40fb431e02..b92f1eca18b0b 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -166,7 +166,7 @@ async function onDrop(expression: string, event: MouseEvent) {
 						<N8nText
 							:class="$style.tip"
 							size="small"
-							v-html="i18n.baseText('expressionTip.javascript')"
+							v-n8n-html="i18n.baseText('expressionTip.javascript')"
 						/>
 					</div>
 
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
index a96b3d0ec31f8..fd24a35196b49 100644
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ b/packages/editor-ui/src/components/FeatureComingSoon.vue
@@ -56,7 +56,7 @@ export default defineComponent({
 		</div>
 		<div v-if="featureInfo.infoText" class="mb-l">
 			<n8n-info-tip theme="info" type="note">
-				<span v-html="$locale.baseText(featureInfo.infoText)"></span>
+				<span v-n8n-html="$locale.baseText(featureInfo.infoText)"></span>
 			</n8n-info-tip>
 		</div>
 		<div :class="$style.actionBoxContainer">
@@ -68,7 +68,7 @@ export default defineComponent({
 				@click:button="openLinkPage"
 			>
 				<template #heading>
-					<span v-html="$locale.baseText(featureInfo.actionBoxTitle)" />
+					<span v-n8n-html="$locale.baseText(featureInfo.actionBoxTitle)" />
 				</template>
 			</n8n-action-box>
 		</div>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
index 9e0744025c26b..73f12a0ec3852 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
@@ -115,15 +115,15 @@ watchDebounced(
 		</div>
 
 		<div v-else-if="tip === 'dotPrimitive'" :class="$style.content">
-			<span v-html="i18n.baseText('expressionTip.typeDotPrimitive')" />
+			<span v-n8n-html="i18n.baseText('expressionTip.typeDotPrimitive')" />
 		</div>
 
 		<div v-else-if="tip === 'dotObject'" :class="$style.content">
-			<span v-html="i18n.baseText('expressionTip.typeDotObject')" />
+			<span v-n8n-html="i18n.baseText('expressionTip.typeDotObject')" />
 		</div>
 
 		<div v-else :class="$style.content">
-			<span v-html="i18n.baseText('expressionTip.javascript')" />
+			<span v-n8n-html="i18n.baseText('expressionTip.javascript')" />
 		</div>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 7bc38c811ed56..a9a6dd3909c7f 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -406,7 +406,7 @@ export default defineComponent({
 				<n8n-tooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
 					<template #content>
 						<div
-							v-html="
+							v-n8n-html="
 								$locale.baseText('dataMapping.dragFromPreviousHint', {
 									interpolate: { name: focusedMappableInput },
 								})
diff --git a/packages/editor-ui/src/components/MappingPill.vue b/packages/editor-ui/src/components/MappingPill.vue
index 76485bf117c38..df4424c2b6762 100644
--- a/packages/editor-ui/src/components/MappingPill.vue
+++ b/packages/editor-ui/src/components/MappingPill.vue
@@ -12,7 +12,7 @@ withDefaults(defineProps<Props>(), {
 <template>
 	<div
 		:class="[$style.dragPill, canDrop ? $style.droppablePill : $style.defaultPill]"
-		v-html="html"
+		v-n8n-html="html"
 	/>
 </template>
 
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 83efe3b0a718d..56ca2cecf82b9 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -633,7 +633,7 @@ function openContextMenu(event: MouseEvent, source: 'node-button' | 'node-right-
 				<i v-if="isTriggerNode" class="trigger-icon">
 					<n8n-tooltip placement="bottom">
 						<template #content>
-							<span v-html="i18n.baseText('node.thisIsATriggerNode')" />
+							<span v-n8n-html="i18n.baseText('node.thisIsATriggerNode')" />
 						</template>
 						<FontAwesomeIcon icon="bolt" size="lg" />
 					</n8n-tooltip>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index ebea3cba41979..49916381762a2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -163,7 +163,7 @@ function onCommunityNodeTooltipClick(event: MouseEvent) {
 			<p
 				:class="$style.communityNodeIcon"
 				@click="onCommunityNodeTooltipClick"
-				v-html="
+				v-n8n-html="
 					i18n.baseText('generic.communityNode.tooltip', {
 						interpolate: {
 							packageName: nodeType.name.split('.')[0],
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 5fe7bb55039cb..0c2816e2d8e30 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -258,7 +258,7 @@ onMounted(() => {
 							data-test-id="actions-panel-no-triggers-callout"
 						>
 							<span
-								v-html="
+								v-n8n-html="
 									i18n.baseText('nodeCreator.actionsCallout.noTriggerItems', {
 										interpolate: { nodeName: subcategory ?? '' },
 									})
@@ -271,7 +271,7 @@ onMounted(() => {
 						<p
 							:class="$style.resetSearch"
 							@click="resetSearch"
-							v-html="i18n.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
+							v-n8n-html="i18n.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
 						/>
 					</template>
 				</CategorizedItemsRenderer>
@@ -293,13 +293,13 @@ onMounted(() => {
 						slim
 						data-test-id="actions-panel-activation-callout"
 					>
-						<span v-html="i18n.baseText('nodeCreator.actionsCallout.triggersStartWorkflow')" />
+						<span v-n8n-html="i18n.baseText('nodeCreator.actionsCallout.triggersStartWorkflow')" />
 					</n8n-callout>
 					<!-- Empty state -->
 					<template #empty>
 						<n8n-info-tip v-if="!search" theme="info" type="note" :class="$style.actionsEmpty">
 							<span
-								v-html="
+								v-n8n-html="
 									i18n.baseText('nodeCreator.actionsCallout.noActionItems', {
 										interpolate: { nodeName: subcategory ?? '' },
 									})
@@ -311,7 +311,7 @@ onMounted(() => {
 							:class="$style.resetSearch"
 							data-test-id="actions-panel-no-matching-actions"
 							@click="resetSearch"
-							v-html="i18n.baseText('nodeCreator.actionsCategory.noMatchingActions')"
+							v-n8n-html="i18n.baseText('nodeCreator.actionsCategory.noMatchingActions')"
 						/>
 					</template>
 				</CategorizedItemsRenderer>
@@ -320,7 +320,7 @@ onMounted(() => {
 		<div v-if="containsAPIAction" :class="$style.apiHint">
 			<span
 				@click.prevent="addHttpNode"
-				v-html="
+				v-n8n-html="
 					i18n.baseText('nodeCreator.actionsList.apiCall', {
 						interpolate: { node: subcategory ?? '' },
 					})
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
index 2fd6d723817f4..93b542c72a605 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -106,7 +106,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
 					<n8n-icon icon="question-circle" size="small" />
 					<template #content>
-						<div v-html="mouseOverTooltip" />
+						<div v-n8n-html="mouseOverTooltip" />
 					</template>
 				</n8n-tooltip>
 			</span>
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index b5ca14dd887fd..df63a8b3228f4 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -1391,7 +1391,7 @@ onUpdated(async () => {
 						<div
 							v-if="option.description"
 							class="option-description"
-							v-html="getOptionsOptionDescription(option)"
+							v-n8n-html="getOptionsOptionDescription(option)"
 						></div>
 					</div>
 				</n8n-option>
@@ -1424,7 +1424,7 @@ onUpdated(async () => {
 						<div
 							v-if="option.description"
 							class="option-description"
-							v-html="getOptionsOptionDescription(option)"
+							v-n8n-html="getOptionsOptionDescription(option)"
 						></div>
 					</div>
 				</n8n-option>
diff --git a/packages/editor-ui/src/components/ParameterInputHint.vue b/packages/editor-ui/src/components/ParameterInputHint.vue
index 87ce1a92ab992..1c28e4e44a937 100644
--- a/packages/editor-ui/src/components/ParameterInputHint.vue
+++ b/packages/editor-ui/src/components/ParameterInputHint.vue
@@ -46,13 +46,13 @@ const simplyText = computed(() => {
 				[$style.highlight]: highlight,
 			}"
 		>
-			<span data-test-id="parameter-input-hint" v-html="simplyText"></span>
+			<span data-test-id="parameter-input-hint" v-n8n-html="simplyText"></span>
 		</div>
 		<div
 			v-else
 			ref="hintTextRef"
 			:class="{ [$style.singleline]: singleLine, [$style.highlight]: highlight }"
-			v-html="sanitizeHtml(hint)"
+			v-n8n-html="sanitizeHtml(hint)"
 		></div>
 	</n8n-text>
 </template>
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/editor-ui/src/components/PushConnectionTracker.vue
index bd4ecc865494b..1be8fb5b6aaef 100644
--- a/packages/editor-ui/src/components/PushConnectionTracker.vue
+++ b/packages/editor-ui/src/components/PushConnectionTracker.vue
@@ -16,7 +16,7 @@ export default defineComponent({
 		<div v-if="!rootStore.pushConnectionActive" class="push-connection-lost primary-color">
 			<n8n-tooltip placement="bottom-end">
 				<template #content>
-					<div v-html="$locale.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
+					<div v-n8n-html="$locale.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
 				</template>
 				<span>
 					<font-awesome-icon icon="exclamation-triangle" />&nbsp;
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index 2c69e1555086c..ab250a07d3989 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -131,7 +131,7 @@ defineExpose({
 							<div class="option-headline">
 								{{ option.name }}
 							</div>
-							<div class="option-description" v-html="option.description" />
+							<div class="option-description" v-n8n-html="option.description" />
 						</div>
 					</N8nOption>
 				</N8nSelect>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index f85800fa160f1..348e3a455b9db 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -1350,7 +1350,7 @@ export default defineComponent({
 			:class="$style.hintCallout"
 			:theme="hint.type || 'info'"
 		>
-			<n8n-text size="small" v-html="hint.message"></n8n-text>
+			<n8n-text size="small" v-n8n-html="hint.message"></n8n-text>
 		</n8n-callout>
 
 		<div
@@ -1509,7 +1509,7 @@ export default defineComponent({
 				<n8n-text :bold="true" color="text-dark" size="large">{{ tooMuchDataTitle }}</n8n-text>
 				<n8n-text align="center" tag="div"
 					><span
-						v-html="
+						v-n8n-html="
 							$locale.baseText('ndv.output.tooMuchData.message', {
 								interpolate: { size: dataSizeInMB },
 							})
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/editor-ui/src/components/RunInfo.vue
index ed8701698ddf1..31689dbc1e04b 100644
--- a/packages/editor-ui/src/components/RunInfo.vue
+++ b/packages/editor-ui/src/components/RunInfo.vue
@@ -41,7 +41,7 @@ const runMetadata = computed(() => {
 		data-test-id="node-run-info-stale"
 	>
 		<span
-			v-html="
+			v-n8n-html="
 				i18n.baseText(
 					hasPinData
 						? 'ndv.output.staleDataWarning.pinData'
diff --git a/packages/editor-ui/src/components/TitledList.vue b/packages/editor-ui/src/components/TitledList.vue
index 4dc308ea8d2fa..bfe701feeaf8a 100644
--- a/packages/editor-ui/src/components/TitledList.vue
+++ b/packages/editor-ui/src/components/TitledList.vue
@@ -9,7 +9,7 @@ defineProps<{
 	<div class="titled-list">
 		<p v-text="title" />
 		<ul>
-			<li v-for="item in items" :key="item" class="titled-list-item" v-html="item" />
+			<li v-for="item in items" :key="item" class="titled-list-item" v-n8n-html="item" />
 		</ul>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index db8a64736a2df..0702f34c49979 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -441,7 +441,7 @@ export default defineComponent({
 				</div>
 
 				<n8n-text v-if="activationHint" size="small" @click="onLinkClick">
-					<span v-html="activationHint"></span>&nbsp;
+					<span v-n8n-html="activationHint"></span>&nbsp;
 				</n8n-text>
 				<n8n-link
 					v-if="activationHint && executionsHelp"
diff --git a/packages/editor-ui/src/components/VersionCard.vue b/packages/editor-ui/src/components/VersionCard.vue
index 1703d21f87056..7b36d1815222f 100644
--- a/packages/editor-ui/src/components/VersionCard.vue
+++ b/packages/editor-ui/src/components/VersionCard.vue
@@ -31,7 +31,7 @@ const nodeName = (node: IVersionNode): string => {
 					{{ `${$locale.baseText('versionCard.version')} ${version.name}` }}
 				</div>
 				<WarningTooltip v-if="version.hasSecurityIssue">
-					<span v-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
+					<span v-n8n-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
 				</WarningTooltip>
 				<Badge
 					v-if="version.hasSecurityFix"
@@ -56,7 +56,7 @@ const nodeName = (node: IVersionNode): string => {
 			<div
 				v-if="version.description"
 				:class="$style.description"
-				v-html="version.description"
+				v-n8n-html="version.description"
 			></div>
 			<div v-if="version.nodes && version.nodes.length > 0" :class="$style.nodes">
 				<NodeIcon
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index d55c143aaeb85..6bfe6f799eed1 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -138,7 +138,7 @@ async function displayActivationError() {
 				<template #content>
 					<div
 						@click="displayActivationError"
-						v-html="i18n.baseText('workflowActivator.theWorkflowIsSetToBeActiveBut')"
+						v-n8n-html="i18n.baseText('workflowActivator.theWorkflowIsSetToBeActiveBut')"
 					></div>
 				</template>
 				<font-awesome-icon icon="exclamation-triangle" @click="displayActivationError" />
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 2d915611ff07a..1ecac538a6a70 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -573,7 +573,7 @@ export default defineComponent({
 						{{ $locale.baseText('workflowSettings.errorWorkflow') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
-								<div v-html="helpTexts.errorWorkflow"></div>
+								<div v-n8n-html="helpTexts.errorWorkflow"></div>
 							</template>
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/editor-ui/src/components/banners/V1Banner.vue
index 72077f1a3c55c..6ea90c712c148 100644
--- a/packages/editor-ui/src/components/banners/V1Banner.vue
+++ b/packages/editor-ui/src/components/banners/V1Banner.vue
@@ -17,14 +17,14 @@ const hasOwnerPermission = computed(() => hasPermission(['instanceOwner']));
 <template>
 	<BaseBanner custom-icon="info-circle" theme="warning" name="V1" :class="$style.v1container">
 		<template #mainContent>
-			<span v-html="locale.baseText('banners.v1.message')"></span>
+			<span v-n8n-html="locale.baseText('banners.v1.message')"></span>
 			<a
 				v-if="hasOwnerPermission"
 				:class="$style.link"
 				data-test-id="banner-confirm-v1"
 				@click="dismissPermanently"
 			>
-				<span v-html="locale.baseText('generic.dontShowAgain')"></span>
+				<span v-n8n-html="locale.baseText('generic.dontShowAgain')"></span>
 			</a>
 		</template>
 	</BaseBanner>
diff --git a/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts b/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
index d9cbedd9e8084..f01ea4c3f6176 100644
--- a/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
+++ b/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
@@ -1,10 +1,12 @@
-import { render } from '@testing-library/vue';
+import { createComponentRenderer } from '@/__tests__/render';
 import V1Banner from '../V1Banner.vue';
 import { createPinia, setActivePinia } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { ROLE } from '@/constants';
 import type { IUser } from '@/Interface';
 
+const renderComponent = createComponentRenderer(V1Banner);
+
 describe('V1 Banner', () => {
 	let pinia: ReturnType<typeof createPinia>;
 	let usersStore: ReturnType<typeof useUsersStore>;
@@ -17,7 +19,7 @@ describe('V1 Banner', () => {
 	});
 
 	it('should render banner', () => {
-		const { container } = render(V1Banner);
+		const { container } = renderComponent();
 		expect(container).toMatchSnapshot();
 		expect(container.querySelectorAll('a')).toHaveLength(1);
 	});
@@ -26,7 +28,7 @@ describe('V1 Banner', () => {
 		usersStore.usersById = { '1': { role: ROLE.Owner } as IUser };
 		usersStore.currentUserId = '1';
 
-		const { container } = render(V1Banner);
+		const { container } = renderComponent();
 		expect(container).toMatchSnapshot();
 		expect(container.querySelectorAll('a')).toHaveLength(2);
 	});
diff --git a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
index afc0523e0cad7..41daf105174c4 100644
--- a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
+++ b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
@@ -2,69 +2,209 @@
 
 exports[`V1 Banner > should render banner 1`] = `
 <div>
-  <n8n-callout
-    class="callout v1container"
+  <div
+    class="n8n-callout callout warning callout v1container"
     data-test-id="banners-V1"
-    icon="info-circle"
-    icon-size="medium"
-    round-corners="false"
-    theme="warning"
+    role="alert"
   >
     <div
-      class="mainContent keepSpace"
+      class="messageSection"
     >
-      
-      <span>
-        n8n has been updated to version 1, introducing some breaking changes. Please consult the 
-        <a
-          href="https://docs.n8n.io/1-0-migration-checklist"
-          target="_blank"
+      <div
+        class="icon"
+      >
+        <span
+          class="n8n-text compact size-medium regular n8n-icon n8n-icon"
+        >
+          
+          <svg
+            aria-hidden="true"
+            class="svg-inline--fa fa-info-circle fa-w-16 medium"
+            data-icon="info-circle"
+            data-prefix="fas"
+            focusable="false"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              class=""
+              d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+              fill="currentColor"
+            />
+          </svg>
+          
+        </span>
+      </div>
+      <span
+        class="n8n-text size-small regular"
+      >
+        
+        
+        <div
+          class="mainContent keepSpace"
         >
-          migration guide
-        </a>
-         for more information.
+          
+          <span>
+            n8n has been updated to version 1, introducing some breaking changes. Please consult the 
+            <a
+              href="https://docs.n8n.io/1-0-migration-checklist"
+              target="_blank"
+            >
+              migration guide
+            </a>
+             for more information.
+          </span>
+          <!--v-if-->
+          
+        </div>
+        
+        
       </span>
-      <!--v-if-->
+         
+      
       
     </div>
-  </n8n-callout>
+    
+    <div
+      class="trailingContent"
+    >
+      
+      
+      <span
+        class="n8n-text compact size-small regular n8n-icon clickable clickable n8n-icon clickable clickable"
+        data-test-id="banner-V1-close"
+        title="Dismiss"
+      >
+        
+        <svg
+          aria-hidden="true"
+          class="svg-inline--fa fa-times fa-w-11 small"
+          data-icon="times"
+          data-prefix="fas"
+          focusable="false"
+          role="img"
+          viewBox="0 0 352 512"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            class=""
+            d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
+            fill="currentColor"
+          />
+        </svg>
+        
+      </span>
+    </div>
+    
+  </div>
 </div>
 `;
 
 exports[`V1 Banner > should render banner with dismiss call if user is owner 1`] = `
 <div>
-  <n8n-callout
-    class="callout v1container"
+  <div
+    class="n8n-callout callout warning callout v1container"
     data-test-id="banners-V1"
-    icon="info-circle"
-    icon-size="medium"
-    round-corners="false"
-    theme="warning"
+    role="alert"
   >
     <div
-      class="mainContent keepSpace"
+      class="messageSection"
     >
-      
-      <span>
-        n8n has been updated to version 1, introducing some breaking changes. Please consult the 
-        <a
-          href="https://docs.n8n.io/1-0-migration-checklist"
-          target="_blank"
-        >
-          migration guide
-        </a>
-         for more information.
-      </span>
-      <a
-        class="link"
-        data-test-id="banner-confirm-v1"
+      <div
+        class="icon"
       >
-        <span>
-          Don't show again
+        <span
+          class="n8n-text compact size-medium regular n8n-icon n8n-icon"
+        >
+          
+          <svg
+            aria-hidden="true"
+            class="svg-inline--fa fa-info-circle fa-w-16 medium"
+            data-icon="info-circle"
+            data-prefix="fas"
+            focusable="false"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              class=""
+              d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+              fill="currentColor"
+            />
+          </svg>
+          
         </span>
-      </a>
+      </div>
+      <span
+        class="n8n-text size-small regular"
+      >
+        
+        
+        <div
+          class="mainContent keepSpace"
+        >
+          
+          <span>
+            n8n has been updated to version 1, introducing some breaking changes. Please consult the 
+            <a
+              href="https://docs.n8n.io/1-0-migration-checklist"
+              target="_blank"
+            >
+              migration guide
+            </a>
+             for more information.
+          </span>
+          <a
+            class="link"
+            data-test-id="banner-confirm-v1"
+          >
+            <span>
+              Don't show again
+            </span>
+          </a>
+          
+        </div>
+        
+        
+      </span>
+         
       
+      
+    </div>
+    
+    <div
+      class="trailingContent"
+    >
+      
+      
+      <span
+        class="n8n-text compact size-small regular n8n-icon clickable clickable n8n-icon clickable clickable"
+        data-test-id="banner-V1-close"
+        title="Dismiss"
+      >
+        
+        <svg
+          aria-hidden="true"
+          class="svg-inline--fa fa-times fa-w-11 small"
+          data-icon="times"
+          data-prefix="fas"
+          focusable="false"
+          role="img"
+          viewBox="0 0 352 512"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            class=""
+            d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
+            fill="currentColor"
+          />
+        </svg>
+        
+      </span>
     </div>
-  </n8n-callout>
+    
+  </div>
 </div>
 `;
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 85d8dedad7153..bc443c1732027 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -96,7 +96,7 @@ function openContextMenu(event: MouseEvent) {
 		<slot />
 		<N8nTooltip v-if="renderOptions.trigger" placement="bottom">
 			<template #content>
-				<span v-html="$locale.baseText('node.thisIsATriggerNode')" />
+				<span v-n8n-html="$locale.baseText('node.thisIsATriggerNode')" />
 			</template>
 			<div :class="$style.triggerIcon">
 				<FontAwesomeIcon icon="bolt" size="lg" />
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue
index 1ae4ef0e5c4df..437cfd8e12f7f 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue
@@ -179,7 +179,7 @@ const onTagsEditEsc = () => {
 			</div>
 			<div v-else :class="$style.noResultsContainer" data-test-id="execution-annotation-data-empty">
 				<n8n-text color="text-base" size="small" align="center">
-					<span v-html="$locale.baseText('executionAnnotationView.data.notFound')" />
+					<span v-n8n-html="$locale.baseText('executionAnnotationView.data.notFound')" />
 				</n8n-text>
 			</div>
 		</div>
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 8feca49da78c4..6cab6b1ba54d5 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -633,7 +633,7 @@ export default defineComponent({
 			</div>
 			<div :class="$style.docsInfoTip">
 				<n8n-info-tip theme="info" type="note">
-					<span v-html="$locale.baseText('settings.ldap.infoTip')"></span>
+					<span v-n8n-html="$locale.baseText('settings.ldap.infoTip')"></span>
 				</n8n-info-tip>
 			</div>
 			<div :class="$style.settingsForm">
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index e8abb67e64d2a..0f62a31aeed1c 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -175,7 +175,7 @@ export default defineComponent({
 		<template v-if="isLicensed">
 			<div class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
+					<span v-n8n-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<template v-if="storeHasItems()">
@@ -207,7 +207,7 @@ export default defineComponent({
 					@click:button="addDestination"
 				>
 					<template #heading>
-						<span v-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
+						<span v-n8n-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
 					</template>
 				</n8n-action-box>
 			</div>
@@ -215,7 +215,7 @@ export default defineComponent({
 		<template v-else>
 			<div v-if="$locale.baseText('settings.log-streaming.infoText')" class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
+					<span v-n8n-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<div data-test-id="action-box-unlicensed">
@@ -225,7 +225,7 @@ export default defineComponent({
 					@click:button="goToUpgrade"
 				>
 					<template #heading>
-						<span v-html="$locale.baseText('settings.log-streaming.actionBox.title')" />
+						<span v-n8n-html="$locale.baseText('settings.log-streaming.actionBox.title')" />
 					</template>
 				</n8n-action-box>
 			</div>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
index a640b49f9da50..ac5bfbe63a4eb 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
@@ -28,7 +28,7 @@ const appNodeCounts = computed(() => {
 <template>
 	<N8nNotice :class="$style.notice" theme="info">
 		<i18n-t tag="span" keypath="templateSetup.instructions" scope="global">
-			<span v-html="appNodeCounts" />
+			<span v-n8n-html="appNodeCounts" />
 		</i18n-t>
 	</N8nNotice>
 </template>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
index 2e64dece86b02..c482d3111477e 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
@@ -95,7 +95,7 @@ const onCredentialModalOpened = () => {
 				:plural="credentials.usedBy.length"
 				scope="global"
 			>
-				<span v-html="nodeNames" />
+				<span v-n8n-html="nodeNames" />
 			</i18n-t>
 		</p>
 
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index 61ce8b42e0fe0..af0381d8209dd 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -410,7 +410,7 @@ export default defineComponent({
 					/>
 					<div v-if="endOfSearchMessage" :class="$style.endText">
 						<n8n-text size="medium" color="text-base">
-							<span v-html="endOfSearchMessage" />
+							<span v-n8n-html="endOfSearchMessage" />
 						</n8n-text>
 					</div>
 				</div>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0b9e8ca0510d4..d94ec4a582b7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1205,9 +1205,6 @@ importers:
       '@vitest/coverage-v8':
         specifier: catalog:frontend
         version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      '@vue/test-utils':
-        specifier: ^2.4.3
-        version: 2.4.3(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)

From c1d88f3bb3c24b22051276b75ef9182c887d52c8 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:58:09 +0300
Subject: [PATCH 2/5] ci(benchmark): Fix bootstrap script (#10863)

---
 packages/@n8n/benchmark/scripts/bootstrap.sh    | 1 -
 packages/@n8n/benchmark/scripts/vm-benchmark.sh | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/@n8n/benchmark/scripts/bootstrap.sh b/packages/@n8n/benchmark/scripts/bootstrap.sh
index c5a8b57db53b7..02858094c8d58 100644
--- a/packages/@n8n/benchmark/scripts/bootstrap.sh
+++ b/packages/@n8n/benchmark/scripts/bootstrap.sh
@@ -43,7 +43,6 @@ sudo systemctl disable getty@tty1.service
 sudo systemctl disable serial-getty@ttyS0.service
 # Snap
 sudo systemctl disable snapd.service
-sudo apt remove snapd
 # Unattended upgrades
 sudo systemctl disable unattended-upgrades.service
 # Cron
diff --git a/packages/@n8n/benchmark/scripts/vm-benchmark.sh b/packages/@n8n/benchmark/scripts/vm-benchmark.sh
index 6bf215cd67963..13b7eb2b1a7fd 100644
--- a/packages/@n8n/benchmark/scripts/vm-benchmark.sh
+++ b/packages/@n8n/benchmark/scripts/vm-benchmark.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Install fio
-sudo apt-get -y install fio > /dev/null
+DEBIAN_FRONTEND=noninteractive sudo apt-get -y install fio > /dev/null
 
 # Run the disk benchmark
 fio --name=rand_rw --ioengine=libaio --rw=randrw --rwmixread=70 --bs=4k --numjobs=4 --size=1G --runtime=30 --directory=/n8n --group_reporting
@@ -10,4 +10,4 @@ fio --name=rand_rw --ioengine=libaio --rw=randrw --rwmixread=70 --bs=4k --numjob
 sudo rm /n8n/rand_rw.*
 
 # Uninstall fio
-sudo apt-get -y remove fio
+DEBIAN_FRONTEND=noninteractive sudo apt-get -y remove fio > /dev/null

From 5a1db6db1adad43887e839181719818474bc66b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Wed, 18 Sep 2024 09:10:51 +0200
Subject: [PATCH 3/5] fix(editor): Restore V1 keybinding, Space Key to toggle
 panning (#10841)

---
 packages/editor-ui/src/components/canvas/Canvas.spec.ts | 8 ++++----
 packages/editor-ui/src/components/canvas/Canvas.vue     | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/components/canvas/Canvas.spec.ts b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
index 256377a8f3bed..8768e97798617 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.spec.ts
+++ b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
@@ -164,7 +164,7 @@ describe('Canvas', () => {
 			const pane = canvas.querySelector('.vue-flow__pane');
 			if (!pane) throw new Error('VueFlow pane not found');
 
-			await fireEvent.keyDown(pane, { view: window, key: 'Shift' });
+			await fireEvent.keyDown(pane, { view: window, key: ' ' });
 			await fireEvent.mouseDown(pane, { view: window });
 			await fireEvent.mouseMove(pane, {
 				view: window,
@@ -172,7 +172,7 @@ describe('Canvas', () => {
 				clientY: 100,
 			});
 			await fireEvent.mouseUp(pane, { view: window });
-			await fireEvent.keyUp(pane, { view: window, key: 'Shift' });
+			await fireEvent.keyUp(pane, { view: window, key: ' ' });
 
 			vi.advanceTimersByTime(minimapTransitionDuration);
 			await waitFor(() => expect(getByTestId('canvas-minimap')).toBeVisible());
@@ -196,7 +196,7 @@ describe('Canvas', () => {
 			const pane = canvas.querySelector('.vue-flow__pane');
 			if (!pane) throw new Error('VueFlow pane not found');
 
-			await fireEvent.keyDown(pane, { view: window, key: 'Shift' });
+			await fireEvent.keyDown(pane, { view: window, key: ' ' });
 			await fireEvent.mouseDown(pane, { view: window });
 			await fireEvent.mouseMove(pane, {
 				view: window,
@@ -204,7 +204,7 @@ describe('Canvas', () => {
 				clientY: 100,
 			});
 			await fireEvent.mouseUp(pane, { view: window });
-			await fireEvent.keyUp(pane, { view: window, key: 'Shift' });
+			await fireEvent.keyUp(pane, { view: window, key: ' ' });
 
 			vi.advanceTimersByTime(minimapTransitionDuration);
 			await waitFor(() => expect(getByTestId('canvas-minimap')).toBeVisible());
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index 8efb8fcea513c..a552c5bd23e24 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -122,7 +122,10 @@ const classes = computed(() => ({
 
 const disableKeyBindings = computed(() => !props.keyBindings);
 
-const panningKeyCode = 'Shift';
+/**
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values#whitespace_keys
+ */
+const panningKeyCode = ' ';
 const isPanningEnabled = ref(false);
 
 onKeyDown(panningKeyCode, () => {

From 4f0a1a953f9cbd9ff069b906cc8b15ec83a5a543 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:19:33 +0300
Subject: [PATCH 4/5] refactor: Enable import/order for design-system, workflow
 and @n8n packages (#10847)

---
 cypress/composables/workflow.ts               |  2 +-
 cypress/e2e/1-workflows.cy.ts                 |  2 +-
 cypress/e2e/10-settings-log-streaming.cy.ts   |  2 +-
 cypress/e2e/10-undo-redo.cy.ts                |  2 +-
 cypress/e2e/12-canvas-actions.cy.ts           |  4 +-
 cypress/e2e/12-canvas.cy.ts                   |  4 +-
 cypress/e2e/14-mapping.cy.ts                  |  4 +-
 cypress/e2e/16-webhook-node.cy.ts             |  3 +-
 cypress/e2e/17-sharing.cy.ts                  |  2 +-
 cypress/e2e/18-user-management.cy.ts          |  2 +-
 cypress/e2e/19-execution.cy.ts                |  2 +-
 cypress/e2e/2-credentials.cy.ts               |  1 +
 cypress/e2e/20-workflow-executions.cy.ts      |  3 +-
 cypress/e2e/21-community-nodes.cy.ts          | 11 ++--
 .../e2e/233-AI-switch-to-logs-on-error.cy.ts  | 29 +++++----
 cypress/e2e/27-cloud.cy.ts                    |  2 +-
 .../e2e/27-two-factor-authentication.cy.ts    |  5 +-
 cypress/e2e/29-templates.cy.ts                |  6 +-
 cypress/e2e/30-langchain.cy.ts                | 64 +++++++++----------
 cypress/e2e/31-demo.cy.ts                     |  2 +-
 .../e2e/34-template-credentials-setup.cy.ts   | 10 +--
 cypress/e2e/36-versions.cy.ts                 |  2 +-
 cypress/e2e/39-projects.cy.ts                 |  2 +-
 cypress/e2e/4-node-creator.cy.ts              |  4 +-
 cypress/e2e/44-routing.cy.ts                  |  6 +-
 cypress/e2e/5-ndv.cy.ts                       |  4 +-
 cypress/e2e/6-code-node.cy.ts                 |  3 +-
 cypress/e2e/7-workflow-actions.cy.ts          |  4 +-
 cypress/pages/mfa-login.ts                    |  2 +-
 cypress/pages/modals/credentials-modal.ts     |  2 +-
 cypress/pages/ndv.ts                          |  2 +-
 cypress/pages/settings-log-streaming.ts       |  2 +-
 cypress/pages/settings-personal.ts            |  3 +-
 cypress/pages/settings-users.ts               |  4 +-
 cypress/pages/signin.ts                       |  2 +-
 cypress/pages/template-credential-setup.ts    |  4 +-
 cypress/pages/variables.ts                    |  1 +
 cypress/pages/workflow.ts                     |  4 +-
 cypress/support/commands.ts                   |  5 +-
 cypress/support/e2e.ts                        |  1 +
 cypress/utils/executions.ts                   |  3 +-
 packages/@n8n/api-types/src/push/index.ts     |  8 +--
 packages/@n8n/benchmark/src/commands/list.ts  |  3 +-
 packages/@n8n/benchmark/src/commands/run.ts   |  7 +-
 .../authenticated-n8n-api-client.ts           |  1 +
 .../n8n-api-client/workflows-api-client.ts    |  3 +-
 .../src/scenario/scenario-data-loader.ts      |  3 +-
 .../benchmark/src/scenario/scenario-loader.ts |  3 +-
 .../src/test-execution/k6-executor.ts         |  5 +-
 .../src/test-execution/scenario-runner.ts     |  7 +-
 .../src/test-execution/test-report.ts         |  1 +
 packages/@n8n/chat/src/App.vue                |  5 +-
 .../@n8n/chat/src/__stories__/App.stories.ts  |  3 +-
 .../@n8n/chat/src/__tests__/index.spec.ts     |  1 +
 .../chat/src/__tests__/utils/selectors.ts     |  1 +
 packages/@n8n/chat/src/components/Chat.vue    |  5 +-
 .../@n8n/chat/src/components/ChatFile.vue     |  7 +-
 .../@n8n/chat/src/components/ChatWindow.vue   |  1 +
 .../chat/src/components/GetStartedFooter.vue  |  2 +-
 packages/@n8n/chat/src/components/Input.vue   |  8 ++-
 packages/@n8n/chat/src/components/Layout.vue  |  1 +
 packages/@n8n/chat/src/components/Message.vue | 16 +++--
 .../chat/src/components/MessageTyping.vue     |  4 +-
 .../@n8n/chat/src/components/MessagesList.vue |  3 +-
 packages/@n8n/chat/src/composables/useChat.ts |  1 +
 packages/@n8n/chat/src/composables/useI18n.ts |  1 +
 .../@n8n/chat/src/composables/useOptions.ts   |  1 +
 packages/@n8n/chat/src/constants/symbols.ts   |  1 +
 packages/@n8n/chat/src/index.ts               |  8 ++-
 packages/@n8n/chat/src/plugins/chat.ts        |  7 +-
 packages/@n8n/chat/src/types/chat.ts          |  1 +
 .../@n8n/client-oauth2/src/ClientOAuth2.ts    |  7 +-
 .../client-oauth2/src/ClientOAuth2Token.ts    |  2 +-
 packages/@n8n/client-oauth2/src/CodeFlow.ts   |  1 +
 .../@n8n/client-oauth2/test/CodeFlow.test.ts  |  6 +-
 .../test/CredentialsFlow.test.ts              |  5 +-
 .../codemirror-lang/src/expressions/index.ts  |  1 +
 .../test/expressions/expressions.test.ts      |  3 +-
 packages/@n8n/config/src/index.ts             | 18 +++---
 packages/@n8n/config/test/config.test.ts      |  3 +-
 packages/@n8n/config/test/decorators.test.ts  |  1 +
 packages/@n8n/imap/src/ImapSimple.ts          |  2 +-
 packages/@n8n/imap/src/PartData.ts            |  2 +-
 packages/@n8n/imap/src/helpers/getMessage.ts  |  1 +
 packages/@n8n/imap/src/index.ts               |  3 +-
 packages/@n8n_io/eslint-config/base.js        | 12 +++-
 packages/cli/.eslintrc.js                     | 11 ----
 packages/design-system/.eslintrc.js           |  1 -
 packages/design-system/src/__tests__/setup.ts |  1 +
 .../AssistantAvatar.stories.ts                |  3 +-
 .../__tests__/AskAssistantAvatar.spec.ts      |  1 +
 .../AskAssistantButton.stories.ts             |  3 +-
 .../AskAssistantButton/AskAssistantButton.vue |  3 +-
 .../__tests__/AskAssistantButton.spec.ts      |  1 +
 .../AskAssistantChat.stories.ts               |  3 +-
 .../AskAssistantChat/AskAssistantChat.vue     | 18 +++---
 .../__tests__/AskAssistantChat.spec.ts        |  1 +
 .../AskAssistantIcon/AssistantIcon.stories.ts |  3 +-
 .../__tests__/AssistantIcon.spec.ts           |  1 +
 .../AssistantLoadingMessage.stories.ts        |  3 +-
 .../AssistantLoadingMessage.vue               |  1 +
 .../DemoComponent.stories.ts                  |  3 +-
 .../DemoComponent.vue                         |  1 +
 .../AskAssistantLoadingMessage.spec.ts        |  1 +
 .../AskAssistantText/AssistantText.stories.ts |  3 +-
 .../__tests__/AssistantText.spec.ts           |  1 +
 .../src/components/BetaTag/BetaTag.stories.ts |  3 +-
 .../BetaTag/__tests__/BetaTag.spec.ts         |  1 +
 .../BlinkingCursor/BlinkingCursor.stories.ts  |  3 +-
 .../__tests__/BlinkingCursor.spec.ts          |  1 +
 .../components/CodeDiff/CodeDiff.stories.ts   |  3 +-
 .../src/components/CodeDiff/CodeDiff.vue      |  1 +
 .../CodeDiff/__tests__/CodeDiff.spec.ts       |  1 +
 .../__tests__/ConditionalRouterLink.spec.ts   |  1 +
 .../InlineAskAssistantButton.stories.ts       |  3 +-
 .../InlineAskAssistantButton.vue              |  3 +-
 .../N8nActionBox/ActionBox.stories.ts         |  3 +-
 .../src/components/N8nActionBox/ActionBox.vue |  7 +-
 .../N8nActionBox/__tests__/ActionBox.spec.ts  |  1 +
 .../ActionDropdown.stories.ts                 |  3 +-
 .../N8nActionDropdown/ActionDropdown.vue      |  8 ++-
 .../__tests__/ActionDropdown.spec.ts          |  1 +
 .../N8nActionToggle/ActionToggle.stories.ts   |  3 +-
 .../N8nActionToggle/ActionToggle.vue          |  4 +-
 .../src/components/N8nAlert/Alert.stories.ts  |  1 +
 .../src/components/N8nAlert/Alert.vue         |  1 +
 .../N8nAlert/__tests__/Alert.spec.ts          |  3 +-
 .../components/N8nAvatar/Avatar.stories.ts    |  1 +
 .../src/components/N8nAvatar/Avatar.vue       |  1 +
 .../N8nAvatar/__tests__/Avatar.test.ts        |  1 +
 .../src/components/N8nBadge/Badge.stories.ts  |  1 +
 .../src/components/N8nBadge/Badge.vue         |  1 +
 .../N8nBadge/__tests__/Badge.spec.ts          |  1 +
 .../components/N8nBlockUi/BlockUi.stories.ts  |  1 +
 .../N8nBlockUi/__tests__/BlockUi.spec.ts      |  1 +
 .../components/N8nButton/Button.stories.ts    |  3 +-
 .../src/components/N8nButton/Button.vue       |  4 +-
 .../N8nButton/__tests__/Button.spec.ts        |  1 +
 .../components/N8nCallout/Callout.stories.ts  |  3 +-
 .../src/components/N8nCallout/Callout.vue     |  6 +-
 .../N8nCallout/__tests__/Callout.spec.ts      |  1 +
 .../src/components/N8nCard/Card.stories.ts    |  3 +-
 .../components/N8nCard/__tests__/Card.spec.ts |  1 +
 .../N8nCheckbox/Checkbox.stories.ts           |  5 +-
 .../src/components/N8nCheckbox/Checkbox.vue   |  3 +-
 .../N8nCheckbox/__tests__/Checkbox.spec.ts    |  1 +
 .../N8nCircleLoader/CircleLoader.stories.ts   |  3 +-
 .../__tests__/CircleLoader.spec.ts            |  1 +
 .../N8nColorPicker/ColorPicker.stories.ts     |  1 +
 .../components/N8nColorPicker/ColorPicker.vue |  3 +-
 .../__tests__/ColorPicker.spec.ts             |  1 +
 .../N8nDatatable/Datatable.stories.ts         |  3 +-
 .../src/components/N8nDatatable/Datatable.vue |  9 +--
 .../N8nDatatable/__tests__/Datatable.spec.ts  |  6 +-
 .../components/N8nDatatable/__tests__/data.ts |  1 +
 .../components/N8nFormBox/FormBox.stories.ts  |  3 +-
 .../src/components/N8nFormBox/FormBox.vue     |  7 +-
 .../N8nFormInput/FormInput.stories.ts         |  3 +-
 .../src/components/N8nFormInput/FormInput.vue | 16 ++---
 .../N8nFormInputs/FormInputs.stories.ts       |  3 +-
 .../components/N8nFormInputs/FormInputs.vue   |  5 +-
 .../components/N8nHeading/Heading.stories.ts  |  1 +
 .../src/components/N8nIcon/Icon.stories.ts    |  1 +
 .../src/components/N8nIcon/Icon.vue           |  2 +
 .../N8nIconButton/IconButton.stories.ts       |  3 +-
 .../components/N8nIconButton/IconButton.vue   |  1 +
 .../N8nInfoAccordion/InfoAccordion.stories.ts |  5 +-
 .../N8nInfoAccordion/InfoAccordion.vue        |  6 +-
 .../components/N8nInfoTip/InfoTip.stories.ts  |  1 +
 .../src/components/N8nInfoTip/InfoTip.vue     |  3 +-
 .../N8nInfoTip/__tests__/InfoTip.spec.ts      |  1 +
 .../src/components/N8nInput/Input.stories.ts  |  5 +-
 .../src/components/N8nInput/Input.vue         |  8 ++-
 .../N8nInput/__tests__/Input.spec.ts          |  1 +
 .../N8nInputLabel/InputLabel.stories.ts       |  3 +-
 .../components/N8nInputLabel/InputLabel.vue   |  5 +-
 .../N8nInputNumber/InputNumber.stories.ts     |  3 +-
 .../components/N8nInputNumber/InputNumber.vue |  3 +-
 .../KeyboardShortcut.stories.ts               |  3 +-
 .../N8nKeyboardShortcut.vue                   |  1 +
 .../src/components/N8nLink/Link.stories.ts    |  3 +-
 .../src/components/N8nLink/Link.vue           |  6 +-
 .../components/N8nLoading/Loading.stories.ts  |  1 +
 .../N8nMarkdown/Markdown.stories.ts           |  1 +
 .../src/components/N8nMarkdown/Markdown.vue   |  6 +-
 .../N8nMarkdown/__tests__/Markdown.spec.ts    |  1 +
 .../src/components/N8nMenu/Menu.stories.ts    |  5 +-
 .../src/components/N8nMenu/Menu.vue           |  5 +-
 .../N8nMenuItem/MenuItem.stories.ts           |  5 +-
 .../src/components/N8nMenuItem/MenuItem.vue   | 11 ++--
 .../src/components/N8nMenuItem/routerUtil.ts  |  3 +-
 .../NodeCreatorNode.stories.ts                |  3 +-
 .../N8nNodeCreatorNode/NodeCreatorNode.vue    |  5 +-
 .../N8nNodeIcon/NodeIcon.stories.ts           |  3 +-
 .../src/components/N8nNodeIcon/NodeIcon.vue   |  3 +-
 .../components/N8nNotice/Notice.stories.ts    |  3 +-
 .../src/components/N8nNotice/Notice.vue       |  3 +-
 .../N8nNotice/__tests__/Notice.spec.ts        |  4 +-
 .../N8nPagination/Pagination.stories.ts       |  1 +
 .../components/N8nPopover/Popover.stories.ts  |  1 +
 .../src/components/N8nPulse/Pulse.stories.ts  |  3 +-
 .../N8nRadioButtons/RadioButtons.stories.ts   |  4 +-
 .../RecycleScroller.stories.ts                |  3 +-
 .../__tests__/RecycleScroller.spec.ts         |  1 +
 .../N8nResizeWrapper/ResizeWrapper.stories.ts |  5 +-
 .../ResizeableSticky.stories.ts               |  1 +
 .../N8nResizeableSticky/ResizeableSticky.vue  |  3 +-
 .../N8nRoute/__tests__/Route.spec.ts          |  1 +
 .../components/N8nSelect/Select.stories.ts    |  5 +-
 .../src/components/N8nSelect/Select.vue       |  4 +-
 .../N8nSelect/__tests__/Select.spec.ts        | 10 +--
 .../components/N8nSpinner/Spinner.stories.ts  |  1 +
 .../src/components/N8nSpinner/Spinner.vue     |  1 +
 .../components/N8nSticky/Sticky.stories.ts    |  1 +
 .../src/components/N8nSticky/Sticky.vue       |  7 +-
 .../src/components/N8nTabs/Tabs.stories.ts    |  4 +-
 .../src/components/N8nTabs/Tabs.vue           |  3 +-
 .../src/components/N8nTag/Tag.stories.ts      |  1 +
 .../src/components/N8nTags/Tags.stories.ts    |  1 +
 .../src/components/N8nTags/Tags.vue           |  5 +-
 .../src/components/N8nText/Text.stories.ts    |  1 +
 .../src/components/N8nText/Text.vue           |  1 +
 .../components/N8nTooltip/Tooltip.stories.ts  |  1 +
 .../src/components/N8nTooltip/Tooltip.vue     |  4 +-
 .../N8nTooltip/__tests__/Tooltip.spec.ts      |  3 +-
 .../src/components/N8nTree/Tree.stories.ts    |  3 +-
 .../components/N8nTree/__tests__/Tree.spec.ts |  1 +
 .../N8nUserInfo/UserInfo.stories.ts           |  1 +
 .../src/components/N8nUserInfo/UserInfo.vue   |  5 +-
 .../N8nUserSelect/UserSelect.stories.ts       |  3 +-
 .../components/N8nUserSelect/UserSelect.vue   |  7 +-
 .../N8nUserStack/UserStack.stories.ts         |  1 +
 .../src/components/N8nUserStack/UserStack.vue |  2 +
 .../N8nUserStack/__tests__/UserStack.spec.ts  |  4 +-
 .../N8nUsersList/UsersList.stories.ts         |  4 +-
 .../src/components/N8nUsersList/UsersList.vue |  5 +-
 .../src/directives/n8n-truncate.test.ts       |  1 +
 .../src/directives/n8n-truncate.ts            |  1 +
 packages/design-system/src/locale/index.ts    |  5 +-
 packages/design-system/src/plugin.ts          |  1 +
 .../src/styleguide/ColorCircles.vue           |  1 +
 .../styleguide/__tests__/ColorCircles.spec.ts |  1 +
 .../src/styleguide/__tests__/Sizes.spec.ts    |  1 +
 .../src/styleguide/border.stories.ts          |  1 +
 .../src/styleguide/colors.stories.ts          |  1 +
 .../styleguide/colorsprimitives.stories.ts    |  1 +
 .../src/styleguide/fonts.stories.ts           |  1 +
 .../src/styleguide/spacing.stories.ts         |  1 +
 .../styleguide/utilities/spacing.stories.ts   |  1 +
 packages/workflow/.eslintrc.js                |  1 -
 packages/workflow/src/ErrorReporterProxy.ts   |  2 +-
 packages/workflow/src/Expression.ts           | 23 ++++---
 .../workflow/src/ExpressionEvaluatorProxy.ts  |  5 +-
 packages/workflow/src/ExpressionSandboxing.ts |  1 +
 .../src/Extensions/ArrayExtensions.ts         |  4 +-
 .../workflow/src/Extensions/DateExtensions.ts |  6 +-
 .../src/Extensions/ExpressionExtension.ts     | 19 +++---
 .../src/Extensions/ExtendedFunctions.ts       |  4 +-
 .../src/Extensions/NumberExtensions.ts        |  3 +-
 .../src/Extensions/ObjectExtensions.ts        |  2 +-
 .../src/Extensions/StringExtensions.ts        |  9 +--
 packages/workflow/src/Extensions/utils.ts     |  1 +
 packages/workflow/src/Interfaces.ts           | 20 +++---
 packages/workflow/src/MessageEventBus.ts      |  1 +
 packages/workflow/src/NativeMethods/index.ts  |  4 +-
 packages/workflow/src/NodeHelpers.ts          |  9 ++-
 .../src/NodeParameters/FilterParameter.ts     |  5 +-
 packages/workflow/src/RoutingNode.ts          |  9 +--
 packages/workflow/src/TelemetryHelpers.ts     | 26 ++++----
 packages/workflow/src/TypeValidation.ts       |  5 +-
 packages/workflow/src/Workflow.ts             | 19 +++---
 packages/workflow/src/WorkflowDataProxy.ts    | 14 ++--
 .../src/errors/abstract/node.error.ts         |  4 +-
 .../workflow/src/errors/application.error.ts  |  2 +-
 .../src/errors/credential-access-error.ts     |  2 +-
 .../workflow/src/errors/expression.error.ts   |  2 +-
 .../workflow/src/errors/node-api.error.ts     | 19 +++---
 .../src/errors/node-operation.error.ts        |  4 +-
 .../src/errors/trigger-close.error.ts         |  2 +-
 .../src/errors/workflow-activation.error.ts   |  2 +-
 .../src/errors/workflow-operation.error.ts    |  2 +-
 packages/workflow/src/utils.ts                | 13 ++--
 packages/workflow/test/AugmentObject.test.ts  |  2 +-
 packages/workflow/test/Expression.test.ts     | 14 ++--
 .../ArrayExtensions.test.ts                   |  2 +-
 .../BooleanExtensions.test.ts                 |  2 +-
 .../DateExtensions.test.ts                    |  2 +
 .../ExpressionExtension.test.ts               |  1 +
 .../test/ExpressionExtensions/Helpers.ts      |  1 +
 .../NumberExtensions.test.ts                  |  1 +
 .../ObjectExtensions.test.ts                  |  2 +-
 .../StringExtensions.test.ts                  |  1 +
 .../workflow/test/ExpressionFixtures/base.ts  |  2 +-
 .../test/ExpressionSandboxing.test.ts         |  3 +-
 .../workflow/test/FilterParameter.test.ts     |  5 +-
 packages/workflow/test/Helpers.ts             |  3 +-
 packages/workflow/test/NodeErrors.test.ts     |  3 +-
 packages/workflow/test/NodeHelpers.test.ts    |  2 +-
 packages/workflow/test/NodeTypes.ts           |  1 +
 packages/workflow/test/RoutingNode.test.ts    |  8 +--
 .../workflow/test/TelemetryHelpers.test.ts    | 13 ++--
 packages/workflow/test/TypeValidation.test.ts |  1 +
 packages/workflow/test/Workflow.test.ts       |  3 +-
 .../workflow/test/WorkflowDataProxy.test.ts   |  3 +-
 .../workflow/test/errors/node.error.test.ts   |  3 +-
 305 files changed, 723 insertions(+), 484 deletions(-)

diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index b3d6f20c2840c..8d37d5f2adf85 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 d01f046d75375..68353460122a6 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 9acec76f420bc..1954543ca0816 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 645344337675b..7e3b5ef8adc1d 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 53dad1cc89669..8a42521d845c5 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 325e509e797dc..4c7cccaafef5f 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 43103415e3c04..3bbbd0b293459 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 791a704174e8d..93460043881b0 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 c90a884325239..e2af15f10180c 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 b53b0fdf53a9d..fe91a7293555e 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 d2c463f1bb153..d6b8d08fd5f4b 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 9dbe6c6b5d763..dbc613bd64e60 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 5f2a26014376f..19256f3bf9d32 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 bf88d3d24ce91..17f82ec573ec9 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 CustomCredential from '../fixtures/Custom_credential.json';
 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 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 4c733df90dc48..eca3af81fbc32 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 dd0d3b06ba6cc..e9b814597d8de 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 21319dd79b5a5..dc62a0c58c087 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 5cc6657416a7b..5b52889c94d10 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 c6d0f4ab4d3e7..0deec76e9f99d 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 eed3198c83687..32307361fdbca 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 c5d9f2643f24d..815f4b1cebfcb 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 1d4fc5180882f..d749ae4537b21 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 e2bf63df7dc46..59ed6bcb848a9 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 bb47ef4765dc7..9dfe128322914 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,8 +1,8 @@
+import { IF_NODE_NAME } from '../constants';
 import { NodeCreator } from '../pages/features/node-creator';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { NDV } from '../pages/ndv';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { getVisibleSelect } from '../utils';
-import { IF_NODE_NAME } from '../constants';
 
 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 67a092235bff2..1d3a8746a93ec 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 d38eb402b93ba..4608b5eefc94a 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 d26e0ded5dd1c..5b422b4589f04 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 7c7c3be554073..8571b174d9f43 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 ae4d916ba911c..66fc197e3f5d0 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 f14f6be0b7f13..cd3ded63f8922 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 8bd7ccf95fd80..b775deec6d233 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 cc1ea1250d80d..9063b8dc41e3a 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 9872fbc668d33..4574f95691fa8 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 d188896225b04..1eaebc911a00e 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 22d0fd163aaa1..a97fe4888ea1f 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 3fa4d2067103d..06c1baab8eb62 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 c74624686eafb..6ac9a939b2999 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 0c2a26960768d..89186ee34ed2e 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 808c0b6aca01f..35f100fded64f 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 4d5d7a7f9af75..0fe782499d1d7 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 e42e2152d6d80..eb0dbfc251f7e 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 3eefb0851c1cb..b97a179141dff 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 { CollaborationPushMessage } from './collaboration';
+import type { DebugPushMessage } from './debug';
 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 { 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 7bcc4de2ce1e8..34b82732098f1 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 eb895c842e320..164eef0f419d6 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 0272181799399..2555ea8061a30 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 76eea4284cbad..92bcfad89fe75 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 b601d19902707..12fcc58ee382e 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 13cc52daf0d3e..4f315c1bf7c1a 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 f99ffd80d90b6..4fcf11d45b509 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 135ebc6007829..84d1d8b0967b0 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 d3177aeb79650..8e858c5e66612 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 ec90bef42583e..0614b7cf73485 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 043039753f87a..5c93917a74d67 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 5307880d67fa5..4a52fbc925dab 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 a510652b0d863..0f586d7796628 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 685b0805bc04f..168021250f14e 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 997954b6c80c0..d3c3c2db7d5b3 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 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 IconDelete from 'virtual:icons/mdi/closeThick';
 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 8e0d05daf8f05..bd5ddbbb5b7b3 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 dca1d16bc6b9f..698fa4c2c267a 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 af4b3343b7a38..3e823917e0c22 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 { useFileDialog } from '@vueuse/core';
 import IconFilePlus from 'virtual:icons/mdi/filePlus';
+import IconSend from 'virtual:icons/mdi/send';
 import { computed, onMounted, onUnmounted, ref, unref } from 'vue';
-import { useFileDialog } from '@vueuse/core';
-import ChatFile from './ChatFile.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 6ed1744f31ca5..3c1546e8d44dc 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 c98bd9c9eb56b..f584516332363 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 { computed, ref, toRefs, onMounted } from 'vue';
-import VueMarkdown from 'vue-markdown-render';
 import hljs from 'highlight.js/lib/core';
+import bash from 'highlight.js/lib/languages/bash';
 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 typescript from 'highlight.js/lib/languages/typescript';
 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 markdownLink from 'markdown-it-link-attributes';
+import { computed, ref, toRefs, onMounted } from 'vue';
+import VueMarkdown from 'vue-markdown-render';
+
 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 b7e9df48e5937..328ba6566e629 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 d9673ee8525a8..1a0cc31874fbd 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 a7ec6147327ba..c4727135282ad 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 68cfc33813582..2f335cd6fc61a 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 5223ad09df142..c78af2dafa22a 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 618d48e9608cf..75d0f531a5eff 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 eb45e0b9630f3..7738f088b1ac7 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 5dcb39a1e5e9d..31b1e6dd3c50c 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 43a5dde1938fd..4d72f9e717ee8 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 b41c68686cff5..676249254ab91 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 c59fa0de464db..2bcacdf112bb1 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 3fda119a003b2..6d0fff235ea89 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 f479769c77f32..303b529d3486c 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 39978c41f8d08..c0c2ff39f8b34 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 929cb32cd43e9..3067a74331d47 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 0896bb580fdf5..0e778efcf5d0f 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 fd1dc50c18d05..c6e456709c2b7 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 { EndpointsConfig } from './configs/endpoints.config';
 import { EventBusConfig } from './configs/event-bus.config';
-import { NodesConfig } from './configs/nodes.config';
+import { ExternalSecretsConfig } from './configs/external-secrets.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 { 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 f7c1d48e21c09..1d3e5f971d7d5 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 8267399a03dbb..c5c90b70a0bcd 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 eb6dc07722df9..f87677ce9466e 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 d4ad353a97253..3c9bcc437db26 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 09b51186671db..ed5562e573706 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 f82cfca037b14..515f0b32c1562 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 1ec0410a888b6..629749289a6d5 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 6c7c7227abbce..a3a1e612ab678 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 58705ee8c6c35..deece11c63169 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 9ebe50564886a..3ad85f014ac30 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 8bf85cca2c50e..9c3f7d2c23276 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 94857ed4dbb34..f77e9d1e370dc 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 6d41905aed209..18b03eee71eae 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 5cb1824699db4..74d0a36316acf 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 13d96d4a622bb..3edf52e279476 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 45da5274853e4..aa0e2bd19f3ec 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 63f4bf9a865aa..3b52dd54d8334 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 Markdown from 'markdown-it';
+import markdownLink from 'markdown-it-link-attributes';
 import { computed, ref } from 'vue';
-import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
-import AssistantText from '../AskAssistantText/AssistantText.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 CodeDiff from '../CodeDiff/CodeDiff.vue';
-import type { ChatUI } from '../../types/assistant';
+import AssistantText from '../AskAssistantText/AssistantText.vue';
+import BetaTag from '../BetaTag/BetaTag.vue';
 import BlinkingCursor from '../BlinkingCursor/BlinkingCursor.vue';
-
-import Markdown from 'markdown-it';
+import CodeDiff from '../CodeDiff/CodeDiff.vue';
 import InlineAskAssistantButton from '../InlineAskAssistantButton/InlineAskAssistantButton.vue';
-import BetaTag from '../BetaTag/BetaTag.vue';
-import { useI18n } from '../../composables/useI18n';
-import markdownLink from 'markdown-it-link-attributes';
 
 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 08312e9adc70b..eef958a006e32 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 976872d8db8ef..1dc1bac819c2c 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 3192d26461ea3..0ad1b13d19f7c 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 317db52179456..3e24204102e02 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 2aa045565ebf4..48cb4d9654c5d 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 870127f0d3352..68cfb2c6578ce 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 deaf903af52ca..1660e139aa85a 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 86f9b8ae5163c..d3d1261c8a973 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 cb6280e5797fc..ca75ee5e3b993 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 9e648bf178f8f..30aa136674c5a 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 541ce06871be5..e09386369495c 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 a22b5404855a5..7f92713ce8e9f 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 419aef4fcc4f6..848baa244f610 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 50d1e650fd246..65c4193e8d948 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 c2f09548ed5d1..05e469bc2d8b6 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 de4a8d8274af6..cb2016c97624e 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 145482bf7d6b8..c92a15efeb464 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 853e06f8a97eb..250950d6d71b5 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 fddc922050adc..4790d946f9655 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 b314ecbfc7d59..38918611d753f 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 b8d90ca151297..5ef4f70cb719f 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 edb877b3d650f..a43d7a6d7e35b 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 caf90bbc0ab11..8bbbee267fd7e 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 30148d3e13106..1de5c76fe1821 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 643d677c04f38..7284dea7ddf69 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 1a3db8f69e407..40c605f225e26 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 bf52cfe3e5d02..5cb7a7b9daf1b 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 2885d1c601a69..78da26b4afee3 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 97ef9c8a0b434..f828397953abb 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 6a401ecf2faca..a344fa9c8bd38 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 6be8dc2f103d1..fe1d5d3aeb49c 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 fe58696d18cbf..6835567999aa1 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 246140f940b9b..1957401f34e1f 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 4fdeef6229795..3abc2b5b5329b 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 e8442fd6a0f7f..09a07758ac5b5 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 245aca5f1723f..8fe8968478a61 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 250f329da9b1f..20d6a29d84061 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 09b1c73ef0efe..333b150c2c5fe 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 7b9c619048dce..2238f07b224c7 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 8234849097230..3aef3d5a05347 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 b365354e08c92..f0c0c71a77ec3 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 9ead6c73449b0..371599f87710f 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 fe2f3988999ea..9d30101ff1d1f 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 1ab024be084f5..9d866715c133d 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 a55c32bf9f268..782ce7c417433 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 6b54c2a30f4d0..3652dca373c1b 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 82c190faa5b5c..3228a51e2b16a 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 c5c065ee5e6e9..ef67fd62bb550 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 4e4ff3946c537..c6bf3f51beab6 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 0ec4f9166002c..43ef21a9c5450 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 a9f11a3165579..eceda7c3d00b7 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 a05b4c219af86..76b76d5a30f81 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 e72e35ea6eb94..d4d93885e2e70 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 d4e461809e36e..dd58a14bcb2df 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 { ElColorPicker } from 'element-plus';
 import { computed, ref } from 'vue';
+
 import { uid } from '../../utils';
-import { ElColorPicker } from 'element-plus';
 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 702db17aa2ec1..bf1253b8b94af 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 e32a808d5c0f2..dd979e561aebc 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 8e733e0758725..3a28a4d54c727 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 N8nOption from '../N8nOption';
-import N8nPagination from '../N8nPagination';
-import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
+
 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 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 3bead6c227333..c19fa3ca0d1a2 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 a9bd9078cb21c..8572bec8ec619 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 3db1bc1f01254..76cf502578136 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 54f010a7efebf..7c33a95a78704 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 e69972ea0c7af..0181aae57435b 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 0266d8347e8d9..5f187611da9ce 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 { 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 { computed, reactive, onMounted, ref, watch, useSlots } from 'vue';
 
 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 d01968b3c288e..733f6cc594371 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 977a10a88fe16..8a27b28137cee 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 8110662bc1948..e079ac440f05c 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 1b5d3b115aa26..65bb99733029a 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 00e5fed31c847..dc764fab24ae9 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 a5207fdb4d1c1..d31738904f54f 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 3d2c0a0541370..52770c185383d 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 75a28abf458c9..f74429d99b8a5 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 e500c73cd65f1..dc669a09844f4 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 cf27c72a7220b..675600da19b45 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 c551000006b42..cde570d716bc8 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 b25713001b563..ce3eb230fa05e 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 2ab4056259879..a178b0365ff96 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 e4a3f57af1904..39cda6ce30e3e 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 d4fb295d71efe..cea5a1f006033 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 0feb1283a131d..c112b869e22af 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 bda96c2e21feb..31e0d1ca461fb 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-import N8nText from '../N8nText';
+import type { TextColor } from 'n8n-design-system/types/text';
+
 import N8nIcon from '../N8nIcon';
+import N8nText from '../N8nText';
 import N8nTooltip from '../N8nTooltip';
-import type { TextColor } from 'n8n-design-system/types/text';
 
 const SIZE = ['small', 'medium'] as const;
 
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
index feee3265c032d..b2522deca64ef 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 35c370bd1ccdf..de90395ef597c 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 d45f1a0a09ac9..9198670f20426 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 5ca8d64b8ad2d..77bbc2d8c06ed 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 b11a7f4afdcf3..0c4b920701bac 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 4c325f6473195..2f3f5e88c850d 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 5d2ac6c435861..859bd30cc83d9 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 783d9eeead24c..b5e51396cb8e0 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 45de891020bb3..7f55c0c6f1810 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 ac2faac7b308f..1ee181d8bb923 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 bca1eff3bd88a..b5bf903a4dc12 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 56c8b2d0ab7a2..596206977f2e7 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 bb8df005a917f..8cf0accb5d9b2 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 f4f01b16d9cc5..03fdb7e18284b 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 a32df485fdf42..30d4c20b386cc 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 6e22518afadb9..99dfa85740a24 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 909db7693021b..bef3b5a261cab 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 2d5f085e95d4c..c99ae9c7bba2c 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 be173979d47b2..f4cf18877ab40 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 aa4db557a9f60..6f197d6f99817 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 f630e95e59c77..a69ef3f584d8f 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 180815e5367b0..25c098b558388 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 20381c31e3b2c..d3d5af884310d 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 afe37f8b7f3f1..4359769879a3c 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 4d29b64379f94..73340b38c82a6 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 5551d34f2d930..5847e8411af61 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 fb2a496c3ca1c..b949f346f5ded 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 765067c855dd8..85c83db4288fb 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 6c7773a062fa7..3b36469a3790b 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 fe344ed483338..6403e03c48a96 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 f75fc0e0ef63e..ea72c506b7518 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 fb5c16b1eef41..430c8f1ae026f 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 b95c5b9b1d86e..de3bca1a2f350 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 { action } from '@storybook/addon-actions';
 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 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 8fc1223abb5c8..1e2870c5d116a 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 170cfdaa3fd5a..bba6055e46667 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 7e1865b60473c..ab9cac400b57b 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 66ac825c3b796..ddee4f4d76484 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 1411f2c05e525..bb9ef279f8040 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 9e258b4afa75a..73aa4933a3ee8 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 6b383cc30cde2..756505f72247e 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 ff1b142e516e2..501b3bd3b2204 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 c2f25a408985c..6dddecea7ed4b 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 89590c75abaed..d24a96432ca1b 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 43ebb107e74b5..ac6406a8d0d5b 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 50577dfba409a..fd12f968d14a7 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 055a79c3ddc97..7ed36f4179bf0 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 191d9e4135d12..7e405803d986a 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 34339fd0be2b8..d0eb5b610eecc 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 abcd416f36de1..8fe4219d2d068 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 d8f98dc903d42..e0f9713065f23 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 4a5bfec92be19..1728a6f9fce74 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 2a8c5d7a9442f..9479d919434c0 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 fd8c3f061c5b6..f34818d2a091a 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 6bae7d537f769..d4e358f2d436f 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 feeaa1a8d2de3..ca99214639520 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 b19bbe3e67638..6d6e4aa57553e 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 bb338d3c61e2e..b1a9bf8f1160e 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 bae51036a70cf..b08fe3d3d30a2 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 3c73a8ce67fbb..cfaf9b3fb0358 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 e4a6870d064cf..a4d61d2db3abd 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 ec8922d2bc76b..89cd771283517 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 8d454654c07d3..27e678f4d5365 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 325b1d0dcdb69..48652a5a65b7a 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 c6d3d2a6c9f30..446dc579dc352 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 007d731bd84ac..55f4c1f9bc728 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 d961fd40e5620..0e8f7cb47965e 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 3ae44c875744b..9ac613c4d3895 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 9bfc2b497dc24..bf14d4eaee344 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 7eca60a850775..74eab515e9470 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 430664a29e673..6f041cb13f0e8 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 6542603deda69..8020f2c45ee02 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 cf4311a21f3ea..c4aaca845b199 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 065383a5d1d91..591f82df432b6 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 32422b284657d..fa81226338e90 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 b878fcedf0cf5..8a6d568d24125 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 018a8e9e2439e..dc7c661b56e4e 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 74d5c46e8f49b..37dec8af51b03 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 8240f8babbd46..7562e8efa2220 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 a97049ece3585..cd58d735f612c 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 8c38fc35bfe1b..e6e721c74cde5 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 615e793eccf44..2c8d745bd87a1 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 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 { ExpressionExtensionError } from '../errors/expression-extension.error';
 import { parse, visit, types, print } from 'recast';
 import { getOption } from 'recast/lib/util';
-import type { Config as EsprimaConfig } from 'esprima-next';
-import { parse as esprimaParse } from 'esprima-next';
 
 import { arrayExtensions } from './ArrayExtensions';
+import { booleanExtensions } from './BooleanExtensions';
 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 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 091cdc8b0c67c..75ad05fd2e711 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 b13520be4dc10..7fc5a97e3e375 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 8970318e1cab2..58759890adb7f 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 8b4e025bf678f..4f42b546da3ae 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,13 +1,14 @@
+import { toBase64, fromBase64 } from 'js-base64';
 import SHA from 'jssha';
+import { DateTime } from 'luxon';
 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 type { Extension, ExtensionMap } from './Extensions';
+import { toDateTime as numberToDateTime } from './NumberExtensions';
 import { ExpressionExtensionError } from '../errors/expression-extension.error';
-import { DateTime } from 'luxon';
 import { tryToParseDateTime } from '../TypeValidation';
-import { toDateTime as numberToDateTime } from './NumberExtensions';
 
 export const SupportedHashAlgorithms = [
 	'md5',
diff --git a/packages/workflow/src/Extensions/utils.ts b/packages/workflow/src/Extensions/utils.ts
index e56d37a691bfc..1e8509db4019a 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 4ad9612d6d370..17f24c3096230 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 48c80e9b52220..f873299090739 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 f51d64f89c2ac..1ba9d9759f9c6 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 9e68a03a8088a..6869652f4f448 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 { validateFieldType } from './TypeValidation';
 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';
 
 export const cronNodeOptions: INodePropertyCollection[] = [
 	{
diff --git a/packages/workflow/src/NodeParameters/FilterParameter.ts b/packages/workflow/src/NodeParameters/FilterParameter.ts
index e1191394dfdcc..b2df097b09a28 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 8824f9c516c28..fe7fac6790a3a 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 b28a59f654392..42c6571b3bbd9 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 a2c299303fe0a..d15a0a07be4a9 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 aa4131bfc676b..c60b94944997f 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 8e9cf49f031f2..1ceb62fb7b549 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 ceaa7f0954ce1..dfa8f9819eb89 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 954df90a788d9..7cd3095cf0f41 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 0fce04cf4e58f..6de0c3ec96be8 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 ac73010957153..02b3c74444b72 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 47f231bcefe60..f18f2e6feddca 100644
--- a/packages/workflow/src/errors/node-api.error.ts
+++ b/packages/workflow/src/errors/node-api.error.ts
@@ -1,24 +1,25 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
+import { AxiosError } from 'axios';
 import { parseString } from 'xml2js';
-import type {
-	INode,
-	JsonObject,
-	IDataObject,
-	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';
+import type {
+	INode,
+	JsonObject,
+	IDataObject,
+	IStatusCodeMessages,
+	Functionality,
+} from '../Interfaces';
+import { removeCircularRefs } from '../utils';
 
 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 c55cd003ccc9b..00a7a179cc77f 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 19d3b7a76934e..25b5e186b85b9 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 2ea7e5628fce6..8e2c493d9a6c7 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 936b6bea10f93..40bdd100e5972 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 c0330955c3508..4fba8de101864 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 fcb126e4ebc18..457567b993303 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 42cd682dbc023..abfb5895daf94 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 6759c9e02d9ee..d85ec4a257162 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 eccb53e50b7e1..842158a5b31a3 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 2e542fc377e4e..09a5761d65fce 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 15980c67e2726..e08f4f05c44f3 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 54836960e55b4..2c2e8ffde706c 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 1f41e853a1028..ff51ec180ab2f 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 4a78037488af3..1107ceae5485f 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 70ec97c91519f..35b23188687cc 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 f05d098fd5bbb..1988180aa04a5 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 f2ba200f8eaf9..dbec45344302a 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 b22460f998d89..d8914ef77307a 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 c618f5fd0c207..f72c041c69ed5 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 12033fd28d720..04aafb1610167 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 583d423c60c74..f3ecc161ca376 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 f255d92e62a9d..9cd5c548f2367 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 16f9735d37e0e..a38f4551e2a55 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 { Workflow } from '@/Workflow';
-
 import * as utilsModule from '@/utils';
+import { Workflow } from '@/Workflow';
 
 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 c1f46d2d66140..9c51b0f1db5fc 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 f01af4cedcc9d..54504bf7f45d0 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 df0e85f49b364..bdd5fec8b9712 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 230c11198b824..ac9504dcd8984 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 7d0783a65c70c..c988aa9930543 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>();

From df8b2c069417efb5e5561e1a40b6add2a29f20f8 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:40:59 +0300
Subject: [PATCH 5/5] fix: Fix lint issues (no-changelog) (#10866)

---
 .../AskAssistantChat/__tests__/AskAssistantChat.spec.ts        | 3 ++-
 .../src/components/N8nMarkdown/__tests__/Markdown.spec.ts      | 3 ++-
 packages/design-system/src/directives/n8n-html.test.ts         | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

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 eef958a006e32..2c1649b2cd628 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
@@ -1,8 +1,9 @@
 import { render } from '@testing-library/vue';
 
-import AskAssistantChat from '../AskAssistantChat.vue';
 import { n8nHtml } from 'n8n-design-system/directives';
 
+import AskAssistantChat from '../AskAssistantChat.vue';
+
 describe('AskAssistantChat', () => {
 	it('renders default placeholder chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
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 1ee181d8bb923..d9671464d2236 100644
--- a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
+++ b/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
@@ -1,8 +1,9 @@
 import { render, fireEvent } from '@testing-library/vue';
 
-import N8nMarkdown from '../Markdown.vue';
 import { n8nHtml } from 'n8n-design-system/directives';
 
+import N8nMarkdown from '../Markdown.vue';
+
 describe('components', () => {
 	describe('N8nMarkdown', () => {
 		it('should render unchecked checkboxes', () => {
diff --git a/packages/design-system/src/directives/n8n-html.test.ts b/packages/design-system/src/directives/n8n-html.test.ts
index 94fb30de51290..d964a3345cf90 100644
--- a/packages/design-system/src/directives/n8n-html.test.ts
+++ b/packages/design-system/src/directives/n8n-html.test.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/vue';
+
 import { n8nHtml } from './n8n-html';
 
 const TestComponent = {