Skip to content

Commit 315ceb0

Browse files
authored
Merge branch 'master' into ib/wgpu-scatterplot
2 parents dea9c32 + acfbbf5 commit 315ceb0

File tree

19 files changed

+96
-91
lines changed

19 files changed

+96
-91
lines changed

examples/playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@loaders.gl/csv": "^4.2.0",
1515
"@loaders.gl/draco": "^4.2.0",
1616
"@loaders.gl/gltf": "^4.2.0",
17-
"@luma.gl/constants": "^9.1.5",
17+
"@luma.gl/constants": "^9.1.7",
1818
"brace": "^0.11.1",
1919
"deck.gl": "^9.0.0",
2020
"maplibre-gl": "^5.0.0",

modules/aggregation-layers/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3939
},
4040
"dependencies": {
41-
"@luma.gl/constants": "^9.1.5",
42-
"@luma.gl/shadertools": "^9.1.5",
41+
"@luma.gl/constants": "^9.1.7",
42+
"@luma.gl/shadertools": "^9.1.7",
4343
"@math.gl/core": "^4.1.0",
4444
"@math.gl/web-mercator": "^4.1.0",
4545
"d3-hexbin": "^0.2.1"
4646
},
4747
"peerDependencies": {
4848
"@deck.gl/core": "^9.1.0",
4949
"@deck.gl/layers": "^9.1.0",
50-
"@luma.gl/core": "^9.1.5",
51-
"@luma.gl/engine": "^9.1.5"
50+
"@luma.gl/core": "^9.1.7",
51+
"@luma.gl/engine": "^9.1.7"
5252
},
5353
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5454
}

modules/arcgis/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3737
},
3838
"dependencies": {
39-
"@luma.gl/constants": "^9.1.5",
39+
"@luma.gl/constants": "^9.1.7",
4040
"esri-loader": "^3.7.0"
4141
},
4242
"peerDependencies": {
4343
"@arcgis/core": "^4.0.0",
4444
"@deck.gl/core": "^9.1.0",
45-
"@luma.gl/core": "^9.1.5",
46-
"@luma.gl/engine": "^9.1.5",
47-
"@luma.gl/webgl": "^9.1.5"
45+
"@luma.gl/core": "^9.1.7",
46+
"@luma.gl/engine": "^9.1.7",
47+
"@luma.gl/webgl": "^9.1.7"
4848
},
4949
"devDependencies": {
5050
"@arcgis/core": "^4.21.0"

modules/carto/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"@loaders.gl/mvt": "^4.2.0",
5050
"@loaders.gl/schema": "^4.2.0",
5151
"@loaders.gl/tiles": "^4.2.0",
52-
"@luma.gl/core": "^9.1.5",
53-
"@luma.gl/shadertools": "^9.1.5",
52+
"@luma.gl/core": "^9.1.7",
53+
"@luma.gl/shadertools": "^9.1.7",
5454
"@math.gl/web-mercator": "^4.1.0",
5555
"@types/d3-array": "^3.0.2",
5656
"@types/d3-color": "^1.4.2",
@@ -73,7 +73,7 @@
7373
"@deck.gl/geo-layers": "^9.1.0",
7474
"@deck.gl/layers": "^9.1.0",
7575
"@loaders.gl/core": "^4.2.0",
76-
"@luma.gl/core": "^9.1.5"
76+
"@luma.gl/core": "^9.1.7"
7777
},
7878
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
7979
}

