File tree Expand file tree Collapse file tree 3 files changed +122
-199
lines changed Expand file tree Collapse file tree 3 files changed +122
-199
lines changed Original file line number Diff line number Diff line change @@ -16,9 +16,16 @@ module.exports = CoreObject.extend({
16
16
17
17
const proxy = this . plugin . readConfig ( 'proxy' ) ;
18
18
if ( proxy ) {
19
- this . _proxyAgent = this . plugin . readConfig ( 'proxyAgent' ) || require ( 'proxy-agent' ) ;
19
+ var agent ;
20
+ this . _proxyAgent = this . plugin . readConfig ( 'proxyAgent' ) ;
21
+ if ( this . _proxyAgent ) {
22
+ agent = this . _proxyAgent ( proxy ) ;
23
+ } else {
24
+ const { ProxyAgent } = require ( 'proxy-agent' ) ;
25
+ agent = new ProxyAgent ( proxy ) ;
26
+ }
20
27
s3Options . httpOptions = {
21
- agent : this . _proxyAgent ( proxy )
28
+ agent
22
29
} ;
23
30
}
24
31
Original file line number Diff line number Diff line change 25
25
"lodash" : " ^4.17.21" ,
26
26
"mime" : " ^3.0.0" ,
27
27
"minimatch" : " ^3.0.3" ,
28
- "proxy-agent" : " ^5.0 .0" ,
28
+ "proxy-agent" : " ^6.3 .0" ,
29
29
"rsvp" : " ^4.8.5"
30
30
},
31
31
"devDependencies" : {
You can’t perform that action at this time.
0 commit comments