use eslint-config-apostrophe without override (#4886)

* fixes lint errors
* bumps eslint-config-apostrophe version and removes all other eslint deps

---------

Co-authored-by: Etienne Laurent <[email protected]>
Co-authored-by: Jed <[email protected]>

Author: 3 people

.eslintrc

@@ -1,100 +1 @@
-{
-  "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
-  }
-}
+{ "extends": ["apostrophe"] }

lib/moog.js

@@ -75,7 +75,10 @@ module.exports = function(options) {
       } else {
         // Extend the default base class by default, if any, unless
         // we're it
-        if (self.options.defaultBaseClass && className !== self.options.defaultBaseClass) {
+        if (
+          self.options.defaultBaseClass &&
+          className !== self.options.defaultBaseClass
+        ) {
           definition.extend = self.options.defaultBaseClass;
         }
       }

modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBar.vue

@@ -4,7 +4,10 @@
     class="apos-admin-bar-wrapper"
     :class="themeClass"
   >
-    <div ref="spacer" class="apos-admin-bar-spacer" />
+    <div
+      ref="spacer"
+      class="apos-admin-bar-spacer"
+    />
     <nav
       ref="adminBar"
       class="apos-admin-bar"

modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBarMenu.vue

@@ -1,6 +1,12 @@
 <template>
-  <ol class="apos-admin-bar__items" role="menu">
-    <li v-if="pageTree" class="apos-admin-bar__item">
+  <ol
+    class="apos-admin-bar__items"
+    role="menu"
+  >
+    <li
+      v-if="pageTree"
+      class="apos-admin-bar__item"
+    >
       <AposButton
         type="subtle"
         label="apostrophe:pages"
@@ -39,7 +45,10 @@
         @click="emitEvent(item.action)"
       />
     </li>
-    <li v-if="createMenu.length > 0" class="apos-admin-bar__item">
+    <li
+      v-if="createMenu.length > 0"
+      class="apos-admin-bar__item"
+    >
       <AposContextMenu
         class="apos-admin-bar__create"
         :menu="createMenu"

modules/@apostrophecms/admin-bar/ui/apos/components/TheAposContextBar.vue

@@ -82,9 +82,11 @@ export default {
       saved: false,
       savingTimeout: null,
       published: null,
-      context: window.apos.adminBar.context ? {
-        ...window.apos.adminBar.context
-      } : {},
+      context: window.apos.adminBar.context
+        ? {
+          ...window.apos.adminBar.context
+        }
+        : {},
       contextStack: [],
       // If a published context doc itself is not editable this will contain a hint
       // that the draft version is editable, when appropriate. It should only be
@@ -94,7 +96,8 @@ export default {
   },
   computed: {
     contextBarActive() {
-      return window.apos.adminBar.contextBar && (this.canEdit || this.moduleOptions.canLocalize);
+      return window.apos.adminBar.contextBar &&
+        (this.canEdit || this.moduleOptions.canLocalize);
     },
     canEdit() {
       return this.context._edit || ((this.context.aposLocale && this.context.aposLocale.endsWith(':published')) &&
@@ -582,9 +585,11 @@ export default {
         ...apos.http.parseQuery(window.location.search),
         aposRefresh: '1',
         aposMode: this.draftMode,
-        ...(this.editMode ? {
-          aposEdit: '1'
-        } : {})
+        ...(this.editMode
+          ? {
+            aposEdit: '1'
+          }
+          : {})
       };
 
       if (doc._url) {
@@ -702,6 +707,7 @@ export default {
           });
         }
       } catch (e) {
+        // eslint-disable-next-line no-console
         console.error(e);
         apos.notify(errorMessageKey, { type: 'error' });
       } finally {
@@ -754,6 +760,7 @@ export default {
           });
           this.draftIsEditable = draftContext && draftContext._edit;
         } catch (e) {
+          // eslint-disable-next-line no-console
           console.error(e);
         }
       }
@@ -772,6 +779,7 @@ export default {
           });
           return doc;
         } catch (error) {
+          // eslint-disable-next-line no-console
           console.error(error);
         }
       }

modules/@apostrophecms/admin-bar/ui/apos/components/TheAposSavingIndicator.vue

@@ -10,7 +10,10 @@
         v-bind="savingIndicator.options"
         class="apos-admin-bar__status__icon"
       />
-      <div ref="statusLabel" class="apos-admin-bar__status__label">
+      <div
+        ref="statusLabel"
+        class="apos-admin-bar__status__label"
+      >
         {{ $t(savingLabel) }}
       </div>
     </span>

modules/@apostrophecms/admin-bar/ui/src/index.js

