From e29150b87811b0e254693b178c480bde563c4538 Mon Sep 17 00:00:00 2001 From: William French Date: Wed, 17 Jun 2026 09:32:17 -0700 Subject: [PATCH] chore: hoist deck.gl dependencies to root package.json to avoid dependabot conflicts --- package-lock.json | 123 ++++++++++-------------- package.json | 5 + samples/deckgl-arclayer/package.json | 8 +- samples/deckgl-heatmap/package.json | 8 +- samples/deckgl-kml-updated/package.json | 6 +- samples/deckgl-kml/package.json | 6 +- samples/deckgl-points/package.json | 8 +- samples/deckgl-polygon/package.json | 8 +- samples/deckgl-tripslayer/package.json | 9 +- 9 files changed, 67 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8f07ebd1..b220d8ff1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,11 @@ "samples/*" ], "dependencies": { + "@deck.gl/core": "^9.3.4", + "@deck.gl/geo-layers": "^9.3.4", + "@deck.gl/google-maps": "^9.3.4", + "@deck.gl/layers": "^9.3.4", + "@loaders.gl/kml": "^4.4.3", "dotenv": "^17.4.2" }, "devDependencies": { @@ -71,7 +76,9 @@ } }, "node_modules/@deck.gl/geo-layers": { - "version": "9.3.2", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-9.3.4.tgz", + "integrity": "sha512-NEfBqU/5fk5A+ZhTmiTvb5lPeRka6l/1bPSCyk0CSeyP2M7y6gJtT+EmtQAduIFl5YMp2sO+5tIu6NbnfxQbrg==", "license": "MIT", "dependencies": { "@loaders.gl/3d-tiles": "^4.4.1", @@ -103,7 +110,9 @@ } }, "node_modules/@deck.gl/google-maps": { - "version": "9.3.2", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-9.3.4.tgz", + "integrity": "sha512-TE4GvdWpw+He6VGbjVvzk1ivdgBlYXdhx+LCOSkfskv+tX/hYIdqnot+REmioDuXOBMhS3Eg2etXmm81fCyCTQ==", "license": "MIT", "dependencies": { "@luma.gl/webgl": "^9.3.3", @@ -117,7 +126,9 @@ } }, "node_modules/@deck.gl/layers": { - "version": "9.3.2", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-9.3.4.tgz", + "integrity": "sha512-9DnFuWiul3rwE9uuum/AdGt7M/z0gybp6rL0ewlaLFojuaonCkxSQZo/gtEBsJwpw3RrNuhGdBej5axKNvkTgw==", "license": "MIT", "dependencies": { "@loaders.gl/images": "^4.4.1", @@ -1142,14 +1153,14 @@ } }, "node_modules/@loaders.gl/kml": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/kml/-/kml-4.4.2.tgz", - "integrity": "sha512-ni/uFSACJSBSB5GLagb3NoJmYTtaa9LpKgg6t7jcT+RxB8v8+t7wZQZWKJvEk5efgXQBdVgWOksBJDhPA2M/Ng==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/kml/-/kml-4.4.3.tgz", + "integrity": "sha512-+L87bxspxC01txqJw3ZG4dFBg/BDnqjEv83blBv9t0VOxdOh0pXPemxshMoVzlx4Y/AGD7JpwciDZ99jts2Etg==", "license": "MIT", "dependencies": { - "@loaders.gl/gis": "4.4.2", - "@loaders.gl/loader-utils": "4.4.2", - "@loaders.gl/schema": "4.4.2", + "@loaders.gl/gis": "4.4.3", + "@loaders.gl/loader-utils": "4.4.3", + "@loaders.gl/schema": "4.4.3", "@tmcw/togeojson": "^4.5.0", "@xmldom/xmldom": "^0.7.13" }, @@ -1158,9 +1169,9 @@ } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/geoarrow": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/geoarrow/-/geoarrow-4.4.2.tgz", - "integrity": "sha512-FGCtUsvTwdxiNqS8cEtys1FdM/m6pwMzvNEa32sHfrI4Si465Oa2iJkyu2q/XMgL/vhfE/G3EezpVKZARbCzkw==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/geoarrow/-/geoarrow-4.4.3.tgz", + "integrity": "sha512-P0TSbtsw1UI1rZnp1tGHuqPVHcH7Yc14q9jZLIcrjhQOzol55YDI0/hYSXpA73794nR6o8ALxNwiy7/4HlBlcA==", "license": "MIT", "dependencies": { "@math.gl/polygon": "^4.1.0", @@ -1171,15 +1182,15 @@ } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/gis": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.4.2.tgz", - "integrity": "sha512-VMs1XcqUCqLczfySsI9VA/L3WDuuNRPqVoHcXU3FZuSe49x++gtwmxF1TEhJCaQINk0CkCOnxBbKOz3I9M1e3w==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-4.4.3.tgz", + "integrity": "sha512-2dhhzfCT1cXQQLZ1lMtb2Y+pX414qaeLL8Wpx7FJu/ar1HJfKL6Fb3juTR+2WzMybkAOX5zLxYh6+y7LqiPjgA==", "license": "MIT", "dependencies": { - "@loaders.gl/geoarrow": "4.4.2", - "@loaders.gl/loader-utils": "4.4.2", - "@loaders.gl/schema": "4.4.2", - "@loaders.gl/schema-utils": "4.4.2", + "@loaders.gl/geoarrow": "4.4.3", + "@loaders.gl/loader-utils": "4.4.3", + "@loaders.gl/schema": "4.4.3", + "@loaders.gl/schema-utils": "4.4.3", "@mapbox/vector-tile": "^1.3.1", "@math.gl/polygon": "^4.1.0", "pbf": "^3.2.1" @@ -1189,21 +1200,21 @@ } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/loader-utils": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.4.2.tgz", - "integrity": "sha512-kqwBbyRC7rrQVsnJyKeoaig9hxaa5oj91OKqWm27HPuVn4q2dD67SEhiG0ND62eRp0tLY6jTqEcI5kDzHBZ6MA==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-4.4.3.tgz", + "integrity": "sha512-5yt1OqZPYR3d+xFAqtzSKO24Hd7019KqN+iOWp7XBKPQBS+sAEhAnmSTnO1axo45IEi14J3FhMDk+ndqBoSKEQ==", "license": "MIT", "dependencies": { - "@loaders.gl/schema": "4.4.2", - "@loaders.gl/worker-utils": "4.4.2", + "@loaders.gl/schema": "4.4.3", + "@loaders.gl/worker-utils": "4.4.3", "@probe.gl/log": "^4.1.1", "@probe.gl/stats": "^4.1.1" } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/schema": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.4.2.tgz", - "integrity": "sha512-mJTZehTHIFl8ed+03nebuPAMnLP8Yp00DKTzCnKT2HNy/uV4+Sw+GrGIuhPHGU8tdQmtBXRURGM2ZxUAxMfGKg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-4.4.3.tgz", + "integrity": "sha512-tDb/rOn44nHWvMFSOaAk1/pQcQcusxirGCM1O5BMJR0PQ71UrCHey56rsbcf7/wGhvyRwPtX+oiMzlJ9TmN8vQ==", "license": "MIT", "dependencies": { "@types/geojson": "^7946.0.7", @@ -1211,12 +1222,12 @@ } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/schema-utils": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/schema-utils/-/schema-utils-4.4.2.tgz", - "integrity": "sha512-yYYRD/POBEO72rhIyLASrqKUUhfIOQuFk/fgInN6Td2qvFgsHbo5UaCM4sTqVUWwNxNvXDQi8ezpbnCa/yi+OQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/schema-utils/-/schema-utils-4.4.3.tgz", + "integrity": "sha512-TggzQWkzf9pIYbj8I9RlTk33kwXslvDkY1nnw/OL/hika6qTls1G127qK5m9skiAjElk5ZkvQLQcwhOboZXZeA==", "license": "MIT", "dependencies": { - "@loaders.gl/schema": "4.4.2", + "@loaders.gl/schema": "4.4.3", "@types/geojson": "^7946.0.7", "apache-arrow": ">= 17.0.0" }, @@ -1225,9 +1236,9 @@ } }, "node_modules/@loaders.gl/kml/node_modules/@loaders.gl/worker-utils": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.4.2.tgz", - "integrity": "sha512-oiZ0SoC1QKrOkhYPlVZ6Q06CtmuFRyZw2rwzmT08ZyaGtOArIJHDjlhxzwWiv+6fdws47Ub5uIGsdI1Ab1xYsA==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-4.4.3.tgz", + "integrity": "sha512-RZt/NwFXm6Kx3Fn/rqiW3Alse9Z0XtBktH/EFAp8W6LvsKuxpRMjULqGfybTu2waRXRYUNYZ6zGs9aOWbtDRLw==", "license": "MIT", "peerDependencies": { "@loaders.gl/core": "~4.4.0" @@ -5513,30 +5524,16 @@ }, "samples/deckgl-arclayer": { "name": "@js-api-samples/deckgl-arclayer", - "version": "1.0.0", - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } + "version": "1.0.0" }, "samples/deckgl-heatmap": { "name": "@js-api-samples/deckgl-heatmap", - "version": "1.0.0", - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } + "version": "1.0.0" }, "samples/deckgl-kml": { "name": "@js-api-samples/deckgl-kml", "version": "1.0.0", "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1", - "@loaders.gl/kml": "^4.4.2", "@tmcw/togeojson": "^7.1.2" }, "devDependencies": { @@ -5547,10 +5544,6 @@ "name": "@js-api-samples/deckgl-kml-updated", "version": "1.0.0", "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1", - "@loaders.gl/kml": "^4.4.2", "@tmcw/togeojson": "^7.1.2" }, "devDependencies": { @@ -5559,31 +5552,15 @@ }, "samples/deckgl-points": { "name": "@js-api-samples/deckgl-points", - "version": "1.0.0", - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } + "version": "1.0.0" }, "samples/deckgl-polygon": { "name": "@js-api-samples/deckgl-polygon", - "version": "1.0.0", - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } + "version": "1.0.0" }, "samples/deckgl-tripslayer": { "name": "@js-api-samples/deckgl-tripslayer", - "version": "1.0.0", - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/geo-layers": "^9.3.2", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } + "version": "1.0.0" }, "samples/event-arguments": { "name": "@js-api-samples/event-arguments", diff --git a/package.json b/package.json index 8f078701c..2ba230ae3 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,11 @@ "vite": "^8.0.16" }, "dependencies": { + "@deck.gl/core": "^9.3.4", + "@deck.gl/geo-layers": "^9.3.4", + "@deck.gl/google-maps": "^9.3.4", + "@deck.gl/layers": "^9.3.4", + "@loaders.gl/kml": "^4.4.3", "dotenv": "^17.4.2" }, "overrides": { diff --git a/samples/deckgl-arclayer/package.json b/samples/deckgl-arclayer/package.json index e4ab0d536..525b31d15 100644 --- a/samples/deckgl-arclayer/package.json +++ b/samples/deckgl-arclayer/package.json @@ -8,9 +8,5 @@ "build:vite": "vite build --base './'", "preview": "vite preview" }, - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } -} + "dependencies": {} +} \ No newline at end of file diff --git a/samples/deckgl-heatmap/package.json b/samples/deckgl-heatmap/package.json index 6de03487e..919722896 100644 --- a/samples/deckgl-heatmap/package.json +++ b/samples/deckgl-heatmap/package.json @@ -8,9 +8,5 @@ "build:vite": "vite build --base './'", "preview": "vite preview" }, - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } -} + "dependencies": {} +} \ No newline at end of file diff --git a/samples/deckgl-kml-updated/package.json b/samples/deckgl-kml-updated/package.json index 28d64e410..db713c7a4 100644 --- a/samples/deckgl-kml-updated/package.json +++ b/samples/deckgl-kml-updated/package.json @@ -9,13 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1", - "@loaders.gl/kml": "^4.4.2", "@tmcw/togeojson": "^7.1.2" }, "devDependencies": { "apache-arrow": "^21.1.0" } -} +} \ No newline at end of file diff --git a/samples/deckgl-kml/package.json b/samples/deckgl-kml/package.json index 0a339b79b..4f91066ec 100644 --- a/samples/deckgl-kml/package.json +++ b/samples/deckgl-kml/package.json @@ -9,13 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1", - "@loaders.gl/kml": "^4.4.2", "@tmcw/togeojson": "^7.1.2" }, "devDependencies": { "apache-arrow": "^21.1.0" } -} +} \ No newline at end of file diff --git a/samples/deckgl-points/package.json b/samples/deckgl-points/package.json index 588ad8ea4..9bd599ddb 100644 --- a/samples/deckgl-points/package.json +++ b/samples/deckgl-points/package.json @@ -8,9 +8,5 @@ "build:vite": "vite build --base './'", "preview": "vite preview" }, - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } -} + "dependencies": {} +} \ No newline at end of file diff --git a/samples/deckgl-polygon/package.json b/samples/deckgl-polygon/package.json index 8bc773e21..c8fe21f6d 100644 --- a/samples/deckgl-polygon/package.json +++ b/samples/deckgl-polygon/package.json @@ -8,9 +8,5 @@ "build:vite": "vite build --base './'", "preview": "vite preview" }, - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1" - } -} + "dependencies": {} +} \ No newline at end of file diff --git a/samples/deckgl-tripslayer/package.json b/samples/deckgl-tripslayer/package.json index b2e7980a5..409cb0141 100644 --- a/samples/deckgl-tripslayer/package.json +++ b/samples/deckgl-tripslayer/package.json @@ -8,10 +8,5 @@ "build:vite": "vite build --base './'", "preview": "vite preview" }, - "dependencies": { - "@deck.gl/core": "^9.3.4", - "@deck.gl/google-maps": "^9.3.2", - "@deck.gl/layers": "^9.3.1", - "@deck.gl/geo-layers": "^9.3.2" - } -} + "dependencies": {} +} \ No newline at end of file