Add a config.action_controller.json_renderer_escapes framework default

Author: etiennebarrie

actionpack/CHANGELOG.md

@@ -9,7 +9,8 @@
     Escaping will still occur when the `:callback` option is set, since the JSON is used as JavaScript code in this
     situation (JSONP).
 
-    You can use the `:escape` option to restore the escaping behavior.
+    You can use the `:escape` option or set `config.action_controller.json_renderer_escapes` to `true` to restore the
+    escaping behavior.
 
     ```ruby
     class PostsController < ApplicationController

actionpack/lib/action_controller/metal/renderers.rb

@@ -29,6 +29,7 @@ module Renderers
 
     included do
       class_attribute :_renderers, default: Set.new.freeze
+      class_attribute :json_renderer_escapes, instance_accessor: false, default: true
     end
 
     # Used in ActionController::Base and ActionController::API to include all
@@ -153,7 +154,7 @@ def _render_to_body_with_renderer(options) # :nodoc:
 
     add :json do |json, options|
       json_options = options.except(:callback, :content_type, :status)
-      json_options[:escape] ||= false unless options[:callback].present?
+      json_options[:escape] ||= false if !self.class.json_renderer_escapes? && options[:callback].blank?
       json = json.to_json(json_options) unless json.kind_of?(String)
 
       if options[:callback].present?

actionpack/test/controller/render_json_test.rb

@@ -3,6 +3,7 @@
 require "abstract_unit"
 require "controller/fake_models"
 require "active_support/logger"
+require "active_support/core_ext/object/with"
 
 class RenderJsonTest < ActionController::TestCase
   class JsonRenderable
@@ -120,10 +121,12 @@ def test_render_json_with_callback_escapes_js_chars
     assert_equal "text/javascript", @response.media_type
   end
 
-  def test_render_json_without_callback_does_not_escape_js_chars
-    get :render_json_unsafe_chars_without_callback
-    assert_equal %({"hello":"\u2028\u2029<script>"}), @response.body
-    assert_equal "application/json", @response.media_type
+  def test_render_json_with_new_default_and_without_callback_does_not_escape_js_chars
+    TestController.with(json_renderer_escapes: false) do
+      get :render_json_unsafe_chars_without_callback
+      assert_equal %({"hello":"\u2028\u2029<script>"}), @response.body
+      assert_equal "application/json", @response.media_type
+    end
   end
 
   def test_render_json_with_custom_content_type
@@ -157,6 +160,6 @@ def test_render_json_calls_to_json_from_object
 
   def test_render_json_avoids_view_options
     get :render_json_inspect_options
-    assert_equal '{"options":{"escape":false}}', @response.body
+    assert_equal '{"options":{}}', @response.body
   end
 end

guides/source/configuring.md

@@ -61,6 +61,7 @@ Below are the default values associated with each target version. In cases of co
 #### Default Values for Target Version 8.1
 
 - [`config.yjit`](#config-yjit): `!Rails.env.local?`
+- [`config.action_controller.json_renderer_escapes`](#config-action-controller-json-renderer-escapes): `false`
 
 #### Default Values for Target Version 8.0
 
@@ -1964,6 +1965,16 @@ The default value depends on the `config.load_defaults` target version:
 Configures the [`ParamsWrapper`](https://api.rubyonrails.org/classes/ActionController/ParamsWrapper.html). This can be called at
 the top level, or on individual controllers.
 
+#### `config.action_controller.json_renderer_escapes`
+
+Configures the JSON renderer to escape HTML entities and Unicode characters that are invalid in JavaScript.
+
+This is useful if you relied on the JSON response having those characters escaped to embed the JSON document in
+\<script> tags in HTML.
+
+This is mainly for compatibility when upgrading Rails applications, otherwise you can use the `:escape` option for
+`render json:` in specific controller actions.
+
 ### Configuring Action Dispatch
 
 #### `config.action_dispatch.cookies_serializer`

railties/lib/rails/application/configuration.rb

@@ -355,6 +355,10 @@ def load_defaults(target_version)
           # redefine methods (e.g. mocking), hence YJIT isn't generally
           # faster in these environments.
           self.yjit = !Rails.env.local?
+
+          if respond_to?(:action_controller)
+            action_controller.json_renderer_escapes = false
+          end
         else
           raise "Unknown version #{target_version.to_s.inspect}"
         end