Merge pull request webpack#661 from corporateanon/fix-windows-compiler

sokra · sokra · commit ccf651394107 · 2015-01-06T22:37:41.000+01:00
Compiler fails under Windows
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -2,6 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
+var path = require("path");
 var clone = require("clone");
 var Tapable = require("tapable");
 
@@ -235,9 +236,9 @@ Compiler.prototype.emitAssets = function(compilation, callback) {
 			if(queryStringIdx >= 0) {
 				targetFile = targetFile.substr(0, queryStringIdx);
 			}
-			if(targetFile.indexOf("/") >= 0) {
-				var idx = targetFile.lastIndexOf("/");
-				var dir = targetFile.substr(0, idx);
+
+			if(targetFile.match(/\/|\\/)) {
+				var dir = path.dirname(targetFile);
 				this.outputFileSystem.mkdirp(this.outputFileSystem.join(outputPath, dir), writeOut.bind(this));
 			} else writeOut.call(this);
 			function writeOut(err) {
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -12,6 +12,10 @@ describe("Compiler", function() {
 		options.entry = entry;
 		options.context = path.join(__dirname, "fixtures");
 		options.output.pathinfo = true;
+		var logs = {
+			mkdirp: [],
+			writeFile: [],
+		};
 
 		var c = new Compiler();
 		c.options = new WebpackOptionsApply().process(options, c);
@@ -20,9 +24,11 @@ describe("Compiler", function() {
 		c.outputFileSystem = {
 			join: path.join.bind(path),
 			mkdirp: function(path, callback) {
+				logs.mkdirp.push(path);
 				callback();
 			},
 			writeFile: function(name, content, callback) {
+				logs.writeFile.push(name, content);
 				files[name] = content.toString("utf-8");
 				callback();
 			}
@@ -44,9 +50,26 @@ describe("Compiler", function() {
 				stats.errors[0].should.be.instanceOf(Error);
 				throw stats.errors[0];
 			}
+			stats.logs = logs;
 			callback(stats, files);
 		});
 	}
+	it("should compile a single file to deep output", function(done) {
+		var sep = path.sep;
+
+		compile("./c", {
+			output: {
+				path: 'what',
+				filename: 'the' + sep + 'hell.js',
+			}
+		}, function(stats, files) {
+			stats.logs.mkdirp.should.eql([
+				'what',
+				'what' + sep + 'the',
+			]);
+			done();
+		});
+	});
 	it("should compile a single file", function(done) {
 		compile("./c", {}, function(stats, files) {
 			files.should.have.property("bundle.js").have.type("string");
@@ -135,4 +158,4 @@ describe("Compiler", function() {
 			done();
 		});
 	});
-});
+});
