Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSneakyFish5 <32284796+SneakyFish5@users.noreply.github.com>2018-08-21 01:31:45 +0300
committerKat Marchán <kzm@zkat.tech>2018-08-21 02:17:49 +0300
commit0e576f0aa6ea02653d948c10f29102a2d4a31944 (patch)
treefcc253a8f2adcdb78a567f036e728d17cf3f18e9
parent4bd40f543dc89f0721020e7d0bb3497300d74818 (diff)
config: fix no-proxy to noproxy (#46)
Fixes: https://npm.community/t/1327 PR-URL: https://github.com/npm/cli/pull/46 Credit: @SneakyFish5 Reviewed-By: @zkat
-rw-r--r--doc/misc/npm-config.md2
-rw-r--r--lib/config/defaults.js4
-rw-r--r--lib/config/pacote.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/misc/npm-config.md b/doc/misc/npm-config.md
index 098693423..8f04a7601 100644
--- a/doc/misc/npm-config.md
+++ b/doc/misc/npm-config.md
@@ -692,7 +692,7 @@ impact how lifecycle scripts are called.
The node version to use when checking a package's `engines` map.
-### no-proxy
+### noproxy
* Default: null
* Type: String or Array
diff --git a/lib/config/defaults.js b/lib/config/defaults.js
index 920910677..991a2129f 100644
--- a/lib/config/defaults.js
+++ b/lib/config/defaults.js
@@ -196,7 +196,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
'progress': !process.env.TRAVIS && !process.env.CI,
proxy: null,
'https-proxy': null,
- 'no-proxy': null,
+ 'noproxy': null,
'user-agent': 'npm/{npm-version} ' +
'node/{node-version} ' +
'{platform} ' +
@@ -318,7 +318,7 @@ exports.types = {
'metrics-registry': [null, String],
'node-options': [null, String],
'node-version': [null, semver],
- 'no-proxy': [null, String, Array],
+ 'noproxy': [null, String, Array],
offline: Boolean,
'onload-script': [null, String],
only: [null, 'dev', 'development', 'prod', 'production'],
diff --git a/lib/config/pacote.js b/lib/config/pacote.js
index b9c651d88..505b69da3 100644
--- a/lib/config/pacote.js
+++ b/lib/config/pacote.js
@@ -38,7 +38,7 @@ function pacoteOpts (moreOpts) {
preferOnline: npm.config.get('prefer-online') || npm.config.get('cache-max') <= 0,
projectScope: npm.projectScope,
proxy: npm.config.get('https-proxy') || npm.config.get('proxy'),
- noProxy: npm.config.get('no-proxy'),
+ noProxy: npm.config.get('noproxy'),
refer: npm.registry.refer,
registry: npm.config.get('registry'),
retry: {