Fix some lint issues

maplibre · Aug 8, 2021 · 140ad58 · 140ad58
1 parent 1d76444
commit 140ad58
Show file tree

Hide file tree

Showing 42 changed files with 169 additions and 127 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ export default function() { @@
                     });
                 });
         });
-    };
+    }