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

[promise] swap out promise-js

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'
       ]
     }
   }

package.json

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

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');