Fix "make lint" command; fix more lint errors

gorhill · gorhill · commit 8629f0713874 · 2025-01-19T09:35:51.000-05:00
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "npm dev tools",
   "main": "index.js",
   "scripts": {
-    "lint": "eslint --no-warn-ignored -- ./src/js/*.js ./src/js/**/*.js ./**/*.json ./platform/**/*.js ",
+    "lint": "eslint --no-warn-ignored -- \"./src/js/*.js\" \"./src/js/**/*.js\" \"./**/*.json\" \"./platform/**/*.js\"",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
diff --git a/platform/mv3/extension/js/ext.js b/platform/mv3/extension/js/ext.js
@@ -64,7 +64,7 @@ export async function localRead(key) {
         const bin = await browser.storage.local.get(key);
         if ( bin instanceof Object === false ) { return; }
         return bin[key] ?? undefined;
-    } catch(ex) {
+    } catch {
     }
 }
 
@@ -89,7 +89,7 @@ export async function sessionRead(key) {
         const bin = await browser.storage.session.get(key);
         if ( bin instanceof Object === false ) { return; }
         return bin[key] ?? undefined;
-    } catch(ex) {
+    } catch {
     }
 }
 
@@ -114,7 +114,7 @@ export async function adminRead(key) {
         const bin = await browser.storage.managed.get(key);
         if ( bin instanceof Object === false ) { return; }
         return bin[key] ?? undefined;
-    } catch(ex) {
+    } catch {
     }
 }
 
