From 089356faa3d27c1ef4d5c9eee1c235bc8ea505ea Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Tue, 17 Jan 2017 22:26:38 +0100 Subject: [PATCH] fixes a bug in OccurrenceOrderPlugin --- lib/optimize/OccurrenceOrderPlugin.js | 2 +- test/statsCases/external/expected.txt | 6 ++--- test/statsCases/optimize-chunks/expected.txt | 22 +++++++++---------- .../separate-css-bundle/expected.txt | 14 ++++++------ test/statsCases/tree-shaking/expected.txt | 16 +++++++------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/optimize/OccurrenceOrderPlugin.js b/lib/optimize/OccurrenceOrderPlugin.js index eca7729ac..6a5623aa7 100644 --- a/lib/optimize/OccurrenceOrderPlugin.js +++ b/lib/optimize/OccurrenceOrderPlugin.js @@ -43,7 +43,7 @@ class OccurrenceOrderPlugin { }).reduce((a, b) => { return a + b; }, 0) + m.chunks.length + m.chunks.filter((c) => { - c.entryModule === m; + return c.entryModule === m; }).length; return m.__OccurenceOrderPlugin_occurs = result; } diff --git a/test/statsCases/external/expected.txt b/test/statsCases/external/expected.txt index f36e36fed..485de51b7 100644 --- a/test/statsCases/external/expected.txt +++ b/test/statsCases/external/expected.txt @@ -1,7 +1,7 @@ -Hash: eafb5955e5fe16cc8826 +Hash: 86950abf8dcf924d9cc1 Time: Xms Asset Size Chunks Chunk Names main.js 2.64 kB 0 [emitted] main chunk {0} main.js (main) 59 bytes [entry] [rendered] - [0] external "test" 42 bytes {0} [not cacheable] - [1] (webpack)/test/statsCases/external/index.js 17 bytes {0} [built] \ No newline at end of file + [0] (webpack)/test/statsCases/external/index.js 17 bytes {0} [built] + [1] external "test" 42 bytes {0} [not cacheable] \ No newline at end of file diff --git a/test/statsCases/optimize-chunks/expected.txt b/test/statsCases/optimize-chunks/expected.txt index 1b4b27777..637894739 100644 --- a/test/statsCases/optimize-chunks/expected.txt +++ b/test/statsCases/optimize-chunks/expected.txt @@ -1,4 +1,4 @@ -Hash: 68b0a8c7311f83e54374 +Hash: 999ae28af33cdfa6ec93 Time: Xms Asset Size Chunks Chunk Names 0.js 231 bytes 0 [emitted] cir1 @@ -11,33 +11,33 @@ Time: Xms main.js 6.53 kB 7 [emitted] main chunk {0} 0.js (cir1) 81 bytes {3} {5} {7} [rendered] > duplicate cir1 from cir2 [3] (webpack)/test/statsCases/optimize-chunks/circular2.js 1:0-79 - > duplicate cir1 [8] (webpack)/test/statsCases/optimize-chunks/index.js 13:0-54 + > duplicate cir1 [7] (webpack)/test/statsCases/optimize-chunks/index.js 13:0-54 [2] (webpack)/test/statsCases/optimize-chunks/circular1.js 81 bytes {0} [built] chunk {1} 1.js (abd) 0 bytes {7} [rendered] - > abd [8] (webpack)/test/statsCases/optimize-chunks/index.js 8:0-11:9 + > abd [7] (webpack)/test/statsCases/optimize-chunks/index.js 8:0-11:9 [0] (webpack)/test/statsCases/optimize-chunks/modules/a.js 0 bytes {1} {2} [built] [1] (webpack)/test/statsCases/optimize-chunks/modules/b.js 0 bytes {1} {2} [built] [5] (webpack)/test/statsCases/optimize-chunks/modules/d.js 0 bytes {1} {4} [built] chunk {2} 2.js (ab) 0 bytes {7} [rendered] - > ab [8] (webpack)/test/statsCases/optimize-chunks/index.js 1:0-6:8 + > ab [7] (webpack)/test/statsCases/optimize-chunks/index.js 1:0-6:8 [0] (webpack)/test/statsCases/optimize-chunks/modules/a.js 0 bytes {1} {2} [built] [1] (webpack)/test/statsCases/optimize-chunks/modules/b.js 0 bytes {1} {2} [built] chunk {3} 3.js (cir2) 81 bytes {7} [rendered] - > cir2 [8] (webpack)/test/statsCases/optimize-chunks/index.js 14:0-54 + > cir2 [7] (webpack)/test/statsCases/optimize-chunks/index.js 14:0-54 [3] (webpack)/test/statsCases/optimize-chunks/circular2.js 81 bytes {3} {5} [built] chunk {4} 4.js (chunk) 0 bytes {1} {6} [rendered] - > chunk [8] (webpack)/test/statsCases/optimize-chunks/index.js 3:2-4:13 - > chunk [8] (webpack)/test/statsCases/optimize-chunks/index.js 9:1-10:12 + > chunk [7] (webpack)/test/statsCases/optimize-chunks/index.js 3:2-4:13 + > chunk [7] (webpack)/test/statsCases/optimize-chunks/index.js 9:1-10:12 [4] (webpack)/test/statsCases/optimize-chunks/modules/c.js 0 bytes {4} {6} [built] [5] (webpack)/test/statsCases/optimize-chunks/modules/d.js 0 bytes {1} {4} [built] chunk {5} 5.js (cir2 from cir1) 81 bytes {0} [rendered] > cir2 from cir1 [2] (webpack)/test/statsCases/optimize-chunks/circular1.js 1:0-79 [3] (webpack)/test/statsCases/optimize-chunks/circular2.js 81 bytes {3} {5} [built] - [7] (webpack)/test/statsCases/optimize-chunks/modules/e.js 0 bytes {5} [built] + [8] (webpack)/test/statsCases/optimize-chunks/modules/e.js 0 bytes {5} [built] chunk {6} 6.js (ac in ab) 0 bytes {2} [rendered] - > ac in ab [8] (webpack)/test/statsCases/optimize-chunks/index.js 2:1-5:15 + > ac in ab [7] (webpack)/test/statsCases/optimize-chunks/index.js 2:1-5:15 [4] (webpack)/test/statsCases/optimize-chunks/modules/c.js 0 bytes {4} {6} [built] chunk {7} main.js (main) 523 bytes [entry] [rendered] - > main [8] (webpack)/test/statsCases/optimize-chunks/index.js + > main [7] (webpack)/test/statsCases/optimize-chunks/index.js [6] (webpack)/test/statsCases/optimize-chunks/modules/f.js 0 bytes {7} [built] - [8] (webpack)/test/statsCases/optimize-chunks/index.js 523 bytes {7} [built] \ No newline at end of file + [7] (webpack)/test/statsCases/optimize-chunks/index.js 523 bytes {7} [built] \ No newline at end of file diff --git a/test/statsCases/separate-css-bundle/expected.txt b/test/statsCases/separate-css-bundle/expected.txt index 16cc6b6e3..c7d5d01b2 100644 --- a/test/statsCases/separate-css-bundle/expected.txt +++ b/test/statsCases/separate-css-bundle/expected.txt @@ -1,6 +1,6 @@ -Hash: c15fc41aa7082c72c0b29661b5ac14d1a0a5b50a +Hash: 36ce346e25270769b244f4d2d844a00ebd8ee85a Child - Hash: c15fc41aa7082c72c0b2 + Hash: 36ce346e25270769b244 Time: Xms Asset Size Chunks Chunk Names c7ab11336573e45dc51e.js 2.65 kB 0 [emitted] main @@ -10,10 +10,10 @@ Child [1] (webpack)/test/statsCases/separate-css-bundle/a/index.js 23 bytes {0} [built] Child extract-text-webpack-plugin: chunk {0} extract-text-webpack-plugin-output-filename 1.65 kB [entry] [rendered] - [0] (webpack)/~/css-loader/lib/css-base.js 1.46 kB {0} [built] - [1] (webpack)/~/css-loader!(webpack)/test/statsCases/separate-css-bundle/a/file.css 192 bytes {0} [built] + [0] (webpack)/~/css-loader!(webpack)/test/statsCases/separate-css-bundle/a/file.css 192 bytes {0} [built] + [1] (webpack)/~/css-loader/lib/css-base.js 1.46 kB {0} [built] Child - Hash: 9661b5ac14d1a0a5b50a + Hash: f4d2d844a00ebd8ee85a Time: Xms Asset Size Chunks Chunk Names c7ab11336573e45dc51e.js 2.65 kB 0 [emitted] main @@ -23,5 +23,5 @@ Child [1] (webpack)/test/statsCases/separate-css-bundle/b/index.js 23 bytes {0} [built] Child extract-text-webpack-plugin: chunk {0} extract-text-webpack-plugin-output-filename 1.65 kB [entry] [rendered] - [0] (webpack)/~/css-loader/lib/css-base.js 1.46 kB {0} [built] - [1] (webpack)/~/css-loader!(webpack)/test/statsCases/separate-css-bundle/b/file.css 194 bytes {0} [built] \ No newline at end of file + [0] (webpack)/~/css-loader!(webpack)/test/statsCases/separate-css-bundle/b/file.css 194 bytes {0} [built] + [1] (webpack)/~/css-loader/lib/css-base.js 1.46 kB {0} [built] \ No newline at end of file diff --git a/test/statsCases/tree-shaking/expected.txt b/test/statsCases/tree-shaking/expected.txt index f177ca4d3..fc4000bf3 100644 --- a/test/statsCases/tree-shaking/expected.txt +++ b/test/statsCases/tree-shaking/expected.txt @@ -1,4 +1,4 @@ -Hash: 029f236f17609d989886 +Hash: 347e6d2384c1a580ac4d Time: Xms Asset Size Chunks Chunk Names bundle.js 7.37 kB 0 [emitted] main @@ -13,17 +13,17 @@ chunk {0} bundle.js (main) 588 bytes [entry] [rendered] [only some exports used: c] [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] + [4] (webpack)/test/statsCases/tree-shaking/index.js 276 bytes {0} [built] + [5] (webpack)/test/statsCases/tree-shaking/reexport-known.js 49 bytes {0} [built] [exports: a, b] [only some exports used: a] - [5] (webpack)/test/statsCases/tree-shaking/reexport-star-known.js 41 bytes {0} [built] + [6] (webpack)/test/statsCases/tree-shaking/reexport-star-known.js 41 bytes {0} [built] [exports: a, b] [only some exports used: a] - [6] (webpack)/test/statsCases/tree-shaking/reexport-star-unknown.js 68 bytes {0} [built] + [7] (webpack)/test/statsCases/tree-shaking/reexport-star-unknown.js 68 bytes {0} [built] [only some exports used: a, c] - [7] (webpack)/test/statsCases/tree-shaking/reexport-unknown.js 83 bytes {0} [built] + [8] (webpack)/test/statsCases/tree-shaking/reexport-unknown.js 83 bytes {0} [built] [exports: a, b, c, d] [only some exports used: a, c] - [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] \ No newline at end of file + [9] (webpack)/test/statsCases/tree-shaking/unknown2.js 0 bytes {0} [built] + [only some exports used: y] \ No newline at end of file