Merge pull request webpack#5303 from probablyup/es-perf

sokra · web-flow · commit cc459eb50511 · 2017-07-18T15:12:04.000+02:00
refactor: collapse several array iterators into a single reduce
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -17,6 +17,38 @@ const basename = (name) => {
 	return name.substr(name.lastIndexOf("/") + 1);
 };
 
+function getTaskForFile(file, chunk, options, compilation) {
+	const asset = compilation.assets[file];
+	if(asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
+		const data = asset.__SourceMapDevToolData;
+		for(const cachedFile in data) {
+			compilation.assets[cachedFile] = data[cachedFile];
+			if(cachedFile !== file)
+				chunk.files.push(cachedFile);
+		}
+		return;
+	}
+	let source, sourceMap;
+	if(asset.sourceAndMap) {
+		const sourceAndMap = asset.sourceAndMap(options);
+		sourceMap = sourceAndMap.map;
+		source = sourceAndMap.source;
+	} else {
+		sourceMap = asset.map(options);
+		source = asset.source();
+	}
+	if(sourceMap) {
+		return {
+			chunk,
+			file,
+			asset,
+			source,
+			sourceMap,
+			modules: undefined
+		};
+	}
+}
+
 class SourceMapDevToolPlugin {
 	constructor(options) {
 		if(arguments.length > 1)
@@ -43,57 +75,41 @@ class SourceMapDevToolPlugin {
 		const requestShortener = new RequestShortener(compiler.context);
 		const options = this.options;
 		options.test = options.test || /\.(js|css)($|\?)/i;
+
+		const matchObject = ModuleFilenameHelpers.matchObject.bind(undefined, options);
+
 		compiler.plugin("compilation", compilation => {
 			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
+
 			compilation.plugin("after-optimize-chunk-assets", function(chunks) {
 				const moduleToSourceNameMapping = new Map();
 				const tasks = [];
+
 				chunks.forEach(function(chunk) {
-					chunk.files.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options)).map(function(file) {
-						const asset = compilation.assets[file];
-						if(asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
-							const data = asset.__SourceMapDevToolData;
-							for(const cachedFile in data) {
-								compilation.assets[cachedFile] = data[cachedFile];
-								if(cachedFile !== file)
-									chunk.files.push(cachedFile);
-							}
-							return;
-						}
-						let source, sourceMap;
-						if(asset.sourceAndMap) {
-							const sourceAndMap = asset.sourceAndMap(options);
-							sourceMap = sourceAndMap.map;
-							source = sourceAndMap.source;
-						} else {
-							sourceMap = asset.map(options);
-							source = asset.source();
-						}
-						if(sourceMap) {
-							return {
-								chunk,
-								file,
-								asset,
-								source,
-								sourceMap
-							};
-						}
-					}).filter(Boolean).map(task => {
-						const modules = task.sourceMap.sources.map(source => {
-							const module = compilation.findModule(source);
-							return module || source;
-						});
-						for(const module of modules) {
-							if(!moduleToSourceNameMapping.get(module)) {
-								moduleToSourceNameMapping.set(module, ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
+					chunk.files.forEach(file => {
+						if(matchObject(file)) {
+							const task = getTaskForFile(file, chunk, options, compilation);
+
+							if(task) {
+								const modules = task.sourceMap.sources.map(source => {
+									const module = compilation.findModule(source);
+									return module || source;
+								});
+
+								for(const module of modules) {
+									if(!moduleToSourceNameMapping.get(module)) {
+										moduleToSourceNameMapping.set(module, ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
+									}
+								}
+
+								task.modules = modules;
+
+								tasks.push(task);
 							}
 						}
-						task.modules = modules;
-						return task;
-					}).forEach(task => {
-						tasks.push(task);
 					});
 				});
+
 				const usedNamesSet = new Set(moduleToSourceNameMapping.values());
 				const conflictDetectionSet = new Set();
 
diff --git a/yarn.lock b/yarn.lock
@@ -4054,7 +4054,7 @@ ua-parser-js@^0.7.9:
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
-uglify-js@^2.6, uglify-js@^2.8.29:
+uglify-js@^2.4.19, uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
