Merge pull request #74 from ChromeDevTools/eslintbump

linting updates.

Author: paulirish

.eslintrc.js

@@ -5,7 +5,11 @@ module.exports = {
   "env": {
     "browser": true,
     "es6": true,
+    "cypress/globals": true,
   },
+  "plugins": [
+    "cypress"
+  ],
   "globals": {
     gapi: true,
     Bindings: true,
@@ -60,9 +64,8 @@ module.exports = {
     "comma-dangle": 0,
     "arrow-parens": 0,
     "no-undef": 1,
-    "no-console": 1,
+    "no-console": 0,
     "no-invalid-this": 1,
-    "prefer-rest-params": 1,
   },
   "parserOptions": {
     "ecmaVersion": 2018,

docs/auth.js

@@ -31,8 +31,9 @@ class GoogleAuth {
       gapi.client.setApiKey(this.config.apiKey);
 
       // if we have no authinstance yet, initialize
-      if (!GoogleAuth.getAuthInstance())
+      if (!GoogleAuth.getAuthInstance()) {
         return gapi.auth2.init(oAuthOptions).then(callback);
+      }
 
       // handle the click
       this.signIn().then(callback);

docs/dev_tools.js

@@ -36,12 +36,15 @@ class DevTools {
         set: _ => { },
         getAsArray: _ => []
       };
-      if (module === 'releaseNoteVersionSeen')
+      if (module === 'releaseNoteVersionSeen') {
         ret.get = _ => Infinity;
-      if (module === 'showNativeFunctionsInJSProfile')
+      }
+      if (module === 'showNativeFunctionsInJSProfile') {
         ret.get = _ => true;
-      if (module === 'flamechartMouseWheelAction')
+      }
+      if (module === 'flamechartMouseWheelAction') {
         ret.get = _ => 'zoom';
+      }
       return ret;
     };
 
@@ -138,7 +141,7 @@ class DevTools {
         .shadowRoot.querySelector('.toolbar-shadow')
         .querySelectorAll('button,div').
         forEach(elem => elem.remove());
-    } catch(e) {
+    } catch (e) {
       console.warn('failed to tweak UI', e);
     }
   }
@@ -156,9 +159,9 @@ class DevTools {
       const timelinePanel = Timeline.TimelinePanel.instance();
       const dropTarget = timelinePanel._dropTarget;
       const handleDrop = dropTarget._handleDrop;
-      dropTarget._handleDrop = function(_) {
+      dropTarget._handleDrop = function(...args) {
         viewerInstance.toggleUploadToDriveElem(viewerInstance.canUploadToDrive);
-        handleDrop.apply(dropTarget, arguments);
+        handleDrop.apply(dropTarget, ...args);
       };
     }
   }
@@ -167,10 +170,12 @@ class DevTools {
     const panel = Timeline.TimelinePanel.instance();
     const oldSetMarkers = panel._setMarkers;
     panel._setMarkers = function() {
-      if (this._performanceModel._timelineModel.networkRequests().length === 0)
+      if (this._performanceModel._timelineModel.networkRequests().length === 0) {
         Common.settings.createSetting('timelineCaptureNetwork', true).set(false);
-      if (this._performanceModel.filmStripModel()._frames.length === 0)
+      }
+      if (this._performanceModel.filmStripModel()._frames.length === 0) {
         Common.settings.createSetting('timelineCaptureFilmStrip', true).set(false);
+      }
       oldSetMarkers.call(this, this._performanceModel._timelineModel);
     };
   }

docs/sync_view.js

@@ -131,8 +131,9 @@ class SyncView {
   }
 
   originalPanel() {
-    if (!this._originalPanel)
+    if (!this._originalPanel) {
       this._originalPanel = Timeline.TimelinePanel.instance();
+    }
 
     return this._originalPanel;
   }

docs/timeline_viewer.js

@@ -8,7 +8,7 @@ class Viewer {
     this.params = new URL(location.href).searchParams;
     this.syncView = new SyncView();
     this.timelineURL = this.params.get('loadTimelineFromURL');
-    this.timelineId;
+    this.timelineId = null;
     this.timelineProvider = 'url';
 
     this.totalSize = 50 * 1000 * 1000;
@@ -105,8 +105,9 @@ class Viewer {
 
   handleDragEvents() {
     const dropboxEl = document.getElementById('dropbox');
-    if (dropboxEl)
+    if (dropboxEl) {
       dropboxEl.addEventListener('dragover', this.dragover.bind(this), false);
+    }
   }
 
   toggleUploadToDriveElem(display) {
@@ -270,8 +271,9 @@ class Viewer {
       return this._orig_loadResourcePromise(redirectedURL.toString());
     }
 
-    if (this.timelineProvider === 'drive')
+    if (this.timelineProvider === 'drive') {
       return this.driveAssetLoaded.then(payload => payload);
+    }
 
     // pass through URLs that aren't our timelineURL param
     if (requestedURL !== this.timelineURL) {

docs/utils.js

@@ -29,7 +29,8 @@ class Utils {
         resolve(xhr);
       };
       xhr.onerror = error => {
-        reject({error, xhr});
+        console.error('XHR error', error);
+        reject(error);
       };
       xhr.send(body);
     });

package.json

@@ -20,8 +20,9 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "cypress": "^4.0.2",
-    "eslint": "^4.19.1",
-    "eslint-config-google": "^0.7.1",
+    "eslint": "^6.8.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-cypress": "^2.10.3",
     "http-server": "^0.12.1",
     "opn-cli": "^5.0.0",
     "pre-push": "^0.1.1",