Merge df2dfa8 into cce33c2

webpack · Jun 15, 2018 · 76a8d71 · 76a8d71
2 parents cce33c2 + df2dfa8
commit 76a8d71
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -457,8 +457,10 @@ module.exports = function(yargs, argv, convertOptions) {
 			ensureArray(options, "plugins");
 			var UglifyJsPlugin = require("../lib/optimize/UglifyJsPlugin");
 			var LoaderOptionsPlugin = require("../lib/LoaderOptionsPlugin");
+			var SourceMapDevToolPlugin = require("../lib/SourceMapDevToolPlugin");
 			options.plugins.push(new UglifyJsPlugin({
-				sourceMap: options.devtool && (options.devtool.indexOf("sourcemap") >= 0 || options.devtool.indexOf("source-map") >= 0)
+				sourceMap: (options.devtool && (options.devtool.indexOf("sourcemap") >= 0 || options.devtool.indexOf("source-map") >= 0) ||
+					options.plugins.some(p => p instanceof SourceMapDevToolPlugin)),
 			}));
 			options.plugins.push(new LoaderOptionsPlugin({
 				minimize: true