react_on_rails 13.0.0.beta.0 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdfa729f75cfd337b3436fe6e310d7e6a7789455fcba1baa729a2288d98c646f
-  data.tar.gz: 54495ad6beed806991e973866a4ccd62fd7b41d3141cbaec2e71a07e13999563
+  metadata.gz: d0c8e1ea64a37bf952902b50d8336916e2d579f8a2e4f04e2467bd750d8418d7
+  data.tar.gz: 388204125e919bb352bb14df64ab67549459c2f63c416e6dc98de39daccf2395
 SHA512:
-  metadata.gz: d0610cfa82d1d1b60f09f1586fb966dcfa12daf8549762f09e74a1fc00df6e0c8374138950e5195db0bed8501f7d8f3a1f62d90a9a779e6b652a0ada08d19d4e
-  data.tar.gz: 9e87301d7790829e6fe2391a68cf8de6e5724777e11b955b112783c7cfec13820d5a0c28691c5f2851ec49c92ab20e886b8c2a7b4c3fe2cfcec727d662cc4490
+  metadata.gz: b59cea6f171d0734b118238b2b7cc1b6cf7573ea47e77716f4175d9fc69dc896d175cc331c064f6dad563cbe5a8474e81ae55568b455e152f7674b15e1670961
+  data.tar.gz: 1f7a8895a3f90eff53089451c79a27bc920ac4488bb9475bdd46373b467e10ca6d8ebe445e715cdb86e50590b27da9a9ca99aa455c724be3cd85a83f8065701d

data/CHANGELOG.md

@@ -16,6 +16,13 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+### [13.0.0] - 2022-02-08
+#### Breaking
+- Removed webpacker as a dependency. Add gem Shakapacker to your project.
+
+#### Fixed
+- Propper throwing of exceptions.
+- Default configuration better handles test env.
 
 ### [12.6.0] - 2022-01-22
 

data/lib/generators/react_on_rails/base_generator.rb

