Skip to content

Commit 7a1b357

Browse files
sokrasokra
authored
Merge branch 'next' into for_of_loops
2 parents d4811b0 + f2141e1 commit 7a1b357

File tree

41 files changed

+482
-385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+482
-385
lines changed

‎examples/code-splitting-specify-chunk-name/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,19 +302,19 @@ __webpack_require__(3)("./ba" + createContextVar).then(function(bar) {
302302
Hash: 0a1b2c3d4e5f6a7b8c9d
303303
Version: webpack next
304304
Asset Size Chunks Chunk Names
305-
0.output.js 445 bytes 0 [emitted] chunk-bar-baz3
306-
1.output.js 439 bytes 1 [emitted] chunk-bar-baz1
305+
0.output.js 445 bytes 0 [emitted] chunk-bar-baz2
306+
1.output.js 439 bytes 1 [emitted] chunk-bar-baz0
307307
2.output.js 436 bytes 2 [emitted] chunk-foo
308308
output.js 8.23 KiB 3 [emitted] main
309309
Entrypoint main = output.js
310-
chunk {0} 0.output.js (chunk-bar-baz3) 41 bytes <{3}> [rendered]
310+
chunk {0} 0.output.js (chunk-bar-baz2) 41 bytes <{3}> [rendered]
311311
> ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
312312
> ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
313313
[1] ./templates/baz.js 41 bytes {0} [optional] [built]
314314
[exports: default]
315315
context element ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
316316
context element ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
317-
chunk {1} 1.output.js (chunk-bar-baz1) 41 bytes <{3}> [rendered]
317+
chunk {1} 1.output.js (chunk-bar-baz0) 41 bytes <{3}> [rendered]
318318
> ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
319319
> ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
320320
[2] ./templates/bar.js 41 bytes {1} [optional] [built]
@@ -342,19 +342,19 @@ chunk {3} output.js (main) 580 bytes >{0}< >{1}< >{2}< [entry] [rendered]
342342
Hash: 0a1b2c3d4e5f6a7b8c9d
343343
Version: webpack next
344344
Asset Size Chunks Chunk Names
345-
0.output.js 114 bytes 0 [emitted] chunk-bar-baz3
346-
1.output.js 115 bytes 1 [emitted] chunk-bar-baz1
345+
0.output.js 114 bytes 0 [emitted] chunk-bar-baz2
346+
1.output.js 115 bytes 1 [emitted] chunk-bar-baz0
347347
2.output.js 113 bytes 2 [emitted] chunk-foo
348348
output.js 2.12 KiB 3 [emitted] main
349349
Entrypoint main = output.js
350-
chunk {0} 0.output.js (chunk-bar-baz3) 41 bytes <{3}> [rendered]
350+
chunk {0} 0.output.js (chunk-bar-baz2) 41 bytes <{3}> [rendered]
351351
> ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
352352
> ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
353353
[1] ./templates/baz.js 41 bytes {0} [optional] [built]
354354
[exports: default]
355355
context element ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
356356
context element ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
357-
chunk {1} 1.output.js (chunk-bar-baz1) 41 bytes <{3}> [rendered]
357+
chunk {1} 1.output.js (chunk-bar-baz0) 41 bytes <{3}> [rendered]
358358
> ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
359359
> ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
360360
[2] ./templates/bar.js 41 bytes {1} [optional] [built]

‎examples/common-chunk-and-vendor-chunk/README.md‎

Lines changed: 72 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ module.exports = {
4545
},
4646
optimization: {
4747
splitChunks: {
48-
chunks: "initial",
49-
minSize: 0, // This is example is too small to create commons chunks
50-
name: "common",
5148
cacheGroups: {
49+
commons: {
50+
chunks: "initial",
51+
minChunks: 2,
52+
minSize: 0 // This is example is too small to create commons chunks
53+
},
5254
vendor: {
5355
test: /node_modules/,
56+
chunks: "initial",
5457
name: "vendor",
5558
enforce: true
5659
}
@@ -67,7 +70,7 @@ module.exports = {
6770
# dist/vendor.js
6871

6972
``` javascript
70-
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
73+
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[5],{
7174

7275
/***/ 1:
7376
/*!*********************************!*\
@@ -94,10 +97,10 @@ module.exports = "vendor2";
9497
}]);
9598
```
9699

97-
# dist/common.js
100+
# dist/commons~pageA~pageB~pageC.js
98101

99102
``` javascript
100-
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{
103+
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
101104

102105
/***/ 3:
103106
/*!*********************!*\
@@ -108,7 +111,15 @@ module.exports = "vendor2";
108111

109112
module.exports = "utility2";
110113

111-
/***/ }),
114+
/***/ })
115+
116+
}]);
117+
```
118+
119+
# dist/commons~pageB~pageC.js
120+
121+
``` javascript
122+
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{
112123

113124
/***/ 6:
114125
/*!*********************!*\
@@ -259,7 +270,7 @@ module.exports = "utility3";
259270
/******/
260271
/******/
261272
/******/ // add entry module to deferred list
262-
/******/ deferredModules.push([0,3,4]);
273+
/******/ deferredModules.push([0,3,5]);
263274
/******/ // run deferred modules when ready
264275
/******/ return checkDeferredModules();
265276
/******/ })
@@ -432,7 +443,7 @@ module.exports = "utility1";
432443
/******/
433444
/******/
434445
/******/ // add entry module to deferred list
435-
/******/ deferredModules.push([4,3,4]);
446+
/******/ deferredModules.push([4,3,4,5]);
436447
/******/ // run deferred modules when ready
437448
/******/ return checkDeferredModules();
438449
/******/ })
@@ -591,7 +602,7 @@ module.exports = "pageB";
591602
/******/
592603
/******/
593604
/******/ // add entry module to deferred list
594-
/******/ deferredModules.push([7,4]);
605+
/******/ deferredModules.push([7,3,4]);
595606
/******/ // run deferred modules when ready
596607
/******/ return checkDeferredModules();
597608
/******/ })
@@ -622,87 +633,95 @@ module.exports = "pageC";
622633
```
623634
Hash: 0a1b2c3d4e5f6a7b8c9d
624635
Version: webpack next
625-
Asset Size Chunks Chunk Names
626-
pageA.js 5.6 KiB 0 [emitted] pageA
627-
pageB.js 5.4 KiB 1 [emitted] pageB
628-
pageC.js 5.34 KiB 2 [emitted] pageC
629-
vendor.js 536 bytes 3 [emitted] vendor
630-
common.js 466 bytes 4 [emitted] common
631-
Entrypoint pageA = vendor.js common.js pageA.js
632-
Entrypoint pageB = vendor.js common.js pageB.js
633-
Entrypoint pageC = common.js pageC.js
634-
chunk {0} pageA.js (pageA) 170 bytes ={3}= ={4}= [entry] [rendered]
636+
Asset Size Chunks Chunk Names
637+
pageA.js 5.6 KiB 0 [emitted] pageA
638+
pageB.js 5.4 KiB 1 [emitted] pageB
639+
pageC.js 5.34 KiB 2 [emitted] pageC
640+
commons~pageA~pageB~pageC.js 269 bytes 3 [emitted] commons~pageA~pageB~pageC
641+
commons~pageB~pageC.js 269 bytes 4 [emitted] commons~pageB~pageC
642+
vendor.js 536 bytes 5 [emitted] vendor
643+
Entrypoint pageA = commons~pageA~pageB~pageC.js vendor.js pageA.js
644+
Entrypoint pageB = commons~pageA~pageB~pageC.js commons~pageB~pageC.js vendor.js pageB.js
645+
Entrypoint pageC = commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageC.js
646+
chunk {0} pageA.js (pageA) 170 bytes ={3}= ={5}= [entry] [rendered]
635647
> ./pageA pageA
636648
[0] ./pageA.js 142 bytes {0} [built]
637649
single entry ./pageA pageA
638650
[2] ./utility1.js 28 bytes {0} [built]
639651
cjs require ./utility1 [0] ./pageA.js 2:15-36
640-
chunk {1} pageB.js (pageB) 142 bytes ={3}= ={4}= [entry] [rendered]
652+
chunk {1} pageB.js (pageB) 142 bytes ={3}= ={4}= ={5}= [entry] [rendered]
641653
> ./pageB pageB
642654
[4] ./pageB.js 142 bytes {1} [built]
643655
single entry ./pageB pageB
644-
chunk {2} pageC.js (pageC) 105 bytes ={4}= [entry] [rendered]
656+
chunk {2} pageC.js (pageC) 105 bytes ={3}= ={4}= [entry] [rendered]
645657
> ./pageC pageC
646658
[7] ./pageC.js 105 bytes {2} [built]
647659
single entry ./pageC pageC
648-
chunk {3} vendor.js (vendor) 54 bytes ={4}= ={0}= ={1}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
649-
> ./pageA pageA
650-
> ./pageB pageB
651-
2 modules
652-
chunk {4} common.js (common) 56 bytes ={2}= ={3}= ={1}= ={0}= [initial] [rendered] split chunk (name: common)
660+
chunk {3} commons~pageA~pageB~pageC.js (commons~pageA~pageB~pageC) 28 bytes ={4}= ={2}= ={5}= ={1}= ={0}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageA~pageB~pageC)
653661
> ./pageC pageC
654662
> ./pageB pageB
655663
> ./pageA pageA
656-
[3] ./utility2.js 28 bytes {4} [built]
664+
[3] ./utility2.js 28 bytes {3} [built]
657665
cjs require ./utility2 [0] ./pageA.js 3:15-36
658666
cjs require ./utility2 [4] ./pageB.js 2:15-36
659667
cjs require ./utility2 [7] ./pageC.js 1:15-36
668+
chunk {4} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={3}= ={2}= ={5}= ={1}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
669+
> ./pageC pageC
670+
> ./pageB pageB
660671
[6] ./utility3.js 28 bytes {4} [built]
661672
cjs require ./utility3 [4] ./pageB.js 3:15-36
662673
cjs require ./utility3 [7] ./pageC.js 2:15-36
674+
chunk {5} vendor.js (vendor) 54 bytes ={3}= ={0}= ={4}= ={1}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
675+
> ./pageA pageA
676+
> ./pageB pageB
677+
2 modules
663678
```
664679

665680
## Production mode
666681

667682
```
668683
Hash: 0a1b2c3d4e5f6a7b8c9d
669684
Version: webpack next
670-
Asset Size Chunks Chunk Names
671-
common.js 132 bytes 0 [emitted] common
672-
vendor.js 134 bytes 1 [emitted] vendor
673-
pageC.js 1.1 KiB 2 [emitted] pageC
674-
pageB.js 1.11 KiB 3 [emitted] pageB
675-
pageA.js 1.15 KiB 4 [emitted] pageA
676-
Entrypoint pageA = vendor.js common.js pageA.js
677-
Entrypoint pageB = vendor.js common.js pageB.js
678-
Entrypoint pageC = common.js pageC.js
679-
chunk {0} common.js (common) 56 bytes ={2}= ={1}= ={3}= ={4}= [initial] [rendered] split chunk (name: common)
685+
Asset Size Chunks Chunk Names
686+
vendor.js 134 bytes 0 [emitted] vendor
687+
commons~pageB~pageC.js 97 bytes 1 [emitted] commons~pageB~pageC
688+
commons~pageA~pageB~pageC.js 96 bytes 2 [emitted] commons~pageA~pageB~pageC
689+
pageC.js 1.1 KiB 3 [emitted] pageC
690+
pageB.js 1.11 KiB 4 [emitted] pageB
691+
pageA.js 1.15 KiB 5 [emitted] pageA
692+
Entrypoint pageA = commons~pageA~pageB~pageC.js vendor.js pageA.js
693+
Entrypoint pageB = commons~pageA~pageB~pageC.js commons~pageB~pageC.js vendor.js pageB.js
694+
Entrypoint pageC = commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageC.js
695+
chunk {0} vendor.js (vendor) 54 bytes ={2}= ={5}= ={1}= ={4}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
696+
> ./pageA pageA
697+
> ./pageB pageB
698+
2 modules
699+
chunk {1} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={2}= ={3}= ={0}= ={4}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
700+
> ./pageC pageC
701+
> ./pageB pageB
702+
[1] ./utility3.js 28 bytes {1} [built]
703+
cjs require ./utility3 [2] ./pageC.js 2:15-36
704+
cjs require ./utility3 [4] ./pageB.js 3:15-36
705+
chunk {2} commons~pageA~pageB~pageC.js (commons~pageA~pageB~pageC) 28 bytes ={1}= ={3}= ={0}= ={4}= ={5}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageA~pageB~pageC)
680706
> ./pageC pageC
681707
> ./pageB pageB
682708
> ./pageA pageA
683-
[0] ./utility2.js 28 bytes {0} [built]
709+
[0] ./utility2.js 28 bytes {2} [built]
684710
cjs require ./utility2 [2] ./pageC.js 1:15-36
685711
cjs require ./utility2 [4] ./pageB.js 2:15-36
686712
cjs require ./utility2 [7] ./pageA.js 3:15-36
687-
[1] ./utility3.js 28 bytes {0} [built]
688-
cjs require ./utility3 [2] ./pageC.js 2:15-36
689-
cjs require ./utility3 [4] ./pageB.js 3:15-36
690-
chunk {1} vendor.js (vendor) 54 bytes ={0}= ={4}= ={3}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
691-
> ./pageA pageA
692-
> ./pageB pageB
693-
2 modules
694-
chunk {2} pageC.js (pageC) 105 bytes ={0}= [entry] [rendered]
713+
chunk {3} pageC.js (pageC) 105 bytes ={2}= ={1}= [entry] [rendered]
695714
> ./pageC pageC
696-
[2] ./pageC.js 105 bytes {2} [built]
715+
[2] ./pageC.js 105 bytes {3} [built]
697716
single entry ./pageC pageC
698-
chunk {3} pageB.js (pageB) 142 bytes ={1}= ={0}= [entry] [rendered]
717+
chunk {4} pageB.js (pageB) 142 bytes ={2}= ={1}= ={0}= [entry] [rendered]
699718
> ./pageB pageB
700-
[4] ./pageB.js 142 bytes {3} [built]
719+
[4] ./pageB.js 142 bytes {4} [built]
701720
single entry ./pageB pageB
702-
chunk {4} pageA.js (pageA) 170 bytes ={1}= ={0}= [entry] [rendered]
721+
chunk {5} pageA.js (pageA) 170 bytes ={2}= ={0}= [entry] [rendered]
703722
> ./pageA pageA
704-
[5] ./utility1.js 28 bytes {4} [built]
723+
[5] ./utility1.js 28 bytes {5} [built]
705724
cjs require ./utility1 [7] ./pageA.js 2:15-36
706-
[7] ./pageA.js 142 bytes {4} [built]
725+
[7] ./pageA.js 142 bytes {5} [built]
707726
single entry ./pageA pageA
708727
```

‎examples/common-chunk-and-vendor-chunk/template.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@ With this bundle configuration, you would load your third party libraries, then
4343
{{dist/vendor.js}}
4444
```
4545

46-
# dist/common.js
46+
# dist/commons~pageA~pageB~pageC.js
4747

4848
``` javascript
49-
{{dist/common.js}}
49+
{{dist/commons~pageA~pageB~pageC.js}}
50+
```
51+
52+
# dist/commons~pageB~pageC.js
53+
54+
``` javascript
55+
{{dist/commons~pageB~pageC.js}}
5056
```
5157

5258
# dist/pageA.js

‎examples/common-chunk-and-vendor-chunk/webpack.config.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ module.exports = {
99
},
1010
optimization: {
1111
splitChunks: {
12-
chunks: "initial",
13-
minSize: 0, // This is example is too small to create commons chunks
14-
name: "common",
1512
cacheGroups: {
13+
commons: {
14+
chunks: "initial",
15+
minChunks: 2,
16+
minSize: 0 // This is example is too small to create commons chunks
17+
},
1618
vendor: {
1719
test: /node_modules/,
20+
chunks: "initial",
1821
name: "vendor",
1922
enforce: true
2023
}

‎examples/common-chunk-grandchildren/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ Version: webpack next
438438
3.output.js 414 bytes 3 [emitted]
439439
output.js 7.53 KiB 4 [emitted] main
440440
Entrypoint main = output.js
441-
chunk {0} 0.output.js 72 bytes <{1}> <{4}> ={3}= ={2}= [rendered] split chunk
441+
chunk {0} 0.output.js 72 bytes <{1}> <{4}> ={3}= ={2}= [rendered] split chunk (cache group: default)
442442
> [2] ./pageB.js 3:1-6:3
443443
> [0] ./example.js 3:1-6:3
444444
[4] ./reusableComponent.js 72 bytes {0} [built]
@@ -476,7 +476,7 @@ Version: webpack next
476476
3.output.js 138 bytes 3 [emitted]
477477
output.js 1.76 KiB 4 [emitted] main
478478
Entrypoint main = output.js
479-
chunk {0} 0.output.js 72 bytes <{1}> <{4}> ={3}= ={2}= [rendered] split chunk
479+
chunk {0} 0.output.js 72 bytes <{1}> <{4}> ={3}= ={2}= [rendered] split chunk (cache group: default)
480480
> [2] ./pageB.js 3:1-6:3
481481
> [0] ./example.js 3:1-6:3
482482
[4] ./reusableComponent.js 72 bytes {0} [built]

0 commit comments

Comments
 (0)