modules/core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"dependencies": {
4343
"@loaders.gl/core": "^4.2.0",
4444
"@loaders.gl/images": "^4.2.0",
45-
"@luma.gl/constants": "^9.1.5",
46-
"@luma.gl/core": "^9.1.5",
47-
"@luma.gl/engine": "^9.1.5",
48-
"@luma.gl/shadertools": "^9.1.5",
49-
"@luma.gl/webgl": "^9.1.5",
45+
"@luma.gl/constants": "^9.1.7",
46+
"@luma.gl/core": "^9.1.7",
47+
"@luma.gl/engine": "^9.1.7",
48+
"@luma.gl/shadertools": "^9.1.7",
49+
"@luma.gl/webgl": "^9.1.7",
5050
"@math.gl/core": "^4.1.0",
5151
"@math.gl/sun": "^4.1.0",
5252
"@math.gl/types": "^4.1.0",

modules/extensions/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3939
},
4040
"dependencies": {
41-
"@luma.gl/constants": "^9.1.5",
42-
"@luma.gl/shadertools": "^9.1.5",
41+
"@luma.gl/constants": "^9.1.7",
42+
"@luma.gl/shadertools": "^9.1.7",
4343
"@math.gl/core": "^4.1.0"
4444
},
4545
"peerDependencies": {
4646
"@deck.gl/core": "^9.1.0",
47-
"@luma.gl/core": "^9.1.5",
48-
"@luma.gl/engine": "^9.1.5"
47+
"@luma.gl/core": "^9.1.7",
48+
"@luma.gl/engine": "^9.1.7"
4949
},
5050
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5151
}

modules/geo-layers/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"@loaders.gl/terrain": "^4.2.0",
4747
"@loaders.gl/tiles": "^4.2.0",
4848
"@loaders.gl/wms": "^4.2.0",
49-
"@luma.gl/gltf": "^9.1.5",
50-
"@luma.gl/shadertools": "^9.1.5",
49+
"@luma.gl/gltf": "^9.1.7",
50+
"@luma.gl/shadertools": "^9.1.7",
5151
"@math.gl/core": "^4.1.0",
5252
"@math.gl/culling": "^4.1.0",
5353
"@math.gl/web-mercator": "^4.1.0",
@@ -61,8 +61,8 @@
6161
"@deck.gl/layers": "^9.1.0",
6262
"@deck.gl/mesh-layers": "^9.1.0",
6363
"@loaders.gl/core": "^4.2.0",
64-
"@luma.gl/core": "^9.1.5",
65-
"@luma.gl/engine": "^9.1.5"
64+
"@luma.gl/core": "^9.1.7",
65+
"@luma.gl/engine": "^9.1.7"
6666
},
6767
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
6868
}

modules/google-maps/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3939
},
4040
"dependencies": {
41-
"@luma.gl/constants": "^9.1.5",
41+
"@luma.gl/constants": "^9.1.7",
4242
"@math.gl/core": "^4.1.0",
4343
"@types/google.maps": "^3.48.6"
4444
},
4545
"peerDependencies": {
4646
"@deck.gl/core": "^9.1.0",
47-
"@luma.gl/core": "^9.1.5",
48-
"@luma.gl/webgl": "^9.1.5"
47+
"@luma.gl/core": "^9.1.7",
48+
"@luma.gl/webgl": "^9.1.7"
4949
},
5050
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5151
}

modules/jupyter-widget/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"@loaders.gl/3d-tiles": "^4.2.0",
4242
"@loaders.gl/core": "^4.2.0",
4343
"@loaders.gl/csv": "^4.2.0",
44-
"@luma.gl/constants": "^9.1.5",
45-
"@luma.gl/core": "^9.1.5",
46-
"@luma.gl/webgl": "^9.1.5",
44+
"@luma.gl/constants": "^9.1.7",
45+
"@luma.gl/core": "^9.1.7",
46+
"@luma.gl/webgl": "^9.1.7",
4747
"d3-dsv": "^1.0.8",
4848
"mapbox-gl": "^1.13.2"
4949
},

modules/layers/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"dependencies": {
4040
"@loaders.gl/images": "^4.2.0",
4141
"@loaders.gl/schema": "^4.2.0",
42-
"@luma.gl/shadertools": "^9.1.5",
42+
"@luma.gl/shadertools": "^9.1.7",
4343
"@mapbox/tiny-sdf": "^2.0.5",
4444
"@math.gl/core": "^4.1.0",
4545
"@math.gl/polygon": "^4.1.0",
@@ -49,8 +49,8 @@
4949
"peerDependencies": {
5050
"@deck.gl/core": "^9.1.0",
5151
"@loaders.gl/core": "^4.2.0",
52-
"@luma.gl/core": "^9.1.5",
53-
"@luma.gl/engine": "^9.1.5"
52+
"@luma.gl/core": "^9.1.7",
53+
"@luma.gl/engine": "^9.1.7"
5454
},
5555
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5656
}

0 commit comments

Comments
 (0)