lib/sprockets/sass_compressor.rb in sprockets-4.0.0.beta4 vs lib/sprockets/sass_compressor.rb in sprockets-4.0.0.beta5

@@ -47,18 +47,16 @@
     end
 
     def call(input)
       css, map = Autoload::Sass::Engine.new(
         input[:data],
-        @options.merge(filename: 'filename')
+        @options.merge(filename: input[:filename])
       ).render_with_sourcemap('')
 
       css = css.sub("/*# sourceMappingURL= */\n", '')
 
-      map = SourceMapUtils.combine_source_maps(
-        input[:metadata][:map],
-        SourceMapUtils.decode_json_source_map(map.to_json(css_uri: 'uri'))["mappings"]
-      )
+      map = SourceMapUtils.format_source_map(JSON.parse(map.to_json(css_uri: '')), input)
+      map = SourceMapUtils.combine_source_maps(input[:metadata][:map], map)
 
       { data: css, map: map }
     end
   end
 end