@@ -1,7 +1,6 @@
-/**
- * If the page delivers a logged-out content but we know from session storage that a user is logged-in,
- * we force-refresh the page to bypass the cache, in order to get the logged-in content (with admin UI).
- */
+// If the page delivers a logged-out content but we know from session storage
+// that a user is logged-in, we force-refresh the page to bypass the cache,
+// in order to get the logged-in content (with admin UI).
 export default function() {
   const isLoggedOutPageContent = !(apos.login && apos.login.user);
   const isLoggedInCookie = apos.util.getCookie(`${self.apos.shortName}.loggedIn`) === 'true';
@@ -19,6 +18,7 @@ export default function() {
     refreshedPages[location.href] = true;
     sessionStorage.setItem('aposRefreshedPages', JSON.stringify(refreshedPages));
 
+    // eslint-disable-next-line no-console
     console.info('Received logged-out content from cache while logged-in, refreshing the page');
 
     location.reload();

modules/@apostrophecms/area/ui/apos/components/AposAreaContextualMenu.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="apos-area-menu" :class="{'apos-is-focused': groupIsFocused}">
+  <div
+    class="apos-area-menu"
+    :class="{'apos-is-focused': groupIsFocused}"
+  >
     <AposContextMenu
       v-bind="extendedContextMenuOptions"
       ref="contextMenu"
@@ -16,7 +19,10 @@
           class="apos-area-menu__item"
           :class="{'apos-has-group': item.items}"
         >
-          <dl v-if="item.items" class="apos-area-menu__group">
+          <dl
+            v-if="item.items"
+            class="apos-area-menu__group"
+          >
             <dt>
               <button
                 v-if="item.items"
@@ -44,7 +50,10 @@
                 />
               </button>
             </dt>
-            <dd class="apos-area-menu__group-list" role="region">
+            <dd
+              class="apos-area-menu__group-list"
+              role="region"
+            >
               <ul
                 :id="`${menuId}-group-${itemIndex}`"
                 class="apos-area-menu__items apos-area-menu__items--accordion"

modules/@apostrophecms/area/ui/apos/components/AposAreaEditor.vue

@@ -400,7 +400,10 @@ export default {
     clone(index) {
       const widget = klona(this.next[index]);
       delete widget._id;
-      this.regenerateIds(apos.modules[apos.area.widgetManagers[widget.type]].schema, widget);
+      this.regenerateIds(
+        apos.modules[apos.area.widgetManagers[widget.type]].schema,
+        widget
+      );
       this.insert({
         widget,
         index
@@ -457,7 +460,10 @@ export default {
       if (clipboard) {
         // clear clipboard after paste
         apos.area.widgetClipboard.set(null);
-        this.regenerateIds(apos.modules[apos.area.widgetManagers[clipboard.type]].schema, clipboard);
+        this.regenerateIds(
+          apos.modules[apos.area.widgetManagers[clipboard.type]].schema,
+          clipboard
+        );
         return this.insert({
           widget: clipboard,
           index
@@ -588,6 +594,7 @@ export default {
     getValidItems() {
       return this.items.filter(item => {
         if (!window.apos.modules[`${item.type}-widget`]) {
+          // eslint-disable-next-line no-console
           console.warn(`The widget type ${item.type} exists in the content but is not configured.`);
         }
         return window.apos.modules[`${item.type}-widget`];

modules/@apostrophecms/area/ui/apos/components/AposAreaExpandedMenu.vue

@@ -15,7 +15,12 @@
             :key="groupIndex"
             class="apos-widget-group"
           >
-            <h2 v-if="group.label" class="apos-widget-group__label">{{ $t(group.label) }}</h2>
+            <h2
+              v-if="group.label"
+              class="apos-widget-group__label"
+            >
+              {{ $t(group.label) }}
+            </h2>
             <div
               :class="[
                 `apos-widget-group--${group.columns}-column${
@@ -52,7 +57,10 @@
                 <p class="apos-widget__label">
                   {{ $t(item.label) }}
                 </p>
-                <p v-if="item.description" class="apos-widget__help">
+                <p
+                  v-if="item.description"
+                  class="apos-widget__help"
+                >
                   {{ $t(item.description) }}
                 </p>
               </button>
@@ -96,6 +104,7 @@ export default {
     if (this.options.groups) {
       for (const item of Object.keys(this.options.groups)) {
         if (!this.isValidColumn(item.columns)) {
+          // eslint-disable-next-line no-console
           console.warn(
             `apos.expanded-menu: The specified number of columns for the group ${item.label} is not between the allowed range of 1-4.`
           );
@@ -106,6 +115,7 @@ export default {
       }
     } else if (this.options.widgets) {
       if (!this.isValidColumn(this.options.columns)) {
+        // eslint-disable-next-line no-console
         console.warn(
           'apos.expanded-menu: The specified number of columns for the area is not between the allowed range of 1-4.'
         );
@@ -114,6 +124,7 @@ export default {
       const group = this.createGroup(this.options);
       this.groups.push(group);
     } else {
+      // eslint-disable-next-line no-console
       console.warn(
         'apos.expanded-menu: No groups or widgets defined. Please, either add a groups or widgets property to your area configuration.'
       );
@@ -172,7 +183,8 @@ export default {
         const widgetName = `${item}-widget`;
         const widgetModule = apos.modules[widgetName];
         if (!widgetModule) {
-          console.error(`${widgetName} is not available in this project, please verify its configuration`);
+          // eslint-disable-next-line no-console
+          console.warn(`${widgetName} is not available in this project, please verify its configuration`);
         } else {
           group.widgets.push(widgetModule);
         }