allow to disable SourceMap in UglifyJsPlugin

sokra · sokra · commit 6779ddb0761d · 2014-10-31T12:46:18.000+01:00
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
@@ -4,6 +4,7 @@
 */
 var SourceMapConsumer = require("webpack-core/lib/source-map").SourceMapConsumer;
 var SourceMapSource = require("webpack-core/lib/SourceMapSource");
+var RawSource = require("webpack-core/lib/RawSource");
 var RequestShortener = require("../RequestShortener");
 var uglify = require("uglify-js");
 
@@ -23,10 +24,12 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 
 	var requestShortener = new RequestShortener(compiler.context);
 	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("build-module", function(module) {
-			// to get detailed location info about errors
-			module.useSourceMap = true;
-		});
+		if(options.sourceMap !== false) {
+			compilation.plugin("build-module", function(module) {
+				// to get detailed location info about errors
+				module.useSourceMap = true;
+			});
+		}
 		compilation.plugin("optimize-chunk-assets", function(chunks, callback) {
 			var files = [];
 			chunks.forEach(function(chunk) {
@@ -48,56 +51,65 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 						compilation.assets[file] = asset.__UglifyJsPlugin;
 						return;
 					}
-					var inputSourceMap = asset.map();
-					var sourceMap = new SourceMapConsumer(inputSourceMap);
-					uglify.AST_Node.warn_function = function(warning) {
-						var match = /\[.+:([0-9]+),([0-9]+)\]/.exec(warning);
-						var line = +match[1];
-						var column = +match[2];
-						var original = sourceMap.originalPositionFor({
-							line: line,
-							column: column
-						});
-						if(!original || !original.source || original.source === file) return;
-						warnings.push(warning.replace(/\[.+:([0-9]+),([0-9]+)\]/, "") + 
-							"[" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]");
-					};
+					if(options.sourceMap !== false) {
+						var inputSourceMap = asset.map();
+						var sourceMap = new SourceMapConsumer(inputSourceMap);
+						uglify.AST_Node.warn_function = function(warning) {
+							var match = /\[.+:([0-9]+),([0-9]+)\]/.exec(warning);
+							var line = +match[1];
+							var column = +match[2];
+							var original = sourceMap.originalPositionFor({
+								line: line,
+								column: column
+							});
+							if(!original || !original.source || original.source === file) return;
+							warnings.push(warning.replace(/\[.+:([0-9]+),([0-9]+)\]/, "") +
+								"[" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]");
+						};
+					} else {
+						uglify.AST_Node.warn_function = function(warning) {
+							warnings.push(warning);
+						};
+					}
 					var ast = uglify.parse(input, {
 						filename: file
 					});
-					ast.figure_out_scope()
 					if(options.compress !== false) {
+						ast.figure_out_scope()
 						var compress = uglify.Compressor(options.compress);
 						ast = ast.transform(compress);
+					}
+					if(options.mangle !== false) {
 						ast.figure_out_scope();
-						if(options.mangle !== false) {
-							ast.compute_char_frequency(options.mangle || {});
-							ast.mangle_names(options.mangle || {});
-						}
+						ast.compute_char_frequency(options.mangle || {});
+						ast.mangle_names(options.mangle || {});
 					}
-					var map = null;
-					map = uglify.SourceMap({
-						file: file,
-						root: ""
-					});
 					var output = {};
 					output.comments = options.comments || /^\**!|@preserve|@license/;
 					output.beautify = options.beautify;
 					for(var k in options.output) {
 						output[k] = options.output[k];
 					}
-					output.source_map = map;
+					if(options.sourceMap !== false) {
+						var map = uglify.SourceMap({
+							file: file,
+							root: ""
+						});
+						output.source_map = map;
+					}
 					var stream = uglify.OutputStream(output);
 					ast.print(stream);
-					map = map + "";
+					if(map) map = map + "";
 					stream = stream + "";
-					asset.__UglifyJsPlugin = compilation.assets[file] = new SourceMapSource(stream, file, map, input, inputSourceMap);
+					asset.__UglifyJsPlugin = compilation.assets[file] = (map ?
+						new SourceMapSource(stream, file, map, input, inputSourceMap) :
+						new RawSource(stream));
 					if(warnings.length > 0) {
 						compilation.warnings.push(new Error(file + " from UglifyJs\n" + warnings.join("\n")));
 					}
 				} catch(err) {
 					if(err.line) {
-						var original = sourceMap.originalPositionFor({
+						var original = sourceMap && sourceMap.originalPositionFor({
 							line: err.line,
 							column: err.col
 						});
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -27,6 +27,11 @@ describe("TestCases", function() {
 		{ name: "devtool-eval-source-map", devtool: "#eval-source-map" },
 		{ name: "devtool-source-map", devtool: "#@source-map" },
 		{ name: "minimized", plugins: [
+			new webpack.optimize.UglifyJsPlugin({
+				sourceMap: false
+			})
+		]},
+		{ name: "minimized-source-map", plugins: [
 			new webpack.optimize.UglifyJsPlugin()
 		]},
 		{ name: "deduped", plugins: [
