diff --git a/build/test/build-tape.js b/build/test/build-tape.js
index 81345061ee..f122c6b053 100644
--- a/build/test/build-tape.js
+++ b/build/test/build-tape.js
@@ -14,4 +14,4 @@ export default function() {
                 });
             });
     });
-};
+}
diff --git a/debug/2762.html b/debug/2762.html
index d2dd80e153..e1ebce5450 100644
--- a/debug/2762.html
+++ b/debug/2762.html
@@ -46,7 +46,7 @@
     }
 });
 
-map.on('click', function(e) {
+map.on('click', function(_) {
     map.setPaintProperty("circle", "circle-color", "red");
     map.setPaintProperty("circle", "circle-translate", [50, 50]);
 });
diff --git a/debug/canvas.html b/debug/canvas.html
index 461593bdfa..0aa055fe25 100644
--- a/debug/canvas.html
+++ b/debug/canvas.html
@@ -61,7 +61,7 @@
     }]
 };
 
-var map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     minZoom: 14,
     zoom: 17,
diff --git a/debug/cluster.html b/debug/cluster.html
index 4fa5f8b5ca..21724c1370 100644
--- a/debug/cluster.html
+++ b/debug/cluster.html
@@ -117,7 +117,7 @@
         });
     });
 
-    map.on('mouseleave', 'cluster', (e) => {
+    map.on('mouseleave', 'cluster', (_) => {
         map.getCanvas().style.cursor = '';
         updateHover([]);
     });
diff --git a/debug/csp-static.html b/debug/csp-static.html
index 6db7070814..26b27d4e1f 100644
--- a/debug/csp-static.html
+++ b/debug/csp-static.html
@@ -22,7 +22,7 @@
 
 maplibregl.workerUrl = '/dist/maplibre-gl-csp-worker.js';
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/csp.html b/debug/csp.html
index 80e56c1772..bc2457c462 100644
--- a/debug/csp.html
+++ b/debug/csp.html
@@ -18,7 +18,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script nonce="dummy">
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/debug.html b/debug/debug.html
index f2140cbad7..2841a88744 100644
--- a/debug/debug.html
+++ b/debug/debug.html
@@ -112,7 +112,7 @@
     map.on('mouseenter', 'marker', function(e) {
         map.setFilter('marker-hover', ['==', 'name', e.features[0].properties.name]);
     });
-    map.on('mouseleave', 'marker', function(e) {
+    map.on('mouseleave', 'marker', function(_) {
         map.setFilter('marker-hover', ['==', 'name', '']);
     });
 
diff --git a/debug/image.html b/debug/image.html
index 814662a90f..b1f7dc6586 100644
--- a/debug/image.html
+++ b/debug/image.html
@@ -47,7 +47,7 @@
     }]
 };
 
-var map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     minZoom: 14,
     zoom: 17,
diff --git a/debug/index.html b/debug/index.html
index c6ee9e8780..f82a8c7056 100644
--- a/debug/index.html
+++ b/debug/index.html
@@ -17,7 +17,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script>
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/mobile_scroll.html b/debug/mobile_scroll.html
index f88ffdc421..02e150a792 100644
--- a/debug/mobile_scroll.html
+++ b/debug/mobile_scroll.html
@@ -18,7 +18,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script>
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/no_wrap.html b/debug/no_wrap.html
index f62060ea89..a2fc261c5c 100644
--- a/debug/no_wrap.html
+++ b/debug/no_wrap.html
@@ -17,7 +17,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script>
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/popup.html b/debug/popup.html
index f8d4a8e5ed..6537863090 100644
--- a/debug/popup.html
+++ b/debug/popup.html
@@ -25,7 +25,7 @@
     hash: true
 });
 
-var popup = new maplibregl.Popup({closeButton: false, closeOnClick: false})
+new maplibregl.Popup({closeButton: false, closeOnClick: false})
     .trackPointer()
     .setHTML('<h1>Hello World!</h1>')
     .addTo(map);
