From 5651a52364ae327ab369f0da72b0ac678e04701a Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 6 Apr 2023 16:32:45 +0300
Subject: [PATCH] feat: Replace new Vue() with custom event bus (no-changelog)
 (#5780)

* refactor: replace new Vue() with custom event bus (no-changelog)

* fix: export types from design system main

* fix: update component types

* fix: update form inputs event bus
---
 packages/design-system/package.json           |  3 +-
 .../src/components/N8nFormBox/FormBox.vue     |  5 +-
 .../components/N8nFormInputs/FormInputs.vue   |  7 ++-
 .../src/components/N8nHeading/Heading.vue     |  2 +-
 .../src/components/N8nText/Text.vue           |  3 +-
 packages/design-system/src/main.d.ts          | 18 ------
 .../design-system/src/{main.js => main.ts}    |  2 +
 packages/design-system/src/shims-types.d.ts   |  7 +++
 packages/design-system/src/types/index.ts     |  2 +-
 .../src/utils/__tests__/event-bus.spec.ts     | 62 +++++++++++++++++++
 packages/design-system/src/utils/event-bus.ts | 47 ++++++++++++++
 packages/design-system/src/utils/index.ts     |  1 +
 packages/design-system/vite.config.ts         |  2 +-
 .../editor-ui/src/components/AboutModal.vue   |  5 +-
 .../src/components/ActivationModal.vue        |  3 +-
 .../src/components/ChangePasswordModal.vue    | 10 +--
 .../CodeNodeEditor/CodeNodeEditor.vue         |  6 +-
 .../CommunityPackageInstallModal.vue          |  6 +-
 .../CommunityPackageManageConfirmModal.vue    |  8 +--
 .../src/components/ContactPromptModal.vue     |  6 +-
 .../CredentialEdit/CredentialEdit.vue         |  6 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |  2 +-
 .../src/components/CredentialsSelectModal.vue |  6 +-
 .../src/components/DeleteUserModal.vue        |  6 +-
 .../components/DuplicateWorkflowDialog.vue    | 10 +--
 .../src/components/ExecutionsModal.vue        |  5 +-
 .../ExpandableInput/ExpandableInputEdit.vue   | 15 ++++-
 .../src/components/HtmlEditor/HtmlEditor.vue  |  6 +-
 .../src/components/ImportCurlModal.vue        |  6 +-
 .../src/components/InlineTextEdit.vue         |  5 +-
 .../src/components/InviteUsersModal.vue       | 10 +--
 .../src/components/MainHeader/MainHeader.vue  |  2 +-
 .../components/MainHeader/WorkflowDetails.vue |  5 +-
 packages/editor-ui/src/components/Modal.vue   |  9 +--
 .../editor-ui/src/components/ModalDrawer.vue  |  7 ++-
 .../components/Node/NodeCreator/SearchBar.vue |  5 +-
 .../src/components/NodeDetailsView.vue        | 15 +++--
 .../src/components/NodeExecuteButton.vue      |  4 +-
 .../editor-ui/src/components/NodeSettings.vue |  7 ++-
 .../components/OnboardingCallSignupModal.vue  |  9 ++-
 .../src/components/ParameterInput.vue         |  4 +-
 .../src/components/PersonalizationModal.vue   | 10 +--
 packages/editor-ui/src/components/RunData.vue | 14 ++---
 .../EventDestinationCard.ee.vue               |  7 ++-
 .../EventDestinationSettingsModal.ee.vue      | 13 ++--
 .../editor-ui/src/components/TagsDropdown.vue | 13 +++-
 .../components/TagsManager/TagsManager.vue    |  5 +-
 .../editor-ui/src/components/ValueSurvey.vue  |  6 +-
 .../src/components/VariableSelectorItem.vue   |  1 -
 .../src/components/WorkflowSettings.vue       |  5 +-
 .../src/components/WorkflowShareModal.ee.vue  | 11 ++--
 .../event-bus/code-node-editor-event-bus.ts   |  3 -
 .../src/event-bus/code-node-editor.ts         |  3 +
 .../src/event-bus/data-pinning-event-bus.ts   |  3 -
 .../editor-ui/src/event-bus/data-pinning.ts   |  3 +
 .../src/event-bus/html-editor-event-bus.ts    |  3 -
 .../editor-ui/src/event-bus/html-editor.ts    |  3 +
 packages/editor-ui/src/event-bus/index.ts     |  5 ++
 .../src/event-bus/node-view-event-bus.ts      |  3 -
 packages/editor-ui/src/event-bus/node-view.ts |  3 +
 .../editor-ui/src/mixins/pushConnection.ts    |  4 +-
 packages/editor-ui/src/models/history.ts      | 18 +++---
 packages/editor-ui/src/stores/workflows.ts    |  8 +--
 packages/editor-ui/src/views/NodeView.vue     | 43 +++++++------
 .../editor-ui/src/views/SettingsLdapView.vue  |  5 +-
 .../src/views/SettingsLogStreamingView.vue    | 10 +--
 .../src/views/SettingsPersonalView.vue        |  6 +-
 67 files changed, 347 insertions(+), 210 deletions(-)
 delete mode 100644 packages/design-system/src/main.d.ts
 rename packages/design-system/src/{main.js => main.ts} (73%)
 create mode 100644 packages/design-system/src/shims-types.d.ts
 create mode 100644 packages/design-system/src/utils/__tests__/event-bus.spec.ts
 create mode 100644 packages/design-system/src/utils/event-bus.ts
 delete mode 100644 packages/editor-ui/src/event-bus/code-node-editor-event-bus.ts
 create mode 100644 packages/editor-ui/src/event-bus/code-node-editor.ts
 delete mode 100644 packages/editor-ui/src/event-bus/data-pinning-event-bus.ts
 create mode 100644 packages/editor-ui/src/event-bus/data-pinning.ts
 delete mode 100644 packages/editor-ui/src/event-bus/html-editor-event-bus.ts
 create mode 100644 packages/editor-ui/src/event-bus/html-editor.ts
 create mode 100644 packages/editor-ui/src/event-bus/index.ts
 delete mode 100644 packages/editor-ui/src/event-bus/node-view-event-bus.ts
 create mode 100644 packages/editor-ui/src/event-bus/node-view.ts

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index eb7a3467c0..7207be9c0c 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -7,7 +7,8 @@
     "name": "Mutasem Aldmour",
     "email": "mutasem@n8n.io"
   },
-  "main": "src/main.js",
+  "main": "src/main.ts",
+  "import": "src/main.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/n8n-io/n8n.git"
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index 465fa957f3..3fc3ddcae4 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -43,6 +43,7 @@ import N8nFormInputs from '../N8nFormInputs';
 import N8nHeading from '../N8nHeading';
 import N8nLink from '../N8nLink';
 import N8nButton from '../N8nButton';
