Bump math.gl and probe.gl dependencies (#4029)

visgl · Dec 17, 2019 · 8674bd3 · 8674bd3
1 parent f43214c
commit 8674bd3
Show file tree

Hide file tree

Showing 9 changed files with 438 additions and 385 deletions.
diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json
@@ -30,8 +30,8 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@luma.gl/shadertools": "^8.0.0-beta.3",
-    "@math.gl/web-mercator": "^3.1.0-alpha",
+    "@luma.gl/shadertools": "^8.0.0-beta.4",
+    "@math.gl/web-mercator": "^3.1.1",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {

diff --git a/modules/core/package.json b/modules/core/package.json
@@ -34,11 +34,11 @@
   "dependencies": {
     "@loaders.gl/core": "^2.0.0-beta.5",
     "@loaders.gl/images": "^2.0.0-beta.5",
-    "@luma.gl/core": "^8.0.0-beta.3",
-    "@math.gl/web-mercator": "^3.1.0-alpha",
+    "@luma.gl/core": "^8.0.0-beta.4",
+    "@math.gl/web-mercator": "^3.1.1",
     "gl-matrix": "^3.0.0",
-    "math.gl": "^3.0.0",
+    "math.gl": "^3.1.1",
     "mjolnir.js": "^2.1.2",
-    "probe.gl": "^3.2.0-beta.3"
+    "probe.gl": "^3.2.0"
   }
 }
diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json
@@ -33,9 +33,9 @@
     "@loaders.gl/3d-tiles": "^2.0.0-beta.5",
     "@loaders.gl/core": "^2.0.0-beta.5",
     "@loaders.gl/gltf": "^2.0.0-beta.5",
-    "@math.gl/culling": "^3.0.0",
-    "@math.gl/geospatial": "^3.0.0",
-    "@math.gl/web-mercator": "^3.1.0-alpha",
+    "@math.gl/culling": "^3.1.1",
+    "@math.gl/geospatial": "^3.1.1",
+    "@math.gl/web-mercator": "^3.1.1",
     "h3-js": "^3.6.0",
     "long": "^3.2.0",
     "s2-geometry": "^1.2.10"

diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json
@@ -38,7 +38,7 @@
     "@loaders.gl/3d-tiles": "^2.0.0-beta.5",
     "@loaders.gl/core": "^2.0.0-beta.5",
     "@loaders.gl/csv": "^2.0.0-beta.5",
-    "@luma.gl/constants": "^8.0.0-beta.3",
+    "@luma.gl/constants": "^8.0.0-beta.4",
     "mapbox-gl": "^1.2.1"
   },
   "jupyterlab": {

diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json
@@ -33,6 +33,6 @@
     "@deck.gl/core": "^8.0.0-beta"
   },
   "dependencies": {
-    "@luma.gl/experimental": "^8.0.0-beta.3"
+    "@luma.gl/experimental": "^8.0.0-beta.4"
   }
 }
diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json
@@ -25,9 +25,9 @@
   ],
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0-beta",
-    "@luma.gl/test-utils": "^8.0.0-beta.3",
-    "@luma.gl/webgl": "^8.0.0-beta.3",
-    "@probe.gl/test-utils": "^3.2.0-beta"
+    "@luma.gl/test-utils": "^8.0.0-beta.4",
+    "@luma.gl/webgl": "^8.0.0-beta.4",
+    "@probe.gl/test-utils": "^3.2.0"
   },
   "scripts": {}
 }
diff --git a/package.json b/package.json
@@ -41,10 +41,10 @@
     "jsdom": false
   },
   "devDependencies": {
-    "@luma.gl/engine": "^8.0.0-beta.3",
-    "@luma.gl/test-utils": "^8.0.0-beta.3",
-    "@probe.gl/bench": "^3.2.0-beta.3",
-    "@probe.gl/test-utils": "^3.2.0-beta.3",
+    "@luma.gl/engine": "^8.0.0-beta.4",
+    "@luma.gl/test-utils": "^8.0.0-beta.4",
+    "@probe.gl/bench": "^3.2.0",
+    "@probe.gl/test-utils": "^3.2.0",
     "@loaders.gl/csv": "^2.0.0-beta.5",
     "@loaders.gl/polyfills": "^2.0.0-beta.5",
     "babel-loader": "^8.0.0",

diff --git a/test/modules/core/shaderlib/project/project-glsl-test-utils.js b/test/modules/core/shaderlib/project/project-glsl-test-utils.js
@@ -60,6 +60,7 @@ export function runOnGPU({
 }
 
 export function verifyResult({t, name, actual, expected, sliceActual = false}) {
+  actual = Number.isFinite(actual) ? [actual] : actual;
   expected = Array.isArray(expected) ? expected : [expected];
   // Convert TypedArray to regular array
   // TODO: remove after https://github.com/uber-web/math.gl/pull/29