From 0e0d581b1edaf500ea678a8b03ee4a54cf5cf18d Mon Sep 17 00:00:00 2001 From: SneakyFish5 <32284796+SneakyFish5@users.noreply.github.com> Date: Mon, 13 Aug 2018 18:47:05 -0500 Subject: [PATCH] config: fix no-proxy to noproxy --- doc/misc/npm-config.md | 2 +- lib/config/defaults.js | 4 ++-- lib/config/pacote.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/misc/npm-config.md b/doc/misc/npm-config.md index b7f27d3ad9d54..d7480ea1d7e02 100644 --- a/doc/misc/npm-config.md +++ b/doc/misc/npm-config.md @@ -684,7 +684,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 ba885a3d46e33..253e61a723e04 100644 --- a/lib/config/defaults.js +++ b/lib/config/defaults.js @@ -195,7 +195,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 b9c651d883021..505b69da375a4 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: {