smaller bundles without Code Splittings

sokra · sokra · commit 1c1a5cac3f33 · 2016-02-04T12:51:40.000+01:00
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -26,6 +26,15 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 		}
 		return source;
 	});
+	mainTemplate.plugin("require-extensions", function(source, chunk) {
+		if(chunk.chunks.length === 0) return source;
+		return this.asString([
+			source,
+			"",
+			"// on error function for async loading",
+			this.requireFn + ".oe = function(err) { throw err; };"
+		]);
+	});
 	mainTemplate.plugin("jsonp-script", function(_, chunk, hash) {
 		var filename = this.outputOptions.filename;
 		var chunkFilename = this.outputOptions.chunkFilename;
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -91,10 +91,6 @@ function MainTemplate(outputOptions) {
 		buf.push("// expose the module cache");
 		buf.push(this.requireFn + ".c = installedModules;");
 
-		buf.push("");
-		buf.push("// on error function for async loading");
-		buf.push(this.requireFn + ".oe = function(err) { throw err; };");
-
 		var publicPath = this.getPublicPath({
 			hash: hash
 		});
@@ -119,6 +115,7 @@ MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependency
 	buf.push("}");
 	buf.push("");
 	buf.push(this.asString(this.applyPluginsWaterfall("require-extensions", "", chunk, hash)));
+	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) {
