Skip to content

Commit c7b06ad

Browse files
TheLarkInnTheLarkInn
authored
feat(moduletemplate): Wrap function module template wrappers with parens (webpack#3658)
* feat(moduletemplate): Wrap function module template wrappers with parens. * update stats
1 parent 5f6029f commit c7b06ad

File tree

14 files changed

+44
-44
lines changed

14 files changed

+44
-44
lines changed

‎lib/FunctionModuleTemplatePlugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ FunctionModuleTemplatePlugin.prototype.apply = function(moduleTemplate) {
1414
if((module.arguments && module.arguments.length !== 0) || module.hasDependencies()) {
1515
defaultArguments.push("__webpack_require__");
1616
}
17-
source.add("/***/ function(" + defaultArguments.concat(module.arguments || []).join(", ") + ") {\n\n");
17+
source.add("/***/ (function(" + defaultArguments.concat(module.arguments || []).join(", ") + ") {\n\n");
1818
if(module.strict) source.add("\"use strict\";\n");
1919
source.add(moduleSource);
20-
source.add("\n\n/***/ }");
20+
source.add("\n\n/***/ })");
2121
return source;
2222
});
2323
moduleTemplate.plugin("package", function(moduleSource, module) {

‎test/statsCases/aggressive-splitting-entry/expected.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Hash: 94ea214f5f8dfcaa01e7
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
48c8b1dae03a37363ec8.js 4.24 kB 1 [emitted]
5-
7ae90280671106fd3e86.js 2.22 kB 2 [emitted]
6-
9356e9a0fb00a97b2e73.js 1.93 kB 3 [emitted]
7-
88d78642a86768757078.js 977 bytes 4 [emitted]
4+
48c8b1dae03a37363ec8.js 4.25 kB 1 [emitted]
5+
7ae90280671106fd3e86.js 2.23 kB 2 [emitted]
6+
9356e9a0fb00a97b2e73.js 1.94 kB 3 [emitted]
7+
88d78642a86768757078.js 979 bytes 4 [emitted]
88
Entrypoint main = 48c8b1dae03a37363ec8.js 9356e9a0fb00a97b2e73.js 88d78642a86768757078.js 7ae90280671106fd3e86.js
99
chunk {1} 48c8b1dae03a37363ec8.js 1.8 kB [entry] [rendered]
1010
> aggressive-splitted main [4] (webpack)/test/statsCases/aggressive-splitting-entry/index.js

‎test/statsCases/aggressive-splitting-on-demand/expected.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Hash: a724b9eabbc88a7196a7
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
fc930a2adf8206ea2dc5.js 1.93 kB 0 [emitted]
5-
cd45585186d59208602b.js 1.95 kB 1 [emitted]
4+
fc930a2adf8206ea2dc5.js 1.94 kB 0 [emitted]
5+
cd45585186d59208602b.js 1.96 kB 1 [emitted]
66
6b94c231e016c5aaccdb.js 1.94 kB 2 [emitted]
7-
fd0985cee894c4f3f1a6.js 1.93 kB 3 [emitted]
8-
d9fc46873c8ea924b895.js 977 bytes 4 [emitted]
7+
fd0985cee894c4f3f1a6.js 1.94 kB 3 [emitted]
8+
d9fc46873c8ea924b895.js 979 bytes 4 [emitted]
99
90b55464dc36b9c472a9.js 7.22 kB 6 [emitted] main
10-
b08c507d4e1e05cbab45.js 983 bytes 9 [emitted]
11-
5d50e858fe6e559aa47c.js 975 bytes 11 [emitted]
10+
b08c507d4e1e05cbab45.js 985 bytes 9 [emitted]
11+
5d50e858fe6e559aa47c.js 977 bytes 11 [emitted]
1212
Entrypoint main = 90b55464dc36b9c472a9.js
1313
chunk {0} fc930a2adf8206ea2dc5.js 1.8 kB {6}
1414
> aggressive-splitted duplicate [9] (webpack)/test/statsCases/aggressive-splitting-on-demand/index.js 4:0-51

‎test/statsCases/chunks/expected.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Hash: 160bbe49f674da1a2284
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
0.bundle.js 236 bytes 0 [emitted]
5-
1.bundle.js 106 bytes 1 [emitted]
6-
2.bundle.js 200 bytes 2 [emitted]
7-
bundle.js 5.86 kB 3 [emitted] main
4+
0.bundle.js 238 bytes 0 [emitted]
5+
1.bundle.js 108 bytes 1 [emitted]
6+
2.bundle.js 204 bytes 2 [emitted]
7+
bundle.js 5.87 kB 3 [emitted] main
88
chunk {0} 0.bundle.js 54 bytes {3} [rendered]
99
> [5] (webpack)/test/statsCases/chunks/index.js 3:0-16
1010
[2] (webpack)/test/statsCases/chunks/c.js 54 bytes {0} [built]

‎test/statsCases/max-modules-default/expected.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Hash: e36ab7d25d7661d1d913
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
main.js 5.76 kB 0 [emitted] main
4+
main.js 5.82 kB 0 [emitted] main
55
chunk {0} main.js (main) 1.18 kB [entry] [rendered]
66
[0] (webpack)/test/statsCases/max-modules-default/a.js?1 33 bytes {0} [built]
77
[1] (webpack)/test/statsCases/max-modules-default/a.js?10 33 bytes {0} [built]

‎test/statsCases/max-modules/expected.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Hash: e36ab7d25d7661d1d913
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
main.js 5.76 kB 0 [emitted] main
4+
main.js 5.82 kB 0 [emitted] main
55
chunk {0} main.js (main) 1.18 kB [entry] [rendered]
66
[0] (webpack)/test/statsCases/max-modules/a.js?1 33 bytes {0} [built]
77
[1] (webpack)/test/statsCases/max-modules/a.js?10 33 bytes {0} [built]

‎test/statsCases/optimize-chunks/expected.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Hash: 98677d85dd05d16cbe7f
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
0.js 229 bytes 0 [emitted] cir1
5-
1.js 212 bytes 1, 2 [emitted] abd
6-
2.js 129 bytes 2 [emitted] ab
7-
3.js 244 bytes 3 [emitted] cir2
8-
4.js 136 bytes 4, 6 [emitted] chunk
9-
5.js 302 bytes 5, 3 [emitted] cir2 from cir1
10-
6.js 78 bytes 6 [emitted] ac in ab
4+
0.js 231 bytes 0 [emitted] cir1
5+
1.js 218 bytes 1, 2 [emitted] abd
6+
2.js 133 bytes 2 [emitted] ab
7+
3.js 246 bytes 3 [emitted] cir2
8+
4.js 140 bytes 4, 6 [emitted] chunk
9+
5.js 306 bytes 5, 3 [emitted] cir2 from cir1
10+
6.js 80 bytes 6 [emitted] ac in ab
1111
main.js 6.53 kB 7 [emitted] main
1212
chunk {0} 0.js (cir1) 81 bytes {3} {5} {7} [rendered]
1313
> duplicate cir1 from cir2 [3] (webpack)/test/statsCases/optimize-chunks/circular2.js 1:0-79

‎test/statsCases/performance-disabled/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Time: <CLR=BOLD>X</CLR>ms
22
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=39,BOLD><CLR=22><CLR=BOLD>Chunk Names</CLR>
3-
<CLR=32,BOLD>0.js</CLR> 236 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4-
<CLR=32,BOLD>1.js</CLR> 106 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5-
<CLR=32,BOLD>2.js</CLR> 200 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
3+
<CLR=32,BOLD>0.js</CLR> 238 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4+
<CLR=32,BOLD>1.js</CLR> 108 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5+
<CLR=32,BOLD>2.js</CLR> 204 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=32,BOLD>main.js</CLR> 306 kB <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> main
77
Entrypoint <CLR=BOLD>main</CLR> = <CLR=32,BOLD>main.js</CLR>
88
chunk {<CLR=33,BOLD>0</CLR>} <CLR=32,BOLD>0.js</CLR> 54 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [rendered]</CLR>

‎test/statsCases/performance-error/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Time: <CLR=BOLD>X</CLR>ms
22
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=39,BOLD><CLR=22> <CLR=BOLD>Chunk Names</CLR>
3-
<CLR=32,BOLD>0.js</CLR> 236 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4-
<CLR=32,BOLD>1.js</CLR> 106 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5-
<CLR=32,BOLD>2.js</CLR> 200 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
3+
<CLR=32,BOLD>0.js</CLR> 238 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4+
<CLR=32,BOLD>1.js</CLR> 108 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5+
<CLR=32,BOLD>2.js</CLR> 204 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=33,BOLD>main.js</CLR> <CLR=33,BOLD>306 kB</CLR> <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> <CLR=33,BOLD>[big]</CLR> main
77
Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR>
88
chunk {<CLR=33,BOLD>0</CLR>} <CLR=32,BOLD>0.js</CLR> 54 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [rendered]</CLR>

‎test/statsCases/performance-no-hints/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Time: <CLR=BOLD>X</CLR>ms
22
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=39,BOLD><CLR=22> <CLR=BOLD>Chunk Names</CLR>
3-
<CLR=32,BOLD>0.js</CLR> 236 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4-
<CLR=32,BOLD>1.js</CLR> 106 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5-
<CLR=32,BOLD>2.js</CLR> 200 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
3+
<CLR=32,BOLD>0.js</CLR> 238 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4+
<CLR=32,BOLD>1.js</CLR> 108 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5+
<CLR=32,BOLD>2.js</CLR> 204 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=33,BOLD>main.js</CLR> <CLR=33,BOLD>306 kB</CLR> <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> <CLR=33,BOLD>[big]</CLR> main
77
Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR>
88
chunk {<CLR=33,BOLD>0</CLR>} <CLR=32,BOLD>0.js</CLR> 54 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [rendered]</CLR>

‎test/statsCases/preset-normal-performance-ensure-filter-sourcemaps/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Time: <CLR=BOLD>X</CLR>ms
22
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=39,BOLD><CLR=22> <CLR=BOLD>Chunk Names</CLR>
3-
<CLR=32,BOLD>0.js</CLR> 266 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4-
<CLR=32,BOLD>1.js</CLR> 136 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5-
<CLR=32,BOLD>2.js</CLR> 230 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
3+
<CLR=32,BOLD>0.js</CLR> 268 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4+
<CLR=32,BOLD>1.js</CLR> 138 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5+
<CLR=32,BOLD>2.js</CLR> 234 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=33,BOLD>main.js</CLR> <CLR=33,BOLD>306 kB</CLR> <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> <CLR=33,BOLD>[big]</CLR> main
77
<CLR=32,BOLD>0.js.map</CLR> 291 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
88
<CLR=32,BOLD>1.js.map</CLR> 250 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>

‎test/statsCases/preset-normal-performance/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Time: <CLR=BOLD>X</CLR>ms
22
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=39,BOLD><CLR=22> <CLR=BOLD>Chunk Names</CLR>
3-
<CLR=32,BOLD>0.js</CLR> 236 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4-
<CLR=32,BOLD>1.js</CLR> 106 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5-
<CLR=32,BOLD>2.js</CLR> 200 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
3+
<CLR=32,BOLD>0.js</CLR> 238 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
4+
<CLR=32,BOLD>1.js</CLR> 108 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
5+
<CLR=32,BOLD>2.js</CLR> 204 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=33,BOLD>main.js</CLR> <CLR=33,BOLD>306 kB</CLR> <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> <CLR=33,BOLD>[big]</CLR> main
77
chunk {<CLR=33,BOLD>0</CLR>} <CLR=32,BOLD>0.js</CLR> 54 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [rendered]</CLR>
88
[2] <CLR=BOLD>(webpack)/test/statsCases/preset-normal-performance/c.js</CLR> 54 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>

‎test/statsCases/preset-verbose/expected.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Hash: 85e57db9faf6765d1cf0
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
0.js 236 bytes 0 [emitted]
5-
1.js 106 bytes 1 [emitted]
6-
2.js 200 bytes 2 [emitted]
4+
0.js 238 bytes 0 [emitted]
5+
1.js 108 bytes 1 [emitted]
6+
2.js 204 bytes 2 [emitted]
77
main.js 5.86 kB 3 [emitted] main
88
Entrypoint main = main.js
99
chunk {0} 0.js 54 bytes {3} [rendered]

‎test/statsCases/tree-shaking/expected.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Hash: e94a2c6bee98efb02ae8
22
Time: Xms
33
Asset Size Chunks Chunk Names
4-
bundle.js 7.14 kB 0 [emitted] main
4+
bundle.js 7.16 kB 0 [emitted] main
55
chunk {0} bundle.js (main) 588 bytes [entry] [rendered]
66
[0] (webpack)/test/statsCases/tree-shaking/a.js 13 bytes {0} [built]
77
[exports: a]

0 commit comments

Comments
 (0)