Merge pull request #1347 from cdrini/eslint-trailing-comma

Add eslint trailing comma rule

Author: cdrini

.eslintrc.js

@@ -5,35 +5,35 @@ module.exports = {
     "jquery": true,
     "es6": true,
     "node": true,
-    "jest": true
+    "jest": true,
   },
   "plugins": [
     "testcafe",
-    "no-jquery"
+    "no-jquery",
   ],
   "extends": [
     "eslint:recommended",
     "plugin:testcafe/recommended",
-    "plugin:no-jquery/deprecated"
+    "plugin:no-jquery/deprecated",
   ],
   "globals": {
     // Browser API
-    "MediaMetadata": "readonly"
+    "MediaMetadata": "readonly",
   },
   "parserOptions": {
     "ecmaVersion": 2020,
     "ecmaFeatures": { "legacyDecorators": true },
-    "sourceType": "module"
+    "sourceType": "module",
   },
   "rules": {
-    "comma-dangle": ["error", "only-multiline"],
+    "comma-dangle": ["error", "always-multiline", {"functions": "only-multiline"}],
     "semi": ["error", "always"],
     "space-before-blocks": ["error"],
     "keyword-spacing": [2, {"before": true, "after": true}],
     "indent": ["error", 2, {
       // This for some reason causing errors after switch to parser: babel-eslint.
       // See https://github.com/babel/babel-eslint/issues/681
-      "ignoredNodes": ["TemplateLiteral"]
+      "ignoredNodes": ["TemplateLiteral"],
     }],
     "no-console": "off", // Used too often behind `debug` options; not dealing with this now
     "no-empty": ["error", { "allowEmptyCatch": true }],
@@ -46,6 +46,6 @@ module.exports = {
     "no-var": ["error"],
     "prefer-const": ["error"],
     "space-infix-ops": ["error", { "int32Hint": false }],
-    "eol-last": ["error", "always"]
-  }
+    "eol-last": ["error", "always"],
+  },
 };

babel.config.js

@@ -6,15 +6,15 @@ module.exports = {
         process.env.NODE_ENV == "development" ? { targets: "last 2 Chrome versions, last 2 Firefox versions, last 2 Safari versions, last 2 Edge versions" } : {
           targets: "> 2%, ie 11, edge 14, samsung > 9, OperaMini all, UCAndroid > 12, Safari >= 9",
           useBuiltIns: "usage",
-          corejs: 3
-        }
-    ]
+          corejs: 3,
+        },
+    ],
   ],
   plugins: [
     ["@babel/plugin-proposal-decorators", {
       version: "2018-09",
-      decoratorsBeforeExport: true
+      decoratorsBeforeExport: true,
     }],
     ["@babel/plugin-proposal-class-properties"],
-  ]
+  ],
 };

src/BookNavigator/book-navigator.js

@@ -71,14 +71,14 @@ export class BookNavigator extends LitElement {
       'volumes',
       'chapters',
       'search',
-      'bookmarks'
+      'bookmarks',
     ];
   }
 
   disconnectedCallback() {
     this.sharedObserver.removeObserver({
       target: this.mainBRContainer,
-      handler: this.sharedObserverHandler
+      handler: this.sharedObserverHandler,
     });
   }
 
@@ -148,7 +148,7 @@ export class BookNavigator extends LitElement {
       item: this.itemMD,
       signedIn: this.signedIn,
       isAdmin: this.isAdmin,
-      onProviderChange: () => {}
+      onProviderChange: () => {},
     };
   }
 
@@ -220,7 +220,7 @@ export class BookNavigator extends LitElement {
           const method = Object.keys(bookmarks).length ? 'add' : 'remove';
           this[`${method}MenuShortcut`]('bookmarks');
           this.updateMenuContents();
-        }
+        },
       });
     }
 
@@ -240,7 +240,7 @@ export class BookNavigator extends LitElement {
               this.updateSideMenu('volumes', 'open');
             });
           }
-        }
+        },
       });
     }
 
