From 50f4fd5345d5ea1ac0f1fa1db5b4f5286e057986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Thu, 5 Apr 2018 11:34:33 -0400
Subject: [PATCH] remove dupe code in minify_js

---
 src/meta/minifier.js | 111 ++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 59 deletions(-)

diff --git a/src/meta/minifier.js b/src/meta/minifier.js
index 53862c85d1..26bf048e93 100644
--- a/src/meta/minifier.js
+++ b/src/meta/minifier.js
@@ -164,91 +164,84 @@ function concat(data, callback) {
 actions.concat = concat;
 
 function minifyJS_batch(data, callback) {
-	async.each(data.files, function (ref, next) {
-		var srcPath = ref.srcPath;
-		var destPath = ref.destPath;
-		var filename = ref.filename;
-
-		fs.readFile(srcPath, 'utf8', function (err, file) {
+	async.each(data.files, function (fileObj, next) {
+		fs.readFile(fileObj.srcPath, 'utf8', function (err, source) {
 			if (err) {
 				return next(err);
 			}
 
-			var scripts = {};
-			scripts[filename] = file;
-
-			try {
-				var minified = uglify.minify(scripts, {
-					sourceMap: {
-						filename: filename,
-						url: filename + '.map',
-						includeSources: true,
-					},
-					compress: false,
-				});
-
-				async.parallel([
-					async.apply(fs.writeFile, destPath, minified.code),
-					async.apply(fs.writeFile, destPath + '.map', minified.map),
-				], next);
-			} catch (e) {
-				next(e);
-			}
+			var filesToMinify = [
+				{
+					srcPath: fileObj.srcPath,
+					filename: fileObj.filename,
+					source: source,
+				},
+			];
+			minifyAndSave({
+				files: filesToMinify,
+				destPath: fileObj.destPath,
+				filename: fileObj.filename,
+			}, next);
 		});
 	}, callback);
 }
 actions.minifyJS_batch = minifyJS_batch;
 
 function minifyJS(data, callback) {
-	async.mapLimit(data.files, 1000, function (ref, next) {
-		var srcPath = ref.srcPath;
-		var filename = ref.filename;
-
-		fs.readFile(srcPath, 'utf8', function (err, file) {
+	async.mapLimit(data.files, 1000, function (fileObj, next) {
+		fs.readFile(fileObj.srcPath, 'utf8', function (err, source) {
 			if (err) {
 				return next(err);
 			}
 
 			next(null, {
-				srcPath: srcPath,
-				filename: filename,
-				source: file,
+				srcPath: fileObj.srcPath,
+				filename: fileObj.filename,
+				source: source,
 			});
 		});
-	}, function (err, files) {
+	}, function (err, filesToMinify) {
 		if (err) {
 			return callback(err);
 		}
 
-		var scripts = {};
-		files.forEach(function (ref) {
-			if (!ref) {
-				return;
-			}
-
-			scripts[ref.filename] = ref.source;
-		});
-
-		var minified = uglify.minify(scripts, {
-			sourceMap: {
-				filename: data.filename,
-				url: data.filename + '.map',
-				includeSources: true,
-			},
-			compress: false,
-		});
+		minifyAndSave({
+			files: filesToMinify,
+			destPath: data.destPath,
+			filename: data.filename,
+		}, callback);
+	});
+}
+actions.minifyJS = minifyJS;
 
-		if (minified.error) {
-			return callback(minified.error);
+function minifyAndSave(data, callback) {
+	var scripts = {};
+	data.files.forEach(function (ref) {
+		if (!ref) {
+			return;
 		}
 
-		async.parallel([
-			async.apply(fs.writeFile, data.destPath, minified.code),
-			async.apply(fs.writeFile, data.destPath + '.map', minified.map),
-		], callback);
+		scripts[ref.filename] = ref.source;
+	});
+
+	var minified = uglify.minify(scripts, {
+		sourceMap: {
+			filename: data.filename,
+			url: data.filename + '.map',
+			includeSources: true,
+		},
+		compress: false,
 	});
+
+	if (minified.error) {
+		return callback(minified.error);
+	}
+
+	async.parallel([
+		async.apply(fs.writeFile, data.destPath, minified.code),
+		async.apply(fs.writeFile, data.destPath + '.map', minified.map),
+	], callback);
 }
-actions.minifyJS = minifyJS;
 
 Minifier.js = {};
 Minifier.js.bundle = function (data, minify, fork, callback) {