diff --git a/debug/raster-streets.html b/debug/raster-streets.html
index 8bb1a3ceec..6bb17343eb 100644
--- a/debug/raster-streets.html
+++ b/debug/raster-streets.html
@@ -17,7 +17,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script>
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/rtl.html b/debug/rtl.html
index dfd6130579..00489b85ce 100644
--- a/debug/rtl.html
+++ b/debug/rtl.html
@@ -32,7 +32,7 @@
 // badPluginURL allows us to simulate a NetworkError that we can recover from by retrying plugin loading
 var badPluginURL = 'http://localhost:9966/debug/2762.html';
 var goodPluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js';
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 16.5,
     center: [44.355435, 33.258814],
diff --git a/debug/satellite.html b/debug/satellite.html
index c6ee9e8780..f82a8c7056 100644
--- a/debug/satellite.html
+++ b/debug/satellite.html
@@ -17,7 +17,7 @@
 <script src='../dist/maplibre-gl-dev.js'></script>
 <script>
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     zoom: 12.5,
     center: [-77.01866, 38.888],
diff --git a/debug/token.html b/debug/token.html
index d953c31efb..e53c8e1782 100644
--- a/debug/token.html
+++ b/debug/token.html
@@ -22,7 +22,7 @@
     var mapToken = maplibregl.accessToken;
     maplibregl.accessToken = 'notAToken';
 
-    var map = window.map = new maplibregl.Map({
+    new maplibregl.Map({
         container: 'map',
         zoom: 12.5,
         center: [-77.01866, 38.888],
diff --git a/debug/variable-anchor-with-icon-text-fit.html b/debug/variable-anchor-with-icon-text-fit.html
index 3eb0515a87..b079bf242d 100644
--- a/debug/variable-anchor-with-icon-text-fit.html
+++ b/debug/variable-anchor-with-icon-text-fit.html
@@ -121,7 +121,7 @@
     }]
 };
 
-var map = window.map = new maplibregl.Map({
+new maplibregl.Map({
     container: 'map',
     style
 });
diff --git a/package-lock.json b/package-lock.json
index 9977df7ac4..82b9ce094b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1350,6 +1350,17 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@es-joy/jsdoccomment": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.7.tgz",
+      "integrity": "sha512-aNKZEoMESDzOBjKxCWrFuG50mcpMeKVBnBNko4+IZZ5t9zXYs8GT1KB0ZaOq1YUsKumDRc6YII/TQm309MJ0KQ==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "1.2.3",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "1.1.1"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
@@ -4648,9 +4659,9 @@
       "dev": true
     },
     "comment-parser": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz",
-      "integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.3.tgz",
+      "integrity": "sha512-vnqDwBSXSsdAkGS5NjwMIPelE47q+UkEgWKHvCDNhVIIaQSUFY6sNnEYGzdoPGMdpV+7KR3ZkRd7oyWIjtuvJg==",
       "dev": true
     },
     "commondir": {
@@ -7179,12 +7190,63 @@
       }
     },
     "eslint-plugin-html": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-5.0.5.tgz",
