Updating axios

parent 5050c4f8
...@@ -11756,7 +11756,7 @@ function forEach(obj, fn) { ...@@ -11756,7 +11756,7 @@ function forEach(obj, fn) {
} }
// Force an array if not already something iterable // Force an array if not already something iterable
if (typeof obj !== 'object' && !isArray(obj)) { if (typeof obj !== 'object') {
/*eslint no-param-reassign:0*/ /*eslint no-param-reassign:0*/
obj = [obj]; obj = [obj];
} }
...@@ -43437,6 +43437,10 @@ var defaults = { ...@@ -43437,6 +43437,10 @@ var defaults = {
return data; return data;
}], }],
/**
* A timeout in milliseconds to abort a request. If set to 0 (default) a
* timeout is not created.
*/
timeout: 0, timeout: 0,
xsrfCookieName: 'XSRF-TOKEN', xsrfCookieName: 'XSRF-TOKEN',
...@@ -49021,7 +49025,7 @@ module.exports = function xhrAdapter(config) { ...@@ -49021,7 +49025,7 @@ module.exports = function xhrAdapter(config) {
var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response; var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
var response = { var response = {
data: responseData, data: responseData,
// IE sends 1223 instead of 204 (https://github.com/mzabriskie/axios/issues/201) // IE sends 1223 instead of 204 (https://github.com/axios/axios/issues/201)
status: request.status === 1223 ? 204 : request.status, status: request.status === 1223 ? 204 : request.status,
statusText: request.status === 1223 ? 'No Content' : request.statusText, statusText: request.status === 1223 ? 'No Content' : request.statusText,
headers: responseHeaders, headers: responseHeaders,
...@@ -105551,8 +105555,6 @@ var defaults = __webpack_require__(142); ...@@ -105551,8 +105555,6 @@ var defaults = __webpack_require__(142);
var utils = __webpack_require__(23); var utils = __webpack_require__(23);
var InterceptorManager = __webpack_require__(529); var InterceptorManager = __webpack_require__(529);
var dispatchRequest = __webpack_require__(530); var dispatchRequest = __webpack_require__(530);
var isAbsoluteURL = __webpack_require__(532);
var combineURLs = __webpack_require__(533);
/** /**
* Create a new instance of Axios * Create a new instance of Axios
...@@ -105581,14 +105583,9 @@ Axios.prototype.request = function request(config) { ...@@ -105581,14 +105583,9 @@ Axios.prototype.request = function request(config) {
}, arguments[1]); }, arguments[1]);
} }
config = utils.merge(defaults, this.defaults, { method: 'get' }, config); config = utils.merge(defaults, {method: 'get'}, this.defaults, config);
config.method = config.method.toLowerCase(); config.method = config.method.toLowerCase();
// Support baseURL config
if (config.baseURL && !isAbsoluteURL(config.url)) {
config.url = combineURLs(config.baseURL, config.url);
}
// Hook up interceptors middleware // Hook up interceptors middleware
var chain = [dispatchRequest, undefined]; var chain = [dispatchRequest, undefined];
var promise = Promise.resolve(config); var promise = Promise.resolve(config);
...@@ -105761,9 +105758,7 @@ module.exports = function buildURL(url, params, paramsSerializer) { ...@@ -105761,9 +105758,7 @@ module.exports = function buildURL(url, params, paramsSerializer) {
if (utils.isArray(val)) { if (utils.isArray(val)) {
key = key + '[]'; key = key + '[]';
} } else {
if (!utils.isArray(val)) {
val = [val]; val = [val];
} }
...@@ -105797,6 +105792,15 @@ module.exports = function buildURL(url, params, paramsSerializer) { ...@@ -105797,6 +105792,15 @@ module.exports = function buildURL(url, params, paramsSerializer) {
var utils = __webpack_require__(23); var utils = __webpack_require__(23);
// Headers whose duplicates are ignored by node
// c.f. https://nodejs.org/api/http.html#http_message_headers
var ignoreDuplicateOf = [
'age', 'authorization', 'content-length', 'content-type', 'etag',
'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since',
'last-modified', 'location', 'max-forwards', 'proxy-authorization',
'referer', 'retry-after', 'user-agent'
];
/** /**
* Parse headers into an object * Parse headers into an object
* *
...@@ -105824,7 +105828,14 @@ module.exports = function parseHeaders(headers) { ...@@ -105824,7 +105828,14 @@ module.exports = function parseHeaders(headers) {
val = utils.trim(line.substr(i + 1)); val = utils.trim(line.substr(i + 1));
if (key) { if (key) {
parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) {
return;
}
if (key === 'set-cookie') {
parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]);
} else {
parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
}
} }
}); });
...@@ -106080,6 +106091,8 @@ var utils = __webpack_require__(23); ...@@ -106080,6 +106091,8 @@ var utils = __webpack_require__(23);
var transformData = __webpack_require__(531); var transformData = __webpack_require__(531);
var isCancel = __webpack_require__(206); var isCancel = __webpack_require__(206);
var defaults = __webpack_require__(142); var defaults = __webpack_require__(142);
var isAbsoluteURL = __webpack_require__(532);
var combineURLs = __webpack_require__(533);
/** /**
* Throws a `Cancel` if cancellation has been requested. * Throws a `Cancel` if cancellation has been requested.
...@@ -106099,6 +106112,11 @@ function throwIfCancellationRequested(config) { ...@@ -106099,6 +106112,11 @@ function throwIfCancellationRequested(config) {
module.exports = function dispatchRequest(config) { module.exports = function dispatchRequest(config) {
throwIfCancellationRequested(config); throwIfCancellationRequested(config);
// Support baseURL config
if (config.baseURL && !isAbsoluteURL(config.url)) {
config.url = combineURLs(config.baseURL, config.url);
}
// Ensure headers exist // Ensure headers exist
config.headers = config.headers || {}; config.headers = config.headers || {};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment