Merge pull request webpack#6345 from Connormiha/regexpr-optimize

sokra · web-flow · commit 33daf641b7d4 · 2018-01-20T11:00:04.000+01:00
Optimize regexp, getEntryPointsSize
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -141,9 +141,9 @@ class NormalModuleFactory extends Tapable {
 			const context = data.context;
 			const request = data.request;
 
-			const noAutoLoaders = /^-?!/.test(request);
-			const noPrePostAutoLoaders = /^!!/.test(request);
-			const noPreAutoLoaders = /^-!/.test(request);
+			const noPreAutoLoaders = request.startsWith("-!");
+			const noAutoLoaders = noPreAutoLoaders || request.startsWith("!");
+			const noPrePostAutoLoaders = request.startsWith("!!");
 			let elements = request.replace(/^-?!+/, "").replace(/!!+/g, "!").split("!");
 			let resource = elements.pop();
 			elements = elements.map(identToLoaderRequest);
@@ -177,7 +177,7 @@ class NormalModuleFactory extends Tapable {
 				// translate option idents
 				try {
 					loaders.forEach(item => {
-						if(typeof item.options === "string" && /^\?/.test(item.options)) {
+						if(typeof item.options === "string" && item.options[0] === "?") {
 							const ident = item.options.substr(1);
 							item.options = this.ruleSet.findOptionsByIdent(ident);
 							item.ident = ident;
diff --git a/lib/performance/SizeLimitsPlugin.js b/lib/performance/SizeLimitsPlugin.js
@@ -18,18 +18,20 @@ module.exports = class SizeLimitsPlugin {
 		const entrypointSizeLimit = this.maxEntrypointSize;
 		const assetSizeLimit = this.maxAssetSize;
 		const hints = this.hints;
-		const assetFilter = this.assetFilter || (asset => !(/\.map$/.test(asset)));
+		const assetFilter = this.assetFilter || (asset => !(asset.endsWith(".map")));
 
 		compiler.hooks.afterEmit.tap("SizeLimitsPlugin", (compilation) => {
 			const warnings = [];
 
 			const getEntrypointSize = entrypoint =>
 				entrypoint.getFiles()
-				.filter(assetFilter)
-				.map(file => compilation.assets[file])
-				.filter(Boolean)
-				.map(asset => asset.size())
-				.reduce((currentSize, nextSize) => currentSize + nextSize, 0);
+				.reduce((currentSize, file) => {
+					if(assetFilter(file) && compilation.assets[file]) {
+						return currentSize + compilation.assets[file].size();
+					}
+
+					return currentSize;
+				}, 0);
 
 			const assetsOverSizeLimit = [];
 			Object.keys(compilation.assets)
