From 186eb3f45f4794d70ecd2c751f9ef0c9e34ca647 Mon Sep 17 00:00:00 2001 From: Etienne Laurent Date: Tue, 18 Mar 2025 16:56:05 +0100 Subject: [PATCH 1/5] eslint autofix (for now) --- .eslintrc | 96 +------------- .../ui/apos/components/TheAposAdminBar.vue | 5 +- .../apos/components/TheAposAdminBarMenu.vue | 15 ++- .../ui/apos/components/TheAposContextBar.vue | 16 ++- .../components/TheAposSavingIndicator.vue | 5 +- .../components/AposAreaContextualMenu.vue | 15 ++- .../apos/components/AposAreaExpandedMenu.vue | 12 +- .../ui/apos/components/AposAreaWidget.vue | 10 +- .../@apostrophecms/asset/lib/build/task.js | 12 +- .../asset/lib/webpack/src/webpack.scss.js | 16 +-- .../ui/apos/components/AposColor.vue | 40 ++++-- .../ui/apos/lib/AposColorAlpha.vue | 10 +- .../color-field/ui/apos/lib/AposColorHue.vue | 5 +- .../color-field/ui/apos/lib/AposColorInfo.vue | 5 +- .../ui/apos/lib/AposColorSaturation.vue | 5 +- .../ui/apos/components/AposCommandMenuKey.vue | 5 +- .../ui/apos/components/AposDocEditor.vue | 13 +- .../apos/components/AposDocLocalePicker.vue | 3 +- .../ui/apos/logic/AposDocContextMenu.js | 118 ++++++++++-------- modules/@apostrophecms/doc/index.js | 16 +-- modules/@apostrophecms/image/index.js | 3 +- .../AposImageRelationshipEditor.vue | 23 +++- .../ui/apos/components/AposMediaManager.vue | 15 ++- .../components/AposMediaManagerDisplay.vue | 5 +- .../components/AposMediaManagerEditor.vue | 30 ++++- .../components/AposMediaManagerSelections.vue | 5 +- modules/@apostrophecms/login/index.js | 16 +-- .../components/AposForgotPasswordForm.vue | 10 +- .../ui/apos/components/AposLoginForm.vue | 5 +- .../login/ui/apos/components/TheAposLogin.vue | 20 ++- .../modal/ui/apos/components/AposModal.vue | 50 ++++++-- .../ui/apos/components/AposModalBody.vue | 10 +- .../apos/components/AposModalBreadcrumbs.vue | 5 +- .../ui/apos/components/AposModalConfirm.vue | 20 ++- .../ui/apos/components/AposModalRail.vue | 5 +- .../ui/apos/components/AposModalReport.vue | 10 +- .../apos/components/AposModalShareDraft.vue | 5 +- .../ui/apos/components/AposModalTabs.vue | 5 +- .../ui/apos/components/AposModalToolbar.vue | 10 +- .../apos/components/AposWidgetModalTabs.vue | 10 +- .../ui/apos/mixins/AposDocErrorsMixin.js | 3 +- modules/@apostrophecms/notification/index.js | 3 +- .../ui/apos/components/AposNotification.vue | 15 ++- .../ui/apos/components/AposInputOembed.vue | 11 +- modules/@apostrophecms/page/index.js | 20 +-- .../ui/apos/components/AposPagesManager.vue | 10 +- .../page/ui/apos/logic/AposPagesManager.js | 17 +-- .../ui/apos/components/AposPermissionGrid.vue | 10 +- modules/@apostrophecms/piece-type/index.js | 14 ++- .../ui/apos/components/AposDocsManager.vue | 13 +- .../components/AposDocsManagerDisplay.vue | 5 +- .../components/AposRelationshipEditor.vue | 3 +- .../lib/generateTiptapTable.js | 20 +-- .../components/AposImageControlDialog.vue | 22 ++-- .../components/AposRichTextWidgetEditor.vue | 16 ++- .../ui/apos/components/AposTiptapAnchor.vue | 5 +- .../ui/apos/components/AposTiptapColor.vue | 5 +- .../apos/components/AposTiptapImportTable.vue | 5 +- .../ui/apos/components/AposTiptapLink.vue | 5 +- .../ui/apos/components/AposTiptapMarks.vue | 10 +- .../ui/apos/components/AposArrayEditor.vue | 10 +- .../ui/apos/components/AposInputArray.vue | 35 ++++-- .../ui/apos/components/AposInputBoolean.vue | 10 +- .../ui/apos/components/AposInputRadio.vue | 5 +- .../ui/apos/components/AposInputRange.vue | 15 ++- .../ui/apos/components/AposInputWrapper.vue | 15 ++- .../schema/ui/apos/components/AposLogo.vue | 55 ++++++-- .../ui/apos/components/AposLogoIcon.vue | 55 ++++++-- .../ui/apos/components/AposLogoPadless.vue | 55 ++++++-- .../ui/apos/components/AposSearchList.vue | 20 ++- .../schema/ui/apos/components/AposSubform.vue | 20 ++- .../schema/ui/apos/logic/AposInputArray.js | 32 ++--- .../ui/apos/logic/AposInputAttachment.js | 3 +- .../ui/apos/logic/AposInputRelationship.js | 13 +- .../apos/components/AposSettingsManager.vue | 5 +- .../components/AposSubmittedDraftIcon.vue | 5 +- modules/@apostrophecms/task/index.js | 14 ++- .../template/lib/bundlesLoader.js | 3 +- .../components/AposTranslationIndicator.vue | 15 ++- .../ui/ui/apos/components/AposButton.vue | 15 ++- .../ui/ui/apos/components/AposButtonSplit.vue | 5 +- .../apos/components/AposCellContextMenu.vue | 5 +- .../ui/ui/apos/components/AposCheckbox.vue | 5 +- .../apos/components/AposCloudUploadIcon.vue | 25 +++- .../ui/ui/apos/components/AposEmptyState.vue | 15 ++- .../ui/ui/apos/components/AposFile.vue | 15 ++- .../ui/ui/apos/components/AposFilterMenu.vue | 5 +- .../ui/apos/components/AposLoadingBlock.vue | 5 +- .../ui/apos/components/AposLocalePicker.vue | 5 +- .../ui/ui/apos/components/AposPager.vue | 5 +- .../ui/ui/apos/components/AposSelect.vue | 5 +- .../ui/ui/apos/components/AposSlat.vue | 25 ++-- .../ui/ui/apos/components/AposSlatList.vue | 5 +- .../ui/ui/apos/components/AposSpinner.vue | 5 +- .../ui/apos/components/AposSubformPreview.vue | 10 +- .../ui/ui/apos/components/AposTable.vue | 5 +- .../ui/ui/apos/components/AposTag.vue | 5 +- .../ui/ui/apos/components/AposTagApply.vue | 10 +- .../ui/ui/apos/components/AposTagList.vue | 14 ++- .../ui/ui/apos/components/AposTree.vue | 5 +- .../ui/ui/apos/components/AposTreeRows.vue | 5 +- .../@apostrophecms/ui/ui/apos/stores/modal.js | 10 +- .../ui/apos/components/AposWidgetEditor.vue | 5 +- test/queryBuilders.js | 22 ++-- 104 files changed, 1045 insertions(+), 472 deletions(-) diff --git a/.eslintrc b/.eslintrc index adeea1d82e..d7702cdd59 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,99 +2,5 @@ "extends": [ "apostrophe", "plugin:vue/vue3-recommended" - ], - "env": { - "mocha": true - }, - "globals": { - "apos": true - }, - "rules": { - "max-len": "off", - "no-var": "error", - "no-console": 0, - "vue/no-deprecated-v-on-native-modifier": 0, - "multiline-ternary": "off", - "no-unused-vars": [ - "error", - { "varsIgnorePattern": "^_.", "args": "none" } - ], - "vue/no-deprecated-destroyed-lifecycle": 0, - "vue/v-on-event-hyphenation": 1, - "vue/custom-event-name-casing": ["warn", "kebab-case"], - "vue/component-tags-order": [ - "warn", - { - "order": [ - "template", - "script", - "style" - ] - } - ], - "vue/max-attributes-per-line": [ - "warn", - { - "singleline": 2 - } - ], - "vue/singleline-html-element-content-newline": [ - "warn", - { - "ignoreWhenNoAttributes": true, - "ignoreWhenEmpty": true, - "ignores": [ - "h1", - "h2", - "h3", - "pre", - "textarea" - ] - } - ] - }, - "overrides": [ - { - "files": "*.vue", - "globals": { - "defineProps": "readonly", - "defineEmits": "readonly", - "defineExpose": "readonly", - "defineOptions": "readonly", - "defineModel": "readonly", - "defineSlots": "readonly" - } - }, - { - "files": [ - "**/ui/**/*.js" - ], - "globals": { - "apos": true - }, - "env": { - "browser": true - } - }, - { - "files": [ - "**/ui/public/*.js" - ], - "globals": { - "apos": true - }, - "env": { - "browser": true - }, - "rules": { - "no-var": 0 - } - } - ], - "parser": "vue-eslint-parser", - "parserOptions": { - "parser": "@babel/eslint-parser", - "sourceType": "module", - "requireConfigFile": false - } + ] } diff --git a/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBar.vue b/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBar.vue index ad423a1c96..ecdea8475a 100644 --- a/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBar.vue +++ b/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBar.vue @@ -4,7 +4,10 @@ class="apos-admin-bar-wrapper" :class="themeClass" > -
+