path: fix bugs related to paths with trailing slashes

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/path.js b/lib/path.js
index 0b24de299fc..980348e7d11 100644
--- a/lib/path.js
+++ b/lib/path.js
@@ -290,7 +290,17 @@ if (isWindows) {
   // 'root' is just a slash, or nothing.
   var splitPathRe =
       /^(\/?)([\s\S]+\/(?!$)|\/)?((?:\.{1,2}$|[\s\S]+?)?(\.[^.\/]*)?)$/;
+  var trailingSlash = /\/+$/;
   var splitPath = function(filename) {
+
+    // removes trailing slashes before spliting the path
+    var tail = trailingSlash.exec(filename);
+    if (tail) {
+      if (tail.index === 0) return ['/', '', '', ''];
+
+      filename = filename.slice(0, tail.index);
+    }
+
     var result = splitPathRe.exec(filename);
     return [result[1] || '', result[2] || '', result[3] || '', result[4] || ''];
   };