npm: Upgrade to v1.3.5

1 files changed, 8 insertions, 7 deletions

diff --git a/deps/npm/node_modules/semver/semver.js b/deps/npm/node_modules/semver/semver.js
index 80b2b0320c..28fa1c03b0 100644
--- a/deps/npm/node_modules/semver/semver.js
+++ b/deps/npm/node_modules/semver/semver.js
@@ -161,8 +161,8 @@ var LONETILDE = R++;
 src[LONETILDE] = '(?:~>?)';
 
 var TILDETRIM = R++;
-src[TILDETRIM] = src[LONETILDE] + '\s+';
-var tildeTrimReplace = '$1';
+src[TILDETRIM] = src[LONETILDE] + '\\s+';
+var tildeTrimReplace = '~';
 
 var TILDE = R++;
 src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
@@ -180,13 +180,12 @@ src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
 // An expression to strip any whitespace between the gtlt and the thing
 // it modifies, so that `> 1.2.3` ==> `>1.2.3`
 var COMPARATORTRIM = R++;
-src[COMPARATORTRIM] = src[GTLT] +
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
                       '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
 
 // this one has to use the /g flag
 re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
-
-var comparatorTrimReplace = '$1$2 ';
+var comparatorTrimReplace = '$1$2$3';
 
 
 // Something like `1.2.3 - 1.2.4`
@@ -598,7 +597,7 @@ Range.prototype.parseRange = function(range) {
   debug('hyphen replace', range);
   // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
   range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
-  debug('comparator trim', range);
+  debug('comparator trim', range, re[COMPARATORTRIM]);
 
   // `~ 1.2.3` => `~1.2.3`
   range = range.replace(re[TILDETRIM], tildeTrimReplace);
@@ -835,7 +834,9 @@ exports.maxSatisfying = maxSatisfying;
 function maxSatisfying(versions, range, loose) {
   return versions.filter(function(version) {
     return satisfies(version, range, loose);
-  }).sort(rcompare)[0] || null;
+  }).sort(function(a, b) {
+    return rcompare(a, b, loose);
+  })[0] || null;
 }
 
 exports.validRange = validRange;