+import { createEventBus } from '../../utils';
 
 export default Vue.extend({
 	name: 'n8n-form-box',
@@ -81,7 +82,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			formBus: new Vue(),
+			formBus: createEventBus(),
 		};
 	},
 	methods: {
@@ -92,7 +93,7 @@ export default Vue.extend({
 			this.$emit('submit', e);
 		},
 		onButtonClick() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 		onSecondaryButtonClick(event: Event) {
 			this.$emit('secondaryClick', event);
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 507c308bd8..df85780748 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -37,10 +37,11 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
 import N8nFormInput from '../N8nFormInput';
 import type { IFormInput } from '../../types';
 import ResizeObserver from '../ResizeObserver';
+import { EventBus } from '@/utils';
 
 export default Vue.extend({
 	name: 'n8n-form-inputs',
@@ -56,7 +57,7 @@ export default Vue.extend({
 			},
 		},
 		eventBus: {
-			type: Vue,
+			type: Object as PropType<EventBus>,
 		},
 		columnView: {
 			type: Boolean,
@@ -83,7 +84,7 @@ export default Vue.extend({
 		});
 
 		if (this.eventBus) {
-			this.eventBus.$on('submit', this.onSubmit); // eslint-disable-line @typescript-eslint/unbound-method
+			this.eventBus.on('submit', this.onSubmit); // eslint-disable-line @typescript-eslint/unbound-method
 		}
 	},
 	computed: {
diff --git a/packages/design-system/src/components/N8nHeading/Heading.vue b/packages/design-system/src/components/N8nHeading/Heading.vue
index 2fe0997717..97320cf4fd 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.vue
+++ b/packages/design-system/src/components/N8nHeading/Heading.vue
@@ -52,7 +52,7 @@ export default Vue.extend({
 
 			applied.push(this.bold ? 'bold' : 'regular');
 
-			return applied.map((c) => (this.$style as { [key: string]: string })[c]);
+			return applied.map((c) => this.$style[c]);
 		},
 	},
 });
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index fb2e0025d4..013d659e01 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -6,7 +6,6 @@
 
 <script lang="ts">
 import Vue from 'vue';
-
 export default Vue.extend({
 	name: 'n8n-text',
 	props: {
@@ -67,7 +66,7 @@ export default Vue.extend({
 
 			applied.push(this.bold ? 'bold' : 'regular');
 
-			return applied.map((c) => (this.$style as { [key: string]: string })[c]);
+			return applied.map((c) => this.$style[c]);
 		},
 	},
 });
diff --git a/packages/design-system/src/main.d.ts b/packages/design-system/src/main.d.ts
deleted file mode 100644
index 21f781a0c6..0000000000
--- a/packages/design-system/src/main.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Vue from 'vue';
-import * as locale from './locale';
-
-declare module 'vue/types/vue' {
-	interface Vue {
-		$style: Record<string, string>;
-		t: (key: string, options?: object) => string;
-	}
-}
-
-declare module 'n8n-design-system' {
-	export * from './components';
-	export { N8nUsersList, N8nUserSelect } from './components';
-	export { locale };
-}
-
-export * from './types';
-export { locale } from './locale';
diff --git a/packages/design-system/src/main.js b/packages/design-system/src/main.ts
similarity index 73%
rename from packages/design-system/src/main.js
rename to packages/design-system/src/main.ts
index b8b42e10ab..65ae159c2c 100644
--- a/packages/design-system/src/main.js
+++ b/packages/design-system/src/main.ts
@@ -1,4 +1,6 @@
 import * as locale from './locale';
 import designSystemComponents from './plugins/n8nComponents';
 
+export * from './types';
+export * from './utils';
 export { locale, designSystemComponents };
diff --git a/packages/design-system/src/shims-types.d.ts b/packages/design-system/src/shims-types.d.ts
new file mode 100644
index 0000000000..310838d645
--- /dev/null
+++ b/packages/design-system/src/shims-types.d.ts
@@ -0,0 +1,7 @@
+import * as Vue from 'vue';
+
+declare module 'vue/types/vue' {
+	interface Vue {
+		$style: Record<string, string>;
+	}
+}
diff --git a/packages/design-system/src/types/index.ts b/packages/design-system/src/types/index.ts
index 4e7d31c6e6..b6ba9e827c 100644
--- a/packages/design-system/src/types/index.ts
+++ b/packages/design-system/src/types/index.ts
@@ -1,4 +1,4 @@
+export * from './button';
 export * from './form';
 export * from './user';
 export * from './menu';
-export * from './button';
diff --git a/packages/design-system/src/utils/__tests__/event-bus.spec.ts b/packages/design-system/src/utils/__tests__/event-bus.spec.ts
new file mode 100644
index 0000000000..e403b61008
--- /dev/null
+++ b/packages/design-system/src/utils/__tests__/event-bus.spec.ts
@@ -0,0 +1,62 @@
+import { createEventBus } from '../event-bus';
+
+describe('createEventBus()', () => {
+	const eventBus = createEventBus();
+
+	describe('on()', () => {
+		it('should register event handler', () => {
+			const handler = vi.fn();
+			const eventName = 'test';
+
+			eventBus.on(eventName, handler);
+
+			eventBus.emit(eventName, {});
+
+			expect(handler).toHaveBeenCalled();
+		});
+
+		it('should return unregister fn', () => {
+			const handler = vi.fn();
+			const eventName = 'test';
+
+			const unregister = eventBus.on(eventName, handler);
+
+			unregister();
+
+			eventBus.emit(eventName, {});
+
+			expect(handler).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('off()', () => {
+		it('should register event handler', () => {
+			const handler = vi.fn();
+			const eventName = 'test';
+
+			eventBus.on(eventName, handler);
+			eventBus.off(eventName, handler);
+
+			eventBus.emit(eventName, {});
+
+			expect(handler).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('emit()', () => {
+		it('should call handlers with given event', () => {
+			const handlerA = vi.fn();
+			const handlerB = vi.fn();
+			const eventName = 'test';
+			const event = new Event(eventName);
+
+			eventBus.on(eventName, handlerA);
+			eventBus.on(eventName, handlerB);
+
+			eventBus.emit(eventName, event);
+
+			expect(handlerA).toHaveBeenCalledWith(event);
+			expect(handlerB).toHaveBeenCalledWith(event);
+		});
+	});
+});
diff --git a/packages/design-system/src/utils/event-bus.ts b/packages/design-system/src/utils/event-bus.ts
new file mode 100644
index 0000000000..b2d408ed01
--- /dev/null
+++ b/packages/design-system/src/utils/event-bus.ts
@@ -0,0 +1,47 @@
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type CallbackFn = Function;
+export type UnregisterFn = () => void;
+
+export function createEventBus() {
+	const handlers = new Map<string, CallbackFn[]>();
+
+	function off(eventName: string, fn: CallbackFn) {
+		const eventFns = handlers.get(eventName);
+
+		if (eventFns) {
+			eventFns.splice(eventFns.indexOf(fn) >>> 0, 1);
+		}
+	}
+
+	function on(eventName: string, fn: CallbackFn): UnregisterFn {
+		let eventFns = handlers.get(eventName);
+
+		if (!eventFns) {
+			eventFns = [fn];
+		} else {
+			eventFns.push(fn);
+		}
+
+		handlers.set(eventName, eventFns);
+
+		return () => off(eventName, fn);
+	}
+
+	function emit<T = Event>(eventName: string, event?: T) {
+		const eventFns = handlers.get(eventName);
+
+		if (eventFns) {
+			eventFns.slice().forEach(async (handler) => {
+				await handler(event);
+			});
+		}
+	}
+
+	return {
+		on,
+		off,
+		emit,
+	};
+}
+
+export type EventBus = ReturnType<typeof createEventBus>;
diff --git a/packages/design-system/src/utils/index.ts b/packages/design-system/src/utils/index.ts
index b2e1c68129..fd3f0010e1 100644
--- a/packages/design-system/src/utils/index.ts
+++ b/packages/design-system/src/utils/index.ts
@@ -1,3 +1,4 @@
+export * from './event-bus';
 export * from './markdown';
 export * from './uid';
 export * from './valueByPath';
diff --git a/packages/design-system/vite.config.ts b/packages/design-system/vite.config.ts
index 8c1381c524..e742ba8aad 100644
--- a/packages/design-system/vite.config.ts
+++ b/packages/design-system/vite.config.ts
@@ -16,7 +16,7 @@ export default mergeConfig(
 		},
 		build: {
 			lib: {
-				entry: resolve(__dirname, 'src', 'main.js'),
+				entry: resolve(__dirname, 'src', 'main.ts'),
 				name: 'N8nDesignSystem',
 				fileName: (format) => `n8n-design-system.${format}.js`,
 			},
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index de35589f64..f23621cea6 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -60,6 +60,7 @@ import { ABOUT_MODAL_KEY } from '../constants';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
+import { createEventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'About',
@@ -69,7 +70,7 @@ export default Vue.extend({
 	data() {
 		return {
 			ABOUT_MODAL_KEY,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 		};
 	},
 	computed: {
@@ -77,7 +78,7 @@ export default Vue.extend({
 	},
 	methods: {
 		closeDialog() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue
index e511a1d96a..0e7d2963ef 100644
--- a/packages/editor-ui/src/components/ActivationModal.vue
+++ b/packages/editor-ui/src/components/ActivationModal.vue
@@ -49,6 +49,7 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { createEventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'ActivationModal',
@@ -60,7 +61,7 @@ export default Vue.extend({
 		return {
 			WORKFLOW_ACTIVE_MODAL_KEY,
 			checked: false,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 		};
 	},
 	methods: {
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 7e404b3328..735336a9fb 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -33,11 +33,11 @@ import mixins from 'vue-typed-mixins';
 
 import { showMessage } from '@/mixins/showMessage';
 import Modal from './Modal.vue';
-import Vue from 'vue';
 import { IFormInputs } from '@/Interface';
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	components: { Modal },
@@ -50,8 +50,8 @@ export default mixins(showMessage).extend({
 	data() {
 		return {
 			config: null as null | IFormInputs,
-			formBus: new Vue(),
-			modalBus: new Vue(),
+			formBus: createEventBus(),
+			modalBus: createEventBus(),
 			password: '',
 			loading: false,
 			CHANGE_PASSWORD_MODAL_KEY,
@@ -133,14 +133,14 @@ export default mixins(showMessage).extend({
 					message: this.$locale.baseText('auth.changePassword.passwordUpdatedMessage'),
 				});
 
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			} catch (error) {
 				this.$showError(error, this.$locale.baseText('auth.changePassword.error'));
 			}
 			this.loading = false;
 		},
 		onSubmitClick() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index d01804660d..55c597bcce 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -14,7 +14,7 @@ import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { CODE_NODE_EDITOR_THEME } from './theme';
 import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
-import { codeNodeEditorEventBus } from '@/event-bus/code-node-editor-event-bus';
+import { codeNodeEditorEventBus } from '@/event-bus';
 import { CODE_NODE_TYPE } from '@/constants';
 import { ALL_ITEMS_PLACEHOLDER, EACH_ITEM_PLACEHOLDER } from './constants';
 import { mapStores } from 'pinia';
@@ -133,10 +133,10 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 		},
 	},
 	destroyed() {
-		codeNodeEditorEventBus.$off('error-line-number', this.highlightLine);
+		codeNodeEditorEventBus.off('error-line-number', this.highlightLine);
 	},
 	mounted() {
-		codeNodeEditorEventBus.$on('error-line-number', this.highlightLine);
+		codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
 
 		const stateBasedExtensions = [
 			this.linterCompartment.of(this.linterExtension()),
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index 39ec805a92..6bc9201210 100644
--- a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
@@ -88,7 +88,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import Modal from './Modal.vue';
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
@@ -100,6 +99,7 @@ import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
 import { mapStores } from 'pinia';
 import { useCommunityNodesStore } from '@/stores/communityNodes';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'CommunityPackageInstallModal',
@@ -111,7 +111,7 @@ export default mixins(showMessage).extend({
 			loading: false,
 			packageName: '',
 			userAgreed: false,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			checkboxWarning: false,
 			infoTextErrorMessage: '',
 			COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
@@ -143,7 +143,7 @@ export default mixins(showMessage).extend({
 					// TODO: We need to fetch a fresh list of installed packages until proper response is implemented on the back-end
 					await this.communityNodesStore.fetchInstalledPackages();
 					this.loading = false;
-					this.modalBus.$emit('close');
+					this.modalBus.emit('close');
 					this.$showMessage({
 						title: this.$locale.baseText('settings.communityNodes.messages.install.success'),
 						type: 'success',
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index 2d0e7f3f95..d0f7e75b29 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -35,7 +35,6 @@
 </template>
 
 <script>
-import Vue from 'vue';
 import mixins from 'vue-typed-mixins';
 import Modal from './Modal.vue';
 import {
@@ -45,6 +44,7 @@ import {
 import { showMessage } from '@/mixins/showMessage';
 import { mapStores } from 'pinia';
 import { useCommunityNodesStore } from '@/stores/communityNodes';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'CommunityPackageManageConfirmModal',
@@ -67,7 +67,7 @@ export default mixins(showMessage).extend({
 	data() {
 		return {
 			loading: false,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 			COMMUNITY_PACKAGE_MANAGE_ACTIONS,
 		};
@@ -151,7 +151,7 @@ export default mixins(showMessage).extend({
 				);
 			} finally {
 				this.loading = false;
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			}
 		},
 		async onUpdate() {
@@ -187,7 +187,7 @@ export default mixins(showMessage).extend({
 				);
 			} finally {
 				this.loading = false;
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 7d87d8f5bc..3978430ae6 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -33,7 +33,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import mixins from 'vue-typed-mixins';
 
 import { IN8nPromptResponse } from '@/Interface';
@@ -43,6 +42,7 @@ import Modal from './Modal.vue';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(workflowHelpers).extend({
 	components: { Modal },
@@ -51,7 +51,7 @@ export default mixins(workflowHelpers).extend({
 	data() {
 		return {
 			email: '',
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 		};
 	},
 	computed: {
@@ -100,7 +100,7 @@ export default mixins(workflowHelpers).extend({
 						type: 'success',
 					});
 				}
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 2c61f62526..29b970f90c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -143,7 +143,7 @@ import { CREDENTIAL_EDIT_MODAL_KEY, EnterpriseEditionFeature } from '@/constants
 import { IDataObject } from 'n8n-workflow';
 import FeatureComingSoon from '../FeatureComingSoon.vue';
 import { getCredentialPermissions, IPermissions } from '@/permissions';
-import { IMenuItem } from 'n8n-design-system';
+import { createEventBus, IMenuItem } from 'n8n-design-system';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
@@ -195,7 +195,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 			credentialId: '',
 			credentialName: '',
 			credentialData: {} as ICredentialDataDecryptedObject,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			nodeAccess: {} as NodeAccessMap,
 			isDeleting: false,
 			isSaving: false,
@@ -645,7 +645,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 			};
 		},
 		closeDialog() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 
 		getParentTypes(name: string): string[] {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 10094bb05b..c33e049ee8 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -178,7 +178,7 @@ export default mixins(showMessage).extend({
 		},
 		goToUsersSettings() {
 			this.$router.push({ name: VIEWS.USERS_SETTINGS });
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 		goToUpgrade() {
 			const linkUrlTranslationKey = this.uiStore.contextBasedTranslationKeys
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index 8a50da6b49..b2470bd0f6 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -58,7 +58,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import mixins from 'vue-typed-mixins';
 import Modal from './Modal.vue';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../constants';
@@ -67,6 +66,7 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useCredentialsStore } from '@/stores/credentials';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(externalHooks).extend({
 	name: 'CredentialsSelectModal',
@@ -88,7 +88,7 @@ export default mixins(externalHooks).extend({
 	},
 	data() {
 		return {
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			selected: '',
 			loading: true,
 			CREDENTIAL_SELECT_MODAL_KEY,
@@ -102,7 +102,7 @@ export default mixins(externalHooks).extend({
 			this.selected = type;
 		},
 		openCredentialType() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 			this.uiStore.openNewCredential(this.selected);
 
 			const telemetryPayload = {
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 23e2ad94e3..ba21d42ae6 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -74,10 +74,10 @@ import mixins from 'vue-typed-mixins';
 
 import { showMessage } from '@/mixins/showMessage';
 import Modal from './Modal.vue';
-import Vue from 'vue';
 import { IUser } from '../Interface';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	components: {
@@ -94,7 +94,7 @@ export default mixins(showMessage).extend({
 	},
 	data() {
 		return {
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			loading: false,
 			operation: '',
 			deleteConfirmText: '',
@@ -175,7 +175,7 @@ export default mixins(showMessage).extend({
 					message,
 				});
 
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			} catch (error) {
 				this.$showError(error, this.$locale.baseText('settings.users.userDeletedError'));
 			}
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index ecd62791ee..3628ee0c95 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -49,7 +49,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import mixins from 'vue-typed-mixins';
 
 import { MAX_WORKFLOW_NAME_LENGTH, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
@@ -64,6 +63,7 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { IWorkflowDataUpdate } from '@/Interface';
 import { getWorkflowPermissions, IPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage, workflowHelpers, restApi).extend({
 	components: { TagsDropdown, Modal },
@@ -76,8 +76,8 @@ export default mixins(showMessage, workflowHelpers, restApi).extend({
 			name: '',
 			currentTagIds,
 			isSaving: false,
-			modalBus: new Vue(),
-			dropdownBus: new Vue(),
+			modalBus: createEventBus(),
+			dropdownBus: createEventBus(),
 			MAX_WORKFLOW_NAME_LENGTH,
 			prevTagIds: currentTagIds,
 		};
@@ -112,7 +112,7 @@ export default mixins(showMessage, workflowHelpers, restApi).extend({
 	},
 	methods: {
 		focusOnSelect() {
-			this.dropdownBus.$emit('focus');
+			this.dropdownBus.emit('focus');
 		},
 		focusOnNameInput() {
 			const input = this.$refs.nameInput as HTMLElement;
@@ -195,7 +195,7 @@ export default mixins(showMessage, workflowHelpers, restApi).extend({
 			}
 		},
 		closeDialog(): void {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/ExecutionsModal.vue b/packages/editor-ui/src/components/ExecutionsModal.vue
index 332d2357d1..7da0c9da3b 100644
--- a/packages/editor-ui/src/components/ExecutionsModal.vue
+++ b/packages/editor-ui/src/components/ExecutionsModal.vue
@@ -11,6 +11,7 @@ import Vue from 'vue';
 import ExecutionsList from '@/components/ExecutionsList.vue';
 import Modal from '@/components/Modal.vue';
 import { EXECUTIONS_MODAL_KEY } from '@/constants';
+import { createEventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'ExecutionsModal',
@@ -20,13 +21,13 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			EXECUTIONS_MODAL_KEY,
 		};
 	},
 	methods: {
 		onCloseModal() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index d66080998d..30acd2b4ae 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -16,13 +16,22 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
 import ExpandableInputBase from './ExpandableInputBase.vue';
+import { EventBus } from '@/event-bus';
 
 export default Vue.extend({
 	components: { ExpandableInputBase },
 	name: 'ExpandableInputEdit',
-	props: ['value', 'placeholder', 'maxlength', 'autofocus', 'eventBus'],
+	props: {
+		value: {},
+		placeholder: {},
+		maxlength: {},
+		autofocus: {},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+		},
+	},
 	mounted() {
 		// autofocus on input element is not reliable
 		if (this.$props.autofocus && this.$refs.input) {
@@ -30,7 +39,7 @@ export default Vue.extend({
 		}
 
 		if (this.$props.eventBus) {
-			this.$props.eventBus.$on('focus', () => {
+			this.$props.eventBus.on('focus', () => {
 				this.focus();
 			});
 		}
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 9f11e07bb6..23b7168b96 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -32,7 +32,7 @@ import {
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { htmlEditorEventBus } from '@/event-bus/html-editor-event-bus';
+import { htmlEditorEventBus } from '@/event-bus';
 import { expressionManager } from '@/mixins/expressionManager';
 import { theme } from './theme';
 import { nonTakenRanges } from './utils';
@@ -256,7 +256,7 @@ export default mixins(expressionManager).extend({
 	},
 
 	mounted() {
-		htmlEditorEventBus.$on('format-html', this.format);
+		htmlEditorEventBus.on('format-html', this.format);
 
 		let doc = this.html;
 
@@ -272,7 +272,7 @@ export default mixins(expressionManager).extend({
 	},
 
 	destroyed() {
-		htmlEditorEventBus.$off('format-html', this.format);
+		htmlEditorEventBus.off('format-html', this.format);
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 3723b7be8b..4baa06600e 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -40,7 +40,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import Modal from './Modal.vue';
 import {
 	IMPORT_CURL_MODAL_KEY,
@@ -53,6 +52,7 @@ import { INodeUi } from '@/Interface';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useNDVStore } from '@/stores/ndv';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'ImportCurlModal',
@@ -63,7 +63,7 @@ export default mixins(showMessage).extend({
 		return {
 			IMPORT_CURL_MODAL_KEY,
 			curlCommand: '',
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 		};
 	},
 	computed: {
@@ -74,7 +74,7 @@ export default mixins(showMessage).extend({
 	},
 	methods: {
 		closeDialog(): void {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 		onInput(value: string): void {
 			this.curlCommand = value;
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/editor-ui/src/components/InlineTextEdit.vue
index b8020a0eac..534f7f0e50 100644
--- a/packages/editor-ui/src/components/InlineTextEdit.vue
+++ b/packages/editor-ui/src/components/InlineTextEdit.vue
@@ -24,6 +24,7 @@
 import Vue from 'vue';
 import ExpandableInputEdit from '@/components/ExpandableInput/ExpandableInputEdit.vue';
 import ExpandableInputPreview from '@/components/ExpandableInput/ExpandableInputPreview.vue';
+import { createEventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'InlineTextEdit',
@@ -34,7 +35,7 @@ export default Vue.extend({
 			newValue: '',
 			escPressed: false,
 			disabled: false,
-			inputBus: new Vue(),
+			inputBus: createEventBus(),
 		};
 	},
 	methods: {
@@ -72,7 +73,7 @@ export default Vue.extend({
 				this.$data.disabled = false;
 
 				if (!updated) {
-					this.$data.inputBus.$emit('focus');
+					this.$data.inputBus.emit('focus');
 				}
 			};
 
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index 94a78158ad..7e4422826c 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -69,13 +69,13 @@ import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
 import { copyPaste } from '@/mixins/copyPaste';
 import Modal from './Modal.vue';
-import Vue from 'vue';
 import { IFormInputs, IInviteResponse, IUser } from '@/Interface';
 import { VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } from '@/constants';
 import { ROLE } from '@/utils';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users';
 import { useSettingsStore } from '@/stores/settings';
+import { createEventBus } from '@/event-bus';
 
 const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
 
@@ -101,8 +101,8 @@ export default mixins(showMessage, copyPaste).extend({
 	data() {
 		return {
 			config: null as IFormInputs | null,
-			formBus: new Vue(),
-			modalBus: new Vue(),
+			formBus: createEventBus(),
+			modalBus: createEventBus(),
 			emails: '',
 			showInviteUrls: null as IInviteResponse[] | null,
 			loading: false,
@@ -279,7 +279,7 @@ export default mixins(showMessage, copyPaste).extend({
 				if (successfulUrlInvites.length > 1) {
 					this.showInviteUrls = successfulUrlInvites;
 				} else {
-					this.modalBus.$emit('close');
+					this.modalBus.emit('close');
 				}
 			} catch (error) {
 				this.$showError(error, this.$locale.baseText('settings.users.usersInvitedError'));
@@ -307,7 +307,7 @@ export default mixins(showMessage, copyPaste).extend({
 			});
 		},
 		onSubmitClick() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 		onCopyInviteLink(user: IUser) {
 			if (user.inviteAcceptUrl && this.showInviteUrls) {
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 6d052bce3b..d4ab9e107f 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -138,7 +138,7 @@ export default mixins(pushConnection, workflowHelpers).extend({
 					} else {
 						this.$router.push({ name: VIEWS.EXECUTION_HOME, params: { name: routeWorkflowId } });
 					}
-					// this.modalBus.$emit('closeAll');
+					// this.modalBus.emit('closeAll');
 					this.activeHeaderTab = MAIN_HEADER_TABS.EXECUTIONS;
 					break;
 				default:
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 199e659f62..6b51d2de09 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -160,6 +160,7 @@ import { getWorkflowPermissions, IPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users';
 import { useUsageStore } from '@/stores/usage';
 import { BaseTextKey } from '@/plugins/i18n';
+import { createEventBus } from '@/event-bus';
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -187,7 +188,7 @@ export default mixins(workflowHelpers, titleChange).extend({
 			isTagsEditEnabled: false,
 			isNameEditEnabled: false,
 			appliedTagIds: [],
-			tagsEditBus: new Vue(),
+			tagsEditBus: createEventBus(),
 			MAX_WORKFLOW_NAME_LENGTH,
 			tagsSaving: false,
 			EnterpriseEditionFeature,
@@ -328,7 +329,7 @@ export default mixins(workflowHelpers, titleChange).extend({
 			setTimeout(() => {
 				// allow name update to occur before disabling name edit
 				this.$data.isNameEditEnabled = false;
-				this.$data.tagsEditBus.$emit('focus');
+				this.$data.tagsEditBus.emit('focus');
 			}, 0);
 		},
 		async onTagsUpdate(tags: string[]) {
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 06480ffba8..8ddf653bf7 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -43,9 +43,10 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
 import { useUIStore } from '@/stores/ui';
 import { mapStores } from 'pinia';
+import { EventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'Modal',
@@ -60,7 +61,7 @@ export default Vue.extend({
 			type: String,
 		},
 		eventBus: {
-			type: Vue,
+			type: Object as PropType<EventBus>,
 		},
 		showClose: {
 			type: Boolean,
@@ -121,11 +122,11 @@ export default Vue.extend({
 		window.addEventListener('keydown', this.onWindowKeydown);
 
 		if (this.$props.eventBus) {
-			this.$props.eventBus.$on('close', () => {
+			this.$props.eventBus.on('close', () => {
 				this.closeDialog();
 			});
 
-			this.$props.eventBus.$on('closeAll', () => {
+			this.$props.eventBus.on('closeAll', () => {
 				this.uiStore.closeAllModals();
 			});
 		}
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index 5ee756c9c9..bb0630e619 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -21,7 +21,8 @@
 <script lang="ts">
 import { useUIStore } from '@/stores/ui';
 import { mapStores } from 'pinia';
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
+import { EventBus } from '@/event-bus';
 
 export default Vue.extend({
 	name: 'ModalDrawer',
@@ -33,7 +34,7 @@ export default Vue.extend({
 			type: Function,
 		},
 		eventBus: {
-			type: Vue,
+			type: Object as PropType<EventBus>,
 		},
 		direction: {
 			type: String,
@@ -54,7 +55,7 @@ export default Vue.extend({
 		window.addEventListener('keydown', this.onWindowKeydown);
 
 		if (this.$props.eventBus) {
-			this.$props.eventBus.$on('close', () => {
+			this.$props.eventBus.on('close', () => {
 				this.close();
 			});
 		}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
index 988e2d2d80..596b14e3fc 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
@@ -24,13 +24,14 @@
 </template>
 
 <script setup lang="ts">
-import Vue, { onMounted, reactive, toRefs, onBeforeUnmount } from 'vue';
+import { onMounted, reactive, toRefs, onBeforeUnmount } from 'vue';
 import { externalHooks } from '@/mixins/externalHooks';
+import { EventBus } from '@/event-bus';
 
 export interface Props {
 	placeholder: string;
 	value: string;
-	eventBus?: Vue;
+	eventBus?: EventBus;
 }
 
 withDefaults(defineProps<Props>(), {
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 0b4dd3de86..38d8c6e62d 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -142,7 +142,6 @@ import NodeSettings from '@/components/NodeSettings.vue';
 import NDVDraggablePanels from './NDVDraggablePanels.vue';
 
 import mixins from 'vue-typed-mixins';
-import Vue from 'vue';
 import OutputPanel from './OutputPanel.vue';
 import InputPanel from './InputPanel.vue';
 import TriggerPanel from './TriggerPanel.vue';
@@ -155,7 +154,7 @@ import {
 } from '@/constants';
 import { workflowActivate } from '@/mixins/workflowActivate';
 import { pinData } from '@/mixins/pinData';
-import { dataPinningEventBus } from '@/event-bus/data-pinning-event-bus';
+import { createEventBus, dataPinningEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
@@ -198,7 +197,7 @@ export default mixins(
 	},
 	data() {
 		return {
-			settingsEventBus: new Vue(),
+			settingsEventBus: createEventBus(),
 			runInputIndex: -1,
 			runOutputIndex: -1,
 			isLinkingEnabled: true,
@@ -212,7 +211,7 @@ export default mixins(
 		};
 	},
 	mounted() {
-		dataPinningEventBus.$on(
+		dataPinningEventBus.on(
 			'data-pinning-discovery',
 			({ isTooltipVisible }: { isTooltipVisible: boolean }) => {
 				this.pinDataDiscoveryTooltipVisible = isTooltipVisible;
@@ -220,7 +219,7 @@ export default mixins(
 		);
 	},
 	destroyed() {
-		dataPinningEventBus.$off('data-pinning-discovery');
+		dataPinningEventBus.off('data-pinning-discovery');
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore, useSettingsStore),
@@ -596,7 +595,7 @@ export default mixins(
 			}, 1000);
 		},
 		openSettings() {
-			this.settingsEventBus.$emit('openSettings');
+			this.settingsEventBus.emit('openSettings');
 		},
 		valueChanged(parameterData: IUpdateInformation) {
 			this.$emit('valueChanged', parameterData);
@@ -622,7 +621,7 @@ export default mixins(
 					const { value } = this.outputPanelEditMode;
 
 					if (!this.isValidPinDataSize(value)) {
-						dataPinningEventBus.$emit('data-pinning-error', {
+						dataPinningEventBus.emit('data-pinning-error', {
 							errorType: 'data-too-large',
 							source: 'on-ndv-close-modal',
 						});
@@ -630,7 +629,7 @@ export default mixins(
 					}
 
 					if (!this.isValidPinDataJSON(value)) {
-						dataPinningEventBus.$emit('data-pinning-error', {
+						dataPinningEventBus.emit('data-pinning-error', {
 							errorType: 'invalid-json',
 							source: 'on-ndv-close-modal',
 						});
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 171c8153e0..167872d61f 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -24,7 +24,7 @@ import { INodeTypeDescription } from 'n8n-workflow';
 import mixins from 'vue-typed-mixins';
 import { workflowRun } from '@/mixins/workflowRun';
 import { pinData } from '@/mixins/pinData';
-import { dataPinningEventBus } from '@/event-bus/data-pinning-event-bus';
+import { dataPinningEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
@@ -195,7 +195,7 @@ export default mixins(workflowRun, pinData).extend({
 					);
 
 					if (shouldUnpinAndExecute) {
-						dataPinningEventBus.$emit('data-unpinning', { source: 'unpin-and-execute-modal' });
+						dataPinningEventBus.emit('data-unpinning', { source: 'unpin-and-execute-modal' });
 						this.workflowsStore.unpinData({ node: this.node });
 					}
 				}
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 51462d075a..f328a3ba6f 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -205,6 +205,7 @@ import { useHistoryStore } from '@/stores/history';
 import { RenameNodeCommand } from '@/models/history';
 import useWorkflowsEEStore from '@/stores/workflows.ee';
 import { useCredentialsStore } from '@/stores/credentials';
+import { EventBus } from '@/event-bus';
 
 export default mixins(externalHooks, nodeHelpers).extend({
 	name: 'NodeSettings',
@@ -322,7 +323,9 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		},
 	},
 	props: {
-		eventBus: {},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+		},
 		dragging: {
 			type: Boolean,
 		},
@@ -897,7 +900,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		this.populateHiddenIssuesSet();
 		this.setNodeValues();
 		if (this.eventBus) {
-			(this.eventBus as Vue).$on('openSettings', () => {
+			this.eventBus.on('openSettings', () => {
 				this.openPanel = 'settings';
 			});
 		}
diff --git a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
index 5d64839512..5dab6526e2 100644
--- a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
+++ b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
@@ -48,8 +48,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
-
 import { ONBOARDING_CALL_SIGNUP_MODAL_KEY, VALID_EMAIL_REGEX } from '@/constants';
 import Modal from './Modal.vue';
 
@@ -57,6 +55,7 @@ import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	components: {
@@ -67,7 +66,7 @@ export default mixins(showMessage).extend({
 	data() {
 		return {
 			email: '',
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			ONBOARDING_CALL_SIGNUP_MODAL_KEY,
 			showError: false,
 			okToClose: false,
@@ -98,7 +97,7 @@ export default mixins(showMessage).extend({
 					message: this.$locale.baseText('onboardingCallSignupSucess.message'),
 				});
 				this.okToClose = true;
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			} catch (e) {
 				this.$showError(
 					e,
@@ -111,7 +110,7 @@ export default mixins(showMessage).extend({
 		},
 		async onCancel() {
 			this.okToClose = true;
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 		onModalClose() {
 			return this.okToClose;
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index fd734894a2..0cd176a07c 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -373,7 +373,7 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
-import { htmlEditorEventBus } from '@/event-bus/html-editor-event-bus';
+import { htmlEditorEventBus } from '@/event-bus';
 
 export default mixins(
 	externalHooks,
@@ -1106,7 +1106,7 @@ export default mixins(
 				}
 				this.loadRemoteParameterOptions();
 			} else if (command === 'formatHtml') {
-				htmlEditorEventBus.$emit('format-html');
+				htmlEditorEventBus.emit('format-html');
 			}
 
 			if (this.node && (command === 'addExpression' || command === 'removeExpression')) {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index c4c4c6f399..8632784476 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -127,7 +127,6 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { showMessage } from '@/mixins/showMessage';
 import Modal from './Modal.vue';
 import { IFormInputs, IPersonalizationLatestVersion, IUser } from '@/Interface';
-import Vue from 'vue';
 import { getAccountAge } from '@/utils';
 import { GenericValue } from 'n8n-workflow';
 import { mapStores } from 'pinia';
@@ -135,6 +134,7 @@ import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
 import { useUsersStore } from '@/stores/users';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage, workflowHelpers).extend({
 	components: { Modal },
@@ -146,8 +146,8 @@ export default mixins(showMessage, workflowHelpers).extend({
 			otherWorkAreaFieldVisible: false,
 			otherCompanyIndustryFieldVisible: false,
 			showAllIndustryQuestions: true,
-			modalBus: new Vue(),
-			formBus: new Vue(),
+			modalBus: createEventBus(),
+			formBus: createEventBus(),
 		};
 	},
 	computed: {
@@ -605,10 +605,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 	},
 	methods: {
 		closeDialog() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 		onSave() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 		async onSubmit(values: IPersonalizationLatestVersion): Promise<void> {
 			this.$data.isSaving = true;
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 984ce5709c..7ea9bae071 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -493,7 +493,7 @@ import { genericHelpers } from '@/mixins/genericHelpers';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { pinData } from '@/mixins/pinData';
 import { CodeEditor } from '@/components/forms';
-import { dataPinningEventBus } from '@/event-bus/data-pinning-event-bus';
+import { dataPinningEventBus } from '@/event-bus';
 import { clearJsonKey, executionDataToJson, stringSizeInBytes } from '@/utils';
 import { isEmpty } from '@/utils';
 import { useWorkflowsStore } from '@/stores/workflows';
@@ -595,8 +595,8 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		this.init();
 
 		if (!this.isPaneTypeInput) {
-			this.eventBus.$on('data-pinning-error', this.onDataPinningError);
-			this.eventBus.$on('data-unpinning', this.onDataUnpinning);
+			this.eventBus.on('data-pinning-error', this.onDataPinningError);
+			this.eventBus.on('data-unpinning', this.onDataUnpinning);
 
 			this.showPinDataDiscoveryTooltip(this.jsonData);
 		}
@@ -609,8 +609,8 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 	},
 	destroyed() {
 		this.hidePinDataDiscoveryTooltip();
-		this.eventBus.$off('data-pinning-error', this.onDataPinningError);
-		this.eventBus.$off('data-unpinning', this.onDataUnpinning);
+		this.eventBus.off('data-pinning-error', this.onDataPinningError);
+		this.eventBus.off('data-unpinning', this.onDataUnpinning);
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore),
@@ -908,7 +908,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				setTimeout(() => {
 					this.isControlledPinDataTooltip = true;
 					this.pinDataDiscoveryTooltipVisible = true;
-					this.eventBus.$emit('data-pinning-discovery', { isTooltipVisible: true });
+					this.eventBus.emit('data-pinning-discovery', { isTooltipVisible: true });
 				}, 500); // Wait for NDV to open
 			}
 		},
@@ -916,7 +916,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			if (this.pinDataDiscoveryTooltipVisible) {
 				this.isControlledPinDataTooltip = false;
 				this.pinDataDiscoveryTooltipVisible = false;
-				this.eventBus.$emit('data-pinning-discovery', { isTooltipVisible: false });
+				this.eventBus.emit('data-pinning-discovery', { isTooltipVisible: false });
 			}
 		},
 		pinDataDiscoveryComplete() {
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index b6823fa63a..2028a02831 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -51,7 +51,7 @@ import mixins from 'vue-typed-mixins';
 import { EnterpriseEditionFeature } from '@/constants';
 import { showMessage } from '@/mixins/showMessage';
 import { useLogStreamingStore } from '../../stores/logStreamingStore';
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import {
 	deepCopy,
@@ -59,6 +59,7 @@ import {
 	MessageEventBusDestinationOptions,
 } from 'n8n-workflow';
 import { BaseTextKey } from '../../plugins/i18n';
+import { EventBus } from '@/event-bus';
 
 export const DESTINATION_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
@@ -75,7 +76,7 @@ export default mixins(showMessage).extend({
 	components: {},
 	props: {
 		eventBus: {
-			type: Vue,
+			type: Object as PropType<EventBus>,
 		},
 		destination: {
 			type: Object,
@@ -91,7 +92,7 @@ export default mixins(showMessage).extend({
 			deepCopy(defaultMessageEventBusDestinationOptions),
 			this.destination,
 		);
-		this.eventBus.$on('destinationWasSaved', () => {
+		this.eventBus.on('destinationWasSaved', () => {
 			const updatedDestination = this.logStreamingStore.getDestination(this.destination.id);
 			if (updatedDestination) {
 				this.nodeParameters = Object.assign(
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 26ac348070..804c52b106 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -193,7 +193,7 @@ import {
 	defaultMessageEventBusDestinationSyslogOptions,
 	defaultMessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
-import Vue from 'vue';
+import Vue, { PropType } from 'vue';
 import { LOG_STREAM_MODAL_KEY } from '../../constants';
 import Modal from '@/components/Modal.vue';
 import { showMessage } from '@/mixins/showMessage';
@@ -210,6 +210,7 @@ import InlineNameEdit from '../InlineNameEdit.vue';
 import SaveButton from '../SaveButton.vue';
 import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
 import { Checkbox } from 'element-ui';
+import { createEventBus, EventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'event-destination-settings-modal',
@@ -221,7 +222,7 @@ export default mixins(showMessage).extend({
 		},
 		isNew: Boolean,
 		eventBus: {
-			type: Vue,
+			type: Object as PropType<EventBus>,
 		},
 	},
 	components: {
@@ -248,7 +249,7 @@ export default mixins(showMessage).extend({
 			webhookDescription: webhookModalDescription,
 			sentryDescription: sentryModalDescription,
 			syslogDescription: syslogModalDescription,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			headerLabel: this.$props.destination.label,
 			testMessageSent: false,
 			testMessageResult: false,
@@ -450,7 +451,7 @@ export default mixins(showMessage).extend({
 			if (deleteConfirmed === false) {
 				return;
 			} else {
-				this.$props.eventBus.$emit('remove', this.destination.id);
+				this.$props.eventBus.emit('remove', this.destination.id);
 				this.uiStore.closeModal(LOG_STREAM_MODAL_KEY);
 				this.uiStore.stateIsDirty = false;
 			}
@@ -461,7 +462,7 @@ export default mixins(showMessage).extend({
 				this.logStreamingStore.removeDestination(this.nodeParameters.id!);
 			}
 			this.ndvStore.activeNodeName = null;
-			this.$props.eventBus.$emit('closing', this.destination.id);
+			this.$props.eventBus.emit('closing', this.destination.id);
 			this.uiStore.stateIsDirty = false;
 		},
 		async saveDestination() {
@@ -473,7 +474,7 @@ export default mixins(showMessage).extend({
 				this.hasOnceBeenSaved = true;
 				this.testMessageSent = false;
 				this.unchanged = true;
-				this.$props.eventBus.$emit('destinationWasSaved', this.destination.id);
+				this.$props.eventBus.emit('destinationWasSaved', this.destination.id);
 				this.uiStore.stateIsDirty = false;
 			}
 		},
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 936a4a16f2..e9f3a444c9 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -64,13 +64,22 @@ import { showMessage } from '@/mixins/showMessage';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useTagsStore } from '@/stores/tags';
+import { EventBus } from '@/event-bus';
+import { PropType } from 'vue';
 
 const MANAGE_KEY = '__manage';
 const CREATE_KEY = '__create';
 
 export default mixins(showMessage).extend({
 	name: 'TagsDropdown',
-	props: ['placeholder', 'currentTagIds', 'createEnabled', 'eventBus'],
+	props: {
+		placeholder: {},
+		currentTagIds: {},
+		createEnabled: {},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+		},
+	},
 	data() {
 		return {
 			filter: '',
@@ -109,7 +118,7 @@ export default mixins(showMessage).extend({
 		}
 
 		if (this.$props.eventBus) {
-			this.$props.eventBus.$on('focus', () => {
+			this.$props.eventBus.on('focus', () => {
 				this.focusOnInput();
 				this.focusOnTopOption();
 			});
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index 41e5cb220f..da54eb6f3b 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -40,6 +40,7 @@ import Modal from '@/components/Modal.vue';
 import { TAGS_MANAGER_MODAL_KEY } from '../../constants';
 import { mapStores } from 'pinia';
 import { useTagsStore } from '@/stores/tags';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'TagsManager',
@@ -51,7 +52,7 @@ export default mixins(showMessage).extend({
 		return {
 			tagIds,
 			isCreating: false,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			TAGS_MANAGER_MODAL_KEY,
 		};
 	},
@@ -176,7 +177,7 @@ export default mixins(showMessage).extend({
 			} else if (!this.hasTags) {
 				this.onEnableCreate();
 			} else {
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/ValueSurvey.vue b/packages/editor-ui/src/components/ValueSurvey.vue
index 55f5146bfb..cbc3d22f01 100644
--- a/packages/editor-ui/src/components/ValueSurvey.vue
+++ b/packages/editor-ui/src/components/ValueSurvey.vue
@@ -63,10 +63,10 @@ import ModalDrawer from './ModalDrawer.vue';
 
 import mixins from 'vue-typed-mixins';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import Vue from 'vue';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
+import { createEventBus } from '@/event-bus';
 
 const DEFAULT_TITLE = 'How likely are you to recommend n8n to a friend or colleague?';
 const GREAT_FEEDBACK_TITLE =
@@ -114,7 +114,7 @@ export default mixins(workflowHelpers).extend({
 			},
 			showButtons: true,
 			VALUE_SURVEY_MODAL_KEY,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 		};
 	},
 	methods: {
@@ -178,7 +178,7 @@ export default mixins(workflowHelpers).extend({
 					this.form.email = '';
 					this.showButtons = true;
 				}, 1000);
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/VariableSelectorItem.vue b/packages/editor-ui/src/components/VariableSelectorItem.vue
index 713392d016..aeb595824d 100644
--- a/packages/editor-ui/src/components/VariableSelectorItem.vue
+++ b/packages/editor-ui/src/components/VariableSelectorItem.vue
@@ -59,7 +59,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import { IVariableSelectorOption, IVariableItemSelected } from '@/Interface';
 import { externalHooks } from '@/mixins/externalHooks';
 import mixins from 'vue-typed-mixins';
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index c5860b1efc..04a4c0f0ae 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -355,6 +355,7 @@ import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
 import useWorkflowsEEStore from '@/stores/workflows.ee';
 import { useUsersStore } from '@/stores/users';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(externalHooks, genericHelpers, restApi, showMessage).extend({
 	name: 'WorkflowSettings',
@@ -407,7 +408,7 @@ export default mixins(externalHooks, genericHelpers, restApi, showMessage).exten
 			executionTimeout: 0,
 			maxExecutionTimeout: 0,
 			timeoutHMS: { hours: 0, minutes: 0, seconds: 0 } as ITimeoutHMS,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			WORKFLOW_SETTINGS_MODAL_KEY,
 		};
 	},
@@ -528,7 +529,7 @@ export default mixins(externalHooks, genericHelpers, restApi, showMessage).exten
 				: str.replace(/[^0-9,\s]/g, '');
 		},
 		closeDialog() {
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 			this.$externalHooks().run('workflowSettings.dialogVisibleChanged', { dialogVisible: false });
 		},
 		setTimeout(key: string, value: string) {
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 6977058ef7..03172d1a9f 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -123,7 +123,6 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 import Modal from './Modal.vue';
 import {
 	EnterpriseEditionFeature,
@@ -135,7 +134,7 @@ import { IUser, IWorkflowDb, UIState } from '@/Interface';
 import { getWorkflowPermissions, IPermissions } from '@/permissions';
 import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
-import { nodeViewEventBus } from '@/event-bus/node-view-event-bus';
+import { createEventBus, nodeViewEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings';
 import { useUIStore } from '@/stores/ui';
@@ -168,7 +167,7 @@ export default mixins(showMessage).extend({
 		return {
 			WORKFLOW_SHARE_MODAL_KEY,
 			loading: true,
-			modalBus: new Vue(),
+			modalBus: createEventBus(),
 			sharedWith: [...(workflow.sharedWith || [])] as Array<Partial<IUser>>,
 			EnterpriseEditionFeature,
 		};
@@ -262,7 +261,7 @@ export default mixins(showMessage).extend({
 			const saveWorkflowPromise = () => {
 				return new Promise<string>((resolve) => {
 					if (this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-						nodeViewEventBus.$emit('saveWorkflow', () => {
+						nodeViewEventBus.emit('saveWorkflow', () => {
 							resolve(this.workflow.id);
 						});
 					} else {
@@ -299,7 +298,7 @@ export default mixins(showMessage).extend({
 			} catch (error) {
 				this.$showError(error, this.$locale.baseText('workflows.shareModal.onSave.error.title'));
 			} finally {
-				this.modalBus.$emit('close');
+				this.modalBus.emit('close');
 				this.loading = false;
 			}
 		},
@@ -428,7 +427,7 @@ export default mixins(showMessage).extend({
 					console.error(failure);
 				}
 			});
-			this.modalBus.$emit('close');
+			this.modalBus.emit('close');
 		},
 		trackTelemetry(data: ITelemetryTrackProperties) {
 			this.$telemetry.track('User selected sharee to remove', {
diff --git a/packages/editor-ui/src/event-bus/code-node-editor-event-bus.ts b/packages/editor-ui/src/event-bus/code-node-editor-event-bus.ts
deleted file mode 100644
index a70ee7231b..0000000000
--- a/packages/editor-ui/src/event-bus/code-node-editor-event-bus.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from 'vue';
-
-export const codeNodeEditorEventBus = new Vue();
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
new file mode 100644
index 0000000000..08a5f865ef
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from '@/event-bus';
+
+export const codeNodeEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/data-pinning-event-bus.ts b/packages/editor-ui/src/event-bus/data-pinning-event-bus.ts
deleted file mode 100644
index 7eccde2710..0000000000
--- a/packages/editor-ui/src/event-bus/data-pinning-event-bus.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from 'vue';
-
-export const dataPinningEventBus = new Vue();
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/editor-ui/src/event-bus/data-pinning.ts
new file mode 100644
index 0000000000..36b83a23ca
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/data-pinning.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from '@/event-bus';
+
+export const dataPinningEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/html-editor-event-bus.ts b/packages/editor-ui/src/event-bus/html-editor-event-bus.ts
deleted file mode 100644
index 0476b2bf2c..0000000000
--- a/packages/editor-ui/src/event-bus/html-editor-event-bus.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from 'vue';
-
-export const htmlEditorEventBus = new Vue();
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/editor-ui/src/event-bus/html-editor.ts
new file mode 100644
index 0000000000..2ca2807f96
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/html-editor.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from '@/event-bus';
+
+export const htmlEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/index.ts b/packages/editor-ui/src/event-bus/index.ts
new file mode 100644
index 0000000000..2429883237
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/index.ts
@@ -0,0 +1,5 @@
+export * from 'n8n-design-system/utils/event-bus';
+export * from './code-node-editor';
+export * from './data-pinning';
+export * from './html-editor';
+export * from './node-view';
diff --git a/packages/editor-ui/src/event-bus/node-view-event-bus.ts b/packages/editor-ui/src/event-bus/node-view-event-bus.ts
deleted file mode 100644
index cda6848a71..0000000000
--- a/packages/editor-ui/src/event-bus/node-view-event-bus.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from 'vue';
-
-export const nodeViewEventBus = new Vue();
diff --git a/packages/editor-ui/src/event-bus/node-view.ts b/packages/editor-ui/src/event-bus/node-view.ts
new file mode 100644
index 0000000000..830bbad00e
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/node-view.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from '@/event-bus';
+
+export const nodeViewEventBus = createEventBus();
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 44da3de6c3..a43c5a5c35 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -25,7 +25,7 @@ import {
 import mixins from 'vue-typed-mixins';
 import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
 import { getTriggerNodeServiceName } from '@/utils';
-import { codeNodeEditorEventBus } from '@/event-bus/code-node-editor-event-bus';
+import { codeNodeEditorEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
@@ -335,7 +335,7 @@ export const pushConnection = mixins(
 					runDataExecuted.data.resultData.error &&
 					runDataExecuted.data.resultData.error.lineNumber;
 
-				codeNodeEditorEventBus.$emit('error-line-number', lineNumber || 'final');
+				codeNodeEditorEventBus.emit('error-line-number', lineNumber || 'final');
 
 				const workflow = this.getCurrentWorkflow();
 				if (runDataExecuted.waitTill !== undefined) {
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index 761391a312..5a404b27f3 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -1,7 +1,7 @@
 import { INodeUi } from '@/Interface';
 import { IConnection } from 'n8n-workflow';
-import Vue from 'vue';
 import { XYPosition } from '../Interface';
+import { createEventBus } from '@/event-bus';
 
 // Command names don't serve any particular purpose in the app
 // but they make it easier to identify each command on stack
@@ -21,7 +21,7 @@ export enum COMMANDS {
 // this timeout in between canvas actions
 // (0 is usually enough but leaving this just in case)
 const CANVAS_ACTION_TIMEOUT = 10;
-export const historyBus = new Vue();
+export const historyBus = createEventBus();
 
 export abstract class Undoable {}
 
@@ -75,7 +75,7 @@ export class MoveNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('nodeMove', {
+			historyBus.emit('nodeMove', {
 				nodeName: this.nodeName,
 				position: this.oldPosition,
 			});
@@ -102,7 +102,7 @@ export class AddNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('revertAddNode', { node: this.node });
+			historyBus.emit('revertAddNode', { node: this.node });
 			resolve();
 		});
 	}
@@ -126,7 +126,7 @@ export class RemoveNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('revertRemoveNode', { node: this.node });
+			historyBus.emit('revertRemoveNode', { node: this.node });
 			resolve();
 		});
 	}
@@ -156,7 +156,7 @@ export class AddConnectionCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('revertAddConnection', { connection: this.connectionData });
+			historyBus.emit('revertAddConnection', { connection: this.connectionData });
 			resolve();
 		});
 	}
@@ -187,7 +187,7 @@ export class RemoveConnectionCommand extends Command {
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
 			setTimeout(() => {
-				historyBus.$emit('revertRemoveConnection', { connection: this.connectionData });
+				historyBus.emit('revertRemoveConnection', { connection: this.connectionData });
 				resolve();
 			}, CANVAS_ACTION_TIMEOUT);
 		});
@@ -218,7 +218,7 @@ export class EnableNodeToggleCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('enableNodeToggle', {
+			historyBus.emit('enableNodeToggle', {
 				nodeName: this.nodeName,
 				isDisabled: this.oldState,
 			});
@@ -251,7 +251,7 @@ export class RenameNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			historyBus.$emit('revertRenameNode', {
+			historyBus.emit('revertRenameNode', {
 				currentName: this.currentName,
 				newName: this.newName,
 			});
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index f8e7c83547..04b1226259 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -57,7 +57,7 @@ import {
 	getWorkflows,
 } from '@/api/workflows';
 import { useUIStore } from './ui';
-import { dataPinningEventBus } from '@/event-bus/data-pinning-event-bus';
+import { dataPinningEventBus } from '@/event-bus';
 import {
 	isJsonKeyObject,
 	getPairedItemsMapping,
@@ -462,7 +462,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 
 		setWorkflowPinData(pinData: IPinData): void {
 			Vue.set(this.workflow, 'pinData', pinData || {});
-			dataPinningEventBus.$emit('pin-data', pinData || {});
+			dataPinningEventBus.emit('pin-data', pinData || {});
 		},
 
 		setWorkflowTagIds(tags: string[]): void {
@@ -523,7 +523,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			const uiStore = useUIStore();
 			uiStore.stateIsDirty = true;
 
-			dataPinningEventBus.$emit('pin-data', { [payload.node.name]: storedPinData });
+			dataPinningEventBus.emit('pin-data', { [payload.node.name]: storedPinData });
 		},
 
 		unpinData(payload: { node: INodeUi }): void {
@@ -537,7 +537,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			const uiStore = useUIStore();
 			uiStore.stateIsDirty = true;
 
-			dataPinningEventBus.$emit('unpin-data', { [payload.node.name]: undefined });
+			dataPinningEventBus.emit('unpin-data', { [payload.node.name]: undefined });
 		},
 
 		addConnection(data: { connection: IConnection[] }): void {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 9ec1750225..41d840499a 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -266,7 +266,7 @@ import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
 import { Route, RawLocation } from 'vue-router';
-import { nodeViewEventBus } from '@/event-bus/node-view-event-bus';
+import { dataPinningEventBus, nodeViewEventBus } from '@/event-bus';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useRootStore } from '@/stores/n8nRootStore';
 import { useNDVStore } from '@/stores/ndv';
@@ -276,7 +276,6 @@ import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
 import { useTagsStore } from '@/stores/tags';
 import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { dataPinningEventBus } from '@/event-bus/data-pinning-event-bus';
 import { useCanvasStore } from '@/stores/canvas';
 import useWorkflowsEEStore from '@/stores/workflows.ee';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
@@ -3976,17 +3975,17 @@ export default mixins(
 		this.$root.$on('newWorkflow', this.newWorkflow);
 		this.$root.$on('importWorkflowData', this.onImportWorkflowDataEvent);
 		this.$root.$on('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		historyBus.$on('nodeMove', this.onMoveNode);
-		historyBus.$on('revertAddNode', this.onRevertAddNode);
-		historyBus.$on('revertRemoveNode', this.onRevertRemoveNode);
-		historyBus.$on('revertAddConnection', this.onRevertAddConnection);
-		historyBus.$on('revertRemoveConnection', this.onRevertRemoveConnection);
-		historyBus.$on('revertRenameNode', this.onRevertNameChange);
-		historyBus.$on('enableNodeToggle', this.onRevertEnableToggle);
+		historyBus.on('nodeMove', this.onMoveNode);
+		historyBus.on('revertAddNode', this.onRevertAddNode);
+		historyBus.on('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.on('revertAddConnection', this.onRevertAddConnection);
+		historyBus.on('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.on('revertRenameNode', this.onRevertNameChange);
+		historyBus.on('enableNodeToggle', this.onRevertEnableToggle);
 
-		dataPinningEventBus.$on('pin-data', this.addPinDataConnections);
-		dataPinningEventBus.$on('unpin-data', this.removePinDataConnections);
-		nodeViewEventBus.$on('saveWorkflow', this.saveCurrentWorkflowExternal);
+		dataPinningEventBus.on('pin-data', this.addPinDataConnections);
+		dataPinningEventBus.on('unpin-data', this.removePinDataConnections);
+		nodeViewEventBus.on('saveWorkflow', this.saveCurrentWorkflowExternal);
 
 		this.canvasStore.isDemo = this.isDemo;
 	},
@@ -3999,17 +3998,17 @@ export default mixins(
 		this.$root.$off('newWorkflow', this.newWorkflow);
 		this.$root.$off('importWorkflowData', this.onImportWorkflowDataEvent);
 		this.$root.$off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		historyBus.$off('nodeMove', this.onMoveNode);
-		historyBus.$off('revertAddNode', this.onRevertAddNode);
-		historyBus.$off('revertRemoveNode', this.onRevertRemoveNode);
-		historyBus.$off('revertAddConnection', this.onRevertAddConnection);
-		historyBus.$off('revertRemoveConnection', this.onRevertRemoveConnection);
-		historyBus.$off('revertRenameNode', this.onRevertNameChange);
-		historyBus.$off('enableNodeToggle', this.onRevertEnableToggle);
+		historyBus.off('nodeMove', this.onMoveNode);
+		historyBus.off('revertAddNode', this.onRevertAddNode);
+		historyBus.off('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.off('revertAddConnection', this.onRevertAddConnection);
+		historyBus.off('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.off('revertRenameNode', this.onRevertNameChange);
+		historyBus.off('enableNodeToggle', this.onRevertEnableToggle);
 
-		dataPinningEventBus.$off('pin-data', this.addPinDataConnections);
-		dataPinningEventBus.$off('unpin-data', this.removePinDataConnections);
-		nodeViewEventBus.$off('saveWorkflow', this.saveCurrentWorkflowExternal);
+		dataPinningEventBus.off('pin-data', this.addPinDataConnections);
+		dataPinningEventBus.off('unpin-data', this.removePinDataConnections);
+		nodeViewEventBus.off('saveWorkflow', this.saveCurrentWorkflowExternal);
 	},
 	destroyed() {
 		this.resetWorkspace();
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 541872cc48..3c38f2a656 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -169,6 +169,7 @@ import { useUsersStore } from '@/stores/users';
 import { useSettingsStore } from '@/stores/settings';
 import { getLdapSynchronizations } from '@/api/ldap';
 import { N8N_CONTACT_EMAIL, N8N_SALES_EMAIL } from '@/constants';
+import { createEventBus } from '@/event-bus';
 
 type FormValues = {
 	loginEnabled: boolean;
@@ -221,7 +222,7 @@ export default mixins(showMessage).extend({
 			loadingTable: false,
 			hasAnyChanges: false,
 			formInputs: null as null | IFormInputs,
-			formBus: new Vue(),
+			formBus: createEventBus(),
 			readyToSubmit: false,
 			page: 0,
 			loginEnabled: false,
@@ -354,7 +355,7 @@ export default mixins(showMessage).extend({
 			}
 		},
 		onSaveClick() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 		async onTestConnectionClick() {
 			this.loadingTestConnection = true;
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index eb70ebc10d..6d0535a544 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -89,7 +89,6 @@ import { useLogStreamingStore } from '../stores/logStreamingStore';
 import { useSettingsStore } from '../stores/settings';
 import { useUIStore } from '../stores/ui';
 import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '../constants';
-import Vue from 'vue';
 import {
 	deepCopy,
 	defaultMessageEventBusDestinationOptions,
@@ -97,6 +96,7 @@ import {
 } from 'n8n-workflow';
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
+import { createEventBus } from '@/event-bus';
 
 export default mixins().extend({
 	name: 'SettingsLogStreamingView',
@@ -107,7 +107,7 @@ export default mixins().extend({
 	},
 	data() {
 		return {
-			eventBus: new Vue(),
+			eventBus: createEventBus(),
 			destinations: Array<MessageEventBusDestinationOptions>,
 			disableLicense: false,
 			allDestinations: [] as MessageEventBusDestinationOptions[],
@@ -135,15 +135,15 @@ export default mixins().extend({
 			}
 		});
 		// refresh when a modal closes
-		this.eventBus.$on('destinationWasSaved', async () => {
+		this.eventBus.on('destinationWasSaved', async () => {
 			this.$forceUpdate();
 		});
 		// listen to remove emission
-		this.eventBus.$on('remove', async (destinationId: string) => {
+		this.eventBus.on('remove', async (destinationId: string) => {
 			await this.onRemove(destinationId);
 		});
 		// listen to modal closing and remove nodes from store
-		this.eventBus.$on('closing', async (destinationId: string) => {
+		this.eventBus.on('closing', async (destinationId: string) => {
 			this.workflowsStore.removeAllNodes({ setStateDirty: false, removePinData: true });
 			this.uiStore.stateIsDirty = false;
 		});
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index ef6cc55220..91263038cc 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -65,8 +65,8 @@ import { useUIStore } from '@/stores/ui';
 import { useUsersStore } from '@/stores/users';
 import { useSettingsStore } from '@/stores/settings';
 import { mapStores } from 'pinia';
-import Vue from 'vue';
 import mixins from 'vue-typed-mixins';
+import { createEventBus } from '@/event-bus';
 
 export default mixins(showMessage).extend({
 	name: 'SettingsPersonalView',
@@ -74,7 +74,7 @@ export default mixins(showMessage).extend({
 		return {
 			hasAnyChanges: false,
 			formInputs: null as null | IFormInputs,
-			formBus: new Vue(),
+			formBus: createEventBus(),
 			readyToSubmit: false,
 		};
 	},
@@ -160,7 +160,7 @@ export default mixins(showMessage).extend({
 			}
 		},
 		onSaveClick() {
-			this.formBus.$emit('submit');
+			this.formBus.emit('submit');
 		},
 		openPasswordModal() {
 			this.uiStore.openModal(CHANGE_PASSWORD_MODAL_KEY);