lib/sprockets/bower.rb in sprockets-3.0.0.beta.6 vs lib/sprockets/bower.rb in sprockets-3.0.0.beta.7

- old
+ new

@@ -10,13 +10,13 @@ # Internal: Override resolve_alternates to install bower.json behavior. # # load_path - String environment path # logical_path - String path relative to base # - # Returns nothing. - def resolve_alternates(load_path, logical_path, &block) - super + # Returns candiate filenames. + def resolve_alternates(load_path, logical_path) + candidates, deps = super # bower.json can only be nested one level deep if !logical_path.index('/') dirname = File.join(load_path, logical_path) stat = self.stat(dirname) @@ -24,15 +24,18 @@ if stat && stat.directory? filenames = POSSIBLE_BOWER_JSONS.map { |basename| File.join(dirname, basename) } filename = filenames.detect { |fn| self.file?(fn) } if filename - read_bower_main(dirname, filename, &block) + deps << build_file_digest_uri(filename) + read_bower_main(dirname, filename) do |path| + candidates << path + end end end end - nil + return candidates, deps end # Internal: Read bower.json's main directive. # # dirname - String path to component directory.