Skip to content

Commit 72e94e3

Browse files
sokrasokra
authored
Merge pull request webpack#4965 from ymichael/duplicate-blocks
CommonsChunkPlugin can cause duplicate chunk blocks
2 parents 1a5858a + 7834e6c commit 72e94e3

8 files changed

Lines changed: 95 additions & 21 deletions

File tree

‎lib/optimize/CommonsChunkPlugin.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,9 @@ Take a look at the "name"/"names" or async/children option.`);
340340
moveExtractedChunkBlocksToTargetChunk(chunks, targetChunk) {
341341
for(let chunk of chunks) {
342342
for(let block of chunk.blocks) {
343-
block.chunks.unshift(targetChunk);
343+
if(block.chunks.indexOf(targetChunk) === -1) {
344+
block.chunks.unshift(targetChunk);
345+
}
344346
targetChunk.addBlock(block);
345347
}
346348
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"script-loader": "~0.7.0",
6161
"should": "^11.1.1",
6262
"simple-git": "^1.65.0",
63-
"sinon": "^1.17.7",
63+
"sinon": "^2.3.2",
6464
"style-loader": "~0.13.0",
6565
"url-loader": "~0.5.0",
6666
"val-loader": "~0.5.0",

‎test/configCases/async-commons-chunk/existing-name/a.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "a";

‎test/configCases/async-commons-chunk/existing-name/b.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "b";

‎test/configCases/async-commons-chunk/existing-name/c.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "c";

‎test/configCases/async-commons-chunk/existing-name/index.js‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
require("should");
2+
const sinon = require("sinon");
3+
const chunkLoadingSpy = sinon.spy(__webpack_require__, 'e');
4+
5+
it("should not have duplicate chunks in blocks", function(done) {
6+
// This split point should contain: a
7+
require.ensure([], function(require) {
8+
require("./a").should.be.eql("a");
9+
}, 'a');
10+
11+
// This split point should contain: a and b - we use CommonsChunksPlugin to
12+
// have it only contain b and make chunk a be an async dependency.
13+
require.ensure([], function(require) {
14+
require("./a").should.be.eql("a");
15+
require("./b").should.be.eql("b");
16+
}, 'a+b');
17+
18+
// This split point should contain: a, b and c - we use CommonsChunksPlugin to
19+
// have it only contain c and make chunks a and a+b be async dependencies.
20+
require.ensure([], function(require) {
21+
require("./a").should.be.eql("a");
22+
require("./b").should.be.eql("b");
23+
require("./c").should.be.eql("c");
24+
}, 'a+b+c');
25+
26+
// Each of the require.ensures above should end up resolving chunks:
27+
// - a
28+
// - a, a+b
29+
// - a, a+b, a+b+c
30+
chunkLoadingSpy.callCount.should.be.eql(6);
31+
chunkLoadingSpy.args.should.be.eql([[0], [0], [1], [0], [1], [2]]);
32+
done();
33+
});

‎test/configCases/async-commons-chunk/existing-name/webpack.config.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
var webpack = require("../../../../");
2+
3+
module.exports = {
4+
plugins: [
5+
new webpack.optimize.CommonsChunkPlugin({
6+
chunks: ["a+b", "a+b+c"],
7+
async: "a+b",
8+
}),
9+
new webpack.optimize.CommonsChunkPlugin({
10+
chunks: ["a", "a+b"],
11+
async: "a",
12+
}),
13+
]
14+
};

‎yarn.lock‎

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ destroy@~1.0.4:
10291029
version "1.0.4"
10301030
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
10311031

1032-
diff@3.2.0:
1032+
diff@3.2.0, diff@^3.1.0:
10331033
version "3.2.0"
10341034
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
10351035

@@ -1500,11 +1500,11 @@ form-data@~2.1.1:
15001500
combined-stream "^1.0.5"
15011501
mime-types "^2.1.12"
15021502

1503-
formatio@1.1.1:
1504-
version "1.1.1"
1505-
resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
1503+
formatio@1.2.0:
1504+
version "1.2.0"
1505+
resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
15061506
dependencies:
1507-
samsam "~1.1"
1507+
samsam "1.x"
15081508

15091509
forwarded@~0.1.0:
15101510
version "0.1.0"
@@ -2371,9 +2371,9 @@ log-driver@1.2.5, log-driver@^1.x:
23712371
version "1.2.5"
23722372
resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
23732373

2374-
lolex@1.3.2:
2375-
version "1.3.2"
2376-
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
2374+
lolex@^1.6.0:
2375+
version "1.6.0"
2376+
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
23772377

23782378
longest@^1.0.1:
23792379
version "1.0.1"
@@ -2541,6 +2541,10 @@ nan@^2.3.0:
25412541
version "2.6.2"
25422542
resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
25432543

2544+
native-promise-only@^0.8.1:
2545+
version "0.8.1"
2546+
resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
2547+
25442548
natural-compare@^1.4.0:
25452549
version "1.4.0"
25462550
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -2823,6 +2827,12 @@ path-to-regexp@0.1.7:
28232827
version "0.1.7"
28242828
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
28252829

2830+
path-to-regexp@^1.7.0:
2831+
version "1.7.0"
2832+
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
2833+
dependencies:
2834+
isarray "0.0.1"
2835+
28262836
path-type@^1.0.0:
28272837
version "1.1.0"
28282838
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -3551,9 +3561,9 @@ safe-buffer@^5.0.1:
35513561
version "5.0.1"
35523562
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
35533563

3554-
samsam@1.1.2, samsam@~1.1:
3555-
version "1.1.2"
3556-
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
3564+
samsam@1.x, samsam@^1.1.3:
3565+
version "1.2.1"
3566+
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
35573567

35583568
sax@~1.2.1:
35593569
version "1.2.2"
@@ -3693,14 +3703,18 @@ simple-git@^1.65.0:
36933703
dependencies:
36943704
debug "^2.6.7"
36953705

3696-
sinon@^1.17.7:
3697-
version "1.17.7"
3698-
resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
3706+
sinon@^2.3.2:
3707+
version "2.3.2"
3708+
resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.2.tgz#c43a9c570f32baac1159505cfeed19108855df89"
36993709
dependencies:
3700-
formatio "1.1.1"
3701-
lolex "1.3.2"
3702-
samsam "1.1.2"
3703-
util ">=0.10.3 <1"
3710+
diff "^3.1.0"
3711+
formatio "1.2.0"
3712+
lolex "^1.6.0"
3713+
native-promise-only "^0.8.1"
3714+
path-to-regexp "^1.7.0"
3715+
samsam "^1.1.3"
3716+
text-encoding "0.6.4"
3717+
type-detect "^4.0.0"
37043718

37053719
slice-ansi@0.0.4:
37063720
version "0.0.4"
@@ -3969,6 +3983,10 @@ tar@^2.2.1:
39693983
fstream "^1.0.2"
39703984
inherits "2"
39713985

3986+
text-encoding@0.6.4:
3987+
version "0.6.4"
3988+
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
3989+
39723990
text-table@~0.2.0:
39733991
version "0.2.0"
39743992
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -4035,6 +4053,10 @@ type-check@~0.3.2:
40354053
dependencies:
40364054
prelude-ls "~1.1.2"
40374055

4056+
type-detect@^4.0.0:
4057+
version "4.0.3"
4058+
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
4059+
40384060
type-is@~1.6.6:
40394061
version "1.6.15"
40404062
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -4122,7 +4144,7 @@ util-deprecate@~1.0.1:
41224144
version "1.0.2"
41234145
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
41244146

4125-
util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
4147+
util@0.10.3, util@^0.10.3:
41264148
version "0.10.3"
41274149
resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
41284150
dependencies:

0 commit comments

Comments
 (0)