diff --git a/platform/mv3/extension/js/fetch.js b/platform/mv3/extension/js/fetch.js
@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
 /******************************************************************************/
 
 function fetchJSON(path) {
diff --git a/platform/mv3/extension/js/popup.js b/platform/mv3/extension/js/popup.js
@@ -79,7 +79,7 @@ async function commitFilteringMode() {
             granted = await browser.permissions.request({
                 origins: [ `*://*.${targetHostname}/*` ],
             });
-        } catch(ex) {
+        } catch {
         }
         if ( granted !== true ) {
             setFilteringMode(beforeLevel);
@@ -287,7 +287,7 @@ dom.on('[data-i18n-title="popupTipReport"]', 'click', ev => {
     let url;
     try {
         url = new URL(currentTab.url);
-    } catch(_) {
+    } catch {
     }
     if ( url === undefined ) { return; }
     const reportURL = new URL(runtime.getURL('/report.html'));
@@ -325,7 +325,7 @@ async function init() {
             url = new URL(url.hash.slice(1));
         }
         tabURL.href = url.href || '';
-    } catch(ex) {
+    } catch {
     }
 
     if ( url !== undefined ) {
@@ -393,7 +393,7 @@ async function init() {
 async function tryInit() {
     try {
         await init();
-    } catch(ex) {
+    } catch {
         setTimeout(tryInit, 100);
     }
 }
diff --git a/platform/mv3/extension/js/report.js b/platform/mv3/extension/js/report.js
@@ -52,7 +52,7 @@ const reportedPage = (( ) => {
             hostname: parsedURL.hostname.replace(/^(m|mobile|www)\./, ''),
             mode: url.searchParams.get('mode'),
         };
-    } catch(ex) {
+    } catch {
     }
     return null;
 })();
diff --git a/platform/mv3/extension/js/scripting/css-declarative.js b/platform/mv3/extension/js/scripting/css-declarative.js
@@ -19,12 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssDeclarative() {
@@ -39,7 +33,7 @@ delete self.declarativeImports;
 
 const hnParts = [];
 try { hnParts.push(...document.location.hostname.split('.')); }
-catch(ex) { }
+catch { }
 const hnpartslen = hnParts.length;
 if ( hnpartslen === 0 ) { return; }
 
diff --git a/platform/mv3/extension/js/scripting/css-procedural.js b/platform/mv3/extension/js/scripting/css-procedural.js
@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssProcedural() {
@@ -37,7 +33,7 @@ delete self.proceduralImports;
 
 const hnParts = [];
 try { hnParts.push(...document.location.hostname.split('.')); }
-catch(ex) { }
+catch { }
 const hnpartslen = hnParts.length;
 if ( hnpartslen === 0 ) { return; }
 
@@ -621,14 +617,14 @@ class PSelectorRoot extends PSelector {
     prime(input) {
         try {
             return super.prime(input);
-        } catch (ex) {
+        } catch {
         }
         return [];
     }
     exec(input) {
         try {
             return super.exec(input);
-        } catch (ex) {
+        } catch {
         }
         return [];
     }
diff --git a/platform/mv3/extension/js/scripting/css-specific.js b/platform/mv3/extension/js/scripting/css-specific.js
@@ -19,12 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssSpecific() {
@@ -39,7 +33,7 @@ delete self.specificImports;
 
 const hnParts = [];
 try { hnParts.push(...document.location.hostname.split('.')); }
-catch(ex) { }
+catch { }
 const hnpartslen = hnParts.length;
 if ( hnpartslen === 0 ) { return; }
 
diff --git a/platform/mv3/extension/js/settings.js b/platform/mv3/extension/js/settings.js
@@ -195,7 +195,7 @@ function getStagedTrustedSites() {
             return punycode.toASCII(
                 (new URL(`https://${hn}/`)).hostname
             );
-        } catch(_) {
+        } catch {
         }
         return '';
     }).filter(hn => hn !== '');
@@ -292,7 +292,7 @@ sendMessage({
         renderFilterLists(cachedRulesetData);
         renderWidgets();
         dom.cl.remove(dom.body, 'loading');
-    } catch(ex) {
+    } catch {
     }
     listen();
 }).catch(reason => {
diff --git a/platform/mv3/extension/js/strictblock.js b/platform/mv3/extension/js/strictblock.js
@@ -42,7 +42,7 @@ function urlToFragment(raw) {
         b.append(hn);
         fragment.append(raw.slice(0,i), b, raw.slice(i+hn.length));
         return fragment;
-    } catch(_) {
+    } catch {
     }
     return raw;
 }
@@ -55,7 +55,7 @@ const toFinalURL = new URL('about:blank');
 try {
     toURL.href = self.location.hash.slice(1);
     toFinalURL.href = toURL.href;
-} catch(_) {
+} catch {
 }
 
 dom.clear('#theURL > p > span:first-of-type');
@@ -144,7 +144,7 @@ function fragmentFromTemplate(template, placeholder, text, details) {
         let url;
         try {
             url = new URL(rawURL);
-        } catch(ex) {
+        } catch {
             return false;
         }
 
diff --git a/platform/mv3/extension/js/theme.js b/platform/mv3/extension/js/theme.js
@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
 import { dom } from './dom.js';
 
 /******************************************************************************/
diff --git a/platform/mv3/extension/js/utils.js b/platform/mv3/extension/js/utils.js
@@ -24,7 +24,7 @@
 function parsedURLromOrigin(origin) {
     try {
         return new URL(origin);
-    } catch(ex) {
+    } catch {
     }
 }
 
diff --git a/platform/mv3/scriptlets/css-declarative.template.js b/platform/mv3/scriptlets/css-declarative.template.js
@@ -19,14 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
 // ruleset: $rulesetId$
 
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssDeclarativeImport() {
diff --git a/platform/mv3/scriptlets/css-generic.template.js b/platform/mv3/scriptlets/css-generic.template.js
@@ -19,20 +19,14 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
-/******************************************************************************/
+// $rulesetId$
 
 // Important!
 // Isolate from global scope
 (function uBOL_cssGenericImport() {
 
 /******************************************************************************/
 
-// $rulesetId$
-
 const toImport = self.$genericSelectorMap$;
 
 const genericSelectorMap = self.genericSelectorMap || new Map();
diff --git a/platform/mv3/scriptlets/css-procedural.template.js b/platform/mv3/scriptlets/css-procedural.template.js
@@ -19,14 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
 // ruleset: $rulesetId$
 
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssProceduralImport() {
diff --git a/platform/mv3/scriptlets/css-specific.template.js b/platform/mv3/scriptlets/css-specific.template.js
@@ -19,14 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* jshint esversion:11 */
-
-'use strict';
-
 // ruleset: $rulesetId$
 
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 (function uBOL_cssSpecificImports() {
diff --git a/platform/mv3/scriptlets/scriptlet.template.js b/platform/mv3/scriptlets/scriptlet.template.js
@@ -24,8 +24,6 @@
 
 // ruleset: $rulesetId$
 
-/******************************************************************************/
-
 // Important!
 // Isolate from global scope
 
@@ -66,8 +64,8 @@ try {
     const pos = origin.lastIndexOf('://');
     if ( pos === -1 ) { return; }
     hnParts.push(...origin.slice(pos+3).split('.'));
+} catch {
 }
-catch(ex) { }
 const hnpartslen = hnParts.length;
 if ( hnpartslen === 0 ) { return; }
 
@@ -124,7 +122,7 @@ if ( entitiesMap.size !== 0 ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     try { $scriptletName$(...argsList[i]); }
-    catch(ex) {}
+    catch { }
 }
 argsList.length = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export async function localRead(key) {`
`64`	`64`	`const bin = await browser.storage.local.get(key);`
`65`	`65`	`if ( bin instanceof Object === false ) { return; }`
`66`	`66`	`return bin[key] ?? undefined;`
`67`		`- } catch(ex) {`
	`67`	`+ } catch {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -89,7 +89,7 @@ export async function sessionRead(key) {`
`89`	`89`	`const bin = await browser.storage.session.get(key);`
`90`	`90`	`if ( bin instanceof Object === false ) { return; }`
`91`	`91`	`return bin[key] ?? undefined;`
`92`		`- } catch(ex) {`
	`92`	`+ } catch {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`@@ -114,7 +114,7 @@ export async function adminRead(key) {`
`114`	`114`	`const bin = await browser.storage.managed.get(key);`
`115`	`115`	`if ( bin instanceof Object === false ) { return; }`
`116`	`116`	`return bin[key] ?? undefined;`
`117`		`- } catch(ex) {`
	`117`	`+ } catch {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ async function commitFilteringMode() {`
`79`	`79`	`granted = await browser.permissions.request({`
`80`	`80`	origins: [ `://.${targetHostname}/*` ],
`81`	`81`	`});`
`82`		`- } catch(ex) {`
	`82`	`+ } catch {`
`83`	`83`	`}`
`84`	`84`	`if ( granted !== true ) {`
`85`	`85`	`setFilteringMode(beforeLevel);`
`@@ -287,7 +287,7 @@ dom.on('[data-i18n-title="popupTipReport"]', 'click', ev => {`
`287`	`287`	`let url;`
`288`	`288`	`try {`
`289`	`289`	`url = new URL(currentTab.url);`
`290`		`- } catch(_) {`
	`290`	`+ } catch {`
`291`	`291`	`}`
`292`	`292`	`if ( url === undefined ) { return; }`
`293`	`293`	`const reportURL = new URL(runtime.getURL('/report.html'));`
`@@ -325,7 +325,7 @@ async function init() {`
`325`	`325`	`url = new URL(url.hash.slice(1));`
`326`	`326`	`}`
`327`	`327`	`tabURL.href = url.href \|\| '';`
`328`		`- } catch(ex) {`
	`328`	`+ } catch {`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`if ( url !== undefined ) {`
`@@ -393,7 +393,7 @@ async function init() {`
`393`	`393`	`async function tryInit() {`
`394`	`394`	`try {`
`395`	`395`	`await init();`
`396`		`- } catch(ex) {`
	`396`	`+ } catch {`
`397`	`397`	`setTimeout(tryInit, 100);`
`398`	`398`	`}`
`399`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ const reportedPage = (( ) => {`
`52`	`52`	`hostname: parsedURL.hostname.replace(/^(m\|mobile\|www)\./, ''),`
`53`	`53`	`mode: url.searchParams.get('mode'),`
`54`	`54`	`};`
`55`		`- } catch(ex) {`
	`55`	`+ } catch {`
`56`	`56`	`}`
`57`	`57`	`return null;`
`58`	`58`	`})();`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function urlToFragment(raw) {`
`42`	`42`	`b.append(hn);`
`43`	`43`	`fragment.append(raw.slice(0,i), b, raw.slice(i+hn.length));`
`44`	`44`	`return fragment;`
`45`		`- } catch(_) {`
	`45`	`+ } catch {`
`46`	`46`	`}`
`47`	`47`	`return raw;`
`48`	`48`	`}`
`@@ -55,7 +55,7 @@ const toFinalURL = new URL('about:blank');`
`55`	`55`	`try {`
`56`	`56`	`toURL.href = self.location.hash.slice(1);`
`57`	`57`	`toFinalURL.href = toURL.href;`
`58`		`-} catch(_) {`
	`58`	`+} catch {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`dom.clear('#theURL > p > span:first-of-type');`
`@@ -144,7 +144,7 @@ function fragmentFromTemplate(template, placeholder, text, details) {`
`144`	`144`	`let url;`
`145`	`145`	`try {`
`146`	`146`	`url = new URL(rawURL);`
`147`		`- } catch(ex) {`
	`147`	`+ } catch {`
`148`	`148`	`return false;`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`function parsedURLromOrigin(origin) {`
`25`	`25`	`try {`
`26`	`26`	`return new URL(origin);`
`27`		`- } catch(ex) {`
	`27`	`+ } catch {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`