From 0fdcd8b27e6d6ba70f8f38b4a033c61555af92bd Mon Sep 17 00:00:00 2001 From: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Date: Thu, 26 Sep 2024 05:18:14 +0200 Subject: [PATCH] chore(legacy-plugin-chart-map-box): bump supercluster to v8 (#30305) --- superset-frontend/package-lock.json | 54 ++++++++++--------- .../legacy-plugin-chart-map-box/package.json | 2 +- .../src/transformProps.js | 4 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index e96937d7d..1a8a962a4 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -49603,17 +49603,6 @@ "version": "4.2.0", "license": "MIT" }, - "node_modules/supercluster": { - "version": "4.1.1", - "license": "ISC", - "dependencies": { - "kdbush": "^2.0.1" - } - }, - "node_modules/supercluster/node_modules/kdbush": { - "version": "2.0.1", - "license": "ISC" - }, "node_modules/supports-color": { "version": "7.2.0", "license": "MIT", @@ -56687,7 +56676,7 @@ "dependencies": { "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^4.1.1", + "supercluster": "^8.0.1", "viewport-mercator-project": "^6.1.1" }, "peerDependencies": { @@ -56697,6 +56686,19 @@ "react": "^15 || ^16" } }, + "plugins/legacy-plugin-chart-map-box/node_modules/kdbush": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", + "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" + }, + "plugins/legacy-plugin-chart-map-box/node_modules/supercluster": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz", + "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==", + "dependencies": { + "kdbush": "^4.0.2" + } + }, "plugins/legacy-plugin-chart-paired-t-test": { "name": "@superset-ui/legacy-plugin-chart-paired-t-test", "version": "0.18.25", @@ -67141,8 +67143,23 @@ "requires": { "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^4.1.1", + "supercluster": "^8.0.1", "viewport-mercator-project": "^6.1.1" + }, + "dependencies": { + "kdbush": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", + "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" + }, + "supercluster": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz", + "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==", + "requires": { + "kdbush": "^4.0.2" + } + } } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { @@ -91739,17 +91756,6 @@ "stylis": { "version": "4.2.0" }, - "supercluster": { - "version": "4.1.1", - "requires": { - "kdbush": "^2.0.1" - }, - "dependencies": { - "kdbush": { - "version": "2.0.1" - } - } - }, "supports-color": { "version": "7.2.0", "requires": { diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json index 7e2127a58..2e0ad2524 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json +++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json @@ -28,7 +28,7 @@ "dependencies": { "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^4.1.1", + "supercluster": "^8.0.1", "viewport-mercator-project": "^6.1.1" }, "peerDependencies": { diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js index bf5fed5ca..de2da2a73 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js +++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import supercluster from 'supercluster'; +import Supercluster from 'supercluster'; import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox'; const NOOP = () => {}; @@ -72,7 +72,7 @@ export default function transformProps(chartProps) { /* eslint-enable no-param-reassign */ }; } - const clusterer = supercluster(opts); + const clusterer = new Supercluster(opts); clusterer.load(geoJSON.features); return {