Merge pull request webpack#7373 from webpack/bugfix/circular-chunks

sokra · web-flow · commit 45a18a863ee1 · 2018-05-22T15:55:34.000+02:00
fix problems with circular unneeded chunks
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -865,7 +865,7 @@ class Compilation extends Tapable {
 			this.assignIndex(module);
 			this.assignDepth(module);
 		}
-		this.processDependenciesBlocksForChunkGroups(this.chunkGroups);
+		this.processDependenciesBlocksForChunkGroups(this.chunkGroups.slice());
 		this.sortModules(this.modules);
 		this.hooks.optimize.call();
 
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -1380,7 +1380,7 @@ cir2 from cir1.js  359 bytes    5, 3  [emitted]  cir2 from cir1
          chunk.js  190 bytes    6, 7  [emitted]  chunk
       ac in ab.js  130 bytes       7  [emitted]  ac in ab
 Entrypoint main = main.js
-chunk    {0} cir1.js (cir1) 81 bytes <{3}> <{4}> <{5}> >{5}< [rendered]
+chunk    {0} cir1.js (cir1) 81 bytes <{3}> <{4}> >{5}< [rendered]
     > [3] ./circular2.js 1:0-79
     > [3] ./circular2.js 1:0-79
     > [8] ./index.js 13:0-54
@@ -1401,7 +1401,7 @@ chunk    {4} main.js (main) 523 bytes >{0}< >{1}< >{2}< >{3}< [entry] [rendered]
     > ./index main
  [4] ./modules/f.js 0 bytes {4} [built]
  [8] ./index.js 523 bytes {4} [built]
-chunk    {5} cir2 from cir1.js (cir2 from cir1) 81 bytes <{0}> >{0}< [rendered]
+chunk    {5} cir2 from cir1.js (cir2 from cir1) 81 bytes <{0}> [rendered]
     > [2] ./circular1.js 1:0-79
     > [2] ./circular1.js 1:0-79
  [3] ./circular2.js 81 bytes {3} {5} [built]
diff --git a/test/cases/chunks/import-circle/index.js b/test/cases/chunks/import-circle/index.js
@@ -0,0 +1,15 @@
+import leftHelix from './leftHelix';
+import rightHelix from './rightHelix';
+
+it("should import generate ensure function for this", () =>
+{
+	return Promise.all([
+		leftHelix.run(),
+		rightHelix.run()
+	]);
+});
+
+export default {
+  leftHelix,
+  rightHelix,
+};
diff --git a/test/cases/chunks/import-circle/leftHelix.js b/test/cases/chunks/import-circle/leftHelix.js
@@ -0,0 +1,6 @@
+import leftHelixPrime, { run } from './leftHelixPrime';
+
+export default {
+	leftHelixPrime,
+	run
+};
diff --git a/test/cases/chunks/import-circle/leftHelixPrime.js b/test/cases/chunks/import-circle/leftHelixPrime.js
@@ -0,0 +1,9 @@
+import rightHelixPrime from './rightHelixPrime';
+
+export function run() {
+	return import(/* webpackChunkName: "left" */ './leftHelix');
+}
+
+export default {
+	rightHelixPrime,
+};
diff --git a/test/cases/chunks/import-circle/rightHelix.js b/test/cases/chunks/import-circle/rightHelix.js
@@ -0,0 +1,6 @@
+import rightHelixPrime, { run } from './rightHelixPrime';
+
+export default {
+	rightHelixPrime,
+	run
+}
diff --git a/test/cases/chunks/import-circle/rightHelixPrime.js b/test/cases/chunks/import-circle/rightHelixPrime.js
@@ -0,0 +1,9 @@
+import leftHelixPrime from './leftHelixPrime';
+
+export function run() {
+	return import(/* webpackChunkName: "right" */ './rightHelix');
+}
+
+export default {
+    leftHelixPrime
+};

Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ class Compilation extends Tapable {`
`865`	`865`	`this.assignIndex(module);`
`866`	`866`	`this.assignDepth(module);`
`867`	`867`	`}`
`868`		`- this.processDependenciesBlocksForChunkGroups(this.chunkGroups);`
	`868`	`+ this.processDependenciesBlocksForChunkGroups(this.chunkGroups.slice());`
`869`	`869`	`this.sortModules(this.modules);`
`870`	`870`	`this.hooks.optimize.call();`
`871`	`871`