Merge pull request #16088 from webpack/correct-error-with-wrong-chunkname

sokra · web-flow · commit a8d7922a85f6 · 2022-11-09T10:53:45.000+01:00
Correct error with wrong chunkname
diff --git a/lib/buildChunkGraph.js b/lib/buildChunkGraph.js
@@ -508,8 +508,9 @@ const visitModules = (
 							new AsyncDependencyToInitialChunkError(chunkName, module, b.loc)
 						);
 						c = chunkGroup;
+					} else {
+						c.addOptions(b.groupOptions);
 					}
-					c.addOptions(b.groupOptions);
 					c.addOrigin(module, b.loc, b.request);
 				}
 				blockConnections.set(b, []);
diff --git a/test/__snapshots__/StatsTestCases.basictest.js.snap b/test/__snapshots__/StatsTestCases.basictest.js.snap
@@ -1014,6 +1014,24 @@ Unexpected end of JSON input while parsing empty string
 webpack x.x.x compiled with 1 error in X ms"
 `;
 
+exports[`StatsTestCases should print correct stats for dynamic-chunk-name-error 1`] = `
+"assets by status 8.29 KiB [cached] 3 assets
+runtime modules 3.54 KiB 8 modules
+cacheable modules 128 bytes
+  ./entry-1.js 63 bytes [built] [code generated]
+  ./entry-2.js 1 bytes [built] [code generated]
+  ./entry-3.js 63 bytes [built] [code generated]
+  ./dynamic.js 1 bytes [built] [code generated]
+
+ERROR in ./entry-1.js 1:7-58
+It's not allowed to load an initial chunk on demand. The chunk name \\"entry2\\" is already used by an entrypoint.
+
+ERROR in ./entry-3.js 1:7-58
+It's not allowed to load an initial chunk on demand. The chunk name \\"entry3\\" is already used by an entrypoint.
+
+webpack x.x.x compiled with 2 errors in X ms"
+`;
+
 exports[`StatsTestCases should print correct stats for entry-filename 1`] = `
 "PublicPath: auto
 asset a.js 1.4 KiB [emitted] (name: a)
diff --git a/test/statsCases/dynamic-chunk-name-error/dynamic.js b/test/statsCases/dynamic-chunk-name-error/dynamic.js
diff --git a/test/statsCases/dynamic-chunk-name-error/entry-1.js b/test/statsCases/dynamic-chunk-name-error/entry-1.js
@@ -0,0 +1 @@
+(() => import(/* webpackChunkName: "entry2" */"./dynamic"))();
diff --git a/test/statsCases/dynamic-chunk-name-error/entry-2.js b/test/statsCases/dynamic-chunk-name-error/entry-2.js
diff --git a/test/statsCases/dynamic-chunk-name-error/entry-3.js b/test/statsCases/dynamic-chunk-name-error/entry-3.js
@@ -0,0 +1 @@
+(() => import(/* webpackChunkName: "entry3" */"./dynamic"))();
diff --git a/test/statsCases/dynamic-chunk-name-error/webpack.config.js b/test/statsCases/dynamic-chunk-name-error/webpack.config.js
@@ -0,0 +1,9 @@
+/** @type {import("../../../").Configuration} */
+module.exports = {
+	mode: "production",
+	entry: {
+		entry1: "./entry-1.js",
+		entry2: "./entry-2.js",
+		entry3: "./entry-3.js"
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -508,8 +508,9 @@ const visitModules = (`
`508`	`508`	`new AsyncDependencyToInitialChunkError(chunkName, module, b.loc)`
`509`	`509`	`);`
`510`	`510`	`c = chunkGroup;`
	`511`	`+ } else {`
	`512`	`+ c.addOptions(b.groupOptions);`
`511`	`513`	`}`
`512`		`- c.addOptions(b.groupOptions);`
`513`	`514`	`c.addOrigin(module, b.loc, b.request);`
`514`	`515`	`}`
`515`	`516`	`blockConnections.set(b, []);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+(() => import(/* webpackChunkName: "entry2" */"./dynamic"))();`