Merge pull request #327 from RyanFrench/master

Add 'sourceMapUrl' option

Gruntfile.js

@@ -184,6 +184,14 @@ module.exports = function(grunt) {
           sourceMapRoot: 'https://github.com/RReverser/grunt-contrib-uglify/tree/master/tmp'
         }
       },
+      sourcemap_customUrl: {
+        src: 'test/fixtures/src/simple.js',
+        dest: 'tmp/sourcemap_customUrl.js',
+        options: {
+          sourceMap: true,
+          sourceMapUrl: 'http://www.test.com/test/sourcemap_customUrl.js.map'
+        }
+      },
       sourcemap_functionName: {
         src: 'test/fixtures/src/simple.js',
         dest: 'tmp/sourcemap_functionName.js',

docs/uglify-options.md

@@ -71,6 +71,12 @@ With this option you can customize root URL that browser will use when looking f
 
 If the sources are not absolute URLs after prepending of the `sourceMapRoot`, the sources are resolved relative to the source map.
 
+## sourceMapUrl
+Type: `String`  
+Default: `undefined`
+
+Override the calculated value for `sourceMappingURL` in the source map. This is useful if the source map location is not relative to the base path of the minified file, i.e. when using a CDN
+
 #### enclose
 Type: `Object`  
 Default: `undefined`

tasks/lib/uglify.js

@@ -192,7 +192,9 @@ exports.init = function(grunt) {
     // Add the source map reference to the end of the file
     if (options.sourceMap) {
       // Set all paths to forward slashes for use in the browser
-      min += '\n//# sourceMappingURL=' + uriPath(options.destToSourceMap);
+      var sourceMappingURL;
+      sourceMappingURL = options.destToSourceMap.match(/^http[s]?\:\/\//) === null ?  uriPath(options.destToSourceMap) : options.destToSourceMap;
+      min += '\n//# sourceMappingURL=' + sourceMappingURL;
     }
 
     var result = {

tasks/uglify.js

@@ -123,10 +123,16 @@ module.exports = function(grunt) {
 
       // Calculate the path from the dest file to the sourcemap for the
       // sourceMappingURL reference
-      if (options.sourceMap) {
-        var destToSourceMapPath = relativePath(f.dest, options.generatedSourceMapName);
-        var sourceMapBasename = path.basename(options.generatedSourceMapName);
-        options.destToSourceMap = destToSourceMapPath + sourceMapBasename;
+      // If sourceMapUrl is defined, use this instead
+      if(options.sourceMap) {
+        var destToSourceMapPath, sourceMapBasename;
+        if (!options.sourceMapUrl) {
+          destToSourceMapPath = relativePath(f.dest, options.generatedSourceMapName);
+          sourceMapBasename = path.basename(options.generatedSourceMapName);
+          options.destToSourceMap = destToSourceMapPath + sourceMapBasename;
+        } else {
+          options.destToSourceMap = options.sourceMapUrl;
+        }
       }
 
       // Minify files, warn and fail on error.

test/uglify_test.js

@@ -32,6 +32,7 @@ exports.contrib_uglify = {
       'sourcemap_customName.js',
       'sourcemap_customRoot.js',
       'sourcemap_customRoot.js.map',
+      'sourcemap_customUrl.js',
       'sourcemap_functionName.js',
       'sourcemap_functionName.js.fn.map',
       path.join('deep', 'directory', 'location', 'source_map.js.map'),