From 60c4ea9f345f1937dca7e359473c369ef3c335af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 01:28:21 +0000 Subject: [PATCH 1/2] Bump eslint-config-openlayers from 18.1.0 to 19.0.0 Bumps [eslint-config-openlayers](https://github.com/openlayers/eslint-config-openlayers) from 18.1.0 to 19.0.0. - [Release notes](https://github.com/openlayers/eslint-config-openlayers/releases) - [Commits](https://github.com/openlayers/eslint-config-openlayers/compare/v18.1.0...v19.0.0) --- updated-dependencies: - dependency-name: eslint-config-openlayers dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 104 ++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 65 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e20d8d..e3228c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "devDependencies": { "@types/geojson": "^7946.0.10", "eslint": "^8.56.0", - "eslint-config-openlayers": "^18.1.0", + "eslint-config-openlayers": "^19.0.0", "lil-gui": "^0.19.1", "typescript": "^5.2.2", "vite": "^5.0.4" @@ -531,6 +531,18 @@ "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.3.tgz", "integrity": "sha512-an2OZ7/6er9Jja8EDUvU/tmtGIutdlb6LwXOwgjzoCjDRAsUd8sRZMBjoPEy78Xa9iOp+Kglk2CHgVwZuZbWbw==" }, + "node_modules/@pkgr/core": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz", + "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.1.tgz", @@ -1569,29 +1581,16 @@ } }, "node_modules/eslint-config-openlayers": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-18.1.0.tgz", - "integrity": "sha512-/ON98zbqnk6pRXBQX8vgEwY6P4qmTDKHfpEsRiH85U5t4wopYU1BiI5KJ0zPnqzisGERbx1kUl0tzXdGCuvaNQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-19.0.0.tgz", + "integrity": "sha512-UGdhughZ0oVZtId1LMN/nlcLA/eDkCgha2aT1daXIiGTe4jNVM3SzeAp0jVTrh6htP3Z6Gq9K9IHXAgccVg/7Q==", "dev": true, "dependencies": { - "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.1", - "eslint-plugin-jsdoc": "^46.2.6", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-jsdoc": "^47.0.1", + "eslint-plugin-prettier": "^5.1.2", "eslint-plugin-sort-imports-es6-autofix": "^0.6.0", - "prettier": "^2.4.1" - } - }, - "node_modules/eslint-config-prettier": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", - "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true, - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" + "prettier": "^3.1.1" } }, "node_modules/eslint-import-resolver-node": { @@ -1693,9 +1692,9 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "46.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.9.0.tgz", - "integrity": "sha512-UQuEtbqLNkPf5Nr/6PPRCtr9xypXY+g8y/Q7gPa0YK7eDhh0y2lWprXRnaYbW7ACgIUvpDKy9X2bZqxtGzBG9Q==", + "version": "47.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-47.0.2.tgz", + "integrity": "sha512-sIq81Pv+yrhhwY0m1JH79rdZRgDNunehv3S0Yv0UfewpoeJyPkODFn2o4o20nofVoI2tjku9/QBcCYUmmeWFXA==", "dev": true, "dependencies": { "@es-joy/jsdoccomment": "~0.41.0", @@ -1706,13 +1705,13 @@ "esquery": "^1.5.0", "is-builtin-module": "^3.2.1", "semver": "^7.5.4", - "spdx-expression-parse": "^3.0.1" + "spdx-expression-parse": "^4.0.0" }, "engines": { "node": ">=16" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" } }, "node_modules/eslint-plugin-jsdoc/node_modules/semver": { @@ -1731,21 +1730,30 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.2.tgz", + "integrity": "sha512-dhlpWc9vOwohcWmClFcA+HjlvUpuyynYs0Rf+L/P6/0iQE6vlHW9l5bkfzN62/Stm9fbq8ku46qzde76T1xlSg==", "dev": true, "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.6" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -2977,15 +2985,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -3290,9 +3298,9 @@ "dev": true }, "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", + "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", "dev": true, "dependencies": { "spdx-exceptions": "^2.1.0", @@ -3407,6 +3415,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/synckit": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 8b8a445..56460d4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "devDependencies": { "@types/geojson": "^7946.0.10", "eslint": "^8.56.0", - "eslint-config-openlayers": "^18.1.0", + "eslint-config-openlayers": "^19.0.0", "lil-gui": "^0.19.1", "typescript": "^5.2.2", "vite": "^5.0.4" From 5fedd4e4a6fe817a74eacafda4f91ccca74c541a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 16 Jan 2024 11:11:45 +0100 Subject: [PATCH 2/2] Add missing trailing commas --- cases/common.js | 8 ++++---- cases/filtering-shapes/main.js | 8 ++++---- cases/line-rendering/main.js | 16 ++++++++-------- cases/point-rendering/main.js | 10 +++++----- cases/polygon-rendering/main.js | 14 +++++++------- cases/vector-tiles-rendering/main.js | 8 ++++---- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cases/common.js b/cases/common.js index 928b37d..fcceb85 100644 --- a/cases/common.js +++ b/cases/common.js @@ -286,7 +286,7 @@ export function registerGuiParameter( label, values, defaultValue, - callback + callback, ) { let controller; const isNumeric = typeof values[0] === 'number'; @@ -309,7 +309,7 @@ export function registerGuiParameter( id, numericValues[0], numericValues[1], - numericValues[2] || 1 + numericValues[2] || 1, ); } else { guiParams[id] = initialValue; @@ -388,7 +388,7 @@ export function initializeGui() { return; } regenerateLayer(); - } + }, ); registerGuiParameter( @@ -402,6 +402,6 @@ export function initializeGui() { } else if (!initial) { location.reload(); } - } + }, ); } diff --git a/cases/filtering-shapes/main.js b/cases/filtering-shapes/main.js index 85000e9..ae4b521 100644 --- a/cases/filtering-shapes/main.js +++ b/cases/filtering-shapes/main.js @@ -48,9 +48,9 @@ function main() { style, }, ], - }) + }), ); - } + }, ); initializeGui(); registerGuiParameter( @@ -60,7 +60,7 @@ function main() { 200000, (value, initial) => { resetData(/** @type {number} */ (value)); - } + }, ); registerGuiParameter( 'filterValue', @@ -73,7 +73,7 @@ function main() { } style.filter = ['>', ['get', 'ratio'], value]; regenerateLayer(); - } + }, ); style.filter = ['>', ['get', 'ratio'], getGuiParameterValue('filterValue')]; } diff --git a/cases/line-rendering/main.js b/cases/line-rendering/main.js index b569e4d..79be1ba 100644 --- a/cases/line-rendering/main.js +++ b/cases/line-rendering/main.js @@ -42,7 +42,7 @@ function main() { }, (map) => { map.addLayer(new VectorLayer({source, style})); - } + }, ); initializeGui(); registerGuiParameter( @@ -57,9 +57,9 @@ function main() { resetData( /** @type {number} */ (value), /** @type {number} */ (getGuiParameterValue('curveComplexity')), - /** @type {number} */ (getGuiParameterValue('width')) + /** @type {number} */ (getGuiParameterValue('width')), ); - } + }, ); registerGuiParameter('width', 'Width', [1, 20, 1], 2, (value, initial) => { if (initial) { @@ -68,7 +68,7 @@ function main() { resetData( /** @type {number} */ (getGuiParameterValue('count')), /** @type {number} */ (getGuiParameterValue('curveComplexity')), - /** @type {number} */ (value) + /** @type {number} */ (value), ); }); registerGuiParameter( @@ -83,9 +83,9 @@ function main() { resetData( /** @type {number} */ (getGuiParameterValue('count')), /** @type {number} */ (value), - /** @type {number} */ (getGuiParameterValue('width')) + /** @type {number} */ (getGuiParameterValue('width')), ); - } + }, ); registerGuiParameter( 'dash', @@ -99,13 +99,13 @@ function main() { delete style['stroke-line-dash']; } regenerateLayer(); - } + }, ); resetData( /** @type {number} */ (getGuiParameterValue('count')), /** @type {number} */ (getGuiParameterValue('curveComplexity')), - /** @type {number} */ (getGuiParameterValue('width')) + /** @type {number} */ (getGuiParameterValue('width')), ); } main(); diff --git a/cases/point-rendering/main.js b/cases/point-rendering/main.js index 918f595..be084d0 100644 --- a/cases/point-rendering/main.js +++ b/cases/point-rendering/main.js @@ -42,7 +42,7 @@ function main() { }, (map) => { map.addLayer(new VectorLayer({source, style})); - } + }, ); initializeGui(); registerGuiParameter( @@ -56,9 +56,9 @@ function main() { } resetData( /** @type {number} */ (value), - /** @type {number} */ (getGuiParameterValue('radius')) + /** @type {number} */ (getGuiParameterValue('radius')), ); - } + }, ); registerGuiParameter('radius', 'Radius', [4, 40, 1], 4, (value, initial) => { if (initial) { @@ -66,13 +66,13 @@ function main() { } resetData( /** @type {number} */ (getGuiParameterValue('count')), - /** @type {number} */ (value) + /** @type {number} */ (value), ); }); resetData( /** @type {number} */ (getGuiParameterValue('count')), - /** @type {number} */ (getGuiParameterValue('radius')) + /** @type {number} */ (getGuiParameterValue('radius')), ); } main(); diff --git a/cases/polygon-rendering/main.js b/cases/polygon-rendering/main.js index d7cff75..61d91b3 100644 --- a/cases/polygon-rendering/main.js +++ b/cases/polygon-rendering/main.js @@ -37,7 +37,7 @@ function main() { }, (map) => { map.addLayer(new VectorLayer({source, style})); - } + }, ); initializeGui(); registerGuiParameter( @@ -51,9 +51,9 @@ function main() { } resetData( /** @type {number} */ (value), - /** @type {number} */ (getGuiParameterValue('vertices')) + /** @type {number} */ (getGuiParameterValue('vertices')), ); - } + }, ); registerGuiParameter( 'vertices', @@ -66,9 +66,9 @@ function main() { } resetData( /** @type {number} */ (getGuiParameterValue('count')), - /** @type {number} */ (value) + /** @type {number} */ (value), ); - } + }, ); registerGuiParameter( 'outline', @@ -84,12 +84,12 @@ function main() { delete style['stroke-color']; } regenerateLayer(); - } + }, ); resetData( /** @type {number} */ (getGuiParameterValue('count')), - /** @type {number} */ (getGuiParameterValue('vertices')) + /** @type {number} */ (getGuiParameterValue('vertices')), ); } diff --git a/cases/vector-tiles-rendering/main.js b/cases/vector-tiles-rendering/main.js index 21bbc3e..a639878 100644 --- a/cases/vector-tiles-rendering/main.js +++ b/cases/vector-tiles-rendering/main.js @@ -187,7 +187,7 @@ function tileLoadFunction(tile) { countPolygons, countLines, numVertices, - extent + extent, ); const features = format.readFeatures(data); tile.setFeatures(features); @@ -204,9 +204,9 @@ function main() { source, // @ts-ignore style: style, - }) + }), ); - } + }, ); initializeGui(); registerGuiParameter( @@ -222,7 +222,7 @@ function main() { // workaround required for webgl renderer; see https://github.com/openlayers/openlayers/issues/15213 // @ts-ignore source.setKey(Date.now().toString()); - } + }, ); }