feat(config): support no-proxy and https-proxy options

npm · Apr 9, 2018 · 9aa906b · 9aa906b
1 parent 57da5cb
commit 9aa906b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config.js b/config.js
@@ -19,6 +19,7 @@ module.exports = figgyPudding({
   'fetch-retry-mintimeout': {},
   'gid': {},
   'headers': {},
+  'https-proxy': {},
   'integrity': {},
   'is-from-ci': 'isFromCI',
   'isFromCI': {
@@ -45,6 +46,7 @@ module.exports = figgyPudding({
   'method': {
     default: 'GET'
   },
+  'no-proxy': {},
   'noproxy': {},
   'npm-session': 'npmSession',
   'npmSession': {},

diff --git a/index.js b/index.js
@@ -66,9 +66,9 @@ function regFetch (uri, opts) {
     maxSockets: opts.get('maxsockets'),
     memoize: opts.get('memoize'),
     method: opts.get('method') || 'GET',
-    noProxy: opts.get('noproxy'),
+    noProxy: opts.get('no-proxy') || opts.get('noproxy'),
     Promise: opts.get('Promise'),
-    proxy: opts.get('proxy'),
+    proxy: opts.get('https-proxy') || opts.get('proxy'),
     referer: opts.get('refer'),
     retry: opts.get('retry') || {
       retries: opts.get('fetch-retries'),