Merge branch 'master' into number-like-categories-misinterpret

nicholas-esterer · nicholas-esterer · commit 6b47a05e7d85 · 2021-08-10T10:10:53.000-04:00
diff --git a/draftlogs/5870_change.md b/draftlogs/5870_change.md
@@ -0,0 +1 @@
+ - Upgrade `regl` module from version 1.6.1 to version 2.1.0 [[#5870](https://github.com/plotly/plotly.js/pull/5870)]
diff --git a/draftlogs/5878_fix.md b/draftlogs/5878_fix.md
@@ -0,0 +1,2 @@
+ - Fix invalid call to `lib.promiseError` in lib.syncOrAsync  [[#5878](https://github.com/plotly/plotly.js/pull/5878)], 
+   with thanks to @jklimke for the contribution!
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -108,7 +108,7 @@
     "gl-spikes2d": "^1.0.2",
     "gl-streamtube3d": "^1.4.1",
     "gl-surface3d": "^1.6.0",
-    "gl-text": "^1.1.8",
+    "gl-text": "^1.2.0",
     "glslify": "^7.1.1",
     "has-hover": "^1.0.1",
     "has-passive-events": "^1.0.0",
@@ -124,7 +124,7 @@
     "parse-svg-path": "^0.1.2",
     "polybooljs": "^1.2.0",
     "probe-image-size": "^7.2.1",
-    "regl": "^1.6.1",
+    "regl": "^2.1.0",
     "regl-error2d": "^2.0.12",
     "regl-line2d": "^3.1.1",
     "regl-scatter2d": "^3.2.6",
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -455,8 +455,7 @@ lib.syncOrAsync = function(sequence, arg, finalStep) {
         ret = fni(arg);
 
         if(ret && ret.then) {
-            return ret.then(continueAsync)
-                .then(undefined, lib.promiseError);
+            return ret.then(continueAsync);
         }
     }
 
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -128,8 +128,9 @@ for(var i = 0; i < allMockList.length; i++) {
                 // more flaky
                 'mapbox_angles',
                 'mapbox_layers',
+                'mapbox_custom-style',
                 'mapbox_geojson-attributes'
-            ].indexOf(mockName) !== -1 ? 0.5 : 0.15
+            ].indexOf(mockName) !== -1 ? 1 : 0.15
     });
 
     if(numDiffPixels) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ - Upgrade `regl` module from version 1.6.1 to version 2.1.0 [[#5870](https://github.com/plotly/plotly.js/pull/5870)]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+ - Fix invalid call to `lib.promiseError` in lib.syncOrAsync [[#5878](https://github.com/plotly/plotly.js/pull/5878)],
	`2`	`+ with thanks to @jklimke for the contribution!`
Original file line number	Diff line number	Diff line change
`@@ -455,8 +455,7 @@ lib.syncOrAsync = function(sequence, arg, finalStep) {`
`455`	`455`	`ret = fni(arg);`
`456`	`456`
`457`	`457`	`if(ret && ret.then) {`
`458`		`- return ret.then(continueAsync)`
`459`		`- .then(undefined, lib.promiseError);`
	`458`	`+ return ret.then(continueAsync);`
`460`	`459`	`}`
`461`	`460`	`}`
`462`	`461`