fix another bug observed in webpack#2977

sokra · sokra · commit 37066fc692a0 · 2016-09-09T14:50:14.000+02:00
diff --git a/lib/FlagDependencyExportsPlugin.js b/lib/FlagDependencyExportsPlugin.js
@@ -25,6 +25,7 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {
 					processDependenciesBlock(module);
 					if(!moduleWithExports) {
 						module.providedExports = true;
+						notifyDependencies();
 					}
 				}
 			}
@@ -73,12 +74,16 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {
 					};
 				}
 				if(changed) {
-					var deps = dependencies["$" + module.identifier()];
-					if(deps) {
-						deps.forEach(function(dep) {
-							queue.push(dep);
-						});
-					}
+					notifyDependencies();
+				}
+			}
+
+			function notifyDependencies() {
+				var deps = dependencies["$" + module.identifier()];
+				if(deps) {
+					deps.forEach(function(dep) {
+						queue.push(dep);
+					});
 				}
 			}
 		});
diff --git a/test/statsCases/tree-shaking/edge.js b/test/statsCases/tree-shaking/edge.js
@@ -0,0 +1,2 @@
+export var x = 1;
+export * from "./unknown2";
diff --git a/test/statsCases/tree-shaking/expected.txt b/test/statsCases/tree-shaking/expected.txt
@@ -1,8 +1,8 @@
-Hash: 11b123cb23c353a91fe4
+Hash: 8bac53cc0c37d71baf6b
 Time: Xms
     Asset     Size  Chunks             Chunk Names
-bundle.js  6.46 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 512 bytes [entry] [rendered]
+bundle.js  7.22 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 588 bytes [entry] [rendered]
    [0] (webpack)/test/statsCases/tree-shaking/a.js 13 bytes {0} [built]
        [exports: a]
        [only some exports used: a]
@@ -11,15 +11,19 @@ chunk    {0} bundle.js (main) 512 bytes [entry] [rendered]
        [only some exports used: ]
    [2] (webpack)/test/statsCases/tree-shaking/unknown.js 0 bytes {0} [built]
        [only some exports used: a, c]
-   [3] (webpack)/test/statsCases/tree-shaking/reexport-known.js 49 bytes {0} [built]
+   [3] (webpack)/test/statsCases/tree-shaking/edge.js 45 bytes {0} [built]
+       [only some exports used: y]
+   [4] (webpack)/test/statsCases/tree-shaking/reexport-known.js 49 bytes {0} [built]
        [exports: a, b]
        [only some exports used: a]
-   [4] (webpack)/test/statsCases/tree-shaking/reexport-star-known.js 41 bytes {0} [built]
+   [5] (webpack)/test/statsCases/tree-shaking/reexport-star-known.js 41 bytes {0} [built]
        [exports: a, b]
        [only some exports used: a]
-   [5] (webpack)/test/statsCases/tree-shaking/reexport-star-unknown.js 68 bytes {0} [built]
+   [6] (webpack)/test/statsCases/tree-shaking/reexport-star-unknown.js 68 bytes {0} [built]
        [only some exports used: a, c]
-   [6] (webpack)/test/statsCases/tree-shaking/reexport-unknown.js 83 bytes {0} [built]
+   [7] (webpack)/test/statsCases/tree-shaking/reexport-unknown.js 83 bytes {0} [built]
        [exports: a, b, c, d]
        [only some exports used: a, c]
-   [7] (webpack)/test/statsCases/tree-shaking/index.js 245 bytes {0} [built]
+   [8] (webpack)/test/statsCases/tree-shaking/unknown2.js 0 bytes {0} [built]
+       [only some exports used: y]
+   [9] (webpack)/test/statsCases/tree-shaking/index.js 276 bytes {0} [built]
diff --git a/test/statsCases/tree-shaking/index.js b/test/statsCases/tree-shaking/index.js
@@ -2,5 +2,6 @@ import { a as a1 } from "./reexport-known";
 import { a as a2, c as c2 } from "./reexport-unknown";
 import { a as a3} from "./reexport-star-known";
 import { a as a4, c as c4 } from "./reexport-star-unknown";
+import { y } from "./edge";
 
-console.log(a1, a2, a3, a4, c2, c4);
+console.log(a1, a2, a3, a4, c2, c4, y);
diff --git a/test/statsCases/tree-shaking/unknown2.js b/test/statsCases/tree-shaking/unknown2.js

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {`
`25`	`25`	`processDependenciesBlock(module);`
`26`	`26`	`if(!moduleWithExports) {`
`27`	`27`	`module.providedExports = true;`
	`28`	`+ notifyDependencies();`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`	`}`
`@@ -73,12 +74,16 @@ FlagDependencyExportsPlugin.prototype.apply = function(compiler) {`
`73`	`74`	`};`
`74`	`75`	`}`
`75`	`76`	`if(changed) {`
`76`		`- var deps = dependencies["$" + module.identifier()];`
`77`		`- if(deps) {`
`78`		`- deps.forEach(function(dep) {`
`79`		`- queue.push(dep);`
`80`		`- });`
`81`		`- }`
	`77`	`+ notifyDependencies();`
	`78`	`+ }`
	`79`	`+ }`
	`80`	`+`
	`81`	`+ function notifyDependencies() {`
	`82`	`+ var deps = dependencies["$" + module.identifier()];`
	`83`	`+ if(deps) {`
	`84`	`+ deps.forEach(function(dep) {`
	`85`	`+ queue.push(dep);`
	`86`	`+ });`
`82`	`87`	`}`
`83`	`88`	`}`
`84`	`89`	`});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export var x = 1;`
	`2`	`+export * from "./unknown2";`