Don't pretty format JSON in development

CHANGELOG.md

@@ -5,10 +5,13 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 
 ## [Unreleased]
 
+## [6.9.2] - 2017-04-02
+
 ### Changed
 - Update version_checker.rb to `logger.error` rather than `logger.warn` for gem/npm version mismatch. [#788](https://github.com/shakacode/react_on_rails/issues/788) by [justin808](https://github.com/justin808).
 
 ### Fixed
+- Remove pretty formatting of JSON in development. [#789](https://github.com/shakacode/react_on_rails/pull/789) by [justin808](https://github.com/justin808)
 - Clear hydrated stores with each server rendered block. [#785](https://github.com/shakacode/react_on_rails/pull/785) by [udovenko](https://github.com/udovenko)
 
 ## [6.9.1] - 2017-03-30
@@ -515,7 +518,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.9.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.9.2...master
+[6.9.2]: https://github.com/shakacode/react_on_rails/compare/6.9.1...6.9.2
 [6.9.1]: https://github.com/shakacode/react_on_rails/compare/6.8.2...6.9.1
 [6.9.0]: https://github.com/shakacode/react_on_rails/compare/6.8.2...6.9.0
 [6.8.2]: https://github.com/shakacode/react_on_rails/compare/6.8.1...6.8.2

app/helpers/react_on_rails_helper.rb

@@ -223,16 +223,19 @@ def server_render_js(js_expression, options = {})
   private
 
   def json_safe_and_pretty(hash_or_string)
-    if Rails.env.development?
-      # TODO: for json_safe_and_pretty
-      # 1. Add test
-      # 2. Add error handler if cannot parse the string with nice message
-      # 3. Consider checking that if not a string then a Hash
-      hash_value = hash_or_string.is_a?(String) ? JSON.parse(hash_or_string) : hash_or_string
-      ERB::Util.json_escape(JSON.pretty_generate(hash_value))
-    else
-      ERB::Util.json_escape(hash_or_string.to_json)
-    end
+    # if Rails.env.development?
+    #   # TODO: for json_safe_and_pretty
+    #   # 1. Add test
+    #   # 2. Add error handler if cannot parse the string with nice message
+    #   # 3. Consider checking that if not a string then a Hash
+    #   hash_value = hash_or_string.is_a?(String) ? JSON.parse(hash_or_string) : hash_or_string
+    #   ERB::Util.json_escape(JSON.pretty_generate(hash_value))
+    # else
+    #
+    # Temp fix given that a hash may contain active record objects and that crashed with the new
+    # code to JSON.pretty_generate
+    ERB::Util.json_escape(hash_or_string.to_json)
+    # end
   end
 
   # prepend the rails_context if not yet applied

rakelib/dummy_apps.rake

@@ -2,16 +2,19 @@ require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 
 namespace :dummy_apps do
-  task :dummy_app do
+  task :yarn_install do
+    yarn_install_cmd = "yarn install --mutex network && yarn run install-react-on-rails"
+    sh_in_dir(dummy_app_dir, yarn_install_cmd)
+  end
+
+  task dummy_app: [:yarn_install] do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_in(dummy_app_dir)
-    sh_in_dir(dummy_app_dir, "yarn install --mutex network")
   end
 
-  task :dummy_app_with_turbolinks_2 do
+  task dummy_app_with_turbolinks_2: [:yarn_install] do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_with_turbolinks_2_in(dummy_app_dir)
-    sh_in_dir(dummy_app_dir, "yarn install --mutex network")
   end
 
   task dummy_apps: [:dummy_app, :node_package] do

spec/dummy/client/package.json

@@ -73,7 +73,7 @@
     "build:dev:server": "webpack -w --config webpack.server.rails.build.config.js",
     "build:server": "webpack --config webpack.server.rails.build.config.js",
     "hot-assets": "babel-node server-rails-hot.js",
-    "install-react-on-rails": "npm i --save 'file:../../..'"
+    "install-react-on-rails": "rm -rf node_modules/react-on-rails && npm i 'file:../../..'"
   },
   "author": "",
   "license": "ISC"

spec/dummy/package.json

@@ -37,8 +37,5 @@
     "url": "https://github.com/shakacode/react_on_rails/issues"
   },
   "devDependencies": {},
-  "dependencies": {
-    "babel-cli": ">= 6",
-    "babel-runtime": ">= 6"
-  }
+  "dependencies": {}
 }