More lint fixes

Author: tunetheweb

.github/linters/.eslintrc.yml

@@ -12,15 +12,18 @@ globals:
   $WPT_ACCESSIBILITY_TREE: readonly
   $WPT_BODIES: readonly
   $WPT_COOKIES: readonly
+  $WPT_DNS: readonly
   $WPT_REQUESTS: readonly
   $WPT_TEST_URL: readonly
   httparchive_enable_observations: writable
+  __REACT_DEVTOOLS_GLOBAL_HOOK__: writable
   CSSUnparsedValue: readonly
   LaunchParams: readonly
 
 ignorePatterns:
   - "!.*"
   - "**/node_modules/.*"
+  - "/dist/third-parties.js"
 
 plugins:
   - n

dist/css-variables.js

@@ -216,7 +216,7 @@ function analyzeVariables() {
     }
     catch (e) {
       // continue regardless of error
-    }}
+    }
 
     if (rules) {
       for (let rule of rules) {

dist/media.js

@@ -10,42 +10,6 @@ function getNodeAttributes(node) {
   return node.cloneNode(false).attributes;
 }
 
-// Map nodes to their attributes,
-function parseNodes(nodes) {
-  var parsedNodes = [];
-  if (nodes) {
-    for (var i = 0, len = nodes.length; i < len; i++) {
-      var node = nodes[i];
-      var attributes = Object.values(getNodeAttributes(node));
-      var el = {};
-
-      el.tagName = node.tagName.toLowerCase(); // for reference
-      for (var n = 0, len2 = attributes.length; n < len2; n++) {
-        var attribute = attributes[n];
-        el[attribute.name.toLowerCase()] = attribute.value;
-      }
-
-      parsedNodes.push(el);
-    }
-  }
-  return parsedNodes;
-}
-
-// Return the set of attributes for nodes,
-function getNodesAttributes(nodes) {
-  if (!nodes) {
-    return [];
-  }
-  var uniqueAttributes = new Set();
-  for (var node of nodes) {
-    var attributes = Object.values(getNodeAttributes(node));
-    for (var attribute of attributes) {
-      uniqueAttributes.add(attribute.name.toLowerCase());
-    }
-  }
-  return Array.from(uniqueAttributes);
-}
-
 return JSON.stringify({
   // Counts the number of picture tags containing an img tag
   'num_picture_img': document.querySelectorAll('picture img').length,

dist/meta_viewport.js

@@ -6,4 +6,5 @@ for (var i = 0; i < metaTags.length; i++) {
         break;
     }
 }
+/* eslint-disable-next-line no-control-regex */
 return viewport.replace(/[\x00-\x1F\x80-\xFF]/g, "");

dist/num_scripts_async.js

@@ -1,13 +1,10 @@
 var aElems = document.getElementsByTagName("script");
-var nAsync = 0, nSync = 0;
+var nAsync = 0;
 for ( var i = 0, len = aElems.length; i < len; i++ ) {
     var e = aElems[i];
     if ( e.src ) {
         if ( e.async ) {
-      nAsync++;
-        }
-        else {
-      nSync++;
+          nAsync++;
         }
     }
 }

dist/num_scripts_sync.js

@@ -1,13 +1,10 @@
 var aElems = document.getElementsByTagName("script");
-var nAsync = 0, nSync = 0;
+var nSync = 0;
 for ( var i = 0, len = aElems.length; i < len; i++ ) {
     var e = aElems[i];
     if ( e.src ) {
-        if ( e.async ) {
-      nAsync++;
-        }
-        else {
-      nSync++;
+        if ( !e.async ) {
+          nSync++;
         }
     }
 }

dist/origin-trials.js

@@ -15,8 +15,7 @@
  * @returns {object} origin_trial_metadata
  */
 function validate(tokenElem) {
-  let validityElem,
-    versionElem,
+  let versionElem,
     originElem,
     subdomainElem,
     thirdpartyElem,

dist/parsed_css.js

@@ -1,5 +1,6 @@
 //[parsed_css]
 
+/* eslint-disable no-cond-assign */
 try {
   const MAX_STYLESHEET_BYTES = 500 * 1024; // 500 KB
   const MAX_AST_BYTES = 4 * 1024 * 1024; // 4 MB
@@ -8,7 +9,7 @@ try {
   const block = Array.from(document.querySelectorAll('style')).map(i => ({url: 'block', body: i.innerHTML}));
   const inline = Array.from(document.querySelectorAll('[style]')).map(i => ({url: 'inline', body: i.getAttribute('style')}));
 
-  const parsed_css = stylesheets.concat(block, inline).filter(({url, body}) => {
+  const parsed_css = stylesheets.concat(block, inline).filter(({body}) => {
     return body.length <= MAX_STYLESHEET_BYTES;
   }).map(({url, body}) => {
     return {
@@ -18,7 +19,7 @@ try {
         inline: url == 'inline'
       })
     };
-  }).filter(({url, ast}) => {
+  }).filter(({ast}) => {
     return JSON.stringify(ast).length <= MAX_AST_BYTES;
   });
 
@@ -35,6 +36,7 @@ try {
 
 // http://www.w3.org/TR/CSS21/grammar.html
 // https://github.com/visionmedia/css-parse/pull/49#issuecomment-30088027
+/* eslint-disable-next-line no-unreachable */
 var commentre = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g
 
 function parse(css, options){
@@ -64,7 +66,7 @@ function parse(css, options){
    */
 
   function position() {
-    var start = { line: lineno, column: column };
+    //var start = { line: lineno, column: column };
     return function(node){
       //node.position = new Position(start);
       whitespace();
@@ -252,15 +254,15 @@ function parse(css, options){
     var pos = position();
 
     // prop
-    var prop = match(/^(\*?[-#\/\*\\\w]+(\[[0-9a-z_-]+\])?)\s*/);
+    var prop = match(/^(\*?[-#/*\\\w]+(\[[0-9a-z_-]+\])?)\s*/);
     if (!prop) return;
     prop = trim(prop[0]);
 
     // :
     if (!match(/^:\s*/)) return error("property missing ':'");
 
     // val
-    var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)/);
+    var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*?\)|[^};])+)/);
 
     var ret = pos({
       type: 'declaration',
@@ -332,7 +334,7 @@ function parse(css, options){
     var vendor = m[1];
 
     // identifier
-    var m = match(/^([-\w]+)\s*/);
+    m = match(/^([-\w]+)\s*/);
     if (!m) return error("@keyframes missing name");
     var name = m[1];
 

dist/performance.js

@@ -9,7 +9,7 @@ function getRawHtmlDocument() {
         rawHtml = response_bodies[0].response_body;
     }
 
-    rawHtmlDocument = document.implementation.createHTMLDocument("New Document");
+    let rawHtmlDocument = document.implementation.createHTMLDocument("New Document");
     rawHtmlDocument.documentElement.innerHTML = rawHtml;
 
     return rawHtmlDocument;
@@ -247,7 +247,7 @@ function parseLinkHeader(link) {
             if (!paramPattern.test(p)) {
                 return;
             }
-            const [_, key, value] = p.match(paramPattern);
+            const [, key, value] = p.match(paramPattern);
             return {key, value};
         });
         return [src, params];

dist/privacy.js

@@ -81,9 +81,9 @@ const parseDSRdelete = async (response) => {
     }
   } catch (error) {
     Object.assign(result, result.present ? { error: error.message } : {});
-  } finally {
-    return Promise.resolve(result);
   }
+
+  return Promise.resolve(result);
 }
 
 let sync_metrics = {
@@ -150,6 +150,7 @@ let sync_metrics = {
       zh: "数据使用政策|隐私政策|数据保护政策|隐私保护政策|數據使用政策|隱私政策|數據保護政策|隱私保護政策"
     }
     const websiteLanguage = document.documentElement.lang.slice(0, 2).toLowerCase();
+    let keywords;
     if (websiteLanguage == 'en') {
       keywords = languageKeywords[websiteLanguage]
     } else if (!(websiteLanguage in languageKeywords)) {
@@ -203,9 +204,11 @@ let sync_metrics = {
           }
         });
       }
-    } finally {
-      return consentData;
+    } catch {
+      // continue regardless of error
     }
+
+    return consentData;
   })(),
 
   /**
@@ -238,9 +241,12 @@ let sync_metrics = {
           }
         });
       }
-    } finally {
-      return tcData;
+    } catch {
+      // continue regardless of error
     }
+
+    return tcData;
+
   })(),
 
   /**
@@ -259,9 +265,11 @@ let sync_metrics = {
           }
         });
       }
-    } finally {
-      return gppData;
+    } catch {
+      // continue regardless of error
     }
+
+    return gppData;
   })(),
 
   /**
@@ -280,9 +288,11 @@ let sync_metrics = {
           }
         });
       }
-    } finally {
-      return uspData;
+    } catch {
+      // continue regardless of error
     }
+
+    return uspData;
   })(),
 
   /**
@@ -487,16 +497,18 @@ let sync_metrics = {
     for (const request of $WPT_REQUESTS) {
       // Add try/catch in case "new URL" throws an exception
       try {
-        request_hostname = (new URL(request.url)).hostname;
+        let request_hostname = (new URL(request.url)).hostname;
 
         for (const [origin, dns_info] of Object.entries($WPT_DNS)) {
-          dns_hostname = (new URL(origin)).hostname;
+          let dns_hostname = (new URL(origin)).hostname;
 
           if (request_hostname == dns_hostname && request_hostname !== dns_info.results.canonical_names[0]) {
             results[dns_hostname] = dns_info.results.canonical_names;
           }
         }
-      } catch { }
+      } catch {
+        // continue regardless of error
+      }
     }
 
     return results;