Skip to content

added getProxy #3320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2018
Merged

added getProxy #3320

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
912f838
added getProxy
mdogadailo Oct 24, 2017
f4eaea0
changed yarn for npm to get https-proxy
mdogadailo Oct 29, 2017
892cd95
Merge branch 'master' into patch-1
mdogadailo Oct 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed yarn for npm to get https-proxy 
default value for https-proxy is null, not undefined like in yarn
  • Loading branch information
@mdogadailo
mdogadailo authored Oct 29, 2017
commit f4eaea09476318a1abac70c9a5a8b0f86d5de832
4 changes: 2 additions & 2 deletions packages/create-react-app/createReactApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,10 +612,10 @@ function getProxy() {
} else {
try {
// Trying to read https-proxy from .npmrc
let httpsProxy = execSync('yarn config get https-proxy')
let httpsProxy = execSync('npm config get https-proxy')
.toString()
.trim();
return httpsProxy !== 'undefined' ? httpsProxy : undefined;
return httpsProxy !== 'null' ? httpsProxy : undefined;
} catch (e) {
return;
}
Expand Down