WIP14

sokra · sokra · commit 7bd207f0bbee · 2018-01-19T13:58:04.000+01:00
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -52,6 +52,7 @@ const FlagDependencyUsagePlugin = require("./FlagDependencyUsagePlugin");
 const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
 const ModuleConcatenationPlugin = require("./optimize/ModuleConcatenationPlugin");
 const AutomaticCommonsChunksPlugin = require("./optimize/AutomaticCommonsChunksPlugin");
+const RuntimeChunkPlugin = require("./optimize/RuntimeChunkPlugin");
 const NoEmitOnErrorsPlugin = require("./NoEmitOnErrorsPlugin");
 const NamedModulesPlugin = require("./NamedModulesPlugin");
 const NamedChunksPlugin = require("./NamedChunksPlugin");
@@ -289,6 +290,8 @@ class WebpackOptionsApply extends OptionsApply {
 			new ModuleConcatenationPlugin().apply(compiler);
 		if(options.optimization.splitChunks)
 			new AutomaticCommonsChunksPlugin(options.optimization.splitChunks).apply(compiler);
+		if(options.optimization.runtimeChunk)
+			new RuntimeChunkPlugin().apply(compiler);
 		if(options.optimization.noEmitOnErrors)
 			new NoEmitOnErrorsPlugin().apply(compiler);
 		if(options.optimization.namedModules)
diff --git a/lib/optimize/AutomaticCommonsChunksPlugin.js b/lib/optimize/AutomaticCommonsChunksPlugin.js
@@ -192,7 +192,7 @@ module.exports = class AutomaticCommonsChunksPlugin {
 					// This automatically merges equal names
 					const chunksKey = chunkIndices.sort().join();
 					const key = name && `name:${name}` ||
-						cacheGroup.key && `key:${cacheGroup.key}` ||
+						cacheGroup.key && `chunks:${chunksKey} key:${cacheGroup.key}` ||
 						`chunks:${chunksKey}`;
 					// Add module to maps
 					let info = chunksInfoMap.get(key);
diff --git a/lib/optimize/RuntimeChunkPlugin.js b/lib/optimize/RuntimeChunkPlugin.js
@@ -0,0 +1,25 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+module.exports = class RuntimeChunkPlugin {
+	constructor(options) {}
+
+	apply(compiler) {
+		compiler.hooks.compilation.tap("RuntimeChunkPlugin", compilation => {
+			compilation.hooks.optimizeChunksAdvanced.tap("RuntimeChunkPlugin", () => {
+				for(const entrypoint of compilation.entrypoints.values()) {
+					const chunk = entrypoint.getRuntimeChunk();
+					if(chunk.getNumberOfModules() > 0) {
+						const newChunk = compilation.addChunk(entrypoint.name + "-runtime");
+						entrypoint.unshiftChunk(newChunk);
+						newChunk.addGroup(entrypoint);
+						entrypoint.setRuntimeChunk(newChunk);
+					}
+				}
+			});
+		});
+	}
+}
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -209,7 +209,7 @@ class JsonpMainTemplatePlugin {
 						"function checkDeferredModules() {",
 						Template.indent([
 							"var result;",
-							"for(i = 0; i < deferredModules.length; i++) {",
+							"for(var i = 0; i < deferredModules.length; i++) {",
 							Template.indent([
 								"var deferredModule = deferredModules[i];",
 								"var fullfilled = true;",
@@ -241,10 +241,11 @@ class JsonpMainTemplatePlugin {
 				var globalObject = mainTemplate.outputOptions.globalObject;
 				return Template.asString([
 					`var jsonpArray = ${globalObject}[${JSON.stringify(jsonpFunction)}] = ${globalObject}[${JSON.stringify(jsonpFunction)}] || [];`,
+					"var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);",
 					"jsonpArray.push = webpackJsonpCallback;",
 					"jsonpArray = jsonpArray.slice();",
 					"for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);",
-					"var parentJsonpFunction = jsonpArray.push.bind(jsonpArray);",
+					"var parentJsonpFunction = oldJsonpFunction;",
 					"",
 					source
 				]);
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1486,6 +1486,10 @@
             }
           ]
         },
+        "runtimeChunk": {
+          "description": "Create an additional chunk which contains only the webpack runtime and chunk hash maps",
+          "type": "boolean"
+        },
         "noEmitOnErrors": {
           "description": "Avoid emitting assets when errors occur",
           "type": "boolean"

Original file line number	Diff line number	Diff line change
`@@ -1486,6 +1486,10 @@`
`1486`	`1486`	`}`
`1487`	`1487`	`]`
`1488`	`1488`	`},`
	`1489`	`+ "runtimeChunk": {`
	`1490`	`+ "description": "Create an additional chunk which contains only the webpack runtime and chunk hash maps",`
	`1491`	`+ "type": "boolean"`
	`1492`	`+ },`
`1489`	`1493`	`"noEmitOnErrors": {`
`1490`	`1494`	`"description": "Avoid emitting assets when errors occur",`
`1491`	`1495`	`"type": "boolean"`