2
0
mirror of https://github.com/tenrok/axios.git synced 2026-05-15 11:59:42 +03:00

Upgrading es6-promise dependency

This commit is contained in:
mzabriskie
2015-01-23 02:53:22 -07:00
parent 59763d3989
commit a9bcc8f419
3 changed files with 4 additions and 3 deletions
-1
View File
@@ -16,7 +16,6 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'dist/axios.js',
'node_modules/es6-promise/dist/promise-1.0.0.js',
'test/specs/**/*.spec.js'
],
+3 -1
View File
@@ -1,10 +1,12 @@
var Promise = require('es6-promise').Promise;
var defaults = require('./defaults');
var utils = require('./utils');
var deprecatedMethod = require('./helpers/deprecatedMethod');
var dispatchRequest = require('./core/dispatchRequest');
var InterceptorManager = require('./core/InterceptorManager');
// Polyfill ES6 Promise if needed
require('es6-promise').polyfill();
var axios = module.exports = function axios(config) {
config = utils.merge({
method: 'get',
+1 -1
View File
@@ -25,7 +25,7 @@
},
"homepage": "https://github.com/mzabriskie/axios",
"dependencies": {
"es6-promise": "^1.0.0"
"es6-promise": "^2.0.1"
},
"devDependencies": {
"grunt": "^0.4.5",