Bugfix for incorrect sourcemap filenames

Author: Tim Morgan

lib/squash/javascript/patches.rb

@@ -4,10 +4,12 @@
 # @private
 class Sprockets::Asset
   def sourcemap
+    resource_path = [Rails.application.config.assets.prefix, logical_path].join('/')
+
     if included
-      return included.inject(SourceMap::Map.new) do |map, path|
+      return included.inject(SourceMap::Map.new([], resource_path)) do |map, path|
         asset = @environment.load(path)
-        map + asset.sourcemap
+        asset.sourcemap + map
       end
     end
 
@@ -19,7 +21,6 @@ def sourcemap
     # any extensions after the ".js" can be removed, because they will have
     # already been processed
     relative_path.gsub! /(?<=\.js)\..*$/, ''
-    resource_path = [Rails.application.config.assets.prefix, logical_path].join('/')
 
     mappings = Array.new
     to_s.lines.each_with_index do |_, index|

lib/squash/javascript/tasks/sourcemaps.rake

@@ -45,7 +45,7 @@ namespace :sourcemaps do
                        'revision'    => Squash::Ruby.current_revision,
                        'sourcemap'   => Base64.encode64(Zlib::Deflate.deflate(map.as_json.to_json)),
                        'from'        => 'concatenated',
-                       'to'          => 'compiled',
+                       'to'          => 'compiled'
                    }
       end
     end