Skip to content

Added proxy support for requests made by fetch #963

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
matthargett merged 2 commits into from
Feb 2, 2017
Merged

Added proxy support for requests made by fetch #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f62f26e
Added proxy support for requests made by fetch
sasivarnan Feb 1, 2017
91f9b54
Merge branch 'master' into fetch-proxy
matthargett Feb 2, 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
11 changes: 9 additions & 2 deletions local-cli/rnpm/windows/src/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ const fs = require('fs');
const path = require('path');
const semver = require('semver');
const fetch = require('node-fetch');
const HttpsProxyAgent = require('https-proxy-agent');

const proxyUrl = process.env.https_proxy || process.env.HTTPS_PROXY;
const options = {};
if(proxyUrl) {
options.agent = new HttpsProxyAgent(proxyUrl);
}

const REACT_NATIVE_PACKAGE_JSON_PATH = function() {
return path.resolve(
Expand All @@ -24,14 +31,14 @@ const REACT_NATIVE_PACKAGE_JSON_PATH = function() {
};

function getLatestVersion() {
return fetch('https://registry.npmjs.org/react-native-windows?version=latest')
return fetch('https://registry.npmjs.org/react-native-windows?version=latest', options)
.then(result => result && result.ok && result.json())
.then(result => result.version)
}

function getMatchingVersion(version) {
console.log(`Checking for react-native-windows version matching ${version}...`)
return fetch(`https://registry.npmjs.org/react-native-windows?version=${version}`)
return fetch(`https://registry.npmjs.org/react-native-windows?version=${version}`, options)
.then(result => {
if (result && result.ok) {
return result.json().then(pkg => pkg.version);
Expand Down
11 changes: 9 additions & 2 deletions local-cli/rnpm/wpf/src/wpf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ const fs = require('fs');
const path = require('path');
const semver = require('semver');
const fetch = require('node-fetch');
const HttpsProxyAgent = require('https-proxy-agent');

const proxyUrl = process.env.https_proxy || process.env.HTTPS_PROXY;
const options = {};
if(proxyUrl) {
options.agent = new HttpsProxyAgent(proxyUrl);
}

const REACT_NATIVE_WINDOWS_GENERATE_PATH = function() {
return path.resolve(
Expand All @@ -36,14 +43,14 @@ const REACT_NATIVE_PACKAGE_JSON_PATH = function() {
};

function getLatestVersion() {
return fetch('https://registry.npmjs.org/react-native-windows?version=latest')
return fetch('https://registry.npmjs.org/react-native-windows?version=latest', options)
.then(result => result && result.ok && result.json())
.then(result => result.version)
}

function getMatchingVersion(version) {
console.log(`Checking for react-native-windows version matching ${version}...`)
return fetch(`https://registry.npmjs.org/react-native-windows?version=${version}`)
return fetch(`https://registry.npmjs.org/react-native-windows?version=${version}`, options)
.then(result => {
if (result && result.ok) {
return result.json().then(pkg => pkg.version);
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
"react": "~15.4.0-rc.4"
},
"devDependencies": {
"https-proxy-agent": "^1.0.0",
"jasmine": "^2.5.2",
"jasmine-reporters": "^2.2.0",
"react-native": "~0.39.0-rc.0",
"react": "~15.4.0-rc.4",
"react-native": "~0.39.0-rc.0",
"selenium-webdriver": "2.48.x"
},
"dependencies": {
Expand Down