From ada54fc1bc1981f7ada3fca8018bab5c9656eb6c Mon Sep 17 00:00:00 2001 From: Ib Green Date: Tue, 12 Mar 2024 17:21:55 -0400 Subject: [PATCH] chore: Upgrade to luma.gl@^9.0.0 (#8642) --- examples/playground/package.json | 2 +- modules/aggregation-layers/package.json | 8 +-- modules/arcgis/package.json | 8 +-- modules/carto/package.json | 4 +- modules/core/package.json | 10 ++-- modules/extensions/package.json | 8 +-- modules/geo-layers/package.json | 8 +-- modules/google-maps/package.json | 4 +- modules/jupyter-widget/package.json | 2 +- modules/layers/package.json | 4 +- modules/mapbox/package.json | 4 +- modules/mesh-layers/package.json | 8 +-- modules/test-utils/package.json | 6 +-- package.json | 4 +- yarn.lock | 70 ++++++++++++------------- 15 files changed, 75 insertions(+), 75 deletions(-) diff --git a/examples/playground/package.json b/examples/playground/package.json index cf1849724af..64906db7831 100644 --- a/examples/playground/package.json +++ b/examples/playground/package.json @@ -14,7 +14,7 @@ "@loaders.gl/csv": "^4.2.0-alpha.5", "@loaders.gl/draco": "^4.2.0-alpha.5", "@loaders.gl/gltf": "^4.2.0-alpha.5", - "@luma.gl/constants": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", "brace": "^0.11.1", "deck.gl": "^8.8.0", "maplibre-gl": "^3.0.0", diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json index 74c00ea5994..5112291bc83 100644 --- a/modules/aggregation-layers/package.json +++ b/modules/aggregation-layers/package.json @@ -38,16 +38,16 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "9.0.0-beta.10", - "@luma.gl/shadertools": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", + "@luma.gl/shadertools": "^9.0.0", "@math.gl/web-mercator": "^4.0.0", "d3-hexbin": "^0.2.1" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", "@deck.gl/layers": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json index df4fde72d7d..9e92f39fd62 100644 --- a/modules/arcgis/package.json +++ b/modules/arcgis/package.json @@ -36,15 +36,15 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "9.0.0-beta.10", - "@luma.gl/webgl": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", + "@luma.gl/webgl": "^9.0.0", "esri-loader": "^3.3.0" }, "peerDependencies": { "@arcgis/core": "^4.0.0", "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/carto/package.json b/modules/carto/package.json index f4b99ce5c1d..79efea70bb1 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -47,7 +47,7 @@ "@loaders.gl/mvt": "^4.2.0-alpha.5", "@loaders.gl/schema": "^4.2.0-alpha.5", "@loaders.gl/tiles": "^4.2.0-alpha.5", - "@luma.gl/constants": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", "@math.gl/web-mercator": "^4.0.0", "@types/d3-array": "^3.0.2", "@types/d3-color": "^1.4.2", @@ -70,7 +70,7 @@ "@deck.gl/geo-layers": "^9.0.0-beta", "@deck.gl/layers": "^9.0.0-beta", "@loaders.gl/core": "^4.2.0-alpha.5", - "@luma.gl/core": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/core/package.json b/modules/core/package.json index f53822b5718..82f168d4522 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -42,11 +42,11 @@ "dependencies": { "@loaders.gl/core": "^4.2.0-alpha.5", "@loaders.gl/images": "^4.2.0-alpha.5", - "@luma.gl/constants": "9.0.0-beta.10", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10", - "@luma.gl/shadertools": "9.0.0-beta.10", - "@luma.gl/webgl": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0", + "@luma.gl/shadertools": "^9.0.0", + "@luma.gl/webgl": "^9.0.0", "@math.gl/core": "^4.0.0", "@math.gl/sun": "^4.0.0", "@math.gl/web-mercator": "^4.0.0", diff --git a/modules/extensions/package.json b/modules/extensions/package.json index 8a7289f7192..f77cfbee6e2 100644 --- a/modules/extensions/package.json +++ b/modules/extensions/package.json @@ -38,14 +38,14 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "9.0.0-beta.10", - "@luma.gl/shadertools": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", + "@luma.gl/shadertools": "^9.0.0", "@math.gl/core": "^4.0.0" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json index 8dc3fdcbb64..49c2d91cdf2 100644 --- a/modules/geo-layers/package.json +++ b/modules/geo-layers/package.json @@ -46,8 +46,8 @@ "@loaders.gl/terrain": "^4.2.0-alpha.5", "@loaders.gl/tiles": "^4.2.0-alpha.5", "@loaders.gl/wms": "^4.2.0-alpha.5", - "@luma.gl/gltf": "9.0.0-beta.10", - "@luma.gl/shadertools": "9.0.0-beta.10", + "@luma.gl/gltf": "^9.0.0", + "@luma.gl/shadertools": "^9.0.0", "@math.gl/core": "^4.0.0", "@math.gl/culling": "^4.0.0", "@math.gl/web-mercator": "^4.0.0", @@ -61,8 +61,8 @@ "@deck.gl/layers": "^9.0.0-beta", "@deck.gl/mesh-layers": "^9.0.0-beta", "@loaders.gl/core": "^4.2.0-alpha.5", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/google-maps/package.json b/modules/google-maps/package.json index dcff094a35f..5fbd3bde88a 100644 --- a/modules/google-maps/package.json +++ b/modules/google-maps/package.json @@ -38,13 +38,13 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", "@math.gl/core": "^4.0.0", "@types/google.maps": "^3.48.6" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json index a02d4ee5363..ea79d668182 100644 --- a/modules/jupyter-widget/package.json +++ b/modules/jupyter-widget/package.json @@ -39,7 +39,7 @@ "@loaders.gl/3d-tiles": "^4.2.0-alpha.5", "@loaders.gl/core": "^4.2.0-alpha.5", "@loaders.gl/csv": "^4.2.0-alpha.5", - "@luma.gl/core": "9.0.0-beta.10", + "@luma.gl/core": "^9.0.0", "d3-dsv": "^1.0.8", "mapbox-gl": "^1.13.2" }, diff --git a/modules/layers/package.json b/modules/layers/package.json index d648c071500..7f95d185555 100644 --- a/modules/layers/package.json +++ b/modules/layers/package.json @@ -48,8 +48,8 @@ "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", "@loaders.gl/core": "^4.2.0-alpha.5", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/mapbox/package.json b/modules/mapbox/package.json index 6a5aadc5b4a..8aaaa18e225 100644 --- a/modules/mapbox/package.json +++ b/modules/mapbox/package.json @@ -38,12 +38,12 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "9.0.0-beta.10", + "@luma.gl/constants": "^9.0.0", "@math.gl/web-mercator": "^4.0.0" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json index 5e0bdb483bf..5d9220b4d6c 100644 --- a/modules/mesh-layers/package.json +++ b/modules/mesh-layers/package.json @@ -39,13 +39,13 @@ }, "dependencies": { "@loaders.gl/gltf": "^4.2.0-alpha.5", - "@luma.gl/gltf": "9.0.0-beta.10", - "@luma.gl/shadertools": "9.0.0-beta.10" + "@luma.gl/gltf": "^9.0.0", + "@luma.gl/shadertools": "^9.0.0" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10" + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json index 92b52290fe9..ae9d1192257 100644 --- a/modules/test-utils/package.json +++ b/modules/test-utils/package.json @@ -33,12 +33,12 @@ "typed" ], "dependencies": { - "@luma.gl/test-utils": "9.0.0-beta.10" + "@luma.gl/test-utils": "^9.0.0" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-beta", - "@luma.gl/core": "9.0.0-beta.10", - "@luma.gl/engine": "9.0.0-beta.10", + "@luma.gl/core": "^9.0.0", + "@luma.gl/engine": "^9.0.0", "@probe.gl/test-utils": "^4.0.0" }, "scripts": {}, diff --git a/package.json b/package.json index 2654bacdadc..91f9a5a9720 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "@babel/register": "^7.13.0", "@loaders.gl/csv": "^4.2.0-alpha.5", "@loaders.gl/polyfills": "^4.2.0-alpha.5", - "@luma.gl/test-utils": "9.0.0-beta.10", - "@luma.gl/webgpu": "9.0.0-beta.10", + "@luma.gl/test-utils": "^9.0.0", + "@luma.gl/webgpu": "^9.0.0", "@math.gl/proj4": "^4.0.0", "@probe.gl/bench": "^4.0.9", "@probe.gl/test-utils": "^4.0.9", diff --git a/yarn.lock b/yarn.lock index fc3dac08f12..466bfcf589e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2603,15 +2603,15 @@ jszip "^3.1.5" md5 "^2.3.0" -"@luma.gl/constants@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.0.0-beta.10.tgz#ac807c050758dbc6458082876900a5580b25c7e3" - integrity sha512-L95lTrRG0/iF/TEN1OZMlrKEP6tlNFeFMphlw31jeo2MWo7kdrrOfsjhGoxtrT3u7fBfWPDcfqfM2OPa5dFIGQ== +"@luma.gl/constants@9.0.0", "@luma.gl/constants@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.0.0.tgz#d5f25344b3ef98d858135baae2dcf5ebd87769f2" + integrity sha512-0oVddffzzkYeHs2CKwehezQ0R5IkqM9Jq2FVYdnOAa02rAtqytWwvmhn4zs0Q/kYtHVn51OnkqIcB1vk5MsLJA== -"@luma.gl/core@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.0.0-beta.10.tgz#b0ebc22bb29e3d4525e79d77a45abc679b073c66" - integrity sha512-RWuwUxQ/0BJUwDsDLZG7B438IFvymU0jpBcYm45xvUV76zMKxn+sUdGfhh6vTuzZfJV6ctmJutzHnC9TDOTsrA== +"@luma.gl/core@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.0.0.tgz#01004c2263a5190e3d6aa3322f547317fc8c1b0e" + integrity sha512-3ApetxOC5vcdViyQGyiyUiXxcpt6f+bsFE0LcJy32HA9ygBkojzcpmfTFRm9SO9FMhI2zn2jq7i+xh7xVmrl0Q== dependencies: "@math.gl/types" "^4.0.0" "@probe.gl/env" "^4.0.2" @@ -2619,53 +2619,53 @@ "@probe.gl/stats" "^4.0.2" "@types/offscreencanvas" "^2019.6.4" -"@luma.gl/engine@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.0.0-beta.10.tgz#0e1aee84952303c0e518a126e3b602e47794262f" - integrity sha512-AQ9T0P/ko1/HfPo6hIJoEkbeISV1Xlu6zBT/kB9h7+11t+2+86cPEdKqpDCNByd8Ycu0PGBH32BLf9mMKCvJGA== +"@luma.gl/engine@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.0.0.tgz#c3d7856be7e9685f86549a30729e7f8d10c3501e" + integrity sha512-I5OUFvqkYlsz1zn0u9EcF+NDtWSCvtSA3Ki8dRcbhx3ff2f1UuMZ8w0H2f/0Dz4pfnRaSXFaxfx6EslbXK2TzQ== dependencies: - "@luma.gl/shadertools" "9.0.0-beta.10" + "@luma.gl/shadertools" "9.0.0" "@math.gl/core" "^4.0.0" "@probe.gl/log" "^4.0.2" "@probe.gl/stats" "^4.0.2" -"@luma.gl/gltf@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.0.0-beta.10.tgz#d7135d784bc70649b9385bab1cba7b345cb6f81d" - integrity sha512-x5KabkIxQOryOw6j4ve3C1sM/NK799/uQZvOU+xKpc4URjyz1GIrsanotGShMoap0/yxVQ1jQenvypld4GKt1A== +"@luma.gl/gltf@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.0.0.tgz#cf87ab045d0b4c28380165f76a2971c7e73a8875" + integrity sha512-Wjpo/kJZm6R9Pr0Co4tWqxc+vBAGNOlpvFkdNLcvdtkJJg/pqOD4QOR1Wc6QRSfUhZh9yPwgYHwSNKfkBO9kAA== dependencies: "@loaders.gl/textures" "^4.1.0" - "@luma.gl/shadertools" "9.0.0-beta.10" + "@luma.gl/shadertools" "9.0.0" "@math.gl/core" "^4.0.0" -"@luma.gl/shadertools@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.0.0-beta.10.tgz#ff790abcf5b6d6aa50bd36160782da8bcdbb5527" - integrity sha512-Xe/s+K3gXHyuJAI8U9P8QULSETEnsD211mibLTiBdftxLel+BibNmdgLCXZlrh3/Y0asvuiVDxicoyU2gS912g== +"@luma.gl/shadertools@9.0.0", "@luma.gl/shadertools@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.0.0.tgz#b510b9ec9a5077a32db368226e30cf44c66d9b98" + integrity sha512-m8IdrG+bFz8P2onLDD0fdaH12ibMzShxZ4I/DDrz9HFq4CitdiMABQiqRmAzZNv0RxnyJ6xIYxvudgvUk18B3Q== dependencies: "@math.gl/core" "^4.0.0" "@math.gl/types" "^4.0.0" -"@luma.gl/test-utils@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.0.0-beta.10.tgz#c94f3c0a33795d8ddc1e79ea931c1384baf2b144" - integrity sha512-XPDk3OTwKRCpCG/tG7ZzxVVJgtoRgVoZf3AJdzrkWd1kaZ7dYQwK3JHQPpKYLWYYp7iMBDtWl8WmIOMsY4268A== +"@luma.gl/test-utils@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.0.0.tgz#db43e5d42afbb6881ff7b39eb333420a18f2b8fe" + integrity sha512-amTq0rglCF3k7qps7cs7nTRykF6R96U8EBUH/fz7Y7WaTxfTYQGbFzVoLNlhMylieNJ2NnzDNgqoEvEY2TUGwQ== dependencies: "@probe.gl/env" "^4.0.2" "@probe.gl/stats" "^4.0.2" -"@luma.gl/webgl@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.0.0-beta.10.tgz#5c31918001ff50b05a1e89fc041a8b6acc4aa006" - integrity sha512-BFf5iKkdFn2JeF5p0ni8dr5ixthwp1Lvc0l4PnUFQ5sJGruYEVMn5puqp4DRjcWm4UtBTdJjGQgWGfiWWvWwkg== +"@luma.gl/webgl@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.0.0.tgz#2efe381529b5af1a092ff10edbe41ddf03d10469" + integrity sha512-yAHvoFcSXepMk5mh3Z3K/P63fkkNYoivkUBhivz0rXFzkp5I1kXpyEvnDvREdan8GRZoKXM9SvlRSvHVxTdNIw== dependencies: - "@luma.gl/constants" "9.0.0-beta.10" + "@luma.gl/constants" "9.0.0" "@probe.gl/env" "^4.0.2" -"@luma.gl/webgpu@9.0.0-beta.10": - version "9.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.0.0-beta.10.tgz#b8d9f306a0937d813ebc4e443b3409f0f149bf84" - integrity sha512-5MRh2acGzel8ivGyWNcYouOw/CG2O0iOGPcA7/cOEbQB5uPdM4lThTAxfqhuN0O9Ur3A/IWUXmyfdtC4C4lcAA== +"@luma.gl/webgpu@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.0.0.tgz#b43c455e93d56bd2553ef72eed22906313fbd530" + integrity sha512-8wkqdh91V8Bou0s4FydVjiESfQrZ/JfL2cExga/mbU/8T2q2hPDNUrui/vbXvzN5ngQD/Wlaub+JdnvrNP3MtQ== dependencies: "@probe.gl/env" "^4.0.2" "@webgpu/types" "^0.1.34"