habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #362 from spalger/non-poluting-promise-lib

Browse Source 
[promise] swap out promise-js
This commit is contained in:
Spencer
2016-04-05 14:47:01 -07:00
parent 4feba4ab97 0139dbbfda
commit 43583179e7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grunt/config/browserify.js
View File

@ -33,7 +33,7 @@ module.exports = {
ignore: [ ignore: [
'src/lib/connectors/jquery.js', 'src/lib/connectors/jquery.js',
'src/lib/connectors/xhr.js', 'src/lib/connectors/xhr.js',
'promise-js' 'promise/lib/es6-extensions'
] ]
} }
}, },
@ -45,7 +45,7 @@ module.exports = {
ignore: [ ignore: [
'src/lib/connectors/angular.js', 'src/lib/connectors/angular.js',
'src/lib/connectors/xhr.js', 'src/lib/connectors/xhr.js',
'promise-js' 'promise/lib/es6-extensions'
] ]
} }
} }

2
package.json
View File

@ -91,7 +91,7 @@
"forever-agent": "^0.6.0", "forever-agent": "^0.6.0",
"lodash": "^3.10.0", "lodash": "^3.10.0",
"lodash-compat": "^3.0.0", "lodash-compat": "^3.0.0",
"promise-js": "0.0.7" "promise": "^7.1.1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

2
src/lib/transport.js
View File

@ -7,7 +7,7 @@ module.exports = Transport;
var _ = require('./utils'); var _ = require('./utils');
var errors = require('./errors'); var errors = require('./errors');
var Host = require('./host'); var Host = require('./host');
var Promise = require('promise-js'); var Promise = require('promise/lib/es6-extensions');
var patchSniffOnConnectionFault = require('./transport/sniff_on_connection_fault'); var patchSniffOnConnectionFault = require('./transport/sniff_on_connection_fault');
var findCommonProtocol = require('./transport/find_common_protocol'); var findCommonProtocol = require('./transport/find_common_protocol');