feat: add UNC paths to the join absoluteWinRegexp regex

webpack · Sep 17, 2016 · 3ccfa79 · 3ccfa79
1 parent a66aa97
commit 3ccfa79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/join.js b/lib/join.js
@@ -1,6 +1,6 @@
 var normalize = require("./normalize");
 
-var absoluteWinRegExp = /^[A-Z]:([\\\/]|$)/i;
+var absoluteWinRegExp = /^(?:[A-Z]:([\\\/]|$))|(\\\\)/i;
 var absoluteNixRegExp = /^\//i;
 
 module.exports = function join(path, request) {

diff --git a/test/MemoryFileSystem.js b/test/MemoryFileSystem.js
@@ -366,6 +366,7 @@ describe("join", function() {
 		fs.join("C:\\", "a\\b").should.be.eql("C:\\a\\b");
 		fs.join("C:/a/b", "./../c/d").should.be.eql("C:\\a\\c\\d");
 		fs.join("C:\\a\\b", "./../c/d").should.be.eql("C:\\a\\c\\d");
+		fs.join("\\\\a\\b\\..\\c\\d\\..").should.be.eql("\\\\a\\c");
 	});
 	it("should join paths (weird cases)", function() {
 		var fs = new MemoryFileSystem();