move externals into chunk with entry

sokra · sokra · commit 1b459d91f562 · 2016-05-05T10:13:50.000+02:00
fixes webpack#2314 maybe fixes webpack#2066 fixes webpack#2375 fixes webpack#1673
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -228,6 +228,12 @@ Chunk.prototype.integratedSize = function(other, options) {
 	return modulesSize * (this.initial || other.initial ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
 };
 
+Chunk.prototype.hasEntryModule = function() {
+	return this.modules.some(function(module) {
+		return module.entry;
+	});
+}
+
 Chunk.prototype.getChunkMaps = function(includeEntries, realHash) {
 	var chunksProcessed = [];
 	var chunkHashMap = {};
diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js
@@ -16,9 +16,7 @@ ChunkTemplate.prototype.render = function(chunk, moduleTemplate, dependencyTempl
 	var modules = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates);
 	var core = this.applyPluginsWaterfall("modules", modules, chunk, moduleTemplate, dependencyTemplates);
 	var source = this.applyPluginsWaterfall("render", core, chunk, moduleTemplate, dependencyTemplates);
-	if(chunk.modules.some(function(module) {
-			return module.entry;
-		})) {
+	if(chunk.hasEntryModule()) {
 		source = this.applyPluginsWaterfall("render-with-entry", source, chunk);
 	}
 	chunk.rendered = true;
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -9,6 +9,9 @@ var WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 
 function ExternalModule(request, type) {
 	Module.call(this);
+	this.chunkCondition = function(chunk) {
+		return chunk.hasEntryModule();
+	};
 	this.request = request;
 	this.type = type;
 	this.built = false;
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -127,9 +127,7 @@ MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependency
 	buf.push("");
 	buf.push(this.asString(this.applyPluginsWaterfall("startup", "", chunk, hash)));
 	var source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", "webpack/bootstrap " + hash), chunk, hash, moduleTemplate, dependencyTemplates);
-	if(chunk.modules.some(function(module) {
-			return module.entry;
-		})) {
+	if(chunk.hasEntryModule()) {
 		source = this.applyPluginsWaterfall("render-with-entry", source, chunk, hash);
 	}
 	if(!source) throw new Error("Compiler error: MainTemplate plugin 'render' should return something");
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -32,6 +32,7 @@ var RequireContextPlugin = require("./dependencies/RequireContextPlugin");
 var RequireEnsurePlugin = require("./dependencies/RequireEnsurePlugin");
 var RequireIncludePlugin = require("./dependencies/RequireIncludePlugin");
 
+var EnsureChunkConditionsPlugin = require("./optimize/EnsureChunkConditionsPlugin");
 var RemoveParentModulesPlugin = require("./optimize/RemoveParentModulesPlugin");
 var RemoveEmptyChunksPlugin = require("./optimize/RemoveEmptyChunksPlugin");
 var MergeDuplicateChunksPlugin = require("./optimize/MergeDuplicateChunksPlugin");
@@ -245,6 +246,7 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 	);
 
 	compiler.apply(
+		new EnsureChunkConditionsPlugin(),
 		new RemoveParentModulesPlugin(),
 		new RemoveEmptyChunksPlugin(),
 		new MergeDuplicateChunksPlugin(),
diff --git a/lib/optimize/EnsureChunkConditionsPlugin.js b/lib/optimize/EnsureChunkConditionsPlugin.js
@@ -0,0 +1,28 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function EnsureChunkConditionsPlugin() {}
+module.exports = EnsureChunkConditionsPlugin;
+
+EnsureChunkConditionsPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation) {
+		compilation.plugin(["optimize-chunks-basic", "optimize-extracted-chunks-basic"], function(chunks) {
+			var changed = false;
+			chunks.forEach(function(chunk) {
+				chunk.modules.slice().forEach(function(module) {
+					if(!module.chunkCondition) return;
+					if(!module.chunkCondition(chunk)) {
+						chunk.parents.forEach(function(parent) {
+							parent.addModule(module);
+						});
+						module.rewriteChunkInReasons(chunk, chunk.parents);
+						chunk.removeModule(module);
+						changed = true;
+					}
+				});
+			});
+			if(changed) return true;
+		});
+	});
+};
diff --git a/test/configCases/externals/externals-in-chunk/chunk.js b/test/configCases/externals/externals-in-chunk/chunk.js
@@ -0,0 +1,2 @@
+exports.a = require("external");
+exports.b = System.import("./chunk2");
diff --git a/test/configCases/externals/externals-in-chunk/chunk2.js b/test/configCases/externals/externals-in-chunk/chunk2.js
@@ -0,0 +1 @@
+module.exports = require("external2");
diff --git a/test/configCases/externals/externals-in-chunk/index.js b/test/configCases/externals/externals-in-chunk/index.js
@@ -0,0 +1,18 @@
+it("should move externals in chunks into entry chunk", function(done) {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+	source.should.containEql("1+" + (1+1));
+	source.should.containEql("3+" + (2+2));
+	source.should.containEql("5+" + (3+3));
+
+	System.import("./chunk").then(function(chunk) {
+		chunk.a.should.be.eql(3);
+		chunk.b.then(function(chunk2) {
+			chunk2.should.be.eql(7);
+			System.import("external3").then(function(ex) {
+				ex.should.be.eql(11);
+				done();
+			});
+		});
+	});
+});
diff --git a/test/configCases/externals/externals-in-chunk/webpack.config.js b/test/configCases/externals/externals-in-chunk/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	externals: {
+		external: "1+2",
+		external2: "3+4",
+		external3: "5+6"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+exports.a = require("external");`
	`2`	`+exports.b = System.import("./chunk2");`