Handle dependencies at sprockets processor layer

adambeynon · adambeynon · commit 930392835fac · 2014-11-25T08:59:10.000Z
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -66,8 +66,6 @@ def process_require(filename, options)
       path  = path_reader.expand(filename).to_s
       asset = find_asset filename
 
-      path_reader.depend_on filename
-
       process_requires asset, path, options
 
       @assets << asset
diff --git a/lib/opal/path_reader.rb b/lib/opal/path_reader.rb
@@ -18,10 +18,6 @@ def stat(path)
       nil
     end
 
-    def depend_on(path)
-      nil
-    end
-
     def expand(path)
       file_finder.find(path)
     end
diff --git a/lib/opal/sprockets/path_reader.rb b/lib/opal/sprockets/path_reader.rb
@@ -9,20 +9,14 @@ def initialize(env, context)
 
       def read path
         if path.end_with? '.js'
-          context.depend_on_asset(path)
           env[path].to_s
         else
-          context.depend_on(path)
           File.read(expand(path))
         end
       rescue ::Sprockets::FileNotFound
         nil
       end
 
-      def depend_on(path)
-        context.depend_on path
-      end
-
       def stat path
         File.stat expand(path)
       rescue Errno::ENOENT
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -68,13 +68,16 @@ def evaluate(context, locals, &block)
       return Opal.compile data unless context.is_a? ::Sprockets::Context
 
       path = context.logical_path
-      prerequired = []
 
       builder = self.class.new_builder(context)
-      builder.build_require(path, :prerequired => prerequired)
+      builder.build_require(path)
 
       result = builder.to_s + "\nOpal.require(#{path.inspect});"
 
+      builder.processed.each do |dependency_path|
+        context.depend_on dependency_path
+      end
+
       if self.class.source_map_enabled
         register_source_map(context.logical_path, builder.source_map.to_s)
         "#{result}\n//# sourceMappingURL=#{File.basename(context.logical_path)}.map\n"
