Skip to content

Commit f682682

Browse files
authored
Upgrade a few packages (#393)
Upgrade a few packages
2 parents 207f056 + f1b3d11 commit f682682

File tree

4 files changed

+68
-221
lines changed

4 files changed

+68
-221
lines changed

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727
"typescript": "3.3.3333"
2828
},
2929
"resolutions": {
30+
"**/cheerio/parse5": "4.0.0",
31+
"**/fstream": "1.0.12",
32+
"**/handlebars": "4.1.2",
33+
"**/js-yaml": "3.13.1",
3034
"**/lodash": "4.17.11",
31-
"**/prettier": "1.18.2",
32-
"**/cheerio/parse5": "4.0.0"
35+
"**/node-gyp/tar": "2.2.2",
36+
"**/prettier": "1.18.2"
3337
},
3438
"workspaces": {
3539
"packages": [

packages/jaeger-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"react-app-rewired": "2.0.1",
3030
"react-scripts": "2.1.2",
3131
"react-test-renderer": "^15.6.1",
32-
"sinon": "^3.2.1",
32+
"sinon": "7.3.2",
3333
"source-map-explorer": "^1.6.0"
3434
},
3535
"dependencies": {

packages/jaeger-ui/src/components/TracePage/Tween.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ export default class Tween {
5757
this.callbackComplete = onComplete;
5858
this.callbackUpdate = onUpdate;
5959
if (delay) {
60-
this.timeoutID = setTimeout(this._frameCallback, delay);
60+
// setTimeout from @types/node returns NodeJS.Timeout, so prefix with `window.`
61+
this.timeoutID = window.setTimeout(this._frameCallback, delay);
6162
this.requestID = undefined;
6263
} else {
6364
this.requestID = window.requestAnimationFrame(this._frameCallback);

0 commit comments

Comments
 (0)