@@ -311,7 +311,7 @@ export class BookNavigator extends LitElement {
    */
   updateMenuContents() {
     const {
-      search, downloads, visualAdjustments, share, bookmarks, volumes, chapters
+      search, downloads, visualAdjustments, share, bookmarks, volumes, chapters,
     } = this.menuProviders;
     const availableMenus = [volumes, chapters, search, bookmarks, visualAdjustments, share].filter((menu) => !!menu);
 
@@ -460,7 +460,7 @@ export class BookNavigator extends LitElement {
     window.archive_analytics?.send_event(
       'BookReader',
       `contextmenu-${this.bookIsRestricted ? 'restricted' : 'unrestricted'}`,
-      e.target?.classList?.value
+      e.target?.classList?.value,
     );
     if (!this.bookIsRestricted) {
       return;
@@ -479,7 +479,7 @@ export class BookNavigator extends LitElement {
     this.sharedObserverHandler = { handleResize: this.handleResize.bind(this) };
     this.sharedObserver?.addObserver({
       target: this.mainBRContainer,
-      handler: this.sharedObserverHandler
+      handler: this.sharedObserverHandler,
     });
   }
 

src/BookNavigator/bookmarks/bookmarks-loginCTA.js

@@ -4,7 +4,7 @@ import buttonStyles from '../assets/button-base.js';
 class BookmarksLogin extends LitElement {
   static get properties() {
     return {
-      url: { type: String }
+      url: { type: String },
     };
   }
 

src/BookNavigator/bookmarks/bookmarks-provider.js

@@ -27,7 +27,7 @@ export default class BookmarksProvider {
     this.component.modal = modal;
     this.component.loginOptions = {
       loginClicked: this.bookmarksLoginClicked,
-      loginUrl
+      loginUrl,
     };
     this.bindEvents();
 

src/BookNavigator/bookmarks/ia-bookmarks.js

@@ -62,7 +62,7 @@ class IABookmarks extends LitElement {
       editedBookmark: { type: Object },
       deleteModalConfig: { type: Object},
       modal: { attribute: false },
-      loginOptions: { type: Object, attribute: false }
+      loginOptions: { type: Object, attribute: false },
     };
   }
 

src/BookNavigator/search/search-provider.js

@@ -13,7 +13,7 @@ let searchState = {
 export default class SearchProvider {
   constructor({
     onProviderChange,
-    bookreader
+    bookreader,
   }) {
     /* search menu events */
     this.onBookSearchInitiated = this.onBookSearchInitiated.bind(this);
@@ -72,7 +72,7 @@ export default class SearchProvider {
       errorMessage: '',
     };
     const updateMenuFor = {
-      searchCanceled: true
+      searchCanceled: true,
     };
     this.updateMenu(updateMenuFor);
 

src/BookNavigator/sharing.js

@@ -6,7 +6,7 @@ export default class SharingProvider {
   constructor({
     item,
     baseHost,
-    bookreader
+    bookreader,
   }) {
     const { identifier, creator, title } = item?.metadata;
     const creatorToUse = Array.isArray(creator) ? creator[0] : creator;

src/BookNavigator/viewable-files.js

@@ -9,7 +9,7 @@ import '@internetarchive/ia-item-navigator/dist/src/menus/viewable-files';
 const sortTypes = {
   title_asc: 'title_asc',
   title_desc: 'title_desc',
-  default: 'default'
+  default: 'default',
 };
 export default class ViewableFilesProvider {
   /**

src/BookNavigator/visual-adjustments/visual-adjustments.js

@@ -43,7 +43,7 @@ export class IABookVisualAdjustments extends LitElement {
   get activeOptions() {
     return this.options.reduce(
       (results, option) => (option.active ? [...results, option.id] : results),
-      []
+      [],
     );
   }
 
@@ -71,7 +71,7 @@ export class IABookVisualAdjustments extends LitElement {
         bubbles: true,
         composed: true,
         detail,
-      })
+      }),
     );
   }
 
@@ -93,7 +93,7 @@ export class IABookVisualAdjustments extends LitElement {
   changeActiveStateFor(optionName) {
     const updatedOptions = [...this.options];
     const checkedOption = updatedOptions.find(
-      (option) => option.id === optionName
+      (option) => option.id === optionName,
     );
     checkedOption.active = !checkedOption.active;
     this.options = updatedOptions;