fix(syntax): fixed edge case where assets do not exist, and added schema

TheLarkInn · sokra · commit 0f0bdff0e131 · 2016-12-07T17:21:23.000+01:00
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -13,7 +13,8 @@ function WebpackOptionsDefaulter() {
 	this.set("context", process.cwd());
 	this.set("target", "web");
 
-	this.set("performance.maxAssetSize", 250);
+	this.set("performance.maxInitialChunkSize", 300);
+	this.set("performance.maxAssetSize", 300);
 	this.set("performance.hints", true);
 
 	this.set("module.unknownContextRequest", ".");
diff --git a/lib/performance/EmittedAssetSizeLimitPlugin.js b/lib/performance/EmittedAssetSizeLimitPlugin.js
@@ -6,6 +6,7 @@ var path = require('path');
 
 function EmittedAssetSizeLimitPlugin(performanceOptions) {
 	this.maxAssetSize = performanceOptions.maxAssetSize;
+	this.maxInitialSize = performanceOptions.maxInitialChunkSize;
 	this.hints = performanceOptions.hints;
 }
 
@@ -44,6 +45,7 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
 		return;
 	}
 
+	var totalInitialChunkSize = this.maxInitialSize;
 	var sizeLimit = this.maxAssetSize;
 	var hints = this.hints;
 	var jsRegex = /\.js($|\?)/i;
@@ -52,9 +54,8 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
 		debugger;
 		var assets = Object.keys(compilation.assets);
 		var noOfAssets = assets.length;
-		var warnings = null;
-		var initialLimit = 300;
-		var totalInitialCost = 0;
+		var warnings = [];
+		var actualTotalInitialSize = 0;
 
 		assets.forEach(function(file) {
 			var assetSize = compilation.assets[file].size();
@@ -63,15 +64,15 @@ EmittedAssetSizeLimitPlugin.prototype.apply = function(compiler) {
 			for(var chunkKey in assetsByChunks) {
 				var chunk = assetsByChunks[chunkKey];
 
-				totalInitialCost += chunk.size;
+				actualTotalInitialSize += chunk.size;
 			}
 
-			warnings = jsRegex.test(file) && getJSWarnings(noOfAssets, sizeLimit, assetSize, initialLimit, totalInitialCost);
+			warnings = jsRegex.test(file) && getJSWarnings(noOfAssets, sizeLimit, assetSize);
 		});
 
-		if(doesExceedInitialLimit(initialLimit, totalInitialCost)) {
+		if(doesExceedInitialLimit(totalInitialChunkSize, actualTotalInitialSize)) {
 			//TODO# Maybe separate warning name
-			warnings.push(new Error("EmittedAssetSizeWarning: " + "The total initial download cost for these assets are likey to impact web performance. Consider keeping the total size of your initial assets < " + initialLimit + "kB"));
+			warnings.push(new Error("EmittedAssetSizeWarning: " + "The total initial download cost for these assets are likey to impact web performance. Consider keeping the total size of your initial assets < " + totalInitialChunkSize + "kB"));
 		}
 
 		if(warnings.length > 0) {
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -751,13 +751,17 @@
       "description": "Configuration for web performance recommendations.",
       "additionalProperties": false,
       "properties": {
-        "maxAssetSize": {
-          "description": "Filesize limit (in kB) when exceeded, that webpack will provide performance hints",
-          "type": "number"
-        },
         "hints": {
           "description": "Turn hints on or off",
           "type": "boolean"
+        },
+        "maxInitialChunkSize": {
+          "description": "Total size of all initial chunks (in kb)",
+          "type": "number"
+        },
+        "maxAssetSize": {
+          "description": "Filesize limit (in kB) when exceeded, that webpack will provide performance hints",
+          "type": "number"
         }
       },
       "type": "object"
