testcase+fix for CommonsChunkPlugin and entries

sokra · sokra · commit 45fcb1fca351 · 2015-07-25T15:00:05.000+02:00
diff --git a/lib/JsonpChunkTemplatePlugin.js b/lib/JsonpChunkTemplatePlugin.js
@@ -14,6 +14,14 @@ JsonpChunkTemplatePlugin.prototype.apply = function(chunkTemplate) {
 		var source = new ConcatSource();
 		source.add(jsonpFunction + "(" + JSON.stringify(chunk.ids) + ",");
 		source.add(modules);
+		var entries = chunk.modules.filter(function(m) {
+			return m.entry;
+		}).map(function(m) {
+			return m.id;
+		});
+		if(entries.length > 0) {
+			source.add("," + JSON.stringify(entries));
+		}
 		source.add(")");
 		return source;
 	});
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -25,6 +25,9 @@ describe("main", function() {
 	});
 
 	it("should load library2 exported as global", function() {
+		should.exist(window.library2common);
+		should.exist(window.library2common.ok2);
+		window.library2common.ok2.should.be.eql(true);
 		should.exist(window.library2);
 		should.exist(window.library2.ok);
 		window.library2.ok.should.be.eql(true);
diff --git a/test/browsertest/library2config.coffee b/test/browsertest/library2config.coffee
@@ -1,5 +1,7 @@
 webpack = require("../../");
 module.exports =
+	entry:
+		common: "library2/lib/common"
 	output:
 		hashDigestLength: 5
 	module:
@@ -15,7 +17,8 @@ module.exports =
 			should: require.resolve "should"
 	plugins: [
 		new webpack.optimize.LimitChunkCountPlugin
-			maxChunks: 2
+			maxChunks: 3
+		new webpack.optimize.CommonsChunkPlugin "common", "library2.commons.js"
 		new webpack.DefinePlugin
 			"typeof CONST_TYPEOF": JSON.stringify("typeof"),
 			CONST_UNDEFINED: undefined,
diff --git a/test/browsertest/node_modules/library2/lib/common.js b/test/browsertest/node_modules/library2/lib/common.js
diff --git a/test/browsertest/node_modules/library2/lib/main.js b/test/browsertest/node_modules/library2/lib/main.js
diff --git a/test/browsertest/tests.html b/test/browsertest/tests.html
@@ -9,6 +9,7 @@
 		<script>
 			mocha.setup('bdd');
 		</script>
+		<script src="js/library2.commons.js" charset="utf-8"></script>
 		<script src="js/library2.js" charset="utf-8"></script>
 		<script src="js/web.js" charset="utf-8"></script>
 		<!-- fixtures -->
