don't deduplicate modules with async blocks

sokra · sokra · commit 026170a8a36c · 2015-04-10T10:02:26.000+02:00
fixes webpack-contrib/bundle-loader#15
diff --git a/lib/optimize/DedupePlugin.js b/lib/optimize/DedupePlugin.js
@@ -18,7 +18,7 @@ DedupePlugin.prototype.apply = function(compiler) {
 			var modulesByHash = {};
 			var allDups = [];
 			modules.forEach(function(module, idx) {
-				if(!module.getSourceHash || !module.getAllModuleDependencies || !module.createTemplate || !module.getTemplateArguments) return;
+				if(!module.getSourceHash || !module.getAllModuleDependencies || !module.createTemplate || !module.getTemplateArguments || module.blocks.length > 0) return;
 				var hash = module.getSourceHash();
 				var dupModule = modulesByHash[hash];
 				if(dupModule) {
diff --git a/test/cases/compile/deduplication-bundle-loader/a/file.js b/test/cases/compile/deduplication-bundle-loader/a/file.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/cases/compile/deduplication-bundle-loader/b/file.js b/test/cases/compile/deduplication-bundle-loader/b/file.js
@@ -0,0 +1 @@
+module.exports = "b";
diff --git a/test/cases/compile/deduplication-bundle-loader/index.js b/test/cases/compile/deduplication-bundle-loader/index.js
@@ -0,0 +1,13 @@
+it("should load a duplicate module with different dependencies correctly", function(done) {
+	var a = require("bundle!./a/file");
+	var b = require("bundle!./b/file");
+	(typeof a).should.be.eql("function");
+	(typeof b).should.be.eql("function");
+	a(function(ra) {
+		ra.should.be.eql("a");
+		b(function(rb) {
+			rb.should.be.eql("b");
+			done();
+		})
+	});
+});
