From 1ae64ec4fbab38e92c427ff7093caf2d9156d447 Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Sat, 6 Jul 2024 13:54:36 -0400 Subject: [PATCH] refactor(editor): Rename `$emits` to `emits` where we use `defineEmits` (no-changelog) (#9959) --- packages/@n8n_io/eslint-config/frontend.js | 10 ++++++++++ .../N8nActionDropdown/ActionDropdown.vue | 10 +++++----- .../components/N8nActionToggle/ActionToggle.vue | 6 +++--- .../src/components/N8nButton/Button.vue | 4 ++-- .../src/components/N8nDatatable/Datatable.vue | 6 +++--- .../src/components/N8nFormBox/FormBox.vue | 8 ++++---- .../src/components/N8nFormInput/FormInput.vue | 14 +++++++------- .../components/N8nInfoAccordion/InfoAccordion.vue | 6 +++--- .../src/components/N8nMarkdown/Markdown.vue | 6 +++--- .../design-system/src/components/N8nMenu/Menu.vue | 8 ++++---- .../src/components/N8nNotice/Notice.vue | 4 ++-- .../components/N8nRadioButtons/RadioButtons.vue | 4 ++-- .../components/N8nResizeWrapper/ResizeWrapper.vue | 8 ++++---- .../design-system/src/components/N8nTabs/Tabs.vue | 6 +++--- .../design-system/src/components/N8nTags/Tags.vue | 6 +++--- .../src/components/N8nUserSelect/UserSelect.vue | 6 +++--- .../CredentialPicker/CredentialPicker.vue | 14 +++++++------- .../CredentialPicker/CredentialsDropdown.vue | 6 +++--- 18 files changed, 71 insertions(+), 61 deletions(-) diff --git a/packages/@n8n_io/eslint-config/frontend.js b/packages/@n8n_io/eslint-config/frontend.js index ef1a315e73..c801a6007c 100644 --- a/packages/@n8n_io/eslint-config/frontend.js +++ b/packages/@n8n_io/eslint-config/frontend.js @@ -56,6 +56,16 @@ module.exports = { 'vue/attribute-hyphenation': ['error', 'always'], 'import/no-extraneous-dependencies': 'warn', 'vue/define-emits-declaration': ['error', 'type-literal'], + 'vue/require-macro-variable-name': [ + 'error', + { + defineProps: 'props', + defineEmits: 'emit', + defineSlots: 'slots', + useSlots: 'slots', + useAttrs: 'attrs', + }, + ], // TODO: fix these '@typescript-eslint/no-unsafe-call': 'off', diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue index 11817b5f80..79a8e883f9 100644 --- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue +++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue @@ -88,8 +88,8 @@ const props = withDefaults(defineProps(), { teleported: true, }); -const $attrs = useAttrs(); -const testIdPrefix = $attrs['data-test-id']; +const attrs = useAttrs(); +const testIdPrefix = attrs['data-test-id']; const $style = useCssModule(); const getItemClasses = (item: ActionDropdownItem): Record => { @@ -101,7 +101,7 @@ const getItemClasses = (item: ActionDropdownItem): Record => { }; }; -const $emit = defineEmits<{ +const emit = defineEmits<{ select: [action: string]; visibleChange: [open: boolean]; }>(); @@ -111,8 +111,8 @@ const popperClass = computed( () => `${$style.shadow}${props.hideArrow ? ` ${$style.hideArrow}` : ''}`, ); -const onSelect = (action: string) => $emit('select', action); -const onVisibleChange = (open: boolean) => $emit('visibleChange', open); +const onSelect = (action: string) => emit('select', action); +const onVisibleChange = (open: boolean) => emit('visibleChange', open); const onButtonBlur = (event: FocusEvent) => { // Hide dropdown when clicking outside of current document diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue index 373a08e904..2705b90e87 100644 --- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue +++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue @@ -68,12 +68,12 @@ withDefaults(defineProps(), { iconOrientation: 'vertical', }); -const $emit = defineEmits<{ +const emit = defineEmits<{ action: [value: string]; 'visible-change': [value: boolean]; }>(); -const onCommand = (value: string) => $emit('action', value); -const onVisibleChange = (value: boolean) => $emit('visible-change', value); +const onCommand = (value: string) => emit('action', value); +const onVisibleChange = (value: boolean) => emit('visible-change', value);