From 7bb8186e43b87cdcb8049beb24aa216b222072dd Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Fri, 10 Jun 2022 19:29:52 +0530 Subject: [PATCH] chore: Update self-closing tag eslint config (#4826) * chore: Fix self-closing tag issues * Fix merge conflicts Co-authored-by: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com> --- .eslintrc.js | 36 ++++++++++++------- app/javascript/dashboard/App.vue | 2 +- .../dashboard/components/ChatList.vue | 7 ++-- .../dashboard/components/ModalHeader.vue | 2 +- .../components/NetworkNotification.vue | 3 +- .../dashboard/components/SettingsSection.vue | 2 +- .../dashboard/components/buttons/Button.vue | 2 +- .../dashboard/components/ui/Banner.vue | 3 +- .../dashboard/components/ui/Switch.vue | 2 +- .../dashboard/components/ui/WootButton.vue | 2 +- .../widgets/AutomationActionInput.vue | 2 +- .../AutomationActionTeamMessageInput.vue | 2 +- .../components/widgets/SettingIntroBanner.vue | 2 +- .../widgets/WootWriter/AudioRecorder.vue | 2 +- .../components/widgets/WootWriter/Editor.vue | 2 +- .../widgets/conversation/MessagesView.vue | 3 +- .../WhatsappTemplates/TemplateParser.vue | 2 +- .../widgets/conversation/bubble/Text.vue | 2 +- .../widgets/forms/AvatarUploader.vue | 2 +- .../components/widgets/forms/Input.vue | 2 +- .../widgets/modal/ConfirmationModal.vue | 2 +- .../contact/components/MergeContact.vue | 4 +-- .../widget-preview/components/WidgetBody.vue | 2 +- .../components/WidgetFooter.vue | 2 +- .../widget-preview/components/WidgetHead.vue | 2 +- app/javascript/dashboard/routes/auth/Auth.vue | 2 +- .../dashboard/routes/auth/Confirmation.vue | 2 +- .../dashboard/routes/auth/PasswordEdit.vue | 3 +- .../dashboard/routes/auth/Signup.vue | 5 ++- .../dashboard/routes/dashboard/Dashboard.vue | 4 +-- .../contacts/components/AddReminder.vue | 3 +- .../conversation/ContactConversations.vue | 2 +- .../conversation/ContactCustomAttributes.vue | 4 +-- .../conversation/ContactDetailsItem.vue | 2 +- .../dashboard/conversation/ContactPanel.vue | 3 +- .../conversation/ConversationView.vue | 3 +- .../conversation/labels/LabelBox.vue | 2 +- .../conversation/search/SearchMessageItem.vue | 2 +- .../components/NotificationPanel.vue | 8 ++--- .../components/NotificationPanelList.vue | 4 +-- .../components/NotificationTable.vue | 3 +- .../dashboard/settings/SettingsHeader.vue | 4 +-- .../settings/SettingsSubPageHeader.vue | 2 +- .../routes/dashboard/settings/Wrapper.vue | 4 +-- .../dashboard/settings/account/Index.vue | 5 ++- .../dashboard/settings/agents/Index.vue | 6 ++-- .../settings/attributes/CustomAttribute.vue | 8 ++--- .../dashboard/settings/automation/Index.vue | 11 +++--- .../dashboard/settings/canned/Index.vue | 8 ++--- .../dashboard/settings/inbox/AddAgents.vue | 3 +- .../dashboard/settings/inbox/FinishSetup.vue | 15 +++----- .../settings/inbox/InboxChannels.vue | 2 +- .../routes/dashboard/settings/inbox/Index.vue | 6 ++-- .../settings/inbox/PreChatForm/Settings.vue | 4 +-- .../dashboard/settings/inbox/channels/Sms.vue | 2 +- .../settings/inbox/channels/Whatsapp.vue | 2 +- .../inbox/settingsPage/ConfigurationPage.vue | 12 +++---- .../MultipleIntegrationHooks.vue | 3 +- .../integrations/IntegrationHelpText.vue | 2 +- .../integrations/Webhooks/WebhookRow.vue | 6 ++-- .../dashboard/settings/labels/Index.vue | 8 ++--- .../dashboard/settings/profile/Index.vue | 2 +- .../reports/components/ReportFilters.vue | 2 +- .../components/overview/MetricCard.vue | 2 +- .../settings/teams/AgentSelector.vue | 2 +- .../dashboard/settings/teams/Create/Index.vue | 2 +- .../dashboard/settings/teams/Edit/Index.vue | 2 +- .../routes/dashboard/settings/teams/Index.vue | 6 ++-- .../dashboard/routes/login/Login.vue | 3 +- app/javascript/shared/components/Button.vue | 2 +- app/javascript/shared/components/Spinner.vue | 2 +- .../ui/MultiselectDropdownItems.vue | 3 +- .../ui/dropdown/DropdownDivider.vue | 6 +--- .../components/ui/dropdown/DropdownItem.vue | 2 +- .../components/ui/dropdown/DropdownMenu.vue | 2 +- .../ui/dropdown/DropdownSubMenu.vue | 2 +- .../shared/mixins/specs/MockComponent.vue | 2 +- app/javascript/survey/views/Response.vue | 2 +- app/javascript/widget/App.vue | 2 +- .../widget/components/AgentMessageBubble.vue | 13 +++---- .../widget/components/AgentTypingBubble.vue | 2 +- .../widget/components/ConversationWrap.vue | 4 +-- .../widget/components/UnreadMessage.vue | 2 +- .../widget/components/UserAvatar.vue | 2 +- .../components/dropdown/DropdownMenu.vue | 6 ++-- package.json | 3 +- 86 files changed, 151 insertions(+), 186 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index f30e21e03..e699f0fd4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -19,18 +19,32 @@ module.exports = { 'jsx-a11y/label-has-for': 'off', 'jsx-a11y/anchor-is-valid': 'off', 'import/no-unresolved': 'off', - 'vue/max-attributes-per-line': ['error', { - 'singleline': 20, - 'multiline': { - 'max': 1, - 'allowFirstLine': false + 'vue/max-attributes-per-line': [ + 'error', + { + singleline: 20, + multiline: { + max: 1, + allowFirstLine: false, + }, }, - }], - 'vue/html-self-closing': 'off', - "vue/no-v-html": 'off', + ], + 'vue/html-self-closing': [ + 'error', + { + html: { + void: 'always', + normal: 'always', + component: 'always', + }, + svg: 'always', + math: 'always', + }, + ], + 'vue/no-v-html': 'off', 'vue/singleline-html-element-content-newline': 'off', 'import/extensions': ['off'], - 'no-console': 'error' + 'no-console': 'error', }, settings: { 'import/resolver': { @@ -41,12 +55,10 @@ module.exports = { }, env: { browser: true, - node: true, jest: true, - jasmine: true + node: true, }, globals: { - __WEBPACK_ENV__: true, bus: true, }, }; diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue index 1e262f1ff..7243e566e 100644 --- a/app/javascript/dashboard/App.vue +++ b/app/javascript/dashboard/App.vue @@ -2,7 +2,7 @@
- +
- +
- + />
@@ -102,7 +101,7 @@ />
- +
{{ headerContent }}

- +
diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue index 115a674a2..6f29dbb74 100644 --- a/app/javascript/dashboard/components/NetworkNotification.vue +++ b/app/javascript/dashboard/components/NetworkNotification.vue @@ -20,8 +20,7 @@ color-scheme="warning" icon="dismiss-circle" @click="closeNotification" - > - + /> diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue index e700e9467..b3348ae04 100644 --- a/app/javascript/dashboard/components/SettingsSection.vue +++ b/app/javascript/dashboard/components/SettingsSection.vue @@ -13,7 +13,7 @@

- +
diff --git a/app/javascript/dashboard/components/buttons/Button.vue b/app/javascript/dashboard/components/buttons/Button.vue index 69dbc3658..733b84639 100644 --- a/app/javascript/dashboard/components/buttons/Button.vue +++ b/app/javascript/dashboard/components/buttons/Button.vue @@ -7,7 +7,7 @@ :icon="icon" /> - + diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue index 227b0a37e..a1b612952 100644 --- a/app/javascript/dashboard/components/ui/Banner.vue +++ b/app/javascript/dashboard/components/ui/Banner.vue @@ -30,8 +30,7 @@ icon="dismiss-circle" class-names="banner-action__button" @click="onClickClose" - > - + /> diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue index b0bc32881..e15258c22 100644 --- a/app/javascript/dashboard/components/ui/Switch.vue +++ b/app/javascript/dashboard/components/ui/Switch.vue @@ -7,7 +7,7 @@ :aria-checked="value.toString()" @click="onClick" > - +