Clean up banner option.

tasks/lib/uglify.js

@@ -15,6 +15,11 @@ var assign = require('object.assign');
 var uriPath = require('uri-path');
 var getOutputOptions;
 
+// Converts \r\n to \n
+function normalizeLf(string) {
+  return string.replace(/\r\n/g, '\n');
+}
+
 exports.init = function(grunt) {
   var exports = {};
 
@@ -228,8 +233,8 @@ exports.init = function(grunt) {
       source_map: null
     };
 
-    if (options.banner && options.sourceMap) {
-      outputOptions.preamble = options.banner;
+    if (options.banner) {
+      outputOptions.preamble = normalizeLf(options.banner);
     }
 
     if (options.screwIE8 === false) {

tasks/uglify.js

@@ -66,8 +66,6 @@ module.exports = function(grunt) {
     });
     var log = reportFacility(grunt, options);
 
-    // Process banner.
-    var banner = normalizeLf(options.banner);
     var footer = normalizeLf(options.footer);
     var mapNameGenerator, mapInNameGenerator;
     var createdFiles = 0;
@@ -171,11 +169,6 @@ module.exports = function(grunt) {
       // Concat minified source + footer
       var output = result.min + footer;
 
-      // Only prepend banner if uglify hasn't taken care of it as part of the preamble
-      if (!options.sourceMap) {
-        output = banner + output;
-      }
-
       // Write the destination file.
       grunt.file.write(f.dest, output);
 

test/fixtures/expected/compress_mangle_banner.js

@@ -1,2 +1,3 @@
 // banner without sourcemap
+
 function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4);