-      "integrity": "sha512-v/33i3OD0fuXcRXexVyXXBOe4mLBLBQoF1UO1Uy9D+XLq4MC8K45GcQKfqjC/FnHAHp3pYUjpHHktYNCtShGmg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.1.2.tgz",
+      "integrity": "sha512-bhBIRyZFqI4EoF12lGDHAmgfff8eLXx6R52/K3ESQhsxzCzIE6hdebS7Py651f7U3RBotqroUnC3L29bR7qJWQ==",
       "dev": true,
       "requires": {
-        "htmlparser2": "^3.10.0"
+        "htmlparser2": "^6.0.1"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+          "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
+        },
+        "domhandler": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
+          "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.2.0"
+          }
+        },
+        "domutils": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
+          "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
+          }
+        },
+        "htmlparser2": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+          "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.0.0",
+            "domutils": "^2.5.2",
+            "entities": "^2.0.0"
+          }
+        }
       }
     },
     "eslint-plugin-import": {
@@ -7290,17 +7352,19 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "30.7.13",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz",
-      "integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==",
+      "version": "36.0.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.0.6.tgz",
+      "integrity": "sha512-vOm27rI2SMfi1bOAYmzzGkanMCD/boquKwvN5ECi8EF9ASsXJwlnCzYtiOYpsDpbC2+6JXEHAmWMkqYNA3BWRw==",
       "dev": true,
       "requires": {
-        "comment-parser": "^0.7.6",
-        "debug": "^4.3.1",
-        "jsdoctypeparser": "^9.0.0",
-        "lodash": "^4.17.20",
-        "regextras": "^0.7.1",
-        "semver": "^7.3.4",
+        "@es-joy/jsdoccomment": "0.10.7",
+        "comment-parser": "1.2.3",
+        "debug": "^4.3.2",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "^1.1.1",
+        "lodash": "^4.17.21",
+        "regextras": "^0.8.0",
+        "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
@@ -9810,10 +9874,10 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
-    "jsdoctypeparser": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
-      "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+    "jsdoc-type-pratt-parser": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz",
+      "integrity": "sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==",
       "dev": true
     },
     "jsdom": {
@@ -16563,9 +16627,9 @@
       }
     },
     "regextras": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
