better minimize options and error handling

sokra · sokra · commit 6a9bd1339635 · 2012-11-12T14:39:53.000+01:00
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -554,17 +554,20 @@ getTemplate.chunk = function(chunk, options, templateOptions) {
 
 // minimize it the uglify
 function uglify(input, filename, options) {
-	if(typeof options != "object") options = {
-		warnings: false
-	};
+	if(typeof options != "object") options = {};
+	if(typeof options.compressor == "undefined") {
+		options.compressor = {
+			warnings: false
+		}
+	}
 	var uglify2 = require("uglify-js2");
 	try {
 		var ast = uglify2.parse(input, {
 			filename: filename
 		});
 		ast.figure_out_scope()
-		if(options.compress !== false) {
-			var compressor = uglify2.Compressor(options);
+		if(options.compressor !== false) {
+			var compressor = uglify2.Compressor(options.compressor);
 			ast = ast.transform(compressor);
 			ast.figure_out_scope();
 			ast.compute_char_frequency(options.mangle || {});
@@ -574,9 +577,10 @@ function uglify(input, filename, options) {
 			comments: options.comments || /^\**!|@preserve|@license/,
 			beautify: options.beautify
 		});
+		return source;
 	} catch(e) {
-		throw new Error(filename + " @ Line " + e.line + ", Col " + e.col + ", " + e);
+		console.warn(e.msg || e.message || (e + ""));
+		console.warn(" @ " + filename);
 		return input;
 	}
-	return source;
 }
diff --git a/lib/writeSource.js b/lib/writeSource.js
@@ -322,17 +322,20 @@ module.exports = function(module, options, toRealId, toRealChuckId) {
 
 // minimize it the uglify
 function uglify(input, filename, options, beautify) {
-	if(typeof options != "object") options = {
-		warnings: false
-	};
+	if(typeof options != "object") options = {};
+	if(typeof options.compressor == "undefined") {
+		options.compressor = {
+			warnings: false
+		}
+	}
 	var uglify2 = require("uglify-js2");
 	try {
 		var ast = uglify2.parse(input, {
 			filename: filename
 		});
 		ast.figure_out_scope()
-		if(options.compress !== false) {
-			var compressor = uglify2.Compressor(options);
+		if(options.compressor !== false) {
+			var compressor = uglify2.Compressor(options.compressor);
 			ast = ast.transform(compressor);
 			ast.figure_out_scope();
 			ast.compute_char_frequency(options.mangle || {});
@@ -342,9 +345,10 @@ function uglify(input, filename, options, beautify) {
 			comments: options.comments || /^\**!|@preserve|@license/,
 			beautify: beautify
 		});
+		return source;
 	} catch(e) {
-		throw new Error(filename + " @ Line " + e.line + ", Col " + e.col + ", " + e);
+		console.warn(e.msg || e.message || (e + ""));
+		console.warn(" @ " + filename);
 		return input;
 	}
-	return source;
 }
