Merge pull request #865 from mrsharpoblunto/master

Fixed conflict with express (and possibly other libraries) when using npm 3.x
ladjs · Jan 20, 2016 · 324c97a · 324c97a
2 parents 5b903fa + 8f5abf1
commit 324c97a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/node/agent.js b/lib/node/agent.js
@@ -55,7 +55,13 @@ Agent.prototype.attachCookies = function(req){
 };
 
 // generate HTTP verb methods
-methods.indexOf('del') == -1 && methods.push('del');
+if (methods.indexOf('del') == -1) {
+  // create a copy so we don't cause conflicts with
+  // other packages using the methods package and
+  // npm 3.x
+  methods = methods.slice(0);
+  methods.push('del');
+}
 methods.forEach(function(method){
   var name = method;
   method = 'del' == method ? 'delete' : method;

diff --git a/lib/node/index.js b/lib/node/index.js
@@ -1162,7 +1162,13 @@ function request(method, url) {
 }
 
 // generate HTTP verb methods
-methods.indexOf('del') == -1 && methods.push('del');
+if (methods.indexOf('del') == -1) {
+  // create a copy so we don't cause conflicts with
+  // other packages using the methods package and
+  // npm 3.x
+  methods = methods.slice(0);
+  methods.push('del');
+}
 methods.forEach(function(method){
   var name = method;
   method = 'del' == method ? 'delete' : method;