@@ -51,6 +51,7 @@ module ReactOnRails
         base_files = %w[babel.config.js
                         config/webpack/clientWebpackConfig.js
                         config/webpack/commonWebpackConfig.js
+                        config/webpack/test.js
                         config/webpack/development.js
                         config/webpack/production.js
                         config/webpack/serverWebpackConfig.js

data/lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt

@@ -1,7 +1,5 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/development.js") %>
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
 const { devServer, inliningCss } = require('shakapacker');
 
 const webpackConfig = require('./webpackConfig');

data/lib/generators/react_on_rails/templates/base/base/config/webpack/production.js.tt

@@ -1,7 +1,5 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/production.js") %>
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
 const webpackConfig = require('./webpackConfig');
 
 const productionEnvOnly = (_clientWebpackConfig, _serverWebpackConfig) => {

data/lib/generators/react_on_rails/templates/base/base/config/webpack/test.js.tt

@@ -0,0 +1,6 @@
+<%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/development.js") %>
+
+// Use dev
+const config = require('./development');
+
+module.exports = config;

data/lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt

@@ -1,4 +1,4 @@
-const { env, webpackConfig } = require('shakapacker')
+const { env } = require('shakapacker')
 const { existsSync } = require('fs')
 const { resolve } = require('path')
 
@@ -8,7 +8,7 @@ const envSpecificConfig = () => {
     console.log(`Loading ENV specific webpack configuration file ${path}`)
     return require(path)
   } else {
-    return webpackConfig
+    throw new Error(`Could not find file to load ${path}, based on NODE_ENV`)
   }
 }
 

data/lib/react_on_rails/helper.rb

@@ -234,9 +234,9 @@ module ReactOnRails
       console_log_script = result["consoleLogScript"]
       raw("#{html}#{render_options.replay_console ? console_log_script : ''}")
     rescue ExecJS::ProgramError => err
-      raise ReactOnRails::PrerenderError, component_name: "N/A (server_render_js called)",
-                                          err: err,
-                                          js_code: js_code
+      raise ReactOnRails::PrerenderError.new(component_name: "N/A (server_render_js called)",
+                                             err: err,
+                                             js_code: js_code)
     end
 
     def json_safe_and_pretty(hash_or_string)
@@ -309,6 +309,7 @@ module ReactOnRails
 
       @rails_context.merge(serverSide: server_side)
     end
+
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     private
@@ -483,21 +484,21 @@ module ReactOnRails
         result = ReactOnRails::ServerRenderingPool.server_render_js_with_console_logging(js_code, render_options)
       rescue StandardError => err
         # This error came from the renderer
-        raise ReactOnRails::PrerenderError, component_name: react_component_name,
-                                            # Sanitize as this might be browser logged
-                                            props: sanitized_props_string(props),
-                                            err: err,
-                                            js_code: js_code
+        raise ReactOnRails::PrerenderError.new(component_name: react_component_name,
+                                               # Sanitize as this might be browser logged
+                                               props: sanitized_props_string(props),
+                                               err: err,
+                                               js_code: js_code)
       end
 
       if result["hasErrors"] && render_options.raise_on_prerender_error
         # We caught this exception on our backtrace handler
-        raise ReactOnRails::PrerenderError, component_name: react_component_name,
-                                            # Sanitize as this might be browser logged
-                                            props: sanitized_props_string(props),
-                                            err: nil,
-                                            js_code: js_code,
-                                            console_messages: result["consoleReplayScript"]
+        raise ReactOnRails::PrerenderError.new(component_name: react_component_name,
+                                               # Sanitize as this might be browser logged
+                                               props: sanitized_props_string(props),
+                                               err: nil,
+                                               js_code: js_code,
+                                               console_messages: result["consoleReplayScript"])
 
       end
       result

data/lib/react_on_rails/json_parse_error.rb

@@ -4,7 +4,7 @@ module ReactOnRails
   class JsonParseError < ::ReactOnRails::Error
     attr_reader :json
 
-    def initialize(parse_error, json)
+    def initialize(parse_error:, json:)
       @json = json
       @original_error = parse_error
       super(parse_error.message)

data/lib/react_on_rails/prerender_error.rb

@@ -49,10 +49,13 @@ module ReactOnRails
       message = +"ERROR in SERVER PRERENDERING\n"
       if err
         message << <<~MSG
-          Encountered error: \"#{err}\"
+          Encountered error:
+
+          #{err}
+
         MSG
 
-        backtrace = err.backtrace.join("\n")
+        backtrace = err.backtrace.first(15).join("\n")
       else
         backtrace = nil
       end

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -47,7 +47,7 @@ module ReactOnRails
         # Note, js_code does not have to be based on React.
         # js_code MUST RETURN json stringify Object
         # Calling code will probably call 'html_safe' on return value before rendering to the view.
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
         def exec_server_render_js(js_code, render_options, js_evaluator = nil)
           js_evaluator ||= self
           if render_options.trace
@@ -56,12 +56,27 @@ module ReactOnRails
                                "tmp/server-generated-#{@file_index % 10}.js")
             @file_index += 1
           end
-          json_string = js_evaluator.eval_js(js_code, render_options)
+          begin
+            json_string = js_evaluator.eval_js(js_code, render_options)
+          rescue StandardError => err
+            msg = <<~MSG
+              Error evaluating server bundle. Check your webpack configuration.
+              ===============================================================
+              Caught error:
+              #{err.message}
+              ===============================================================
+            MSG
+
+            if err.message.include?("ReferenceError: self is not defined")
+              msg << "\nError indicates that you may have code-splitting incorrectly enabled.\n"
+            end
+            raise ReactOnRails::Error, msg, err.backtrace
+          end
           result = nil
           begin
             result = JSON.parse(json_string)
           rescue JSON::ParserError => e
-            raise ReactOnRails::JsonParseError.new(e, json_string)
+            raise ReactOnRails::JsonParseError.new(parse_error: e, json: json_string)
           end
 
           if render_options.logging_on_server
@@ -76,7 +91,7 @@ module ReactOnRails
           end
           result
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
 
         def trace_js_code_used(msg, js_code, file_name = "tmp/server-generated.js", force: false)
           return unless ReactOnRails.configuration.trace || force

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "13.0.0.beta.0"
+  VERSION = "13.0.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "13.0.0-beta.0",
+  "version": "13.0.0",
   "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: 13.0.0.beta.0
+  version: 13.0.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -248,6 +248,7 @@ files:
 - lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/production.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/test.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/webpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpacker.yml
@@ -333,9 +334,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key: