Merge pull request #926 from homedepotlabs/sourcemaps_licensecomments

Source Maps with License Comments

Author: jrburke

build/jslib/build.js

@@ -1428,12 +1428,12 @@ define(function (require) {
         }
 
         if (config.generateSourceMaps) {
-            if (config.preserveLicenseComments && config.optimize !== 'none') {
+            if (config.preserveLicenseComments && !(config.optimize === 'none' || config.optimize === 'uglify')) {
                 throw new Error('Cannot use preserveLicenseComments and ' +
-                    'generateSourceMaps together. Either explcitly set ' +
-                    'preserveLicenseComments to false (default is true) or ' +
-                    'turn off generateSourceMaps. If you want source maps with ' +
-                    'license comments, see: ' +
+                    'generateSourceMaps together, unless optimize is set ' +
+                    'to \'uglify\'. Either explicitly set preserveLicenseComments ' +
+                    'to false (default is true) or turn off generateSourceMaps. ' +
+                    'If you want source maps with license comments, see: ' +
                     'http://requirejs.org/docs/errors.html#sourcemapcomments');
             } else if (config.optimize !== 'none' &&
                        config.optimize !== 'closure' &&

build/jslib/optimize.js

@@ -247,6 +247,11 @@ function (lang,   logger,   envOptimize,        file,           parse,
                         }
                     }
 
+                    if (config.generateSourceMaps && licenseContents) {
+                        optConfig.preamble = licenseContents;
+                        licenseContents = '';
+                    }
+
                     fileContents = licenseContents + optFunc(fileName,
                                                              fileContents,
                                                              outFileName,
@@ -406,6 +411,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                 var result, existingMap, resultMap, finalMap, sourceIndex,
                     uconfig = {},
                     existingMapPath = outFileName + '.map',
+                    preamble = config.preamble || "",
                     baseName = fileName && fileName.split('/').pop();
 
                 config = config || {};
@@ -414,6 +420,11 @@ function (lang,   logger,   envOptimize,        file,           parse,
 
                 uconfig.fromString = true;
 
+                if (config.preamble) {
+                    uconfig.output = {preamble: config.preamble};
+                }
+
+
                 if (config.generateSourceMaps && (outFileName || config._buildSourceMap)) {
                     uconfig.outSourceMap = baseName + '.map';
 
@@ -450,7 +461,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                 } catch (e) {
                     throw new Error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString());
                 }
-                return fileContents;
+                return preamble + fileContents;
             }
         }
     };