Merge pull request gruntjs#119 from kzar/master

Fix sourceMappingURL paths.
looker · Feb 7, 2014 · 6cc5d1e · 6cc5d1e
2 parents 23e2b17 + 6596edf
commit 6cc5d1e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/tasks/coffee.js b/tasks/coffee.js
@@ -134,9 +134,9 @@ module.exports = function(grunt) {
   };
 
   var appendFooter = function(output, paths, options) {
-    // we need sourceMappingURL to be relative to the js path
-    var sourceMappingDir = paths.destDir.replace(/[^/]+/g, '..') + options.sourceMapDir;
-    // add sourceMappingURL to file footer
+    // We need the sourceMappingURL to be relative to the JS path
+    var sourceMappingDir = appendTrailingSlash(path.relative(paths.destDir, options.sourceMapDir));
+    // Add sourceMappingURL to file footer
     output.js = output.js + '\n//# sourceMappingURL=' + sourceMappingDir + paths.mapFileName + '\n';
   };
 

diff --git a/test/expected/eachMap/coffee1.js b/test/expected/eachMap/coffee1.js
diff --git a/test/expected/eachMap/litcoffee.js b/test/expected/eachMap/litcoffee.js
diff --git a/test/expected/maps/coffee.js b/test/expected/maps/coffee.js
diff --git a/test/expected/maps/coffeeBare.js b/test/expected/maps/coffeeBare.js
diff --git a/test/expected/maps/coffeeBareJoin.js b/test/expected/maps/coffeeBareJoin.js
diff --git a/test/expected/maps/coffeeJoin.js b/test/expected/maps/coffeeJoin.js
diff --git a/test/expected/sourceMapDir1/coffee.js b/test/expected/sourceMapDir1/coffee.js