Skip to content

Commit

Permalink
Use "t2-progress" which is a throwaway fork of "progress" that applie…
Browse files Browse the repository at this point in the history
…s the patch to terminate. Fixes gh-1073, Fixes gh-1044

Note: this is the same thing as we did with npmlog. When/if the relevant patch is merged to the official node-progress module, we'll drop this and restore that module as a dependency.
  • Loading branch information
rwaldron committed Nov 3, 2016
1 parent fb394d5 commit 486c986
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/install/rust.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var createHash = require('sha.js');
var fs = require('fs-extra');
var fsTemp = require('fs-temp');
var osenv = require('osenv');
var Progress = require('progress');
var Progress = require('t2-progress');
var request = require('request');
var tags = require('common-tags');
var tar = require('tar-fs');
Expand Down
2 changes: 1 addition & 1 deletion lib/tessel/restore.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// ...

// Third Party Dependencies
var Progress = require('progress');
var Progress = require('t2-progress');

// Internal
var log = require('../log');
Expand Down
2 changes: 1 addition & 1 deletion lib/update-fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var fs = require('fs');
// Third Party Dependencies
var gunzip = require('zlib').createGunzip();
var extract = require('tar-stream').extract();
var Progress = require('progress');
var Progress = require('t2-progress');
var request = require('request');
var streamToBuffer = require('stream-to-buffer');
var urljoin = require('url-join');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"npm": "^2.7.1",
"npmlog": "^4.0.0",
"osenv": "^0.1.0",
"progress": "^1.1.8",
"promzard": "^0.3.0",
"request": "^2.60.0",
"semver": "^5.1.0",
Expand All @@ -79,6 +78,7 @@
"ssh2": "^0.4.2",
"sshpk": "^1.6.0",
"stream-to-buffer": "^0.1.0",
"t2-progress": "^1.4.0",
"t2-project": "^0.4.0",
"tar": "^2.1.1",
"tar-fs": "^1.13.2",
Expand Down
2 changes: 1 addition & 1 deletion test/common/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ global.mkdirp = require('mkdirp');
global.npmlog = require('npmlog');
global.osenv = require('osenv');
global.Project = require('t2-project');
global.Progress = require('progress');
global.Progress = require('t2-progress');
global.request = require('request');
global.sinon = require('sinon');
global.sshpk = require('sshpk');
Expand Down

0 comments on commit 486c986

Please sign in to comment.