From 27e4f75190d54f5c04d2a4bdeeab6e548b3f12a5 Mon Sep 17 00:00:00 2001
From: Kyle Zhao <xrav3nz@users.noreply.github.com>
Date: Sat, 5 Aug 2017 11:01:40 -0400
Subject: [PATCH] Backport static-file-to-json from #6273 to 3.5-stable

---
 lib/jekyll/static_file.rb | 4 ++++
 test/test_static_file.rb  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 29d71cbe8e7..18bcec800dc 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -1,7 +1,11 @@
 module Jekyll
   class StaticFile
+    extend Forwardable
+
     attr_reader :relative_path, :extname, :name, :data
 
+    def_delegator :to_liquid, :to_json, :to_json
+
     class << self
       # The cache of last modification times [path] -> mtime.
       def mtimes
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 49adc96b79f..418b83d8055 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -174,5 +174,9 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       }
       assert_equal expected, @static_file.to_liquid.to_h
     end
+
+    should "jsonify its liquid drop instead of itself" do
+      assert_equal @static_file.to_liquid.to_json, @static_file.to_json
+    end
   end
 end