react_on_rails 11.0.5 → 11.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2e9cfdc5d161ab3706f779c18c8ce1a166b066
-  data.tar.gz: 6211ecc33d60cccc7d385ddcc7550a31f1502d43
+  metadata.gz: 2e83dc63e255b12add1db7f16fa2ae9c8ee21f8d
+  data.tar.gz: e771480790081124a2673330cda45802e11ea15d
 SHA512:
-  metadata.gz: 3cac9f496b6163da14528c717ef9c6a87ad15d11f87cab027d3af08ebe48121345f62264cd42dcd2cb64e847a38bc07a2ccb6b5951a98b9ca4737414e1a5afe2
-  data.tar.gz: e692554e9375d8c789894624c86639fcc442314ccc024050fca0ee4e371a7f05e047188bed0cf24f6d32497b7ee454ad9cba07fc1d062821c720a0274d4ddd50
+  metadata.gz: 8c3da1497f3990327569b93d578d8cc992f222dcb1a2be1c859abf2b4df37afbe960f5242fb567b861cf55339e2affe3d45c776124b9586de05a93020e5bf8f2
+  data.tar.gz: 37ab5c553e1adca77bc00a5c99832ebffbaa6c64b40aaed12023abe8e89351cf03a6c479502f43ce504526bb940a3aecde21bbd687c9f2b0acb791b0824e13b7

data/CHANGELOG.md

@@ -12,6 +12,9 @@ Changes since last non-beta release.
 
 #### Changed
 
+### [11.0.6] - 2018-05-11
+- Even more detailed errors for Honeybadger and Sentry when there's a JSON parse error on server rendering. [PR 1086](https://github.com/shakacode/react_on_rails/pull/1086) by [justin808](https://github.com/justin808).
+
 ### [11.0.5] - 2018-05-11
 - More detailed errors for Honeybadger and Sentry. [PR 1081](https://github.com/shakacode/react_on_rails/pull/1081) by [justin808](https://github.com/justin808).
 
@@ -758,7 +761,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/11.0.5...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/11.0.6...master
+[11.0.6]: https://github.com/shakacode/react_on_rails/compare/11.0.5...11.0.6
 [11.0.5]: https://github.com/shakacode/react_on_rails/compare/11.0.4...11.0.5
 [11.0.4]: https://github.com/shakacode/react_on_rails/compare/11.0.3...11.0.4
 [11.0.3]: https://github.com/shakacode/react_on_rails/compare/11.0.2...11.0.3

data/README.md

@@ -2,17 +2,16 @@
 
 *If this projects helps you, please give us a star!*
 
-## Need Help with Rails + Webpack + React? Want better performance?
+## Need Help with Rails + Webpack v4 + React? Want better performance?
 Aloha, I'm Justin Gordon the creator and maintainer of React on Rails. I offer a [React on Rails Pro Support Plan](http://www.shakacode.com/work/shakacode-pro-support.pdf), and I can help you with:
-* Optimizing your webpack setup for React on Rails.
-* Upgrading from older React on Rails to newer versions.
+* Optimizing your webpack setup to Webpack v4 for React on Rails.
+* Upgrading from older React on Rails to newer versions (are using using the new Webpacker setup that avoids the asset pipeline?)
 * Better performance client and server side.
-* Migrating from Angular to React.
+* Efficiently migrating from Angular to React.
 * Best practices based on 4 years of React on Rails experience.
 * Early access to the React on Rails Pro Gem and Node code, including:
-  * ShakaCode's Node.js rendering server for better performance for server rendering (used now at [egghead.io](https://egghead.io/)).
-  * Performance helpers, especially for server rendering
-  * Webpack configuration examples
+  * ShakaCode's Node.js rendering server for better performance for server rendering (live at [egghead.io](https://egghead.io/)).
+  * Performance caching helpers, especially for server rendering
 
 Please [email me](mailto:justin@shakacode.com) for a free half-hour project consultation, on anything from React on Rails to any aspect of web development.
 

data/lib/react_on_rails.rb

@@ -3,6 +3,8 @@
 require "rails"
 
 require "react_on_rails/error"
+require "react_on_rails/prerender_error"
+require "react_on_rails/json_parse_error"
 require "react_on_rails/react_on_rails_helper"
 require "react_on_rails/controller"
 require "react_on_rails/version"

data/lib/react_on_rails/json_parse_error.rb

@@ -0,0 +1,26 @@
+module ReactOnRails
+  class JsonParseError < ::ReactOnRails::Error
+    attr_reader :json
+
+    def initialize(parse_error, json)
+      @json = json
+      @original_error = parse_error
+      super(parse_error.message)
+    end
+
+    def to_honeybadger_context
+      to_error_context
+    end
+
+    def raven_context
+      to_error_context
+    end
+
+    def to_error_context
+      {
+        original_error: @original_error,
+        json: @json
+      }
+    end
+  end
+end

data/lib/react_on_rails/prerender_error.rb

@@ -27,6 +27,19 @@ module ReactOnRails
       to_error_context
     end
 
+    def to_error_context
+      result = {
+        component_name: component_name,
+        err: err,
+        props: props,
+        js_code: js_code,
+        console_messages: console_messages
+      }
+
+      result.merge!(err.to_error_context) if err.respond_to?(:to_error_context)
+      result
+    end
+
     private
 
     def calc_message(component_name, console_messages, err, js_code, props)
@@ -59,15 +72,5 @@ console messages:
       end
       [backtrace, message]
     end
-
-    def to_error_context
-      {
-        component_name: component_name,
-        err: err,
-        props: props,
-        js_code: js_code,
-        console_messages: console_messages
-      }
-    end
   end
 end

data/lib/react_on_rails/react_component/render_options.rb

@@ -7,6 +7,8 @@ module ReactOnRails
     class RenderOptions
       include Utils::Required
 
+      attr_accessor :request_digest
+
       NO_PROPS = {}.freeze
 
       def initialize(react_component_name: required("react_component_name"), options: required("options"))
@@ -49,7 +51,7 @@ module ReactOnRails
       end
 
       def to_s
-        "{ react_component_name = #{react_component_name}, options = #{options}"
+        "{ react_component_name = #{react_component_name}, options = #{options}, request_digest = #{request_digest}"
       end
 
       private

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -47,8 +47,13 @@ module ReactOnRails
                                "tmp/server-generated-#{@file_index % 10}.js")
             @file_index += 1
           end
-          json_string = js_evaluator.eval_js(js_code)
-          result = JSON.parse(json_string)
+          json_string = js_evaluator.eval_js(js_code, render_options)
+          result = nil
+          begin
+            result = JSON.parse(json_string)
+          rescue JSON::ParserError => e
+            raise ReactOnRails::JsonParseError.new(e, json_string)
+          end
 
           if render_options.logging_on_server
             console_script = result["consoleReplayScript"]
@@ -82,7 +87,7 @@ module ReactOnRails
           end
         end
 
-        def eval_js(js_code)
+        def eval_js(js_code, _render_options)
           @js_context_pool.with do |js_context|
             result = js_context.eval(js_code)
             js_context.eval("console.history = []")

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "11.0.5".freeze
+  VERSION = "11.0.6".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "11.0.5",
+  "version": "11.0.6",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 11.0.5
+  version: 11.0.6
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -436,6 +436,7 @@ files:
 - lib/react_on_rails/error.rb
 - lib/react_on_rails/git_utils.rb
 - lib/react_on_rails/json_output.rb
+- lib/react_on_rails/json_parse_error.rb
 - lib/react_on_rails/locales_to_js.rb
 - lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/react_component/render_options.rb
@@ -497,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.