Skip to content

Commit e360c8b

Browse files
TheLarkInnsokra
TheLarkInn
authored and
sokra
committed
fix(test): update test, fix asset type case, and formatting
1 parent dd3c9f2 commit e360c8b

8 files changed

Lines changed: 46 additions & 77 deletions

File tree

‎lib/Stats.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@ Stats.jsonToString = function jsonToString(obj, useColors) {
451451

452452
function isHugeBundle(assetSize) {
453453
var sizeLimit = obj.performance.maxAssetSize;
454-
sizeLimit = sizeLimit * 1024;
455454
return sizeLimit < assetSize;
456455
}
457456

‎lib/WebpackOptionsDefaulter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function WebpackOptionsDefaulter() {
1414
this.set("target", "web");
1515

1616
this.set("performance.maxInitialChunkSize", 300);
17-
this.set("performance.maxAssetSize", 300);
17+
this.set("performance.maxAssetSize", 300000);
1818
this.set("performance.hints", true);
1919

2020
this.set("module.unknownContextRequest", ".");

‎lib/performance/AssetsOverSizeLimitWarning.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
MIT License http://www.opensource.org/licenses/mit-license.php
33
Author Sean Larkin @thelarkinn
44
*/
5-
function AssetsOverSizeLimitWarning(assetsOverSizeLimit, compilation) {
5+
function AssetsOverSizeLimitWarning(assetsOverSizeLimit, compilation, formatSizeFn, assetLimit) {
66
Error.call(this);
77
Error.captureStackTrace(this, AssetsOverSizeLimitWarning);
88
this.name = "AssetsOverSizeLimitWarning";
99
this.assets = assetsOverSizeLimit;
1010

11+
var formatSize = formatSizeFn;
1112
var assetLists = this.assets.map(function(asset) {
12-
return "\n -" + asset.name;
13+
return "\n " + asset.name;
1314
}).join("");
1415

15-
this.message = "asset size limit: The following assets exceed the recommended size limit.\n" +
16+
this.message = "asset size limit: The following assets exceed the recommended size limit (" + formatSize(assetLimit).number + " kB). \n" +
1617
"This can impact web performance.\n" +
1718
"Assets: " + assetLists;
1819
}

‎lib/performance/EmittedAssetSizeLimitPlugin.js‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ function formatSize(size) {
2828
};
2929
}
3030

31+
// When using this we should always
32+
// compare byte size and then format later
3133
function doesExceedLimit(limit, actualSize) {
3234
return limit < actualSize;
3335
}
@@ -63,7 +65,7 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
6365
emitted: compilation.assets[asset].emitted
6466
};
6567

66-
if(formatSize(obj.size).number > sizeLimit) {
68+
if(doesExceedLimit(sizeLimit, obj.size)) {
6769
obj.isOverSizeLimit = true;
6870
assetsOverSizeLimit.push(obj);
6971
}
@@ -111,6 +113,9 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
111113
});
112114

113115
files.forEach(function(file) {
116+
if(!isAssetJsFile(file)) {
117+
return;
118+
}
114119
entrypoint.assets[file] = assetsByFile[file];
115120
entrypoint.size = entrypoint.size + assetsByFile[file].size;
116121
entrypoint.isOverSizeLimit = false;
@@ -135,22 +140,29 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
135140
// 2. Collective Initial Chunks (Each Set?): Size < 200kb
136141
// 3. No Async Chunks
137142
// if !1, then 2, if !2 return
138-
// if 1, then 2, then 3,
143+
// if 1, then 2, then 3,
139144

140145
if(assetsOverSizeLimit.length) {
141-
warnings.push(new AssetsOverSizeLimitWarning(assetsOverSizeLimit, compilation, formatSize));
142-
warnings.push(new EntrypointsOverSizeLimitWarning(entrypointsOverSizeLimit, compilation, formatSize));
146+
warnings.push(new AssetsOverSizeLimitWarning(assetsOverSizeLimit, compilation, formatSize, sizeLimit));
147+
warnings.push(new EntrypointsOverSizeLimitWarning(entrypointsOverSizeLimit, compilation, formatSize, entrypointSizeLimit));
148+
149+
if(!hasAsyncChunks) {
150+
warnings.push(new Error("webpack performance recommendations: \n" +
151+
"You can limit the size of your bundles by using System.import() or require.ensure to lazy load some parts of your application.\n" +
152+
"For more info visit https://webpack.github.io/docs/code-splitting.html"
153+
));
154+
}
143155
} else {
144156
if(entrypointsOverSizeLimit.legnth) {
145-
warnings.push(new EntrypointsOverSizeLimitWarning(entrypointsOverSizeLimit, compilation, formatSize));
146-
}
147-
}
157+
warnings.push(new EntrypointsOverSizeLimitWarning(entrypointsOverSizeLimit, compilation, formatSize, entrypointSizeLimit));
148158

149-
if(!hasAsyncChunks) {
150-
warnings.push(new Error("webpack performance recommendations: \n" +
151-
"You can limit the size of your bundles by using System.import() or require.ensure to lazy load some parts of your application.\n" +
152-
"For more info visit https://webpack.github.io/docs/code-splitting.html"
153-
));
159+
if(!hasAsyncChunks) {
160+
warnings.push(new Error("webpack performance recommendations: \n" +
161+
"You can limit the size of your bundles by using System.import() or require.ensure to lazy load some parts of your application.\n" +
162+
"For more info visit https://webpack.github.io/docs/code-splitting.html"
163+
));
164+
}
165+
}
154166
}
155167

156168
if(!!warnings.length) {

‎lib/performance/EntrypointsOverSizeLimitWarning.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
MIT License http://www.opensource.org/licenses/mit-license.php
33
Author Sean Larkin @thelarkinn
44
*/
5-
function EntrypointsOverSizeLimitWarning(entrypoints, compilation, formatSizeFn) {
5+
function EntrypointsOverSizeLimitWarning(entrypoints, compilation, formatSizeFn, entrypointLimit) {
66
Error.call(this);
77
Error.captureStackTrace(this, EntrypointsOverSizeLimitWarning);
88
this.name = "EntrypointsOverSizeLimitWarning";
@@ -17,7 +17,7 @@ function EntrypointsOverSizeLimitWarning(entrypoints, compilation, formatSizeFn)
1717
}).join("");
1818
}).join("");
1919

