react_on_rails 13.3.5 → 13.4.0

data/lib/react_on_rails/helper.rb

@@ -313,20 +313,25 @@ module ReactOnRails
       @rails_context.merge(serverSide: server_side)
     end
 
-    def load_pack_for_generated_component(component_name)
-      ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
+    def load_pack_for_generated_component(react_component_name, render_options)
+      return unless render_options.auto_load_bundle
 
-      append_javascript_pack_tag("generated/#{component_name}",
+      ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
+      if Rails.env.development?
+        is_component_pack_present = File.exist?(generated_components_pack_path(react_component_name))
+        raise_missing_autoloaded_bundle(react_component_name) unless is_component_pack_present
+      end
+      append_javascript_pack_tag("generated/#{react_component_name}",
                                  defer: ReactOnRails.configuration.defer_generated_component_packs)
-      append_stylesheet_pack_tag("generated/#{component_name}")
+      append_stylesheet_pack_tag("generated/#{react_component_name}")
     end
 
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     private
 
-    def generated_components_pack_path(component_name)
-      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{component_name}.js"
+    def generated_components_pack_path(react_component_name)
+      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{react_component_name}.js"
     end
 
     def build_react_component_result_for_server_rendered_string(
@@ -439,11 +444,7 @@ module ReactOnRails
       # Create the HTML rendering part
       result = server_rendered_react_component(render_options)
 
-      if render_options.auto_load_bundle
-        is_component_pack_present = File.exist?(generated_components_pack_path(react_component_name))
-
-        load_pack_for_generated_component(react_component_name) if is_component_pack_present
-      end
+      load_pack_for_generated_component(react_component_name, render_options)
 
       {
         render_options: render_options,
@@ -564,6 +565,17 @@ module ReactOnRails
       instrument_method :react_component, type: "ReactOnRails", name: "react_component"
       instrument_method :react_component_hash, type: "ReactOnRails", name: "react_component_hash"
     end
+
+    def raise_missing_autoloaded_bundle(react_component_name)
+      msg = <<~MSG
+        **ERROR** ReactOnRails: Component "#{react_component_name}" is configured as "auto_load_bundle: true"
+        but the generated component entrypoint, which should have been at #{generated_components_pack_path(react_component_name)},
+        is missing. You might want to check that this component is in a directory named "#{ReactOnRails.configuration.components_subdirectory}"
+        & that "bundle exec rake react_on_rails:generate_packs" has been run.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
   end
 end
 # rubocop:enable Metrics/ModuleLength

data/lib/react_on_rails/packs_generator.rb

@@ -13,6 +13,8 @@ module ReactOnRails
     end
 
     def generate_packs_if_stale
+      return unless ReactOnRails.configuration.auto_load_bundle
+
       are_generated_files_present_and_up_to_date = Dir.exist?(generated_packs_directory_path) &&
                                                    File.exist?(generated_server_bundle_file_path) &&
                                                    !stale_or_missing_packs?

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -113,9 +113,7 @@ module ReactOnRails
 
         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 = []")
-            result
+            js_context.eval(js_code)
           end
         end
 

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "13.3.5"
+  VERSION = "13.4.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "13.3.5",
+  "version": "13.4.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.3.5
+  version: 13.4.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -157,6 +157,7 @@ files:
 - docs/additional-details/manual-installation-overview.md
 - docs/additional-details/migrating-from-react-rails.md
 - docs/additional-details/recommended-project-structure.md
+- docs/additional-details/tips-for-usage-with-sp6.md
 - docs/additional-details/updating-dependencies.md
 - docs/additional-details/upgrade-webpacker-v3-to-v4.md
 - docs/api/javascript-api.md
@@ -203,6 +204,7 @@ files:
 - docs/javascript/react-helmet.md
 - docs/javascript/react-router.md
 - docs/javascript/server-rendering-tips.md
+- docs/javascript/troubleshooting-when-using-shakapacker.md
 - docs/javascript/troubleshooting-when-using-webpacker.md
 - docs/javascript/webpack-v1-notes.md
 - docs/javascript/webpack.md
@@ -225,6 +227,7 @@ files:
 - docs/testimonials/testimonials.md
 - jest.config.js
 - lib/generators/USAGE
+- lib/generators/react_on_rails/adapt_for_older_shakapacker_generator.rb
 - lib/generators/react_on_rails/base_generator.rb
 - lib/generators/react_on_rails/bin/dev
 - lib/generators/react_on_rails/bin/dev-static
@@ -247,6 +250,7 @@ files:
 - lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb
 - lib/generators/react_on_rails/templates/base/base/babel.config.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb
+- lib/generators/react_on_rails/templates/base/base/config/shakapacker.yml
 - lib/generators/react_on_rails/templates/base/base/config/webpack/clientWebpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/commonWebpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt
@@ -255,7 +259,6 @@ files:
 - 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
 - lib/generators/react_on_rails/templates/dev_tests/.eslintrc
 - lib/generators/react_on_rails/templates/dev_tests/.rspec
 - lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb