From e081e6ab779e3878805f8e253707fd6f7077d818 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 15 Feb 2016 12:31:40 -0700 Subject: [PATCH] [promise] swap out promise-js due to https://github.com/elastic/elasticsearch-js/issues/345 --- grunt/config/browserify.js | 4 ++-- package.json | 4 ++-- src/lib/transport.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index a131541aa..7d5668a1b 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -33,7 +33,7 @@ module.exports = { ignore: [ 'src/lib/connectors/jquery.js', 'src/lib/connectors/xhr.js', - 'promise-js' + 'promise/lib/es6-extensions' ] } }, @@ -45,7 +45,7 @@ module.exports = { ignore: [ 'src/lib/connectors/angular.js', 'src/lib/connectors/xhr.js', - 'promise-js' + 'promise/lib/es6-extensions' ] } } diff --git a/package.json b/package.json index baae48503..b28371de3 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "forever-agent": "^0.6.0", "lodash": "^3.10.0", "lodash-compat": "^3.0.0", - "promise-js": "0.0.6" + "promise": "^7.1.1" }, "repository": { "type": "git", @@ -103,4 +103,4 @@ "engines": { "node": ">=0.8" } -} \ No newline at end of file +} diff --git a/src/lib/transport.js b/src/lib/transport.js index f8adb6668..7e6d75f76 100644 --- a/src/lib/transport.js +++ b/src/lib/transport.js @@ -7,7 +7,7 @@ module.exports = Transport; var _ = require('./utils'); var errors = require('./errors'); 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 findCommonProtocol = require('./transport/find_common_protocol');