-      "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+      "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
       "dev": true
     },
     "registry-url": {
diff --git a/package.json b/package.json
index 200f5a8f45..8b4c56b016 100644
--- a/package.json
+++ b/package.json
@@ -102,10 +102,10 @@
     "ejs": "^2.5.7",
     "eslint": "^7.15.0",
     "eslint-config-mourner": "^3.0.0",
-    "eslint-plugin-html": "^5.0.5",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^30.7.8",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-html": "^6.1.2",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jsdoc": "^36.0.6",
+    "eslint-plugin-react": "^7.24.0",
     "gl": "^4.5.3",
     "glob": "^7.1.4",
     "is-builtin-module": "^3.0.0",
diff --git a/test/build/min.test.js b/test/build/min.test.js
index 719ea04791..49be715fd2 100644
--- a/test/build/min.test.js
+++ b/test/build/min.test.js
@@ -4,7 +4,7 @@ import path, {dirname} from 'path';
 import reference from '../../rollup/build/tsc/style-spec/reference/latest';
 import packageJson from '../../package.json';
 import browserify from 'browserify';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const minBundle = fs.readFileSync('dist/maplibre-gl.js', 'utf8');
@@ -47,7 +47,7 @@ test('evaluates without errors', async (t) => {
     global.performance = {};
     global.navigator = {};
     try {
-        await import ('../../dist/maplibre-gl.js');
+        await import('../../dist/maplibre-gl.js');
     } catch (e) {
         t.error(e);
     }
diff --git a/test/build/style-spec.test.js b/test/build/style-spec.test.js
index 09ba2673d9..00ba93aa4f 100644
--- a/test/build/style-spec.test.js
+++ b/test/build/style-spec.test.js
@@ -1,17 +1,10 @@
-import fs from 'fs';
 import isBuiltin from 'is-builtin-module';
-
-import {Linter} from 'eslint';
 import * as rollup from 'rollup';
-
 import {test} from '../util/test';
 import rollupConfig from '../../rollup.config.style-spec';
 import styleSpecPackage from '../../src/style-spec/package.json';
 import * as spec from '../../dist/style-spec/index.es.js';
 
-
-const styleSpecDistBundle = fs.readFileSync('./dist/style-spec/index.js', 'utf-8');
-
 test('@mapbox/mapbox-gl-style-spec npm package', (t) => {
     t.test('build plain ES5 bundle in prepublish', (t) => {
         t.stub(console, 'warn');
diff --git a/test/integration/lib/expression.js b/test/integration/lib/expression.js
index ff982818d6..92eb556632 100644
--- a/test/integration/lib/expression.js
+++ b/test/integration/lib/expression.js
@@ -1,9 +1,9 @@
-import path, { dirname } from 'path';
+import path, {dirname} from 'path';
 import * as diff from 'diff';
 import fs from 'fs';
 import harness from './harness';
 import compactStringify from 'json-stringify-pretty-compact';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
diff --git a/test/integration/lib/generate-fixture-json.js b/test/integration/lib/generate-fixture-json.js
index 17af524bcc..4c7a6f1229 100644
--- a/test/integration/lib/generate-fixture-json.js
+++ b/test/integration/lib/generate-fixture-json.js
@@ -6,9 +6,9 @@ import localizeURLs from './localize-urls.js';
 const OUTPUT_FILE = 'fixtures.json';
 
 export default {
-    generateFixtureJson: generateFixtureJson,
-    getAllFixtureGlobs: getAllFixtureGlobs
-}
+    generateFixtureJson,
+    getAllFixtureGlobs
+};
 
 /**
  * Analyzes the contents of the specified `path.join(rootDirectory, suiteDirectory)`, and inlines
diff --git a/test/integration/lib/harness.js b/test/integration/lib/harness.js
index e7d953d241..a7ffe932e9 100644
--- a/test/integration/lib/harness.js
+++ b/test/integration/lib/harness.js
@@ -1,21 +1,21 @@
 /* eslint-disable no-process-exit */
 
-import path, { dirname } from 'path';
+import path, {dirname} from 'path';
 import fs from 'fs';
 import glob from 'glob';
-import shuffle_seed from 'shuffle-seed';
+import shuffleSeed from 'shuffle-seed';
 import d3 from 'd3';
 import colors from 'chalk';
 import template from 'lodash.template';
 import createServer from './server';
-import { createRequire } from 'module';
-import { fileURLToPath } from 'url';
+import {createRequire} from 'module';
+import {fileURLToPath} from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 
 const {queue} = d3;
-const {shuffle} = shuffle_seed;
+const {shuffle} = shuffleSeed;
 
 export default function (directory, implementation, options, run) {
     const q = queue(1);
diff --git a/test/integration/lib/localize-urls.js b/test/integration/lib/localize-urls.js
index 8556761144..642fb0b59e 100644
--- a/test/integration/lib/localize-urls.js
+++ b/test/integration/lib/localize-urls.js
@@ -1,9 +1,8 @@
-import path from 'path';
+import path, {dirname} from 'path';
 import fs from 'fs';
 import colors from 'chalk';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
+import {fileURLToPath} from 'url';
+import {createRequire} from 'module';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
@@ -47,7 +46,7 @@ export default function localizeURLs(style, port) {
             }
         });
     }
-};
+}
 
 function localizeURL(url, port) {
     return url.replace(/^local:\/\//, `http://localhost:${port}/`);
diff --git a/test/integration/lib/query.js b/test/integration/lib/query.js
index 7054aa22c2..cab2fa9c2a 100644
--- a/test/integration/lib/query.js
+++ b/test/integration/lib/query.js
@@ -1,10 +1,10 @@
-import path, { dirname } from 'path';
+import path, {dirname} from 'path';
 import fs from 'fs';
 import * as diff from 'diff';
 import {PNG} from 'pngjs';
 import harness from './harness';
-import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
+import {fileURLToPath} from 'url';
+import {createRequire} from 'module';
 
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
diff --git a/test/integration/lib/render.js b/test/integration/lib/render.js
index 9b88046656..4f77b7bb2d 100644
--- a/test/integration/lib/render.js
+++ b/test/integration/lib/render.js
@@ -3,7 +3,7 @@ import fs from 'fs';
 import {PNG} from 'pngjs';
 import harness from './harness';
 import pixelmatch from 'pixelmatch';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 import glob from 'glob';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
diff --git a/test/integration/lib/server.js b/test/integration/lib/server.js
index f4ab33875d..3e545a9809 100644
--- a/test/integration/lib/server.js
+++ b/test/integration/lib/server.js
@@ -3,8 +3,8 @@ import fs from 'fs';
 import st from 'st';
 import {createServer} from 'http';
 import localizeURLs from './localize-urls.js';
-import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
+import {fileURLToPath} from 'url';
+import {createRequire} from 'module';
 
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -51,4 +51,4 @@ export default function () {
             return localizeURLs(style, port);
         }
     };
-};
+}
diff --git a/test/stub_loader.js b/test/stub_loader.js
index 108c49c06b..18f7dcee38 100644
--- a/test/stub_loader.js
+++ b/test/stub_loader.js
@@ -41,8 +41,8 @@ Object.defineProperty(global.Image.prototype, 'src', {
             return;
         }
         if (src.startsWith('data:image/png')) {
-            let base64 = src.replace(/data:.*;base64,/, '');
-            let buff = Buffer.from(base64, 'base64');
+            const base64 = src.replace(/data:.*;base64,/, '');
+            const buff = Buffer.from(base64, 'base64');
             new PNG().parse(buff, (err, png) => {
                 if (err) throw new Error("Couldn't parse PNG");
                 this.data = png.data;
@@ -80,7 +80,6 @@ Object.defineProperty(global.Image.prototype, 'src', {
     }
 });
 
-
 // Delete local and session storage from JSDOM and stub them out with a warning log
 // Accessing these properties during extend() produces an error in Node environments
 // See https://github.com/mapbox/mapbox-gl-js/pull/7455 for discussion
@@ -155,4 +154,3 @@ window.performance.measure = function () { };
 window.performance.clearMarks = function () { };
 window.performance.clearMeasures = function () { };
 
-
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index f10551ea7f..1a6105dee0 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -2,13 +2,12 @@ import {PNG} from 'pngjs';
 import request from 'request';
 import maplibregl from '../rollup/build/tsc/index';
 import browser from '../rollup/build/tsc/util/browser';
-import * as rtl_text_plugin from '../rollup/build/tsc/source/rtl_text_plugin';
+import * as rtlTextPluginModule from '../rollup/build/tsc/source/rtl_text_plugin';
 import rtlText from '@mapbox/mapbox-gl-rtl-text';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import customLayerImplementations from './integration/custom_layer_implementations';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 
 const cache = {};
 function cached(data, callback) {
@@ -19,7 +18,7 @@ function cached(data, callback) {
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const { plugin: rtlTextPlugin } = rtl_text_plugin;
+const {plugin: rtlTextPlugin} = rtlTextPluginModule;
 
 rtlTextPlugin['applyArabicShaping'] = rtlText.applyArabicShaping;
 rtlTextPlugin['processBidirectionalText'] = rtlText.processBidirectionalText;
@@ -28,11 +27,11 @@ rtlTextPlugin['processStyledBidirectionalText'] = rtlText.processStyledBidirecti
 // replacing the browser method of get image in order to avoid usage of context and canvas 2d with Image object...
 browser.getImageData = function (img, padding = 0) {
     if (!img.data) {
-        return {width: 1, height: 1, data: new Uint8Array(1)}
+        return {width: 1, height: 1, data: new Uint8Array(1)};
     }
-    let width = img.width;
-    let height = img.height;
-    let data = img.data;
+    const width = img.width;
+    const height = img.height;
+    const data = img.data;
     const source = new Uint8Array(data);
     const dest = new Uint8Array((2 * padding + width) * (2 * padding + height) * 4);
 
@@ -62,9 +61,9 @@ export default function(style, options, _callback) {
     window.useFakeXMLHttpRequest();
     XMLHttpRequest.onCreate = req => {
         setTimeout(() => {
-            let reqObj = req.url
-            if (req.responseType == 'arraybuffer') {
-                reqObj = { url: req.url, encoding: null }
+            let reqObj = req.url;
+            if (req.responseType === 'arraybuffer') {
+                reqObj = {url: req.url, encoding: null};
             }
             request(reqObj, (error, response, body) => {
                 req.setStatus(response.statusCode);
@@ -72,7 +71,7 @@ export default function(style, options, _callback) {
                 req.onload();
             });
         }, 0);
-    }
+    };
 
     if (options.addFakeCanvas) {
         const fakeCanvas = createFakeCanvas(window.document, options.addFakeCanvas.id, options.addFakeCanvas.image);
@@ -225,7 +224,7 @@ export default function(style, options, _callback) {
             applyOperations(map, operations.slice(1), callback);
         }
     }
-};
+}
 
 function createFakeCanvas(document, id, imagePath) {
     const fakeCanvas = document.createElement('canvas');
diff --git a/test/unit/data/fill_bucket.test.js b/test/unit/data/fill_bucket.test.js
index 696dceff2c..2da2590492 100644
--- a/test/unit/data/fill_bucket.test.js
+++ b/test/unit/data/fill_bucket.test.js
@@ -2,15 +2,14 @@
 import '../../stub_loader';
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import Point from '../../../rollup/build/tsc/symbol/point';
 import segment from '../../../rollup/build/tsc/data/segment';
 import FillBucket from '../../../rollup/build/tsc/data/bucket/fill_bucket';
 import FillStyleLayer from '../../../rollup/build/tsc/style/style_layer/fill_style_layer';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a fill feature from fixture tile.
diff --git a/test/unit/data/line_bucket.test.js b/test/unit/data/line_bucket.test.js
index e8cbf5be4f..7752cfc140 100644
--- a/test/unit/data/line_bucket.test.js
+++ b/test/unit/data/line_bucket.test.js
@@ -1,15 +1,14 @@
 import '../../stub_loader';
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import Point from '../../../rollup/build/tsc/symbol/point';
 import segment from '../../../rollup/build/tsc/data/segment';
 import LineBucket from '../../../rollup/build/tsc/data/bucket/line_bucket';
 import LineStyleLayer from '../../../rollup/build/tsc/style/style_layer/line_style_layer';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a line feature from fixture tile.
diff --git a/test/unit/data/load_geometry.test.js b/test/unit/data/load_geometry.test.js
index 34182c6166..dc9bea5e5e 100644
--- a/test/unit/data/load_geometry.test.js
+++ b/test/unit/data/load_geometry.test.js
@@ -1,11 +1,10 @@
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import loadGeometry from '../../../rollup/build/tsc/data/load_geometry.js';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a line feature from fixture tile.
diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js
index fcaf9d1246..e1056f7733 100644
--- a/test/unit/data/symbol_bucket.test.js
+++ b/test/unit/data/symbol_bucket.test.js
@@ -1,7 +1,7 @@
 import '../../stub_loader';
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import SymbolBucket from '../../../rollup/build/tsc/data/bucket/symbol_bucket';
@@ -14,8 +14,7 @@ import Tile from '../../../rollup/build/tsc/source/tile';
 import CrossTileSymbolIndex from '../../../rollup/build/tsc/symbol/cross_tile_symbol_index';
 import FeatureIndex from '../../../rollup/build/tsc/data/feature_index';
 import {createSymbolBucket} from '../../util/create_symbol_layer';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a point feature from fixture tile.
diff --git a/test/unit/source/tile.test.js b/test/unit/source/tile.test.js
index 93957c7622..ade4867252 100644
--- a/test/unit/source/tile.test.js
+++ b/test/unit/source/tile.test.js
@@ -5,14 +5,13 @@ import Tile from '../../../rollup/build/tsc/source/tile';
 import GeoJSONWrapper from '../../../rollup/build/tsc/source/geojson_wrapper';
 import {OverscaledTileID} from '../../../rollup/build/tsc/source/tile_id';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import vtpbf from 'vt-pbf';
 import FeatureIndex from '../../../rollup/build/tsc/data/feature_index';
 import {CollisionBoxArray} from '../../../rollup/build/tsc/data/array_types';
 import {extend} from '../../../rollup/build/tsc/util/util';
 import {serialize, deserialize} from '../../../rollup/build/tsc/util/web_worker_transfer';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 test('querySourceFeatures', (t) => {
diff --git a/test/unit/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js
index aacbb80204..bda1c213af 100644
--- a/test/unit/source/vector_tile_worker_source.test.js
+++ b/test/unit/source/vector_tile_worker_source.test.js
@@ -1,14 +1,13 @@
 import '../../stub_loader';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import vt from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import {test} from '../../util/test';
 import VectorTileWorkerSource from '../../../rollup/build/tsc/source/vector_tile_worker_source';
 import StyleLayerIndex from '../../../rollup/build/tsc/style/style_layer_index';
 import perf from '../../../rollup/build/tsc/util/performance';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const actor = {send: () => {}};
diff --git a/test/unit/style-spec/migrate.test.js b/test/unit/style-spec/migrate.test.js
index e5888d7c55..339096d03a 100644
--- a/test/unit/style-spec/migrate.test.js
+++ b/test/unit/style-spec/migrate.test.js
@@ -1,12 +1,11 @@
 import {test} from '../../util/test';
 import fs from 'fs';
 import glob from 'glob';
-import path from 'path';
+import path, {dirname} from 'path';
 import validate from '../../../rollup/build/tsc/style-spec/validate_style';
 import v8 from '../../../rollup/build/tsc/style-spec/reference/v8';
 import migrate from '../../../rollup/build/tsc/style-spec/migrate';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 /* eslint-disable import/namespace */
diff --git a/test/unit/style-spec/validate.test.js b/test/unit/style-spec/validate.test.js
index 1ee065aaff..5b881be619 100644
--- a/test/unit/style-spec/validate.test.js
+++ b/test/unit/style-spec/validate.test.js
@@ -1,10 +1,9 @@
 import {test} from '../../util/test';
 import glob from 'glob';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import validate from '../../../rollup/build/tsc/style-spec/validate_style';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const UPDATE = !!process.env.UPDATE;
diff --git a/test/unit/style/load_glyph_range.test.js b/test/unit/style/load_glyph_range.test.js
index 5cc310d192..d5e912741c 100644
--- a/test/unit/style/load_glyph_range.test.js
+++ b/test/unit/style/load_glyph_range.test.js
@@ -1,11 +1,10 @@
 import '../../stub_loader';
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import {RequestManager} from '../../../rollup/build/tsc/util/mapbox';
 import loadGlyphRange from '../../../rollup/build/tsc/style/load_glyph_range';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 test('loadGlyphRange', (t) => {
diff --git a/test/unit/symbol/shaping.test.js b/test/unit/symbol/shaping.test.js
index 37a17261c2..fa8952eea5 100644
--- a/test/unit/symbol/shaping.test.js
+++ b/test/unit/symbol/shaping.test.js
@@ -1,14 +1,13 @@
 import '../../stub_loader';
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import * as shaping from '../../../rollup/build/tsc/symbol/shaping';
 import Formatted, {FormattedSection} from '../../../rollup/build/tsc/style-spec/expression/types/formatted';
 import ResolvedImage from '../../../rollup/build/tsc/style-spec/expression/types/resolved_image';
 import expectedJson from '../../expected/text-shaping-linebreak.json';
 import {ImagePosition} from '../../../rollup/build/tsc/render/image_atlas';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const WritingMode = shaping.WritingMode;
 
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
index 54f97727e3..748ebe82d9 100755
--- a/test/unit/ui/map.test.js
+++ b/test/unit/ui/map.test.js
@@ -568,7 +568,7 @@ test('Map', (t) => {
         });
 
         t.test('listen to window resize event', (t) => {
-            let original = global.addEventListener;
+            const original = global.addEventListener;
             global.addEventListener = function(type) {
                 if (type === 'resize') {
                     //restore original function not to mess with other tests
diff --git a/test/unit/util/classify_rings.test.js b/test/unit/util/classify_rings.test.js
index ff4bc61f24..31691e9a45 100644
--- a/test/unit/util/classify_rings.test.js
+++ b/test/unit/util/classify_rings.test.js
@@ -1,11 +1,10 @@
 import {test} from '../../util/test';
 import fs from 'fs';
-import path from 'path';
+import path, {dirname} from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import classifyRings from '../../../rollup/build/tsc/util/classify_rings';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {fileURLToPath} from 'url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load a fill feature from fixture tile.