Merge branch 'master' into feature/chunk-module-index

# Conflicts:
#	test/__snapshots__/StatsTestCases.test.js.snap

lib/web/JsonpChunkTemplatePlugin.js

@@ -6,7 +6,23 @@
 
 const { ConcatSource } = require("webpack-sources");
 
+/** @typedef {import("../ChunkTemplate")} ChunkTemplate */
+
+const getEntryInfo = chunk => {
+	return [chunk.entryModule].filter(Boolean).map(m =>
+		[m.id].concat(
+			Array.from(chunk.groupsIterable)[0]
+				.chunks.filter(c => c !== chunk)
+				.map(c => c.id)
+		)
+	);
+};
+
 class JsonpChunkTemplatePlugin {
+	/**
+	 * @param {ChunkTemplate} chunkTemplate the chunk template
+	 * @returns {void}
+	 */
 	apply(chunkTemplate) {
 		chunkTemplate.hooks.render.tap(
 			"JsonpChunkTemplatePlugin",
@@ -23,13 +39,7 @@ class JsonpChunkTemplatePlugin {
 					)}] || []).push([${JSON.stringify(chunk.ids)},`
 				);
 				source.add(modules);
-				const entries = [chunk.entryModule].filter(Boolean).map(m =>
-					[m.id].concat(
-						Array.from(chunk.groupsIterable)[0]
-							.chunks.filter(c => c !== chunk)
-							.map(c => c.id)
-					)
-				);
+				const entries = getEntryInfo(chunk);
 				if (entries.length > 0) {
 					source.add(`,${JSON.stringify(entries)}`);
 				} else if (prefetchChunks && prefetchChunks.length) {
@@ -49,6 +59,13 @@ class JsonpChunkTemplatePlugin {
 			hash.update(`${chunkTemplate.outputOptions.jsonpFunction}`);
 			hash.update(`${chunkTemplate.outputOptions.globalObject}`);
 		});
+		chunkTemplate.hooks.hashForChunk.tap(
+			"JsonpChunkTemplatePlugin",
+			(hash, chunk) => {
+				hash.update(JSON.stringify(getEntryInfo(chunk)));
+				hash.update(JSON.stringify(chunk.getChildIdsByOrders().prefetch) || "");
+			}
+		);
 	}
 }
 module.exports = JsonpChunkTemplatePlugin;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.12.1",
+  "version": "4.12.2",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",

test/statsCases/issue-7577/a.js

@@ -0,0 +1 @@
+console.log("a");

test/statsCases/issue-7577/b.js

@@ -0,0 +1 @@
+import "vendor";

test/statsCases/issue-7577/c.js

@@ -0,0 +1,2 @@
+console.log("c");
+import(/* webpackPrefetch: true */ "./b");

test/statsCases/issue-7577/webpack.config.js

@@ -0,0 +1,45 @@
+const base = {
+	mode: "production",
+	optimization: {
+		runtimeChunk: true,
+		namedChunks: true,
+		splitChunks: {
+			minSize: 0,
+			chunks: "all",
+			cacheGroups: {
+				all: {
+					priority: -30
+				}
+			}
+		}
+	}
+};
+module.exports = [
+	Object.assign(
+		{
+			entry: "./a.js",
+			output: {
+				filename: "a-[name]-[chunkhash].js"
+			}
+		},
+		base
+	),
+	Object.assign(
+		{
+			entry: "./b.js",
+			output: {
+				filename: "b-[name]-[chunkhash].js"
+			}
+		},
+		base
+	),
+	Object.assign(
+		{
+			entry: "./c.js",
+			output: {
+				filename: "c-[name]-[chunkhash].js"
+			}
+		},
+		base
+	)
+];