Sprockets 3.0 fixes

Author: Tim Morgan

lib/squash/javascript/patches.rb

@@ -4,6 +4,13 @@
 # @private
 class Sprockets::Asset
   def sourcemap
+    if included
+      return included.inject(SourceMap::Map.new) do |map, path|
+        asset = @environment.load(path)
+        map + asset.sourcemap
+      end
+    end
+
     relative_path = if pathname.to_s.include?(Rails.root.to_s)
                       pathname.relative_path_from(Rails.root)
                     else
@@ -22,12 +29,3 @@ def sourcemap
     SourceMap::Map.new(mappings, resource_path)
   end
 end
-
-# @private
-class Sprockets::BundledAsset < Sprockets::Asset
-  def sourcemap
-    to_a.inject(SourceMap::Map.new) do |map, asset|
-      map + asset.sourcemap
-    end
-  end
-end

lib/squash/javascript/tasks/sourcemaps.rake

@@ -34,7 +34,7 @@ namespace :sourcemaps do
       Rails.application.assets.each_logical_path(Rails.application.config.assets.precompile) do |path|
         next unless path.end_with?('.js')
         asset = Rails.application.assets.find_asset(path)
-        next unless asset.kind_of?(Sprockets::BundledAsset)
+        next unless asset.included
         map = asset.sourcemap
         Squash::Uploader.new(Squash::Ruby.configuration(:api_host),
                              skip_verification: Squash::Ruby.configuration(:skip_verification)