Merge 4070531 into d248b04

webpack · Sep 7, 2016 · c12abf0 · c12abf0
2 parents d248b04 + 4070531
commit c12abf0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/lib/MemoryFileSystem.js b/lib/MemoryFileSystem.js
@@ -38,8 +38,16 @@ function isFile(item) {
 
 function pathToArray(path) {
 	path = normalize(path);
+
+	var unc = /^\\\\/.test(path);
 	var nix = /^\//.test(path);
-	if(!nix) {
+
+	if(unc) {
+		path = path.slice(2);
+		path = path.replace(/[\\\/]+/g, "\\");
+		path = path.split(/[\\\/]/);
+		path[0] = '\\\\' + path[0];
+	} else if(!nix) {
 		if(!/^[A-Za-z]:/.test(path)) {
 			throw new MemoryFileSystemError(errors.code.EINVAL, path);
 		}

diff --git a/lib/normalize.js b/lib/normalize.js
@@ -1,3 +1,4 @@
+var doubleSlackUNCRegExp = /^\\\\/;
 var doubleSlashWinRegExp = /\\+/g;
 var doubleSlashNixRegExp = /\/+/g;
 var currentDirectoryWinMiddleRegExp = /\\(\.\\)+/;
@@ -34,5 +35,13 @@ module.exports = function normalize(path) {
 	path = path.replace(parentDirectoryNixEndRegExp2, "");
 	path = path.replace(parentDirectoryNixEndRegExp3, "/");
 
-	return path.replace(doubleSlashWinRegExp, "\\").replace(doubleSlashNixRegExp, "/");
-};
+	var unc = doubleSlackUNCRegExp.test(path);
+
+	path = path.replace(doubleSlashWinRegExp, "\\").replace(doubleSlashNixRegExp, "/")
+
+	if (unc) {
+		path = '\\' + path;
+	}
+
+	return path;
+};
diff --git a/test/MemoryFileSystem.js b/test/MemoryFileSystem.js
@@ -355,6 +355,8 @@ describe("normalize", function() {
 		fs.normalize("C:\\a\\b\\\c\\..\\..").should.be.eql("C:\\a");
 		fs.normalize("C:\\a\\b\\d\\..\\c\\..\\..").should.be.eql("C:\\a");
 		fs.normalize("C:\\a\\b\\d\\\\.\\\\.\\c\\.\\..").should.be.eql("C:\\a\\b\\d");
+		fs.normalize("\\\\a\\\\b").should.be.eql("\\\\a\\b");
+		fs.normalize("\\\\a\\\\b\\..\\c").should.be.eql("\\\\a\\c");
 	});
 });
 describe("pathToArray", function() {
@@ -363,6 +365,7 @@ describe("pathToArray", function() {
 		fs.pathToArray("/a/b/c").should.be.eql(["a", "b", "c"]);
 		fs.pathToArray("C:/a/b").should.be.eql(["C:", "a", "b"]);
 		fs.pathToArray("C:\\a\\b").should.be.eql(["C:", "a", "b"]);
+		fs.pathToArray("\\\\a\\b\\c").should.be.eql(["\\\\a", "b", "c"]);
 	});
 	it("should fail on invalid paths", function() {
 		(function() {