axios 0.28.0 → 0.29.0

package/lib/env/data.js

@@ -1,3 +1,3 @@
 module.exports = {
-  "version": "0.28.0"
+  "version": "0.29.0"
 };

package/lib/helpers/buildURL.js

@@ -35,12 +35,20 @@ module.exports = function buildURL(url, params, options) {
 
   var _encode = options && options.encode || encode;
 
-  var serializerParams = utils.isURLSearchParams(params) ?
-    params.toString() :
-    new AxiosURLSearchParams(params, options).toString(_encode);
+  var serializeFn = options && options.serialize;
 
-  if (serializerParams) {
-    url += (url.indexOf('?') === -1 ? '?' : '&') + serializerParams;
+  var serializedParams;
+
+  if (serializeFn) {
+    serializedParams = serializeFn(params, options);
+  } else {
+    serializedParams = utils.isURLSearchParams(params) ?
+      params.toString() :
+      new AxiosURLSearchParams(params, options).toString(_encode);
+  }
+
+  if (serializedParams) {
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
   }
 
   return url;

package/lib/helpers/combineURLs.js

@@ -9,6 +9,6 @@
  */
 module.exports = function combineURLs(baseURL, relativeURL) {
   return relativeURL
-    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    ? baseURL.replace(/\/?\/$/, '') + '/' + relativeURL.replace(/^\/+/, '')
     : baseURL;
 };

package/lib/helpers/formDataToJSON.js

@@ -28,6 +28,9 @@ function arrayToObject(arr) {
 function formDataToJSON(formData) {
   function buildPath(path, value, target, index) {
     var name = path[index++];
+
+    if (name === '__proto__') return true;
+
     var isNumericKey = Number.isFinite(+name);
     var isLast = index >= path.length;
     name = !name && utils.isArray(target) ? target.length : name;

package/lib/helpers/toFormData.js

@@ -118,7 +118,7 @@ function toFormData(obj, formData, options) {
         key = removeBrackets(key);
 
         arr.forEach(function each(el, index) {
-          !utils.isUndefined(el) && formData.append(
+          !(utils.isUndefined(el) || el === null) && formData.append(
             // eslint-disable-next-line no-nested-ternary
             indexes === true ? renderKey([key], index, dots) : (indexes === null ? key : key + '[]'),
             convertValue(el)
@@ -155,7 +155,7 @@ function toFormData(obj, formData, options) {
     stack.push(value);
 
     utils.forEach(value, function each(el, key) {
-      var result = !utils.isUndefined(el) && visitor.call(
+      var result = !(utils.isUndefined(el) || el === null) && visitor.call(
         formData, el, utils.isString(key) ? key.trim() : key, path, exposedHelpers
       );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "types": "index.d.ts",
@@ -87,7 +87,7 @@
   "unpkg": "dist/axios.min.js",
   "typings": "./index.d.ts",
   "dependencies": {
-    "follow-redirects": "^1.15.0",
+    "follow-redirects": "^1.15.4",
     "form-data": "^4.0.0",
     "proxy-from-env": "^1.1.0"
   },
@@ -97,4 +97,4 @@
       "threshold": "5kB"
     }
   ]
-}
+}