20-
this.message = "entrypoint size limit: The following Entrypoints combined asset size exceeds the recommended limit. " +
20+
this.message = "entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (" + entrypointLimit + " kB). " +
2121
"This can impact web performance.\n" +
2222
"Entrypoints: \n" +
2323
entrypointList;

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Hash: <CLR=BOLD>8f8b70c74c2686431118</CLR>
1+
Hash: <CLR=BOLD>f8acbb13651bd3d16001</CLR>
22
Time: <CLR=BOLD>X</CLR>ms
33
<CLR=BOLD>Asset</CLR> <CLR=BOLD>Size</CLR> <CLR=BOLD>Chunks</CLR> <CLR=39,BOLD><CLR=22> <CLR=BOLD>Chunk Names</CLR>
44
<CLR=32,BOLD>0.js</CLR> 251 bytes <CLR=BOLD>0</CLR> <CLR=32,BOLD>[emitted]</CLR>
55
<CLR=32,BOLD>1.js</CLR> 100 bytes <CLR=BOLD>1</CLR> <CLR=32,BOLD>[emitted]</CLR>
66
<CLR=32,BOLD>2.js</CLR> 178 bytes <CLR=BOLD>2</CLR> <CLR=32,BOLD>[emitted]</CLR>
7-
<CLR=32,BOLD>main.js</CLR> 419 kB <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> main
7+
<CLR=33,BOLD>main.js</CLR> <CLR=33,BOLD>419 kB</CLR> <CLR=BOLD>3</CLR> <CLR=32,BOLD>[emitted]</CLR> main
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>
99
[5] <CLR=BOLD>(webpack)/test/statsCases/preset-normal-performance/c.js</CLR> 54 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
1010
chunk {<CLR=33,BOLD>1</CLR>} <CLR=32,BOLD>1.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [rendered]</CLR>
@@ -17,4 +17,16 @@ chunk {<CLR=33,BOLD>3</CLR>} <CLR=32,BOLD>main.js</CLR> (main) 413 kB<CLR=33,
1717
[1] <CLR=BOLD>(webpack)/buildin/module.js</CLR> 528 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
1818
[2] <CLR=BOLD>(webpack)/~/lodash/index.js</CLR> 411 kB {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
1919
[3] <CLR=BOLD>(webpack)/test/statsCases/preset-normal-performance/a.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
20-
[8] <CLR=BOLD>(webpack)/test/statsCases/preset-normal-performance/index.js</CLR> 93 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
20+
[8] <CLR=BOLD>(webpack)/test/statsCases/preset-normal-performance/index.js</CLR> 93 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
21+
22+
<CLR=33,BOLD>WARNING in asset size limit: The following assets exceed the recommended size limit (300 kB).
23+
This can impact web performance.
24+
Assets:
25+
main.js</CLR>
26+
27+
<CLR=33,BOLD>WARNING in entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (300 kB). This can impact web performance.
28+
Entrypoints:
29+
30+
main: 419 kB
31+
main.js: 419 kB
32+
</CLR>

‎test/statsCases/separate-css-bundle/actual.txt‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)