axios 0.15.2 → 0.15.3

package/lib/adapters/xhr.js

@@ -6,7 +6,7 @@ var buildURL = require('./../helpers/buildURL');
 var parseHeaders = require('./../helpers/parseHeaders');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
 var createError = require('../core/createError');
-var btoa = (typeof window !== 'undefined' && window.btoa) || require('./../helpers/btoa');
+var btoa = (typeof window !== 'undefined' && window.btoa && window.btoa.bind(window)) || require('./../helpers/btoa');
 
 module.exports = function xhrAdapter(config) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {

package/lib/axios.js

@@ -3,6 +3,7 @@
 var utils = require('./utils');
 var bind = require('./helpers/bind');
 var Axios = require('./core/Axios');
+var defaults = require('./defaults');
 
 /**
  * Create an instance of Axios
@@ -24,14 +25,14 @@ function createInstance(defaultConfig) {
 }
 
 // Create the default instance to be exported
-var axios = createInstance();
+var axios = createInstance(defaults);
 
 // Expose Axios class to allow class inheritance
 axios.Axios = Axios;
 
 // Factory for creating new instances
-axios.create = function create(defaultConfig) {
-  return createInstance(defaultConfig);
+axios.create = function create(instanceConfig) {
+  return createInstance(utils.merge(defaults, instanceConfig));
 };
 
 // Expose Cancel & CancelToken

package/lib/core/Axios.js

@@ -10,10 +10,10 @@ var combineURLs = require('./../helpers/combineURLs');
 /**
  * Create a new instance of Axios
  *
- * @param {Object} defaultConfig The default config for the instance
+ * @param {Object} instanceConfig The default config for the instance
  */
-function Axios(defaultConfig) {
-  this.defaults = utils.merge(defaults, defaultConfig);
+function Axios(instanceConfig) {
+  this.defaults = instanceConfig;
   this.interceptors = {
     request: new InterceptorManager(),
     response: new InterceptorManager()

package/lib/defaults.js

@@ -26,7 +26,7 @@ function getDefaultAdapter() {
   return adapter;
 }
 
-module.exports = {
+var defaults = {
   adapter: getDefaultAdapter(),
 
   transformRequest: [function transformRequest(data, headers) {
@@ -64,15 +64,6 @@ module.exports = {
     return data;
   }],
 
-  headers: {
-    common: {
-      'Accept': 'application/json, text/plain, */*'
-    },
-    patch: utils.merge(DEFAULT_CONTENT_TYPE),
-    post: utils.merge(DEFAULT_CONTENT_TYPE),
-    put: utils.merge(DEFAULT_CONTENT_TYPE)
-  },
-
   timeout: 0,
 
   xsrfCookieName: 'XSRF-TOKEN',
@@ -84,3 +75,19 @@ module.exports = {
     return status >= 200 && status < 300;
   }
 };
+
+defaults.headers = {
+  common: {
+    'Accept': 'application/json, text/plain, */*'
+  }
+};
+
+utils.forEach(['delete', 'get', 'head'], function forEachMehtodNoData(method) {
+  defaults.headers[method] = {};
+});
+
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE);
+});
+
+module.exports = defaults;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "scripts": {
@@ -32,22 +32,22 @@
   "homepage": "https://github.com/mzabriskie/axios",
   "devDependencies": {
     "coveralls": "^2.11.9",
-    "es6-promise": "^3.2.1",
-    "grunt": "0.4.5",
-    "grunt-banner": "0.6.0",
-    "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "1.0.0",
-    "grunt-contrib-nodeunit": "1.0.0",
-    "grunt-contrib-watch": "0.6.1",
-    "grunt-eslint": "18.0.0",
-    "grunt-karma": "0.12.1",
-    "grunt-ts": "5.3.2",
-    "grunt-typings": "0.1.5",
-    "grunt-webpack": "1.0.11",
-    "istanbul-instrumenter-loader": "^0.2.0",
+    "es6-promise": "^4.0.5",
+    "grunt": "^1.0.1",
+    "grunt-banner": "^0.6.0",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-nodeunit": "^1.0.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-eslint": "^19.0.0",
+    "grunt-karma": "^2.0.0",
+    "grunt-ts": "^6.0.0-beta.3",
+    "grunt-typings": "^0.1.5",
+    "grunt-webpack": "^1.0.18",
+    "istanbul-instrumenter-loader": "^1.0.0",
     "jasmine-core": "^2.4.1",
-    "karma": "^0.13.22",
-    "karma-chrome-launcher": "^1.0.1",
+    "karma": "^1.3.0",
+    "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.0.0",
     "karma-firefox-launcher": "^1.0.0",
     "karma-jasmine": "^1.0.2",
@@ -55,23 +55,24 @@
     "karma-opera-launcher": "^1.0.0",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-safari-launcher": "^1.0.0",
-    "karma-sauce-launcher": "^1.0.0",
+    "karma-sauce-launcher": "^1.1.0",
     "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "load-grunt-tasks": "3.4.1",
+    "load-grunt-tasks": "^3.5.2",
     "minimist": "^1.2.0",
     "phantomjs-prebuilt": "^2.1.7",
     "sinon": "^1.17.4",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
-    "url-search-params": "^0.5.0"
+    "url-search-params": "^0.6.1",
+    "typescript": "^2.0.3"
   },
   "browser": {
     "./lib/adapters/http.js": "./lib/adapters/xhr.js"
   },
-  "typings": "./axios.d.ts",
+  "typings": "./index.d.ts",
   "dependencies": {
-    "follow-redirects": "0.0.7"
+    "follow-redirects": "1.0.0"
   }
 }